9 files changed, 14 insertions, 14 deletions
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt
index f32eaa8c6..4e3244eaa 100644
--- a/doc/appendix/guides/fedora.txt
+++ b/doc/appendix/guides/fedora.txt
@@ -252,9 +252,8 @@ Add a probe
 
 The next step for the client will be to have the proper
 arch group membership. For this, we will make use of the
-:ref:`server-plugins-grouping-dynamic_groups` capabilities of
-the Probes plugin. Add **Probes** to your plugins line in ``bcfg2.conf``
-and create the Probe:
+:ref:`unsorted-dynamic_groups` capabilities of the Probes plugin. Add
+**Probes** to your plugins line in ``bcfg2.conf`` and create the Probe:
 
 .. code-block:: sh
 
diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt
index e22707f2c..24338c6d2 100644
--- a/doc/appendix/guides/ubuntu.txt
+++ b/doc/appendix/guides/ubuntu.txt
@@ -201,7 +201,7 @@ should look something like this
 
 The last thing we need is for the client to have the proper
 arch group membership. For this, we will make use of the
-:ref:`server-plugins-grouping-dynamic_groups` capabilities of the Probes plugin. Add
+:ref:`unsorted-dynamic_groups` capabilities of the Probes plugin. Add
 Probes to your plugins line in ``bcfg2.conf`` and create the Probe.
 
 .. code-block:: sh
@@ -484,7 +484,7 @@ Now we run the client and see there are no more unmanaged entries! ::
 Dynamic (web) reports
 =====================
 
-See installation instructions at :ref:`server-reports-install`
+See installation instructions at :ref:`appendix-guides-web-reports-install`
 
 Upstart
 =======
diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 676feb175..d9a9b76f4 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -14,7 +14,7 @@ management. The POSIX tool also handles file system and permissions/groups
 operations.
 
 To write your own tool driver, to handle a new packaging format, or new
-service architecture see :ref:`development-index-writingtooldrivers`
+service architecture see :ref:`development-client-driver`
 
 When the Bcfg2 client is run, it attempts to instantiate each of these
 drivers. The succeeding list of drivers are printed as a debug message
diff --git a/doc/getting_started/index.txt b/doc/getting_started/index.txt
index 9661fcb89..b256edd2d 100644
--- a/doc/getting_started/index.txt
+++ b/doc/getting_started/index.txt
@@ -234,7 +234,7 @@ Next Steps
 
 Several other utilities can help from this point on:
 
-:ref:`bcfg2-info <appendix-guides-using_bcfg2_info>` is a utility that
+:ref:`bcfg2-info <server-bcfg2-info>` is a utility that
 instantiates a copy of the bcfg2 server core (minus the networking code)
 for examination. From this, you can directly query:
 
diff --git a/doc/help/faq/general.txt b/doc/help/faq/general.txt
index 0534e72d2..f8ecc9854 100644
--- a/doc/help/faq/general.txt
+++ b/doc/help/faq/general.txt
@@ -17,7 +17,7 @@ cubic feet of gas.
 
 Bcfg2 should run on any POSIX compatible operating system, however direct
 support for an operating system's package and service formats are limited
-by the currently available :ref:`client-tools-index` (although new client
+by the currently available :ref:`client-tools` (although new client
 tools are pretty easy to add). The following is an incomplete but more
 exact list of platforms on which Bcfg2 works.
 
diff --git a/doc/server/plugins/grouping/metadata.txt b/doc/server/plugins/grouping/metadata.txt
index f215e6cc5..1c915e2cf 100644
--- a/doc/server/plugins/grouping/metadata.txt
+++ b/doc/server/plugins/grouping/metadata.txt
@@ -105,7 +105,8 @@ Additionally, the following properties can be specified:
 |          | resolution.                            |                |
 +----------+----------------------------------------+----------------+
 
-For detailed information on client authentication see :ref:`authentication`
+For detailed information on client authentication see
+:ref:`appendix-guides-authentication`
 
 Metadata/groups.xml
 ===================
diff --git a/doc/server/plugins/statistics/dbstats.txt b/doc/server/plugins/statistics/dbstats.txt
index dd25fe9ab..7f59b1ce7 100644
--- a/doc/server/plugins/statistics/dbstats.txt
+++ b/doc/server/plugins/statistics/dbstats.txt
@@ -12,4 +12,4 @@ DBStats can be enabled by adding DBStats to the plugins line in
     plugins = Base,Bundler,Cfg,...,DBStats
 
 For more information on how to use DBStats to setup reporting, see
-:ref:`server-reports-dynamic`.
+:ref:`reports-dynamic`.
diff --git a/doc/server/snapshots/index.txt b/doc/server/snapshots/index.txt
index ca8af2663..13a9fe2c0 100644
--- a/doc/server/snapshots/index.txt
+++ b/doc/server/snapshots/index.txt
@@ -9,8 +9,8 @@ Bcfg2 Snapshots
 .. versionadded:: 1.0.0
 
 This page describes the Snapshots plugin. This plugin is meant to replace
-the older :ref:`server-reports-dynamic`. It stores various
-aspects of a client's state when the client checks into the server.
+the older :ref:`reports-dynamic`. It stores various aspects of a client's
+state when the client checks into the server.
 
 Before you begin
 ================
diff --git a/doc/unsorted/howtos.txt b/doc/unsorted/howtos.txt
index 31e41ab75..4347632f6 100644
--- a/doc/unsorted/howtos.txt
+++ b/doc/unsorted/howtos.txt
@@ -8,10 +8,10 @@ HOWTOs
 
 Here are several howtos that describe different aspects of Bcfg2 deployment
 
-* :ref:`authentication` - a description of the Bcfg2 authentication infrastructure
+* :ref:`appendix-guides-authentication` - a description of the Bcfg2 authentication infrastructure
 * AnnotatedExamples - a description of basic Bcfg2 specification operations
 * BuildingDebianPackages - How to build debian packages
-* :ref:`unsorted-gentoo` - Issues specific to running Bcfg2 on Gentoo
+* :ref:`appendix-guides-gentoo` - Issues specific to running Bcfg2 on Gentoo
 * :ref:`server-plugins-generators-tcheetah` - Howto use the TCheetah template plugin
 * :ref:`server-plugins-generators-hostbase` - How to use the Hostbase plugin and web interface
 * :ref:`server-plugins-probes-index` - How to use Probes to gather information from a client machine.