Merge branch 'remove-global-nav-redirects' into 'master'

Update redirected navbar links

See merge request gitlab-org/gitlab-docs!1254

4 files changed, 30 insertions, 58 deletions

diff --git a/content/_data/charts-nav.yaml b/content/_data/charts-nav.yaml
index 2cbfe661..c0de0adf 100644
--- a/content/_data/charts-nav.yaml
+++ b/content/_data/charts-nav.yaml
@@ -18,6 +18,7 @@
 sections:
   - section_title: GitLab Helm Charts Docs
     section_url: ''
+
   - section_title: Install
     section_url: 'installation/'
     section_categories:
@@ -47,6 +48,7 @@ sections:
         category_url: 'installation/migration/'
       - category_title: Version mappings
         category_url: 'installation/version_mappings.html'
+
   - section_title: Configure
     section_url: 'charts/'
     section_categories:
@@ -74,7 +76,7 @@ sections:
           - doc_title: Sidekiq chart
             doc_url: 'charts/gitlab/sidekiq/'
           - doc_title: Task Runner chart
-            doc_url: 'charts/gitlab/sidekiq/'
+            doc_url: 'charts/gitlab/task-runner/'
           - doc_title: Webservice chart
             doc_url: 'charts/gitlab/webservice/'
       - category_title: Minio chart
@@ -82,9 +84,9 @@ sections:
       - category_title: Nginx chart
         category_url: 'charts/nginx/'
       - category_title: Redis chart
-        category_url: 'charts/redis/'
+        category_url: 'installation/deployment.html#redis'
       - category_title: Redis HA chart
-        category_url: 'charts/redis-ha/'
+        category_url: 'installation/deployment.html#redis'
       - category_title: Registry chart
         category_url: 'charts/registry/'
       - category_title: Advanced
@@ -104,13 +106,26 @@ sections:
             doc_url: 'advanced/external-redis/'
           - doc_title: Persistent volumes
             doc_url: 'advanced/persistent-volumes/'
+
   - section_title: Troubleshoot
     section_url: 'troubleshooting/'
+
   - section_title: Contribute
     section_url: 'development/'
     section_categories:
-      - category_title: Architecture
+      - category_title: Architecture of Cloud native GitLab Helm charts
         category_url: 'architecture/'
+        docs:
+          - doc_title: Backup and Restore
+            doc_url: 'architecture/backup-restore.html'
+          - doc_title: Goals
+            doc_url: 'architecture/goals.html'
+          - doc_title: Architecture
+            doc_url: 'architecture/architecture.html'
+          - doc_title: Design Decisions
+            doc_url: 'architecture/decisions.html'
+          - doc_title: Resource Usage
+            doc_url: 'architecture/resource-usage.html'
       - category_title: Environment setup
         category_url: 'development/environment_setup.html'
       - category_title: Style guide
diff --git a/content/_data/default-nav.yaml b/content/_data/default-nav.yaml
index cebff174..f03c4048 100644
--- a/content/_data/default-nav.yaml
+++ b/content/_data/default-nav.yaml
@@ -153,10 +153,6 @@ sections:
             doc_url: 'user/group/epics/manage_epics.html'
             ee_only: true
             ee_tier: 'GitLab Premium, GitLab.com Silver, and higher tiers'
-      - category_title: Dependency proxy
-        category_url: 'user/group/dependency_proxy/'
-        ee_only: true
-        ee_tier: 'GitLab Premium, GitLab.com Silver, and higher tiers'
       - category_title: Group Import/Export
         category_url: 'user/group/settings/import_export.html'
       - category_title: Insights
@@ -407,7 +403,7 @@ sections:
           - doc_title: Git attributes
             doc_url: 'user/project/git_attributes.html'
           - doc_title: Git LFS
-            doc_url: 'administration/lfs/manage_large_binaries_with_git_lfs.html'
+            doc_url: 'topics/git/lfs/'
           - doc_title: Locked files
             doc_url: 'user/project/file_lock.html'
             ee_only: true
@@ -586,7 +582,7 @@ sections:
           - doc_title: Migrating from CircleCI
             doc_url: 'ci/migration/circleci.html'
           - doc_title: Migrating from Jenkins
