Index: user/conf.py
===================================================================
--- user/conf.py	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/conf.py	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -5,35 +5,4 @@
 
 project = "RTEMS User Manual"
-
-exclude_patterns = ['config/build.rst',
-                    'config/runtime.rst',
-
-                    'start/quick.rst',
-
-                    'hosts/os.rst',
-                    'hosts/prefixes.rst',
-                    'hosts/macos.rst',
-                    'hosts/posix.rst',
-                    'hosts/windows.rst',
-
-                    'installation/prefixes-sandboxing.rst',
-                    'installation/releases.rst',
-                    'installation/developer.rst',
-                    'installation/kernel.rst',
-
-                    'hardware/targets.rst',
-                    'hardware/architectures.rst',
-                    'hardware/bsps.rst',
-                    'hardware/tiers.rst',
-
-                    'tools/build.rst',
-                    'tools/simulation.rst',
-
-                    'test/create.rst',
-                    'test/running.rst',
-                    'start/installation.rst',
-                    'start/transition.rst',
-
-                    'waf/index.rst']
 
 latex_documents = [
Index: er/config/build.rst
===================================================================
--- user/config/build.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-Build Configuration
-===================
-.. index:: Build Configuration
-
-XXX: build configuration
Index: er/config/index.rst
===================================================================
--- user/config/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,10 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-
-Config
-******
-
-XXX: All about rtems config
-
-.. include:: build.rst
-.. include:: runtime.rst
Index: er/config/runtime.rst
===================================================================
--- user/config/runtime.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-Runtime
-=======
-.. index:: Runtime Configuration
-
-XXX: runtime config
Index: user/hardware/index.rst
===================================================================
--- user/hardware/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/hardware/index.rst	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -13,6 +13,8 @@
 Packages, and running RTEMS on real hardware and simulators.
 
-.. include:: targets.rst
-.. include:: architectures.rst
-.. include:: bsps.rst
-.. include:: tiers.rst
+.. toctree::
+
+   targets
+   architectures
+   bsps
+   tiers
Index: user/hosts/index.rst
===================================================================
--- user/hosts/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/hosts/index.rst	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -45,6 +45,8 @@
 can happen and for the ARM architecture and with all BSPs it can be many hours.
 
-.. include:: os.rst
-.. include:: posix.rst
-.. include:: macos.rst
-.. include:: windows.rst
+.. toctree::
+
+   os
+   posix
+   macos
+   windows
Index: user/index.rst
===================================================================
--- user/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/index.rst	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -54,5 +54,5 @@
 
 	support/index
-	additional/index
+
 	glossary/index
 
Index: user/installation/index.rst
===================================================================
--- user/installation/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/installation/index.rst	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -4,9 +4,9 @@
 .. comment: All rights reserved.
 
+.. index:: Installation
 .. _installation:
 
 Installation
 ************
-.. index:: Installation
 
 This section details how to set up and install the RTEMS Ecosystem. You will
@@ -43,8 +43,10 @@
 repositories for the tools and kernel.
 
-.. include:: prefixes-sandboxing.rst
-.. include:: releases.rst
-.. include:: developer.rst
-.. include:: kernel.rst
+.. comment: code block warning is in kernel.rst
 
-.. comment: code block warning is in kernel.rst
+.. toctree::
+
+   prefixes-sandboxing
+   releases
+   developer
+   kernel
Index: user/installation/prefixes-sandboxing.rst
===================================================================
--- user/installation/prefixes-sandboxing.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/installation/prefixes-sandboxing.rst	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -5,9 +5,8 @@
 
 .. _prefixes:
+.. index:: Prefixes
 
 Prefixes
 ========
-
-.. index:: Prefixes
 
 You will see the term :ref:term:`prefix` referred to thoughout this
Index: er/start/installation.rst
===================================================================
--- user/start/installation.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,27 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-.. comment: Copyright (c) 2016 Chris Johns <chrisj@rtems.org>
-.. comment: All rights reserved.
-
-Installation
-============
-
-.. index:: Installation
-
-RTEMS is built from source on your host machine. Releases are available from
-our :r:url:`ftp` and each release contains a Quick Start build guide. If you
-are wanting to track changes to RTEMS as they happen or you want to make
-changes to RTEMS to send back to the project on our :r:list:`devel` then you
-can use the developer's version available in our :r:url:`git`.
-
-RTEMS supports development on a wide vararity of hosts. There is no preferred
-host operating system the project requires you use. This means you are able to
-decide on a host operating system that is your passion, suites your needs, or
-in some cases is decided for you by your employer. Our aim is to provide a
-consistent user experience and on matching hardware the experience should feel
-similar.
-
-The RTEMS core development team uses POSIX type operating systems, that is
-Unix.  The :ref:`released-version` and :ref:`development-version` sections
-assume Unix. Microsoft Windows is documented in a separate section
-:ref:`microsoft-windows-installation`.
Index: er/start/quick.rst
===================================================================
--- user/start/quick.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,68 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-.. comment: Copyright (c) 2016 Chris Johns <chrisj@rtems.org>
-.. comment: All rights reserved.
-
-Quick Start Guide
-=================
-
-.. index:: Quick Start
-
-The following is a quick start guide that provides you with the basic commands
-you need to build the RTEMS Tools and Kernel.
-
-You need to have your development host set up and ready, the
-:ref:`development-host` covers what you need.
-
-This procedure does a development (unstable) build from Git for a POSIX
-host. You can refer to the specific section that cover the specific part of the
-process in detail if you have an issue. The output from the commands has been
-removed and replaced with ``...``.
-
-Create a workspace, download the RTEMS Source Builder (RSB) and build a tool
-chain (See :ref:`rtems-tools-chain`):
-
-.. code-block:: shell
-
-  $ cd
-  $ mkdir -p development/rtems
-  $ cd development/rtems
-  $ git clone git://git.rtems.org/rtems-source-builder.git rsb
-    ...
-  $ cd rsb
-  $ ./source-builder/sb-check
-    ...
-  $ cd rtems
-  $ ../source-builder/sb-set-builder \
-      --prefix=/usr/home/chris/development/rtems/5 5/rtems-sparc
-    ...
-
-Build the RTEMS Kernel (See :ref:`rtems-kernel`) by cloning the repository,
-running the ``bootstrap`` procecure, building and finally installing the
-kernel:
-
-.. code-block:: shell
-
-  $ export PATH=$HOME/development/rtems/5/bin:$PATH
-  $ cd
-  $ cd development/rtems
-  $ mkdir kernel
-  $ cd kernel
-  $ git clone git://git.rtems.org/rtems.git rtems
-    ...
-  $ cd rtems
-  $ ./bootstrap -c && ./bootstrap -p && \
-              $HOME/development/rtems/rsb/source-builder/sb-bootstrap
-    ...
-  $ cd ..
-  $ mkdir erc32
-  $ cd erc32
-  $ $HOME/development/rtems/kernel/rtems/configure --prefix=$HOME/development/rtems/5 \
-                     --target=sparc-rtems5 --enable-rtemsbsp=erc32 --enable-posix \
-		     --disable-networking
-    ...
-  $ make -j 8
-    ...
-  $ make install
-
-You can now build a 3rd party library like LibBSD or an application.
Index: er/start/transition.rst
===================================================================
--- user/start/transition.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-Transition
-===========
-.. index:: Transition, Autotools
-
-XXX: Transition from auto* to waf.
Index: user/tools/index.rst
===================================================================
--- user/tools/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ user/tools/index.rst	(revision ac0eaff94117757046867bc92797d6c2dae78cd4)
@@ -15,8 +15,10 @@
 developers.
 
-.. include:: linker.rst
-.. include:: symbols.rst
-.. include:: exeinfo.rst
-.. include:: trace-linker.rst
-.. include:: bsp-builder.rst
-.. include:: tester.rst
+.. toctree::
+
+   linker
+   symbols
+   exeinfo
+   trace-linker
+   bsp-builder
+   tester
Index: er/waf/build.rst
===================================================================
--- user/waf/build.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-:orphan:
-
-Building
-========
-.. index:: Building
-
-XXX: How to build.
-
-
Index: er/waf/config.rst
===================================================================
--- user/waf/config.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-:orphan:
-
-Config
-=======
-.. index:: Config
-
-XXX: waf config
-
-
Index: er/waf/index.rst
===================================================================
--- user/waf/index.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,15 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-.. _waf:
-
-===
-Waf
-===
-
-XXX: All about waf.
-
-
-.. include:: config.rst
-.. include:: build.rst
-.. include:: install.rst
-
Index: er/waf/install.rst
===================================================================
--- user/waf/install.rst	(revision 6c5640131fca82624f72b2bd33b5b5f46156626e)
+++ 	(revision )
@@ -1,11 +1,0 @@
-.. comment SPDX-License-Identifier: CC-BY-SA-4.0
-
-:orphan:
-
-Installing RTEMS
-================
-.. index:: Installing RTEMS
-
-XXX: How to install.
-
-
