From 161937f95a62c3f69eee869d89063c8037afaa70 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 30 Dec 2016 17:11:28 -0800
Subject: [PATCH] INFRA-230 - Add rewrite map to facilitate wiki migration
---
docs/documentation.md | 6 ++++--
redirects/wiki-crmdoc.txt | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 redirects/wiki-crmdoc.txt
diff --git a/docs/documentation.md b/docs/documentation.md
index 78169fb0..51cd4583 100644
--- a/docs/documentation.md
+++ b/docs/documentation.md
@@ -47,8 +47,10 @@ For minor changes you can simply edit the markdown online using GitHub. However,
See [Markdown](markdownrules) for formatting syntax within mkdocs.
-## Documentation in the wiki
+## Wiki migration
The [CiviCRM wiki](https://wiki.civicrm.org/confluence/display/CRMDOC/CiviCRM+Documentation) has lots of great info but is slowly falling out of use in favor of mkdocs.
-
+If you migrate content from the wiki to mkdocs, you may want to setup an HTTP redirect from the wiki
+(`https://wiki.civicrm.org/confluence/display/CRMDOC/{$x}`) to mkdocs (`https://docs.civicrm.org/dev/en/master/{$y}`).
+To do this, add a new row to the [redirects/wiki-crmdoc.txt](redirects/wiki-crmdoc.txt).
diff --git a/redirects/wiki-crmdoc.txt b/redirects/wiki-crmdoc.txt
new file mode 100644
index 00000000..97f84fc5
--- /dev/null
+++ b/redirects/wiki-crmdoc.txt
@@ -0,0 +1 @@
+Documentation+Infrastructure+Canary develop
--
GitLab