doc: Fix broken links

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

5 files changed, 18 insertions, 14 deletions

diff --git a/doc/client/tools/yumng.txt b/doc/client/tools/yumng.txt
index 8e7ffa1eb..07706ad8b 100644
--- a/doc/client/tools/yumng.txt
+++ b/doc/client/tools/yumng.txt
@@ -433,7 +433,7 @@ Pkgmgr Configuration
 --------------------
 
 Also see the general :ref:`Pkgmgr <server-plugins-generators-pkgmgr>`
-and :ref:`unsorted-altsrc` pages.
+and :ref:`server-plugins-structures-altsrc` pages.
  
 Package Tag (Old style)
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -588,7 +588,7 @@ The two utilities detailed below are provided in the tools directory of
 the source tarball.
 
 Also see the general :ref:`Pkgmgr <server-plugins-generators-pkgmgr>`
-and :ref:`unsorted-altsrc` pages.
+and :ref:`server-plugins-structures-altsrc` pages.
 
 pkgmgr_gen.py
 ^^^^^^^^^^^^^
diff --git a/doc/quickstart/ubuntu.txt b/doc/quickstart/ubuntu.txt
index 226fc800f..365167ed4 100644
--- a/doc/quickstart/ubuntu.txt
+++ b/doc/quickstart/ubuntu.txt
@@ -144,8 +144,8 @@ Replace Pkgmgr with Packages in the plugins line of bcfg2.conf::
     [components]
     bcfg2 = https://lucid:6789
 
-Create Packages layout (as per [wiki:Plugins/Packages#Exampleusage])
-in ``/var/lib/bcfg2``
+Create Packages layout (as per :ref:`packages-exampleusage`) in
+``/var/lib/bcfg2``
 
 .. code-block:: xml
 
@@ -167,8 +167,8 @@ in ``/var/lib/bcfg2``
 
 Due to the `Magic Groups`_, we need to modify our Metadata. Let's add
 an **ubuntu-lucid** group which inherits the **ubuntu** group already
-present in /var/lib/bcfg2/Metadata/groups.xml. The resulting file should
-look something like this
+present in ``/var/lib/bcfg2/Metadata/groups.xml``. The resulting file
+should look something like this
 
 .. _Magic Groups: http://trac.mcs.anl.gov/projects/bcfg2/wiki/Plugins/Packages#MagicGroups
 
@@ -194,10 +194,10 @@ look something like this
 .. note::
     When editing your xml files by hand, it is useful to occasionally run `bcfg2-repo-validate` to ensure that your xml validates properly.
 
-The last thing we need is for the client to have the proper arch group
-membership. For this, we will make use of the [wiki:DynamicGroups]
-capabilities of the Probes plugin. Add Probes to your plugins line in
-bcfg2.conf and create the Probe.
+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:`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/server/configurationentries.txt b/doc/server/configurationentries.txt
index 4e4516106..cedac8042 100644
--- a/doc/server/configurationentries.txt
+++ b/doc/server/configurationentries.txt
@@ -65,6 +65,8 @@ path. The following table describes the various types available for new
 |             | entries              |                 |                          |
 +-------------+----------------------+-----------------+--------------------------+
 
+.. _boundentries:
+
 Bound Entries
 =============
 
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index 7ca30cdbe..a96f3a725 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -90,6 +90,8 @@ any prerequisites that cannot be satisfied. This facility should largely
 remove the need to use the :ref:`Base <server-plugins-structures-base>`
 plugin.
 
+.. _packages-exampleusage:
+
 Example usage
 =============
 
@@ -201,7 +203,7 @@ Package Verification
 ====================
 
 In order to do disable per-package verification Pkgmgr style, you will
-need to use :ref:`BoundEntries <unsorted-boundentry>` like below
+need to use :ref:`BoundEntries <boundentries>` like below
 
 .. code-block:: xml
 
diff --git a/doc/server/plugins/generators/pkgmgr.txt b/doc/server/plugins/generators/pkgmgr.txt
index a9c166446..d3342feb6 100644
--- a/doc/server/plugins/generators/pkgmgr.txt
+++ b/doc/server/plugins/generators/pkgmgr.txt
@@ -266,8 +266,8 @@ special Packages that are older than the ones available in the updates.
         </Client>
     </PackageList>
 
-Simplifying Multi-Architecture Environments with :ref:`Altsrc <unsorted-altsrc>`
-================================================================================
+Simplifying Multi-Architecture Environments with :ref:`Altsrc <server-plugins-structures-altsrc>`
+=================================================================================================
 
 Frequently multi-architecture environments (typically x86_64) will run
 into problems needing to specify different architectures on different
@@ -278,7 +278,7 @@ onerous, because different package targets (64bit, 32+64, etc) needed
 to be specified on a package by group basis. Two features have been
 implemented that should ease this situation considerably.
 
-* The :ref:`Altsrc <unsorted-altsrc>` feature adds the ability to add a "bind as" directive
+* The :ref:`Altsrc <server-plugins-structures-altsrc>` feature adds the ability to add a "bind as" directive
   to entries. For example, the following entry, in a bundle:
 
 .. code-block:: xml