Update references to the main branch
Conflicts:
.github/CONTRIBUTING.md
website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx
The website conflicts seems like it some of the changes on main didn't
make it into the 1.10.x branch, but the content is relevant for 1.10 so
I took the changes from main.
* docs: Add info on using cloud auto-join with Network Segments
Resolves hashicorp/go-discover#57
* Add note about joining network segments
Specifically call out that agents can be configured to join a network
segment by either specifying the Serf LAN port in the join address,
changing the agent's default Serf LAN port by configuring
`ports.serf_lan`, or specifying the port in the `-serf-lan-port`
command line flag.
Resolves#9972
* Update glossary.mdx
1. Update header to the first section to "Consul Vocabulary" since these are the terms used in the context of Consul conversations.
2. Kept the header "Consul Glossary" since these are the terms useful for practitioners in the consul space.
3. Removed interlinking to terms on the same page.
Co-authored-by: Hans Hasselberg <me@hans.io>
Co-authored-by: Swarna Podila <swarnap@users.noreply.github.com>
* website: migrate to new nav-data format
* website: clean up unused intro content
* website: remove deprecated sidebar_title from frontmatter
* website: add react-content to fix global style import issue
Blake Covarrubias
Daniel Nephin
Jono Sosulska
Zachary Shilton
Jeff Escalante