-            doc_url: 'ci/jenkins/'
+            doc_url: 'ci/migration/jenkins.html'
       - category_title: '.gitlab-ci.yml Reference'
         category_url: 'ci/yaml/README.html'
         docs:
@@ -642,7 +638,7 @@ sections:
         category_url: 'ci/examples/README.html'
         docs:
           - doc_title: Browser performance testing
-            doc_url: 'ci/examples/browser_performance.html'
+            doc_url: 'user/project/merge_requests/browser_performance_testing.html#configuring-browser-performance-testing'
           - doc_title: Clojure
             doc_url: 'ci/examples/test-clojure-application.html'
           - doc_title: Deployment with Dpl
@@ -1295,7 +1291,7 @@ sections:
           - doc_title: Admin Area settings
             doc_url: 'user/admin_area/settings/'
           - doc_title: Appearance
-            doc_url: 'customization/'
+            doc_url: 'user/admin_area/appearance.html'
           - doc_title: Authentication
             doc_url: 'topics/authentication/'
           - doc_title: CI/CD
@@ -1315,7 +1311,7 @@ sections:
             ee_only: true
             ee_tier: 'GitLab Premium and higher tiers. Not available in GitLab.com'
           - doc_title: Git LFS administration
-            doc_url: 'administration/lfs/lfs_administration.html'
+            doc_url: 'administration/lfs/'
           - doc_title: Gitaly timeouts
             doc_url: 'user/admin_area/settings/gitaly_timeouts.html'
           - doc_title: GitLab Pages
@@ -1449,9 +1445,9 @@ sections:
           - doc_title: Setting up Geo
             doc_url: 'administration/geo/setup/'
           - doc_title: Database replication
-            doc_url: 'administration/geo/replication/database.html'
+            doc_url: 'administration/geo/setup/database.html'
           - doc_title: External PostgreSQL instances
-            doc_url: 'administration/geo/replication/external_database.html'
+            doc_url: 'administration/geo/setup/external_database.html'
           - doc_title: Configuration
             doc_url: 'administration/geo/replication/configuration.html'
           - doc_title: Using a Geo server
@@ -1615,7 +1611,7 @@ sections:
           - doc_title: Database review guidelines
             doc_url: 'development/database_review.html'
           - doc_title: SQL guidelines
-            doc_url: 'development/database_review.html'
+            doc_url: 'development/sql.html'
           - doc_title: Migrations style guide
             doc_url: 'development/migration_style_guide.html'
           - doc_title: What requires downtime
@@ -1696,8 +1692,6 @@ sections:
             doc_url: 'development/fe_guide/principles.html'
           - doc_title: Security
             doc_url: 'development/fe_guide/security.html'
-          - doc_title: Testing
-            doc_url: 'development/fe_guide/testing.html'
           - doc_title: Tooling
             doc_url: 'development/fe_guide/tooling.html'
           - doc_title: Vuex
@@ -1732,8 +1726,6 @@ sections:
             doc_url: 'development/fe_guide/style/html.html'
           - doc_title: JavaScript style guide
             doc_url: 'development/fe_guide/style/javascript.html'
-          - doc_title: Migration style guide
-            doc_url: 'development/migration_style_guide.html'
           - doc_title: Newlines style guide
             doc_url: 'development/newlines_styleguide.html'
           - doc_title: Python development guidelines
@@ -1746,8 +1738,6 @@ sections:
             doc_url: 'development/sidekiq_debugging.html'
           - doc_title: Sidekiq style guide
             doc_url: 'development/sidekiq_style_guide.html'
-          - doc_title: SQL query guidelines
-            doc_url: 'development/sql.html'
           - doc_title: Vue style guide
             doc_url: 'development/fe_guide/style/vue.html'
       - category_title: GitLab project pipelines
diff --git a/content/_data/omnibus-nav.yaml b/content/_data/omnibus-nav.yaml
index f219fb99..b89c6421 100644
--- a/content/_data/omnibus-nav.yaml
+++ b/content/_data/omnibus-nav.yaml
@@ -63,7 +63,8 @@ sections:
       - category_title: High availability roles
         category_url: 'roles/README.html'
       - category_title: LDAP
