doc: simplify navigation with restored doc org

A few more tweaks to the site navigation since we moved the content back
to its original folder structure.

Remove the temporary "doc reorg in progress" banner.

Add reference to hardware in the "try" section.

Add link to the documentation home page in left nav pane.

Add additional redirects to handle external links to moved content.

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

doc/conf.py

@@ -311,8 +311,9 @@ breathe_default_members = ('members', 'undoc-members', 'content-only')
 # URLs must be relative to document root (with NO leading slash),
 # and without the html extension)
 html_redirect_pages = [
-   ('developer-guides/index', 'contribute/index'),
+   ('developer-guides/index', 'contribute'),
-   ('getting-started/index', 'try/index'),
+   ('getting-started/index', 'try'),
-   ('user-guides/index', 'develop/index'),
+   ('user-guides/index', 'develop'),
+   ('hardware', 'reference/hardware'),
    ('release_notes', 'release_notes/index')
    ]

doc/contribute.rst

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

doc/develop.rst

@@ -0,0 +1,63 @@
+.. _develop_acrn:
+
+Develop using ACRN
+##################
+
+.. toctree::
+   :maxdepth: 1
+
+   user-guides/acrn-shell
+   user-guides/kernel-parameters
+   user-guides/acrn-dm-parameters
+   user-guides/tools
+
+Selecting OS as a User VM
+*************************
+
+.. toctree::
+   :maxdepth: 1
+
+   tutorials/using_agl_as_uos
+   tutorials/using_celadon_as_uos
+   tutorials/building_uos_from_clearlinux
+   tutorials/using_ubuntu_as_sos
+   tutorials/using_vxworks_as_uos
+   tutorials/using_windows_as_uos
+
+Real time OS setup as User VM
+*****************************
+
+.. toctree::
+   :maxdepth: 1
+
+   tutorials/rt_linux
+   tutorials/using_zephyr_as_uos
+
+Tuning and debugging
+********************
+
+.. toctree::
+   :maxdepth: 1
+
+   tutorials/acrn-dm_QoS
+   tutorials/debug
+   tutorials/increase-uos-disk-size
+   tutorials/open_vswitch
+   tutorials/rtvm_workload_design_guideline
+   tutorials/sgx_virtualization
+   tutorials/sign_clear_linux_image
+   tutorials/skl-nuc
+   tutorials/static-ip
+   tutorials/using_cat_on_up2
+   tutorials/using_partition_mode_on_nuc
+   tutorials/using_partition_mode_on_up2
+   tutorials/using_sbl_on_up2
+
+Other topics
+************
+
+.. toctree::
+   :maxdepth: 1
+
+   tutorials/agl-vms
+   tutorials/trustyACRN

doc/develop/index.rst

@@ -1,63 +0,0 @@
-.. _develop_acrn:
-
-Develop using ACRN
-##################
-
-.. toctree::
-   :maxdepth: 1
-
-   ../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
-*************************
-
-.. toctree::
-   :maxdepth: 1
-
-   ../tutorials/using_agl_as_uos.rst
-   ../tutorials/using_celadon_as_uos.rst
-   ../tutorials/building_uos_from_clearlinux.rst
-   ../tutorials/using_ubuntu_as_sos.rst
-   ../tutorials/using_vxworks_as_uos.rst
-   ../tutorials/using_windows_as_uos.rst
-
-Real time OS setup as User VM
-*****************************
-
-.. toctree::
-   :maxdepth: 1
-
-   ../tutorials/rt_linux.rst
-   ../tutorials/using_zephyr_as_uos.rst
-
-Tuning and debugging
-********************
-
-.. toctree::
-   :maxdepth: 1
-
-   ../tutorials/acrn-dm_QoS.rst
-   ../tutorials/debug.rst
-   ../tutorials/increase-uos-disk-size.rst
-   ../tutorials/open_vswitch.rst
-   ../tutorials/rtvm_workload_design_guideline.rst
-   ../tutorials/sgx_virtualization.rst
-   ../tutorials/sign_clear_linux_image.rst
-   ../tutorials/skl-nuc.rst
-   ../tutorials/static-ip.rst
-   ../tutorials/using_cat_on_up2.rst
-   ../tutorials/using_partition_mode_on_nuc.rst
-   ../tutorials/using_partition_mode_on_up2.rst
-   ../tutorials/using_sbl_on_up2.rst
-
-Other topics
-************
-
-.. toctree::
-   :maxdepth: 1
-
-   ../tutorials/agl-vms.rst
-   ../tutorials/trustyACRN.rst

doc/index.rst

@@ -73,10 +73,11 @@ license.
    :maxdepth: 1
    :hidden:
 
-   learn/index
+   Documentation Home <self>
-   try/index
+   learn
-   develop/index
+   try
-   contribute/index
+   develop
+   contribute
    reference/index
    release_notes/index
    faq

doc/learn.rst

@@ -0,0 +1,13 @@
+.. _learn_acrn:
+
+Learn about ACRN
+################
+
+ACRN is supported on Apollo Lake and Kaby Lake Intel platforms,
+as described in :ref:`hardware`.
+
+.. toctree::
+   :maxdepth: 1
+
+   introduction/index
+

doc/learn/index.rst

@@ -1,10 +0,0 @@
-.. _learn_acrn:
-
-Learn about ACRN
-################
-
-.. toctree::
-   :maxdepth: 1
-
-   ../introduction/index
-

doc/static/acrn-custom.css

@@ -5,14 +5,14 @@
    max-width: none;
 }
 
-/* (temporarily) add an under development tagline to the bread crumb */
+/* (temporarily) add an under development tagline to the bread crumb
 .wy-breadcrumbs::after {
    content: " (Content reorganization in progress)";
    background-color: #FFFACD;
    color: red;
    font-weight: bold;
 }
-/* */
+*/
 
 /* pygments tweak for white-on-black console */
 

doc/try.rst

@@ -11,12 +11,14 @@ hypervisor and the `Clear Linux`_ Service OS and Guest OS on the Intel
 
 .. _Clear Linux: https://clearlinux.org
 
-ACRN development is currently supported on Apollo Lake Intel platforms,
+ACRN is supported on Apollo Lake and Kaby Lake Intel platforms,
-described in :ref:`hardware`. Follow the setup guides listed here:
+as described in :ref:`hardware`.
+
+Follow these getting started guides to give ACRN a try:
 
 .. toctree::
    :maxdepth: 1
 
-   ../getting-started/apl-nuc.rst
+   getting-started/apl-nuc
-   ../getting-started/up2.rst
+   getting-started/up2
-   ../getting-started/building-from-source.rst
+   getting-started/building-from-source