doc: continue doc restructuring

Changing the folder structure will cause too many broken links for
external references (from other sites). So, let's put the content back
where it was before the reorg, and instead use the new persona-based
navigation to point to documents in the original locations.

Also, introduce redirects for some documents that no longer exits.

Signed-off-by: David B. Kinder <david.b.kinder@intel.com>

doc/.known-issues/doc/redirect.conf

@@ -0,0 +1,4 @@
+#
+# Redirect messages
+#
+^Creating redirect:.*

doc/conf.py

@@ -36,7 +36,7 @@ if "RELEASE" in os.environ:
 
 sys.path.insert(0, os.path.join(os.path.abspath('.'), 'extensions'))
 extensions = ['breathe', 'sphinx.ext.graphviz', 'sphinx.ext.extlinks',
-              'kerneldoc', 'eager_only']
+              'kerneldoc', 'eager_only', 'html_redirects']
 
 # extlinks provides a macro template
 
@@ -301,3 +301,18 @@ breathe_projects = {
 }
 breathe_default_project = "Project ACRN"
 breathe_default_members = ('members', 'undoc-members', 'content-only')
+
+
+# Custom added feature to allow redirecting old URLs (caused by
+# reorganizing doc directories)
+#
+# list of tuples (old_url, new_url) for pages to redirect
+#
+# URLs must be relative to document root (with NO leading slash),
+# and without the html extension)
+html_redirect_pages = [
+   ('developer-guides/index', 'contribute/index'),
+   ('getting-started/index', 'try/index'),
+   ('user-guides/index', 'develop/index'),
+   ('release_notes', 'release_notes/index')
+   ]

doc/contribute/index.rst

@@ -18,13 +18,13 @@ also find details about specific architecture topics.
 .. toctree::
    :maxdepth: 1
 
-   modularity
-   hld/index
-   sw_design_guidelines
-   GVT-g-porting
-   trusty
-   l1tf
-   VBSK-analysis
+   ../developer-guides/modularity
+   ../developer-guides/hld/index
+   ../developer-guides/sw_design_guidelines
+   ../developer-guides/GVT-g-porting
+   ../developer-guides/trusty
+   ../developer-guides/l1tf
+   ../developer-guides/VBSK-analysis
 
 
 Contributing Documents
@@ -39,8 +39,8 @@ the project.
 .. toctree::
    :maxdepth: 1
 
-   contribute_guidelines
-   coding_guidelines
-   doc_guidelines
-   graphviz
+   ../developer-guides/contribute_guidelines
+   ../developer-guides/coding_guidelines
+   ../developer-guides/doc_guidelines
+   ../developer-guides/graphviz
    ../tutorials/docbuild.rst

doc/develop/index.rst

@@ -6,11 +6,10 @@ Develop using ACRN
 .. toctree::
    :maxdepth: 1
 
-   building-from-source.rst
-   acrn-shell.rst
-   kernel-parameters.rst
-   acrn-dm-parameters.rst
-   tools.rst
+   ../user-guides/acrn-shell.rst
+   ../user-guides/kernel-parameters.rst
+   ../user-guides/acrn-dm-parameters.rst
+   ../user-guides/tools.rst
 
 Selecting OS as a User VM
 *************************