From e00e0666ca6fda812a0db878ed5a59f619442877 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Thu, 25 Aug 2022 23:05:08 -0700 Subject: [PATCH 1/2] Replace references to Learn --- website/content/docs/connect/ca/vault.mdx | 2 +- website/content/docs/connect/configuration.mdx | 2 +- website/content/docs/download-tools.mdx | 7 +++---- website/content/docs/dynamic-app-config/kv.mdx | 5 ++--- website/content/docs/ecs/manual/acl-controller.mdx | 2 +- website/content/docs/enterprise/admin-partitions.mdx | 2 +- website/content/docs/enterprise/audit-logging.mdx | 3 +-- website/content/docs/enterprise/backups.mdx | 3 +-- website/content/docs/enterprise/namespaces.mdx | 2 +- website/content/docs/enterprise/network-segments.mdx | 12 ++++++------ website/content/docs/enterprise/redundancy.mdx | 5 ++--- website/content/docs/enterprise/sentinel.mdx | 2 +- website/content/docs/enterprise/upgrades.mdx | 2 +- website/content/docs/guides/index.mdx | 6 ++---- website/content/docs/index.mdx | 5 ++--- website/content/docs/intro/index.mdx | 7 +++---- .../docs/intro/usecases/what-is-a-service-mesh.mdx | 2 +- .../intro/usecases/what-is-service-discovery.mdx | 2 +- .../k8s/installation/multi-cluster/kubernetes.mdx | 6 +++--- .../content/docs/release-notes/consul/v1_11_x.mdx | 2 +- website/content/docs/upgrading/upgrade-specific.mdx | 4 +--- 21 files changed, 36 insertions(+), 47 deletions(-) diff --git a/website/content/docs/connect/ca/vault.mdx b/website/content/docs/connect/ca/vault.mdx index 332d8dfbd4..9bc176f71b 100644 --- a/website/content/docs/connect/ca/vault.mdx +++ b/website/content/docs/connect/ca/vault.mdx @@ -19,7 +19,7 @@ Please read the [certificate management overview](/docs/connect/ca) page first to understand how Consul manages certificates with configurable CA providers. --> **NOTE**: A Learn [tutorial](/consul/tutorials/vault-secure/vault-pki-consul-connect-ca?utm_source=docs) is available to help you configure Vault as the Consul Connect service mesh Certification Authority. +-> **Tip:** Complete the [tutorial](/consul/tutorials/vault-secure/vault-pki-consul-connect-ca?utm_source=docs) to learn how to configure Vault as the Consul Connect service mesh Certification Authority. ## Requirements diff --git a/website/content/docs/connect/configuration.mdx b/website/content/docs/connect/configuration.mdx index be645da8e7..056f17ef09 100644 --- a/website/content/docs/connect/configuration.mdx +++ b/website/content/docs/connect/configuration.mdx @@ -104,7 +104,7 @@ Connect can be used with Nomad to provide secure service-to-service communication between Nomad jobs and task groups. The ability to use the dynamic port feature of Nomad makes Connect particularly easy to use. Learn about how to configure Connect on Nomad by reading the -[integration documentation](/docs/connect/nomad) +[integration documentation](/docs/connect/nomad). ### Kubernetes diff --git a/website/content/docs/download-tools.mdx b/website/content/docs/download-tools.mdx index 60f2e11df2..a03f13d1c8 100644 --- a/website/content/docs/download-tools.mdx +++ b/website/content/docs/download-tools.mdx @@ -16,14 +16,13 @@ These Consul tools are created and managed by the dedicated engineers at HashiCo - [Envconsul](https://github.com/hashicorp/envconsul) - Read and set environmental variables for processes from Consul. - [Consul API Gateway](https://github.com/hashicorp/consul-api-gateway/) - dedicated ingress solution for intelligently routing traffic to applications running on a Consul Service Mesh. -- [Consul ESM](https://github.com/hashicorp/consul-esm) - Provides external service monitoring for Consul. A tutorial is available on [HashiCorp Learn](/consul/tutorials/developer-discovery/service-registration-external-services?utm_source=docs). +- [Consul ESM](https://github.com/hashicorp/consul-esm) - Provides external service monitoring for Consul. Complete the [tutorial]((/consul/tutorials/developer-discovery/service-registration-external-services?utm_source=docs)) to learn more. - [Consul Migrate](https://github.com/hashicorp/consul-migrate) - Data migration tool to handle Consul upgrades to 0.5.1+ - [Consul Replicate](https://github.com/hashicorp/consul-replicate) - Consul cross-DC KV replication daemon. -- [Consul Template](https://github.com/hashicorp/consul-template) - Generic template rendering and notifications with Consul. A step by step tutorial is available on [HashiCorp Learn](/consul/tutorials/developer-configuration/consul-template?utm_source=docs). +- [Consul Template](https://github.com/hashicorp/consul-template) - Generic template rendering and notifications with Consul. Complete the [tutorial](/consul/tutorials/developer-configuration/consul-template?utm_source=docs) to the learn more. - [Consul-Terraform Sync](https://github.com/hashicorp/consul-terraform-sync) - enables dynamic updates to network infrastructure devices triggered by service -changes. A tutorial is available on [HashiCorp -Learn](/consul/tutorials/network-infrastructure-automation?utm_source=docs) +changes. Complete the [tutorial](/consul/tutorials/network-infrastructure-automation?utm_source=docs) to learn more. ## Community Tools diff --git a/website/content/docs/dynamic-app-config/kv.mdx b/website/content/docs/dynamic-app-config/kv.mdx index 7c26a7035a..bf364a4875 100644 --- a/website/content/docs/dynamic-app-config/kv.mdx +++ b/website/content/docs/dynamic-app-config/kv.mdx @@ -21,9 +21,8 @@ core design allows data to be replicated automatically across all the servers. Having a quorum of servers will decrease the risk of data loss if an outage occurs. -If you have not used Consul KV, check out this [Getting Started -tutorial](/consul/tutorials/getting-started/get-started-key-value-store?utm_source=docs) on HashiCorp -Learn. +If you have not used Consul KV, complete this [Getting Started +tutorial](/consul/tutorials/getting-started/get-started-key-value-store?utm_source=docs) on HashiCorp. ## Accessing the KV store diff --git a/website/content/docs/ecs/manual/acl-controller.mdx b/website/content/docs/ecs/manual/acl-controller.mdx index d2a847ecf5..fe97253048 100644 --- a/website/content/docs/ecs/manual/acl-controller.mdx +++ b/website/content/docs/ecs/manual/acl-controller.mdx @@ -13,7 +13,7 @@ This topic describes how to manually deploy the ACL controller, which will autom * Your application tasks must include certain tags to be compatible with the ACL controller. Refer to the [Task Tags](/docs/ecs/manual/install#task-tags) section of the installation page. -* You should be familiar with configuring Consul's secure features, including how to create ACL tokens and policies. Refer to the [Learn Guides about Consul Security](/consul/tutorials/security?utm_source=docs) for an introduction and the [ACL system](/docs/security/acl) documentation for more information. +* You should be familiar with configuring Consul's secure features, including how to create ACL tokens and policies. Refer to the [Consul Security tutorials](/consul/tutorials/security?utm_source=docs) for an introduction and the [ACL system](/docs/security/acl) documentation for more information. * If you are using Consul with multiple ECS clusters, each cluster requires its own instance of the ACL controller. ## Set Up Secrets diff --git a/website/content/docs/enterprise/admin-partitions.mdx b/website/content/docs/enterprise/admin-partitions.mdx index bd09611a95..a51e4b3f53 100644 --- a/website/content/docs/enterprise/admin-partitions.mdx +++ b/website/content/docs/enterprise/admin-partitions.mdx @@ -22,7 +22,7 @@ Admin partitions exist a level above namespaces in the identity hierarchy. They -> **Preexisting resource nodes and namespaces**: Admin partitions were introduced in Consul 1.11. Resource nodes were not namespaced prior to 1.11. After upgrading to Consul 1.11 or later, all resource nodes will be namespaced. -There are Learn tutorials available to help you get started with admin partitions. +There are tutorials available to help you get started with admin partitions. - [Multi-Tenancy with Administrative Partitions](/consul/tutorials/enterprise/consul-admin-partitions?utm_source=docs) - [Multi Cluster Applications with Consul Enterprise Admin Partitions](/consul/tutorials/kubernetes/kubernetes-admin-partitions?utm_source=docs) diff --git a/website/content/docs/enterprise/audit-logging.mdx b/website/content/docs/enterprise/audit-logging.mdx index 4e60aa2410..c6890a3f62 100644 --- a/website/content/docs/enterprise/audit-logging.mdx +++ b/website/content/docs/enterprise/audit-logging.mdx @@ -23,8 +23,7 @@ and contain a timestamp, the operation performed, and the user who initiated the Audit logging enables security and compliance teams within an organization to get greater insight into Consul access and usage patterns. -For more experience leveraging Consul's audit logging functionality, explore our -HashiCorp Learn tutorial [Capture Consul Events with Audit Logging](/consul/tutorials/datacenter-operations/audit-logging?utm_source=docs). +Complete the [Capture Consul Events with Audit Logging](/consul/tutorials/datacenter-operations/audit-logging?utm_source=docs) tutorial to learn more about Consul's audit logging functionality, For detailed configuration information on configuring the Consul Enterprise's audit logging, review the Consul [Audit Log](/docs/agent/config/config-files#audit) diff --git a/website/content/docs/enterprise/backups.mdx b/website/content/docs/enterprise/backups.mdx index befb6d7735..76f00e5c6c 100644 --- a/website/content/docs/enterprise/backups.mdx +++ b/website/content/docs/enterprise/backups.mdx @@ -35,7 +35,6 @@ datacenter backups include (but are not limited to): - Access Control Lists (ACLs) - Namespaces -For more experience leveraging Consul's snapshot functionality, we suggest you look through our HashiCorp -Learn tutorial for [Datacenter Backups in Consul](/consul/tutorials/production-deploy/backup-and-restore?utm_source=docs). +For more experience leveraging Consul's snapshot functionality, complete the [Datacenter Backups in Consul](/consul/tutorials/production-deploy/backup-and-restore?utm_source=docs) tutorial. For detailed configuration information on configuring the Consul Enterprise's snapshot agent, review the [Consul Snapshot Agent documentation](/commands/snapshot/agent). diff --git a/website/content/docs/enterprise/namespaces.mdx b/website/content/docs/enterprise/namespaces.mdx index ddabfe02db..5bc6bb7a98 100644 --- a/website/content/docs/enterprise/namespaces.mdx +++ b/website/content/docs/enterprise/namespaces.mdx @@ -19,7 +19,7 @@ can be isolated from each other with the use of namespaces. Namespaces help redu by removing restrictions around uniqueness of resource names across distinct teams, and enable operators to provide self-service through delegation of administrative privileges. -For more information on how to use namespaces with Consul Enterprise please review the following HashiCorp Learn Guides: +For more information on how to use namespaces with Consul Enterprise please review the following tutorials: - [Register and Discover Services within Namespaces](/consul/tutorials/namespaces/namespaces-share-datacenter-access?utm_source=docs) - Register multiple services within different namespaces in Consul. - [Setup Secure Namespaces](/consul/tutorials/namespaces/namespaces-secure-shared-access?utm_source=docs) - Secure resources within a namespace and delegate namespace ACL rights via ACL tokens. diff --git a/website/content/docs/enterprise/network-segments.mdx b/website/content/docs/enterprise/network-segments.mdx index 421d922061..352bfd6d06 100644 --- a/website/content/docs/enterprise/network-segments.mdx +++ b/website/content/docs/enterprise/network-segments.mdx @@ -33,8 +33,7 @@ connectivity between agent members on the same segment. ![Consul datacenter agent connectivity with network segments](/img/network-segments/consul-network-segments-multiple.png) -To get started with network segments you can review the tutorial on HashiCorp -Learn for [Network Segments](/consul/tutorials/datacenter-operations/network-partition-datacenters?utm_source=docs). +Complete the [Network Segments](/consul/tutorials/datacenter-operations/network-partition-datacenters?utm_source=docs) tutorial to learn more about network segments. -> **Info:** Network segments enable you to operate a Consul datacenter without full mesh (LAN) connectivity between agents. To federate multiple Consul datacenters @@ -57,10 +56,11 @@ Segments (Enterprise) creates multiple segments within one cluster. **Federated Cluster:** A set of connected clusters, each representing a unique Consul “datacenter”. These Consul servers are federated together over the WAN. Consul clients make use of resources in federated clusters by forwarding RPCs through the Consul servers in their local cluster, but they -never interact with remote Consul servers directly. There are currently two -inter-cluster network models which can be viewed on HashiCorp Learn: -[WAN gossip (OSS)](/consul/tutorials/networking/federation-gossip-wan?utm_source=docs) -and [Network Areas (Enterprise)](/consul/tutorials/datacenter-operations/federation-network-areas?utm_source=docs). +never interact with remote Consul servers directly. There are two tutorials that +will guide you through inter-cluster network models: + +1. [WAN gossip (OSS)](/consul/tutorials/networking/federation-gossip-wan?utm_source=docs) +1. [Network Areas (Enterprise)](/consul/tutorials/datacenter-operations/federation-network-areas?utm_source=docs). **LAN Gossip Pool**: A set of Consul agents that have full mesh connectivity among themselves, and use Serf to maintain a shared view of the members of the diff --git a/website/content/docs/enterprise/redundancy.mdx b/website/content/docs/enterprise/redundancy.mdx index 1b80b743b4..891b251288 100644 --- a/website/content/docs/enterprise/redundancy.mdx +++ b/website/content/docs/enterprise/redundancy.mdx @@ -30,6 +30,5 @@ for server nodes while also providing (and expanding) the capabilities of [enhanced read scalability](/docs/enterprise/read-scale) by also including recovery capabilities. -For more information, review the HashiCorp Learn tutorial on -[Redundancy Zones](/consul/tutorials/datacenter-operations/autopilot-datacenter-operations?utm_source=docs#redundancy-zones), -as well as the documentation for [Consul Autopilot](/commands/operator/autopilot). +For more information, complete the [Redundancy Zones](/consul/tutorials/datacenter-operations/autopilot-datacenter-operations?utm_source=docs#redundancy-zones) tutorial +and reference the [Consul Autopilot](/commands/operator/autopilot) documentation. diff --git a/website/content/docs/enterprise/sentinel.mdx b/website/content/docs/enterprise/sentinel.mdx index e336ba74b4..1eff5aecdb 100644 --- a/website/content/docs/enterprise/sentinel.mdx +++ b/website/content/docs/enterprise/sentinel.mdx @@ -19,7 +19,7 @@ description: >- Sentinel policies extend the ACL system in Consul beyond static "read", "write", and "deny" policies to support full conditional logic and integration with -external systems. [Learn more about Sentinel here.](https://docs.hashicorp.com/sentinel/concepts/). +external systems. Reference the [Sentinel documentation](https://docs.hashicorp.com/sentinel/concepts/) for high-level Sentinel concepts. To get started with Sentinel in Consul, [read the general documentation](https://docs.hashicorp.com/sentinel/consul/) or diff --git a/website/content/docs/enterprise/upgrades.mdx b/website/content/docs/enterprise/upgrades.mdx index 5a1192633a..273257e421 100644 --- a/website/content/docs/enterprise/upgrades.mdx +++ b/website/content/docs/enterprise/upgrades.mdx @@ -23,4 +23,4 @@ currently in a cluster. When an equal amount of new server nodes are joined runn will be demoted to non voting members. Demotion of legacy server nodes will not occur until the voting members on the new version match. Once this demotion occurs, the previous versioned servers can be removed from the cluster safely. -You can review more information about this functionality in the [Consul operator autopilot](/commands/operator/autopilot) documentation as well as on the HashiCorp Learn [Automated Upgrade](/consul/tutorials/datacenter-operations/autopilot-datacenter-operations?utm_source=docs#upgrade-migrations) tutorial. +Review the [Consul operator autopilot](/commands/operator/autopilot) documentation and complete the [Automated Upgrade](/consul/tutorials/datacenter-operations/autopilot-datacenter-operations?utm_source=docs#upgrade-migrations) tutorial to learn more about automated upgrades. diff --git a/website/content/docs/guides/index.mdx b/website/content/docs/guides/index.mdx index e1bfd11fd0..20b54307c6 100644 --- a/website/content/docs/guides/index.mdx +++ b/website/content/docs/guides/index.mdx @@ -9,9 +9,9 @@ description: |- # Consul Guides -~> The Consul guides have moved to the [HashiCorp Learn platform](/consul/tutorials?utm_source=docs&utm_content=guide-index). +~> The Consul guides are now Consul [tutorials](/consul/tutorials?utm_source=docs). -[Guides](/consul/tutorials?utm_source=docs&utm_content=guide-index) are step by step command-line +[Guides](/consul/tutorials?utm_source=docs) are step by step command-line walkthroughs that demonstrate how to perform common operations using Consul, and complement the feature-focused Consul documentation. @@ -36,5 +36,3 @@ Tracks include: - Service Segmentation and Consul Connect - Service Configuration and Consul KV - Cloud and Load Balancer Integrations - -[**Explore the Learn platform**](/consul/tutorials?utm_source=docs&utm_content=guide-index) diff --git a/website/content/docs/index.mdx b/website/content/docs/index.mdx index 26cb55ac1d..9e5cce4995 100644 --- a/website/content/docs/index.mdx +++ b/website/content/docs/index.mdx @@ -12,9 +12,8 @@ Welcome to the Consul documentation! The documentation is reference material for all available features and options of Consul In the Quick Links below, you will find the most commonly used documentation -and a link to our guides that walk you through common tasks. Note that the -guides are located on the HashiCorp Learn site. +and a link to our guides that guide you through common tasks. - Follow [the documentation](/docs/install) to install Consul either with a precompiled binary or from source. - Read more about the [configuration options](/docs/agent/config) for Consul servers and clients. -- Get started using Consul with our step-by-step guides at [HashiCorp Learn](/consul/tutorials?utm_source=docs). +- Get started using Consul by completing the step-by-step [tutorials](/consul/tutorials?utm_source=docs). diff --git a/website/content/docs/intro/index.mdx b/website/content/docs/intro/index.mdx index fa0cf7c7ea..f92394060b 100644 --- a/website/content/docs/intro/index.mdx +++ b/website/content/docs/intro/index.mdx @@ -15,9 +15,8 @@ Welcome to the intro guide to Consul! This guide is the best place to start with Consul. We cover what Consul is, what problems it can solve, how it compares to existing software, and how you can get started using it. If you are familiar with the basics of Consul, the [documentation](/docs) provides a more -detailed reference of available features. If you're ready to get hands-on -experience, deploy Consul locally with our -[HashiCorp Learn tutorial](/consul/tutorials/getting-started/get-started-install?utm_source=docs). +detailed reference of available features. Complete the [Get Started](/consul/tutorials/getting-started/get-started-install?utm_source=docs) tutorials for a step-by-step guide on how +to use Consul. ## Why Consul? @@ -115,5 +114,5 @@ forward the request to the remote datacenter and return the result. ## Next Steps -Continue onwards with [HashiCorp Learn](/consul/tutorials/getting-started/get-started-install?utm_source=docs) +Complete the [Get Started](/consul/tutorials/getting-started/get-started-install?utm_source=docs) tutorials to learn more about Consul and how to get Consul up and running. diff --git a/website/content/docs/intro/usecases/what-is-a-service-mesh.mdx b/website/content/docs/intro/usecases/what-is-a-service-mesh.mdx index b9189f5228..f7c2c268fb 100644 --- a/website/content/docs/intro/usecases/what-is-a-service-mesh.mdx +++ b/website/content/docs/intro/usecases/what-is-a-service-mesh.mdx @@ -111,7 +111,7 @@ Consul is platform agnostic which makes it a great fit for all environments, inc Consul is available as a [self-install](/downloads) project or as a fully managed service mesh solution called [HCP Consul](https://portal.cloud.hashicorp.com/sign-in?utm_source=consul_docs). HCP Consul enables users to discover and securely connect services without the added operational burden of maintaining a service mesh on their own. -You can learn more about Consul by visiting the Consul Learn [tutorials](/consul/tutorials?utm_source=docs). +You can learn more about Consul by visiting the Consul [tutorials](/consul/tutorials?utm_source=docs). ## Next diff --git a/website/content/docs/intro/usecases/what-is-service-discovery.mdx b/website/content/docs/intro/usecases/what-is-service-discovery.mdx index f61b05d16e..39dfd6b184 100644 --- a/website/content/docs/intro/usecases/what-is-service-discovery.mdx +++ b/website/content/docs/intro/usecases/what-is-service-discovery.mdx @@ -89,7 +89,7 @@ Consul is available as a [self-managed](/downloads) project or as a fully manage Get started with service discovery today by leveraging Consul on HCP, Consul on Kubernetes, or Consul on VMs. Prepare your organization for the future of multi-cloud and embrace a [zero-trust](https://www.hashicorp.com/solutions/zero-trust-security) architecture. -Feel free to get started with Consul by exploring one of these Consul Learn tutorials: +Feel free to get started with Consul by exploring one of these Consul tutorials: [Getting Started with Consul on VMs](/consul/tutorials/getting-started?utm_source=docs) [Getting Started with Consul on HCP](/consul/tutorials/cloud-get-started?utm_source=docs) diff --git a/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx b/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx index 61d18cfc4d..f78ee234ff 100644 --- a/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx +++ b/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx @@ -11,7 +11,7 @@ description: >- ~> This topic requires familiarity with [Mesh Gateways](/docs/connect/gateways/mesh-gateway/service-to-service-traffic-datacenters) and [WAN Federation Via Mesh Gateways](/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways). --> Looking for a step-by-step guide? Please follow our Learn tutorial: [Secure and Route Service Mesh Communication Across Kubernetes](/consul/tutorials/kubernetes/kubernetes-mesh-gateways?utm_source=docs). +-> Looking for a step-by-step guide? Complete the [Secure and Route Service Mesh Communication Across Kubernetes](/consul/tutorials/kubernetes/kubernetes-mesh-gateways?utm_source=docs) tutorial to learn more. This page describes how to federate multiple Kubernetes clusters. See [Multi-Cluster Overview](/docs/k8s/installation/multi-cluster) for more information on use-cases and how it works. @@ -465,8 +465,8 @@ in the top left: ## Next Steps -With your Kubernetes clusters federated, try out using Consul service mesh to -route between services deployed on each cluster by following our Learn tutorial: [Secure and Route Service Mesh Communication Across Kubernetes](/consul/tutorials/kubernetes/kubernetes-mesh-gateways?utm_source=docs#deploy-microservices). +With your Kubernetes clusters federated, complete the [Secure and Route Service Mesh Communication Across Kubernetes](/consul/tutorials/kubernetes/kubernetes-mesh-gateways?utm_source=docs#deploy-microservices) tutorial to learn how to use Consul service mesh to +route between services deployed on each cluster. You can also read our in-depth documentation on [Consul Service Mesh In Kubernetes](/docs/k8s/connect). diff --git a/website/content/docs/release-notes/consul/v1_11_x.mdx b/website/content/docs/release-notes/consul/v1_11_x.mdx index f6522d9cee..45d5dd43f9 100644 --- a/website/content/docs/release-notes/consul/v1_11_x.mdx +++ b/website/content/docs/release-notes/consul/v1_11_x.mdx @@ -21,7 +21,7 @@ description: >- ## What's Changed -- The legacy ACL system that was deprecated in Consul 1.4.0 has been removed. Before upgrading you should verify that all tokens and policies have been migrated to the newer ACL system. See the [Migrate Legacy ACL Tokens Learn Guide](/consul/tutorials/security-operations/access-control-token-migration?utm_source=docs) for more information. +- The legacy ACL system that was deprecated in Consul 1.4.0 has been removed. Before upgrading you should verify that all tokens and policies have been migrated to the newer ACL system. Complete the [Migrate Legacy ACL Tokens](/consul/tutorials/security-operations/access-control-token-migration?utm_source=docs) tutorial to learn more. - The `agent_master` ACL token has been renamed to `agent_recovery` ACL token. In addition, the `consul acl set-agent-token master` command has been replaced with `consul acl set-agent-token recovery`. See [ACL Agent Recovery Token](/docs/security/acl/acl-tokens#acl-agent-recovery-token) and [Consul ACL Set Agent Token](/commands/acl/set-agent-token) for more information. diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx index 9c161ebb0f..729c22f8ca 100644 --- a/website/content/docs/upgrading/upgrade-specific.mdx +++ b/website/content/docs/upgrading/upgrade-specific.mdx @@ -113,9 +113,7 @@ The `consul acl set-agent-token master` subcommand has been replaced with The legacy ACL system that was deprecated in Consul 1.4.0 has been removed. Before upgrading you should verify that nothing is still using the legacy ACL -system. See the [Migrate Legacy ACL Tokens Learn -Guide](/consul/tutorials/security-operations/access-control-token-migration?utm_source=docs) -for more information. +system. Complete the [Migrate Legacy ACL Tokens](/consul/tutorials/security-operations/access-control-token-migration?utm_source=docs) tutorial to learn more. Due to this removal the following endpoints no longer function: From 4278fe8113af287c99c770ead45716bd7a3ec00f Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Sun, 28 Aug 2022 19:41:35 -0700 Subject: [PATCH 2/2] fix merge conflicts --- website/data/docs-nav-data.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json index 435de3081c..e83300fb15 100644 --- a/website/data/docs-nav-data.json +++ b/website/data/docs-nav-data.json @@ -562,10 +562,6 @@ "title": "Auth Methods", "routes": [ { -<<<<<<< HEAD - "title": "Minikube", - "href": "/consul/tutorials/kubernetes/kubernetes-minikube?utm_source=docs&utm_content=k8s&utm_term=mk" -======= "title": "Overview", "path": "security/acl/auth-methods" },