8 files changed, 22 insertions, 20 deletions
diff --git a/ebuild-writing/error-handling/text.xml b/ebuild-writing/error-handling/text.xml
index 3e4c887..9382d04 100644
--- a/ebuild-writing/error-handling/text.xml
+++ b/ebuild-writing/error-handling/text.xml
@@ -96,7 +96,8 @@ cat list | while read file ; do epatch ${file} ; done
 </codesample>
 
 <p>
-Using input redirection (see `Abuse of cat`_) avoids this problem:
+Using input redirection (see <uri link="::tools-reference/cat/#Abuse of cat"/>)
+avoids this problem:
 </p>
 
 <codesample lang="ebuild">
diff --git a/ebuild-writing/functions/src_compile/build-environment/text.xml b/ebuild-writing/functions/src_compile/build-environment/text.xml
index c2ec07e..24a4bfa 100644
--- a/ebuild-writing/functions/src_compile/build-environment/text.xml
+++ b/ebuild-writing/functions/src_compile/build-environment/text.xml
@@ -17,7 +17,8 @@ Except where otherwise specified, any function which operates on
 </note>
 
 <p>
-Ebuilds must not simply ignore use CFLAGS <d/> see <uri link="::general-concepts/user-environment#Not Filtering Variables"/>.
+Ebuilds must not simply ignore use CFLAGS <d/> see
+<uri link="::general-concepts/user-environment#Not Filtering Variables"/>.
 </p>
 </body>
 
@@ -140,7 +141,7 @@ functions can be used here.
 </codesample>
 
 <p>
-See `flag-o-matic.eclass Reference`_ for a full reference.
+See <uri link="::eclass-reference/flag-o-matic.eclass/"/> for a full reference.
 </p>
 </body>
 </section>
diff --git a/ebuild-writing/functions/src_compile/building/text.xml b/ebuild-writing/functions/src_compile/building/text.xml
index 171429e..621e51c 100644
--- a/ebuild-writing/functions/src_compile/building/text.xml
+++ b/ebuild-writing/functions/src_compile/building/text.xml
@@ -35,7 +35,7 @@ some MIPS and SPARC systems.
 Sometimes a package will try to use a bizarre compiler, or will need to be told
 which compiler to use. In these situations, the <c>tc-getCC()</c> function from
 <c>toolchain-funcs.eclass</c> should be used. Other similar functions are available
-<d/> these are documented in `toolchain-funcs.eclass-5`_.
+<d/> these are documented in <c>man toolchain-funcs.eclass</c>.
 </p>
 
 <note>
diff --git a/ebuild-writing/functions/src_unpack/svn-sources/text.xml b/ebuild-writing/functions/src_unpack/svn-sources/text.xml
index 06f17e8..c23ff7c 100644
--- a/ebuild-writing/functions/src_unpack/svn-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/svn-sources/text.xml
@@ -6,8 +6,8 @@
 <body>
 <p>
 As with CVS, an eclass exists for working directly with upstream
-Subversion repositories. See `subversion.eclass Reference`_ for a full
-list of functions and variables. Also see
+Subversion repositories. See <uri link="eclass-reference/subversion.eclass/"/>
+for a full list of functions and variables. Also see
 the <uri link="::ebuild-writing/functions/src_unpack/cvs-sources"/> 
 ection.
 </p>
@@ -21,8 +21,8 @@ ection.
 Note that Subversion ebuilds should <b>not</b> generally be added to
 the tree (except under <c>package.mask</c>) for much the same reasons
 that live CVS ebuilds should not (see
-<uri link="::ebuild-writing/functions/src_unpack/cvs-sources#Disadvantages of CVS Sources"/>). Indeed, there should be even less
-impetus to add a live Subversion ebuild than a live CVS ebuild, as
+<uri link="::ebuild-writing/functions/src_unpack/cvs-sources#Disadvantages of CVS Sources"/>).
+Indeed, there should be even less impetus to add a live Subversion ebuild than a live CVS ebuild, as
 Subversion checkouts are roughly a factor of five larger than an
 equivalent CVS checkout.
 </p>
@@ -82,8 +82,8 @@ following variables are also noteworthy:
 </table>
 
 <p>