-        category_url: 'settings/ldap.html'
+        category_url: 'https://docs.gitlab.com/ee/administration/auth/ldap/index.html'
+        external_url: true
       - category_title: Logs
         category_url: 'settings/logs.html'
       - category_title: NGINX
@@ -136,8 +137,6 @@ sections:
         category_url: 'settings/configuration.html'
       - category_title: Changing YAML config options
         category_url: 'settings/gitlab.yml.html'
-      - category_title: Prepare a build environment
-        category_url: 'build/README.html'
       - category_title: Adding deprecation messages
         category_url: 'development/adding-deprecation-messages.html'
       - category_title: Adding new gitlab-ctl commands
diff --git a/content/_data/runner-nav.yaml b/content/_data/runner-nav.yaml
index 5df1f252..73eb6633 100644
--- a/content/_data/runner-nav.yaml
+++ b/content/_data/runner-nav.yaml
@@ -22,106 +22,76 @@ sections:
   - section_title: Install
     section_url: 'install/'
     section_categories:
-
       - category_title: Docker
         category_url: 'install/docker.html'
-
       - category_title: FreeBSD
         category_url: 'install/freebsd.html'
-
       - category_title: Kubernetes (Helm Chart)
         category_url: 'install/kubernetes.html'
-
       - category_title: Linux
         category_url: 'install/linux-manually.html'
-
       - category_title: macOS
         category_url: 'install/osx.html'
-
       - category_title: OpenShift
         category_url: 'install/openshift.html'
-
       - category_title: Windows
         category_url: 'install/windows.html'
-
       - category_title: Bleeding edge releases
         category_url: 'install/bleeding-edge.html'
-
       - category_title: Official Linux packages
         category_url: 'install/linux-repository.html'
-
       - category_title: Old GitLab Runner URLs
         category_url: 'install/old.html'
-
       - category_title: Container Registry and cache server
         category_url: 'install/registry_and_cache_servers.html'
 
   - section_title: Configure
     section_url: 'configuration/'
     section_categories:
-
       - category_title: Advanced config
         category_url: 'configuration/advanced-configuration.html'
-
       - category_title: Autoscale config
         category_url: 'configuration/autoscale.html'
-
       - category_title: Autoscale on AWS EC2
         category_url: 'configuration/runner_autoscale_aws/'
-
       - category_title: Autoscale on AWS Fargate
         category_url: 'configuration/runner_autoscale_aws_fargate/'
-
       - category_title: Commands
         category_url: 'commands/README.html'
-
       - category_title: Feature flags
         category_url: 'configuration/feature-flags.html'
-
       - category_title: Running behind a proxy
         category_url: 'configuration/proxy.html'
-
       - category_title: Rate limited requests
-        category_url: 'configuration/rate_limiting.html'
-
+        category_url: 'configuration/proxy.html#handling-rate-limited-requests'
       - category_title: Self-signed certificates
         category_url: 'configuration/tls-self-signed.html'
-
       - category_title: System services
         category_url: 'configuration/init.html'
 
   - section_title: Register
     section_url: 'register/'
     section_categories:
-
       - category_title: Examples
         category_url: 'examples/gitlab.html'
 
   - section_title: Executors
     section_url: 'executors/README.html'
     section_categories:
-
       - category_title: Custom
         category_url: 'executors/custom.html'
-
       - category_title: Docker
         category_url: 'executors/docker.html'
-
       - category_title: Docker Machine
         category_url: 'executors/docker_machine.html'
-
       - category_title: Kubernetes
         category_url: 'executors/kubernetes.html'
-
       - category_title: Shell
         category_url: 'executors/shell.html'
-
       - category_title: SSH
         category_url: 'executors/ssh.html'
-
       - category_title: Parallels
         category_url: 'executors/parallels.html'
-
       - category_title: Virtual Box
         category_url: 'executors/virtualbox.html'
 
@@ -140,11 +110,9 @@ sections:
   - section_title: Contribute
     section_url: 'development/README.html'
     section_categories:
-
       - category_title: Documentation
         category_url: 'https://docs.gitlab.com/ee/development/documentation/'
         external_url: true
-
       - category_title: Reviewing GitLab Runner
         category_url: 'development/reviewing-gitlab-runner.html'