summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-05-06 00:03:46 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-05-06 00:03:46 +0000
commitba91a736e7fc2e462405e35793bb11646f7fc430 (patch)
tree950397e1f06f6e1f757eb067b0ac2e8f9e5ce563
parent3ac10a26432987fa076c97c70bff9d3912ad6f8d (diff)
parentebd1083360bd27dcda4efb649febefc0cb807826 (diff)
downloadgitlab-ce-ba91a736e7fc2e462405e35793bb11646f7fc430.tar.gz
Merge branch 'docs-repo-merge-redux-1-geo' into 'master'
Docs: Change geo redirects to relative to match EE See merge request gitlab-org/gitlab-ce!28100
-rw-r--r--doc/gitlab-geo/README.md4
-rw-r--r--doc/gitlab-geo/after_setup.md4
-rw-r--r--doc/gitlab-geo/bring-primary-back.md4
-rw-r--r--doc/gitlab-geo/configuration.md4
-rw-r--r--doc/gitlab-geo/configuration_source.md4
-rw-r--r--doc/gitlab-geo/database.md4
-rw-r--r--doc/gitlab-geo/database_source.md4
-rw-r--r--doc/gitlab-geo/disaster-recovery.md4
-rw-r--r--doc/gitlab-geo/docker_registry.md4
-rw-r--r--doc/gitlab-geo/faq.md4
-rw-r--r--doc/gitlab-geo/ha.md4
-rw-r--r--doc/gitlab-geo/object_storage.md4
-rw-r--r--doc/gitlab-geo/planned-failover.md4
-rw-r--r--doc/gitlab-geo/security-review.md4
-rw-r--r--doc/gitlab-geo/ssh.md4
-rw-r--r--doc/gitlab-geo/troubleshooting.md4
-rw-r--r--doc/gitlab-geo/tuning.md4
-rw-r--r--doc/gitlab-geo/updating_the_geo_nodes.md4
-rw-r--r--doc/gitlab-geo/using_a_geo_server.md4
19 files changed, 38 insertions, 38 deletions
diff --git a/doc/gitlab-geo/README.md b/doc/gitlab-geo/README.md
index d08b47999a9..30d21db7de5 100644
--- a/doc/gitlab-geo/README.md
+++ b/doc/gitlab-geo/README.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/index.md'
+redirect_to: '../administration/geo/replication/index.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/index.md).
+This document was moved to [another location](../administration/geo/replication/index.md).
diff --git a/doc/gitlab-geo/after_setup.md b/doc/gitlab-geo/after_setup.md
index 90fac0c71d8..c8a7b9d1096 100644
--- a/doc/gitlab-geo/after_setup.md
+++ b/doc/gitlab-geo/after_setup.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/using_a_geo_server.md'
+redirect_to: '../administration/geo/replication/using_a_geo_server.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/using_a_geo_server.md).
+This document was moved to [another location](../administration/geo/replication/using_a_geo_server.md).
diff --git a/doc/gitlab-geo/bring-primary-back.md b/doc/gitlab-geo/bring-primary-back.md
index eb223367e56..8c43f4d805f 100644
--- a/doc/gitlab-geo/bring-primary-back.md
+++ b/doc/gitlab-geo/bring-primary-back.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/disaster_recovery/bring_primary_back.md'
+redirect_to: '../administration/geo/disaster_recovery/bring_primary_back.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/disaster_recovery/bring_primary_back.md).
+This document was moved to [another location](../administration/geo/disaster_recovery/bring_primary_back.md).
diff --git a/doc/gitlab-geo/configuration.md b/doc/gitlab-geo/configuration.md
index d0ca191ebeb..b46a2caea4a 100644
--- a/doc/gitlab-geo/configuration.md
+++ b/doc/gitlab-geo/configuration.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/configuration.md'
+redirect_to: '../administration/geo/replication/configuration.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/configuration.md).
+This document was moved to [another location](../administration/geo/replication/configuration.md).
diff --git a/doc/gitlab-geo/configuration_source.md b/doc/gitlab-geo/configuration_source.md
index e2d96d43ee3..f1aab86fadc 100644
--- a/doc/gitlab-geo/configuration_source.md
+++ b/doc/gitlab-geo/configuration_source.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/configuration_source.md'
+redirect_to: '../administration/geo/replication/configuration_source.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/configuration_source.md).
+This document was moved to [another location](../administration/geo/replication/configuration_source.md).
diff --git a/doc/gitlab-geo/database.md b/doc/gitlab-geo/database.md
index fe2d830d1d7..b4156dc4ec6 100644
--- a/doc/gitlab-geo/database.md
+++ b/doc/gitlab-geo/database.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/database.md'
+redirect_to: '../administration/geo/replication/database.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/database.md).
+This document was moved to [another location](../administration/geo/replication/database.md).
diff --git a/doc/gitlab-geo/database_source.md b/doc/gitlab-geo/database_source.md
index 949c4020a32..3392d0f02c0 100644
--- a/doc/gitlab-geo/database_source.md
+++ b/doc/gitlab-geo/database_source.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/database_source.md'
+redirect_to: '../administration/geo/replication/database_source.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/database_source.md).
+This document was moved to [another location](../administration/geo/replication/database_source.md).
diff --git a/doc/gitlab-geo/disaster-recovery.md b/doc/gitlab-geo/disaster-recovery.md
index 6849df3a4fc..d42e815a879 100644
--- a/doc/gitlab-geo/disaster-recovery.md
+++ b/doc/gitlab-geo/disaster-recovery.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/disaster_recovery/index.md'
+redirect_to: '../administration/geo/disaster_recovery/index.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/disaster_recovery/index.md).
+This document was moved to [another location](../administration/geo/disaster_recovery/index.md).
diff --git a/doc/gitlab-geo/docker_registry.md b/doc/gitlab-geo/docker_registry.md
index cef4e26beaf..26a708f6845 100644
--- a/doc/gitlab-geo/docker_registry.md
+++ b/doc/gitlab-geo/docker_registry.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/docker_registry.md'
+redirect_to: '../administration/geo/replication/docker_registry.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/docker_registry.md).
+This document was moved to [another location](../administration/geo/replication/docker_registry.md).
diff --git a/doc/gitlab-geo/faq.md b/doc/gitlab-geo/faq.md
index 1fa26a375d4..f1952bc7e4c 100644
--- a/doc/gitlab-geo/faq.md
+++ b/doc/gitlab-geo/faq.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/faq.md'
+redirect_to: '../administration/geo/replication/faq.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/faq.md).
+This document was moved to [another location](../administration/geo/replication/faq.md).
diff --git a/doc/gitlab-geo/ha.md b/doc/gitlab-geo/ha.md
index 805b519b8df..23ed11eaf09 100644
--- a/doc/gitlab-geo/ha.md
+++ b/doc/gitlab-geo/ha.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/high_availability.md'
+redirect_to: '../administration/geo/replication/high_availability.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/high_availability.md).
+This document was moved to [another location](../administration/geo/replication/high_availability.md).
diff --git a/doc/gitlab-geo/object_storage.md b/doc/gitlab-geo/object_storage.md
index 7238d7d0422..1f29b7b7e8c 100644
--- a/doc/gitlab-geo/object_storage.md
+++ b/doc/gitlab-geo/object_storage.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/object_storage.md'
+redirect_to: '../administration/geo/replication/object_storage.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/object_storage.md).
+This document was moved to [another location](../administration/geo/replication/object_storage.md).
diff --git a/doc/gitlab-geo/planned-failover.md b/doc/gitlab-geo/planned-failover.md
index 9ed42140033..720b6bc9424 100644
--- a/doc/gitlab-geo/planned-failover.md
+++ b/doc/gitlab-geo/planned-failover.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/disaster_recovery/planned_failover.md'
+redirect_to: '../administration/geo/disaster_recovery/planned_failover.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/disaster_recovery/planned_failover.md).
+This document was moved to [another location](../administration/geo/disaster_recovery/planned_failover.md).
diff --git a/doc/gitlab-geo/security-review.md b/doc/gitlab-geo/security-review.md
index ef0905bb1d3..a0a5b0e536c 100644
--- a/doc/gitlab-geo/security-review.md
+++ b/doc/gitlab-geo/security-review.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/security_review.md'
+redirect_to: '../administration/geo/replication/security_review.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/security_review.md).
+This document was moved to [another location](../administration/geo/replication/security_review.md).
diff --git a/doc/gitlab-geo/ssh.md b/doc/gitlab-geo/ssh.md
index 310084033ec..4f8db687850 100644
--- a/doc/gitlab-geo/ssh.md
+++ b/doc/gitlab-geo/ssh.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/operations/fast_ssh_key_lookup.md'
+redirect_to: '../administration/operations/fast_ssh_key_lookup.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/operations/fast_ssh_key_lookup.md).
+This document was moved to [another location](../administration/operations/fast_ssh_key_lookup.md).
diff --git a/doc/gitlab-geo/troubleshooting.md b/doc/gitlab-geo/troubleshooting.md
index a6bd8b6f650..25fe1372c69 100644
--- a/doc/gitlab-geo/troubleshooting.md
+++ b/doc/gitlab-geo/troubleshooting.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/troubleshooting.md'
+redirect_to: '../administration/geo/replication/troubleshooting.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/troubleshooting.md).
+This document was moved to [another location](../administration/geo/replication/troubleshooting.md).
diff --git a/doc/gitlab-geo/tuning.md b/doc/gitlab-geo/tuning.md
index b4c44e14776..84ac40f99db 100644
--- a/doc/gitlab-geo/tuning.md
+++ b/doc/gitlab-geo/tuning.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/tuning.md'
+redirect_to: '../administration/geo/replication/tuning.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/tuning.md).
+This document was moved to [another location](../administration/geo/replication/tuning.md).
diff --git a/doc/gitlab-geo/updating_the_geo_nodes.md b/doc/gitlab-geo/updating_the_geo_nodes.md
index c791668082a..28234ec02ed 100644
--- a/doc/gitlab-geo/updating_the_geo_nodes.md
+++ b/doc/gitlab-geo/updating_the_geo_nodes.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/updating_the_geo_nodes.md'
+redirect_to: '../administration/geo/replication/updating_the_geo_nodes.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/updating_the_geo_nodes.md).
+This document was moved to [another location](../administration/geo/replication/updating_the_geo_nodes.md).
diff --git a/doc/gitlab-geo/using_a_geo_server.md b/doc/gitlab-geo/using_a_geo_server.md
index 90fac0c71d8..c8a7b9d1096 100644
--- a/doc/gitlab-geo/using_a_geo_server.md
+++ b/doc/gitlab-geo/using_a_geo_server.md
@@ -1,5 +1,5 @@
---
-redirect_to: 'https://docs.gitlab.com/ee/administration/geo/replication/using_a_geo_server.md'
+redirect_to: '../administration/geo/replication/using_a_geo_server.md'
---
-This document was moved to [another location](https://docs.gitlab.com/ee/administration/geo/replication/using_a_geo_server.md).
+This document was moved to [another location](../administration/geo/replication/using_a_geo_server.md).