-See the eclass itself and `subversion.eclass Reference`_ for the full
-range of options. To perform the actual checkout, use
+See the eclass itself and <uri link="eclass-reference/subversion.eclass/"/>
+for the full range of options. To perform the actual checkout, use
 the <c>subversion_src_unpack</c> function, which calls
 both <c>subversion_svn_fetch</c> and <c>subversion_bootstrap</c>
 itself.
diff --git a/ebuild-writing/messages/text.xml b/ebuild-writing/messages/text.xml
index de3c476..65c3c1e 100644
--- a/ebuild-writing/messages/text.xml
+++ b/ebuild-writing/messages/text.xml
@@ -98,7 +98,7 @@ important.
 </p>
 
 <p>
-See `Message Functions Reference`_ for a full list of functions.
+See <uri link="::function-reference/message-functions/"/> for a full list of functions.
 </p>
 
 </body>
diff --git a/ebuild-writing/use-conditional-code/text.xml b/ebuild-writing/use-conditional-code/text.xml
index 79d580b..d9a1b8b 100644
--- a/ebuild-writing/use-conditional-code/text.xml
+++ b/ebuild-writing/use-conditional-code/text.xml
@@ -21,7 +21,7 @@ occasionally seen in older code must <b>not</b> be used.
 <note>
 <c>die</c> will not work as expected within a subshell, so code in the
 form <c>use foo &amp;&amp; ( blah ; blah )</c> should be avoided in favour of a proper if
-statement. See `die and Subshells`_.
+statement. See <uri link="::ebuild-writing/error-handling/#die and Subshells"/>.
 </note>
 
 <codesample lang="ebuild">
diff --git a/ebuild-writing/using-eclasses/text.xml b/ebuild-writing/using-eclasses/text.xml
index ddd2b9c..e9b7a42 100644
--- a/ebuild-writing/using-eclasses/text.xml
+++ b/ebuild-writing/using-eclasses/text.xml
@@ -7,7 +7,7 @@
 <p>
 An eclass is a collection (library) of functions or functionality that is shared
 between packages. See <uri link="::eclass-writing/" /> for the full story on what
-eclasses can do, how they work and how to write them, and `Eclass Reference`_
+eclasses can do, how they work and how to write them, and <uri link="::eclass-reference/"/>
 for documentation on various commonly used eclasses. This section only explains
 how to use an eclass which has already been written.
 </p>
@@ -84,11 +84,11 @@ Note the <c>inherit</c> immediately after the header.
 </p>
 
 <p>
-The <c>eutils</c> eclass (see `eutils.eclass Reference`_) is needed to get the
-<c>epatch</c> function.  The <c>flag-o-matic</c> eclass (see `flag-o-matic.eclass
-Reference`_) is needed for <c>replace-flags</c>, and the <c>bash-completion</c> eclass
-(`bash-completion.eclass Reference`_) is used to handle the bash completion file
-via <c>dobashcompletion</c> and <c>bash-completion_pkg_postinst</c>.
+The <c>eutils</c> eclass (see <uri link="::eclass-reference/eutils.eclass/"/>) is needed to get the
+<c>epatch</c> function.  The <c>flag-o-matic</c> eclass (see <uri
+link="::eclass-reference/flag-o-matic.eclass/"/>) is needed for <c>replace-flags</c>, and
+the <c>bash-completion</c> eclass (<uri link="::eclass-reference/bash-completion.eclass/"/>) is used
+to handle the bash completion file via <c>dobashcompletion</c> and <c>bash-completion_pkg_postinst</c>.
 </p>
 
 </body>
diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml
index 1e68bef..d290676 100644
--- a/ebuild-writing/variables/text.xml
+++ b/ebuild-writing/variables/text.xml
@@ -217,7 +217,7 @@ Specifying the following variables is optional:
     <ti>
     A space-delimited list of portage features to restrict.
     Valid values are <c>nostrip</c>, <c>nomirror</c>, <c>nouserpriv</c>
-    and <c>fetch</c>. See `ebuild-5`_ for details.
+    and <c>fetch</c>. See <c>man ebuild</c> for details.
     </ti>
   </tr>
   <tr>
@@ -379,7 +379,7 @@ highly discouraged.
 
 <p>
 The <c>versionator</c> eclass can also be used to extract particular components
-from a version string. See `versionator.eclass-5`_ and the eclass source code
+from a version string. See <c>man versionator.eclass</c> and the eclass source code
 for further documentation and examples. A brief summary of the functions
 follows.
 </p>