aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--appendices/common-problems/text.xml45
-rw-r--r--appendices/contributing/text.xml2
-rw-r--r--ebuild-writing/error-handling/text.xml3
-rw-r--r--ebuild-writing/functions/src_compile/build-environment/text.xml5
-rw-r--r--ebuild-writing/functions/src_compile/building/text.xml2
-rw-r--r--ebuild-writing/functions/src_unpack/svn-sources/text.xml12
-rw-r--r--ebuild-writing/messages/text.xml2
-rw-r--r--ebuild-writing/use-conditional-code/text.xml2
-rw-r--r--ebuild-writing/using-eclasses/text.xml12
-rw-r--r--ebuild-writing/variables/text.xml4
-rw-r--r--eclass-reference/eutils.eclass/text.xml8
-rw-r--r--eclass-reference/text.xml2
-rw-r--r--function-reference/sandbox-functions/text.xml3
-rw-r--r--general-concepts/autotools/text.xml2
-rw-r--r--general-concepts/overlay/text.xml6
-rw-r--r--general-concepts/sandbox/text.xml7
-rw-r--r--general-concepts/use-flags/text.xml2
-rw-r--r--profiles/categories/text.xml4
-rw-r--r--profiles/package.mask/text.xml2
-rw-r--r--profiles/text.xml2
-rw-r--r--profiles/use.mask/text.xml2
-rw-r--r--quickstart/text.xml10
-rw-r--r--tasks-reference/completion/text.xml6
-rw-r--r--tasks-reference/environment/text.xml4
-rw-r--r--tasks-reference/init-scripts/text.xml8
-rw-r--r--tools-reference/bash/text.xml13
26 files changed, 93 insertions, 77 deletions
diff --git a/appendices/common-problems/text.xml b/appendices/common-problems/text.xml
index 35b642d..b9d6afa 100644
--- a/appendices/common-problems/text.xml
+++ b/appendices/common-problems/text.xml
@@ -26,20 +26,21 @@ covered here.
</note>
<subsection>
-<title>QA Notice <d/> USE Flag foo not in IUSE</title>
+<title>QA Notice -- USE Flag foo not in IUSE</title>
<body>
<p>
With the exception of 'special' flags (the arch flags and <c>USE_EXPAND</c>
variables), all <c>USE</c> flags used by a package must be included in <c>IUSE</c>.
-See `IUSE`_ and `USE Flags`_.
+See <uri link="::ebuild-writing/variables/#IUSE"/> and
+<uri link="::general-concepts/use-flags/"/>.
</p>
</body>
</subsection>
<subsection>
-<title>QA Notice <d/> foo in global scope</title>
+<title>QA Notice -- foo in global scope</title>
<body>
<p>
@@ -57,8 +58,9 @@ in use, there are various alternatives:
Usually when any of the above are used in global scope, it is to manipulate
a version or program name string. These should be avoided in favour of
pure <c>bash</c> constructs. The <c>versionator</c> eclass is often of use here.
- See `Version Formatting Issues`_, `versionator.eclass-5`_ and `Bash Variable
- Manipulation`_.
+ See <uri link="::ebuild-writing/variables/#Version Formatting Issues"/>,
+ <c>man versionator.eclass</c> and <uri
+ link="::tools-reference/bash/#Bash Variable Manipulation"/>.
</p>
</dd>
<dt>
@@ -67,9 +69,9 @@ in use, there are various alternatives:
<dd>
<p>
Calls to any of these globally indicates a serious problem. You must <b>not</b>
- have metadata varying based upon system-dependent information <d/> see `The
- Portage Cache`_. You should rewrite your ebuilds to correctly use
- dependencies.
+ have metadata varying based upon system-dependent information <d/> see
+ <uri link="::general-concepts/portage-cache/"/>. You should rewrite your ebuilds
+ to correctly use dependencies.
</p>
</dd>
<dt>
@@ -89,7 +91,7 @@ in use, there are various alternatives:
</subsection>
<subsection>
-<title>QA Notice <d/> foo is setXid, dynamically linked and using lazy bindings</title>
+<title>QA Notice -- foo is setXid, dynamically linked and using lazy bindings</title>
<body>
<p>
@@ -103,8 +105,9 @@ for security reasons. If this message is shown, you have a couple of options:
linking. This solution is preferred.
</li>
<li>
- Use <c>append-ldflags</c> (see `Adding Additional Flags`_) to add <c>-Wl,-z,now</c>.
- This will affect <e>all</e> binaries installed, not just the setXid ones.
+ Use <c>append-ldflags</c> (see <uri
+ link="ebuild-writing/functions/src_compile/build-environment/#Adding Additional Flags"/>)
+ to add <c>-Wl,-z,now</c>. This will affect <e>all</e> binaries installed, not just the setXid ones.
</li>
</ul>
@@ -112,13 +115,13 @@ for security reasons. If this message is shown, you have a couple of options:
</subsection>
<subsection>
-<title>QA Notice <d/> ECLASS foo inherited illegally</title>
+<title>QA Notice -- ECLASS foo inherited illegally</title>
<body>
<p>
All eclass inherits must be unconditional, or based purely upon static
-machine-independent criteria (<c>PN</c> and <c>PV</c> are most common here). See `The
-Portage Cache`_.
+machine-independent criteria (<c>PN</c> and <c>PV</c> are most common here). See
+<uri link="::general-concepts/portage-cache/"/>.
</p>
<p>
@@ -132,8 +135,8 @@ inheritance occurring. Most commonly:
did not record inheritance.
</li>
<li>
- When working with eclasses in an overlay with a stale cache. See `Overlay and
- Eclasses`_.
+ When working with eclasses in an overlay with a stale cache. See <uri
+ link="::general-concepts/overlay/#Overlay and Eclasses"/>.
</li>
<li>
When working with a stale portage cache.
@@ -141,7 +144,8 @@ inheritance occurring. Most commonly:
</ul>
<p>
-You should manually check against the rules described in `The Portage Cache`_ if
+You should manually check against the rules described in
+<uri link="::general-concepts/portage-cache/"/> if
you see this notice locally. If you see this notice when working with a pure
<c>emerge sync</c> over <c>rsync</c> setup, it is probably a genuine issue.
</p>
@@ -180,8 +184,8 @@ write me
<p>
Portage uses a sandbox for certain phases of the build process. This prevents a
-package from accidentally writing outside 'safe' locations. See `Sandbox`_ for
-details.
+package from accidentally writing outside 'safe' locations. See
+<uri link="::general-concepts/sandbox/"/> for details.
</p>
<p>
@@ -211,7 +215,8 @@ ebuilds.
<p>
Access violations most commonly occur during the install phase. See
-<c>src_install</c> and `Install Destinations`_ for discussion.
+<c>src_install</c> and <uri link="::general-concepts/install-destinations/"/>
+for discussion.
</p>
<p>
diff --git a/appendices/contributing/text.xml b/appendices/contributing/text.xml
index 6262a5c..3d327b3 100644
--- a/appendices/contributing/text.xml
+++ b/appendices/contributing/text.xml
@@ -6,7 +6,7 @@
<body>
<p>
Contributions for this document are highly welcomed. Whether you've found a typo
-or have written an entire new section, the best way to get in touch is to `send
+or have written an entire new section, the best way to get in touch is to send
an email to plasmaroo.
</p>
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>
diff --git a/eclass-reference/eutils.eclass/text.xml b/eclass-reference/eutils.eclass/text.xml
index 256a81c..effdf25 100644
--- a/eclass-reference/eutils.eclass/text.xml
+++ b/eclass-reference/eutils.eclass/text.xml
@@ -6,7 +6,7 @@
<p>
The <c>eutils</c> eclass provides various useful functions. For full documentation,
-see `eutils.eclass-5`_.
+see <c>man eutils.eclass</c>.
</p>
<table>
@@ -59,7 +59,7 @@ see `eutils.eclass-5`_.
<c>epatch</c>
</ti>
<ti>
- Apply a patch (see `eutils.eclass-5`_ and
+ Apply a patch (see <c>man eutils.eclass</c> and
<uri link="::ebuild-writing/functions/src_unpack/epatch"/>).
</ti>
</tr>
@@ -168,7 +168,7 @@ see `eutils.eclass-5`_.
<c>cdrom_get_cds</c>
</ti>
<ti>
- See `eutils.eclass-5`_.
+ See <c>man eutils.eclass</c>.
</ti>
</tr>
<tr>
@@ -176,7 +176,7 @@ see `eutils.eclass-5`_.
<c>cdrom_load_next_cd</c>
</ti>
<ti>
- See `eutils.eclass-5`_.
+ See <c>man eutils.eclass</c>.
</ti>
</tr>
<tr>
diff --git a/eclass-reference/text.xml b/eclass-reference/text.xml
index fb03dbd..2e3b034 100644
--- a/eclass-reference/text.xml
+++ b/eclass-reference/text.xml
@@ -6,7 +6,7 @@
<body>
<p>
This section provides a reference for some of the more commonly used eclasses.
-Note that most eclasses have an accompanying manual page -- see `Manual Pages`_.
+Note that most eclasses have an accompanying manual page.
</p>
</body>
diff --git a/function-reference/sandbox-functions/text.xml b/function-reference/sandbox-functions/text.xml
index 557210f..f80b2c6 100644
--- a/function-reference/sandbox-functions/text.xml
+++ b/function-reference/sandbox-functions/text.xml
@@ -62,7 +62,8 @@ recursive, so to allow predicted writes to <c>/foo/bar</c> and <c>/foo/baz</c>,
<p>
See <uri link="::general-concepts/sandbox"/> for details on how the sandbox works.
-See `Handling Access Violations`_ for how to handle sandbox-related build problems.
+See <uri link="::appendices/common-problems/#Handling Access Violations"/> for how
+to handle sandbox-related build problems.
</p>
</body>
diff --git a/general-concepts/autotools/text.xml b/general-concepts/autotools/text.xml
index 7bf1739..b1627e3 100644
--- a/general-concepts/autotools/text.xml
+++ b/general-concepts/autotools/text.xml
@@ -6,7 +6,7 @@
<body>
<todo>
This is too long for <uri link="::general-concepts"/>. It needs to be split up and
-moved somewhere, either to a top-level of its own or into `Appendices`_.
+moved somewhere, either to a top-level of its own or into <uri link="::appendices/"/>.
</todo>
<p>
diff --git a/general-concepts/overlay/text.xml b/general-concepts/overlay/text.xml
index e823f3a..adffd86 100644
--- a/general-concepts/overlay/text.xml
+++ b/general-concepts/overlay/text.xml
@@ -42,8 +42,10 @@ Be very careful when using eclasses in an overlay. Portage will not do cache
updates when an overlay eclass is changed, nor will it do cache updates when a
main portage tree eclass which is used by an overlay ebuild changes. You may
also encounter bogus 'illegal inherit' notices when working with eclasses in
-overlay (see `QA Notice <d/> ECLASS foo inherited illegally`_). To be safe,
-manually <c>touch</c> all relevant overlay files after updating overlay eclasses.
+overlay (see <uri
+link="::appendices/common-problems/#QA Notice -- ECLASS foo inherited illegally"/>).
+To be safe, manually <c>touch</c> all relevant overlay files after updating overlay
+eclasses.
</p>
</body>
</section>
diff --git a/general-concepts/sandbox/text.xml b/general-concepts/sandbox/text.xml
index 216be0d..8fd63a4 100644
--- a/general-concepts/sandbox/text.xml
+++ b/general-concepts/sandbox/text.xml
@@ -20,9 +20,10 @@ generally <b>not</b> the correct solution.
</p>
<p>
-See `Sandbox Functions Reference`_ for details on sandbox-related functions. See
-`Handling Access Violations`_ for suggestions on fixing sandbox-related build
-problems.
+See <uri link="::function-reference/sandbox-functions/"/> for details on
+sandbox-related functions. See <uri
+link="::appendices/common-problems/#Handling Access Violations"/> for suggestions
+on fixing sandbox-related build problems.
</p>
</body>
diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml
index 858aaec..9c84573 100644
--- a/general-concepts/use-flags/text.xml
+++ b/general-concepts/use-flags/text.xml
@@ -148,7 +148,7 @@ mailing list.
<p>
All USE flags (excluding <c>USE_EXPAND</c> flags) must be described in either
<c>use.desc</c> or <c>use.local.desc</c> in the <c>profiles/</c> directory. See
-`portage-5`_ or the comments in these files for an explanation of the format.
+<c>man portage</c> or the comments in these files for an explanation of the format.
Remember to keep these files sorted.
</p>
</body>
diff --git a/profiles/categories/text.xml b/profiles/categories/text.xml
index a2a4625..c04c1c1 100644
--- a/profiles/categories/text.xml
+++ b/profiles/categories/text.xml
@@ -11,8 +11,8 @@ to update and commit this file <e>before</e> making any related commits.
</p>
<p>
-The <c>categories</c> file is a straight list. For descriptions, see `Category
-Metadata`_.
+The <c>categories</c> file is a straight list. For descriptions, see <uri
+link="::ebuild-writing/misc-files/metadata/#Category Metadata"/>.
</p>
</body>
diff --git a/profiles/package.mask/text.xml b/profiles/package.mask/text.xml
index 577c12b..ef57b28 100644
--- a/profiles/package.mask/text.xml
+++ b/profiles/package.mask/text.xml
@@ -8,7 +8,7 @@
The <c>package.mask</c> file can be used to hard mask packages or certain versions
of packages. This is often used when adding certain experimental (either in
ebuild or upstream terms) packages to the tree. The format is described in
-`portage-5`_.
+<c>man portage</c>.
</p>
<p>
diff --git a/profiles/text.xml b/profiles/text.xml
index 44b7774..a8e6e2a 100644
--- a/profiles/text.xml
+++ b/profiles/text.xml
@@ -6,7 +6,7 @@
<body>
<p>
This section provides details on the <c>profiles/</c> directory. All of these files
-are also documented in `portage-5`_.
+are also documented in <c>man portage</c>.
</p>
</body>
diff --git a/profiles/use.mask/text.xml b/profiles/use.mask/text.xml
index 2effe8b..180da2e 100644
--- a/profiles/use.mask/text.xml
+++ b/profiles/use.mask/text.xml
@@ -36,7 +36,7 @@ Updates to <c>use.mask</c> should be handled via the relevant arch team.
</p>
<p>
-See `noblah USE Flags`_ for more discussion.
+See <uri link="::general-concepts/use-flags/#noblah USE Flags"/> for more discussion.
</p>
</body>
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 29e5077..883925e 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -155,8 +155,9 @@ for errors.
The canonical install method is <c>make DESTDIR=&quot;${D}&quot;
install</c>. This will work with any properly written standard
<c>Makefile</c>. If this gives sandbox errors, try <c>einstall</c>
-instead. If this still fails, see `src_install`_ for how to do
-manual installs.
+instead. If this still fails, see <uri
+link="::ebuild-writing/functions/src_install/"/> for how to do manual
+installs.
</note>
<p>
@@ -301,7 +302,8 @@ src_install() {
Note the <c>${FILESDIR}/${P}-destdir.patch</c> <d/> this refers to
<c>detox-1.1.0-destdir.patch</c>, which lives in the <c>files/</c>
subdirectory in the portage tree. Larger patch files must go on the
-mirrors rather than in <c>files/</c> <d/> see `Basic epatch Usage`_.
+mirrors rather than in <c>files/</c> <d/> see <uri
+link="::ebuild-writing/functions/src_unpack/epatch/"/>.
</p>
</body>
@@ -351,7 +353,7 @@ by the ebuild. This is used for the <c>emerge -pv</c> output, amongst other thin
<p>
The package's <c>./configure</c> script takes the usual <c>--enable-nls</c> or
<c>--disable-nls</c> argument. We use the <c>use_enable</c> utility function to
-generate this automatically (see `Query Functions Reference`_).
+generate this automatically (see <uri link="::function-reference/query-functions/"/>).
</p>
<p>
diff --git a/tasks-reference/completion/text.xml b/tasks-reference/completion/text.xml
index dec64ac..a04858d 100644
--- a/tasks-reference/completion/text.xml
+++ b/tasks-reference/completion/text.xml
@@ -7,8 +7,8 @@
<p>
Since v2.05a, <c>bash</c> has offered intelligent programmable completion. Writing
such completions for your own programs/things you maintain is relatively easy
-provided you know bash already. See `bash-completion.eclass Reference`_ for how
-to install completion files.
+provided you know bash already. See <uri link="::eclass-reference/bash-completion.eclass/"/>
+for how to install completion files.
</p>
<section>
@@ -94,7 +94,7 @@ are subsequently reset.
<body>
<p>
-See `bash-1`_ for a full description of these builtins and their options.
+See <c>man bash</c> for a full description of these builtins and their options.
</p>
<table>
diff --git a/tasks-reference/environment/text.xml b/tasks-reference/environment/text.xml
index f6eea7a..be30bf8 100644
--- a/tasks-reference/environment/text.xml
+++ b/tasks-reference/environment/text.xml
@@ -17,8 +17,8 @@ This directory should <b>only</b> be used for setting environment variables.
<p>
To install a file into this directory, use <c>doenvd</c> or <c>newenvd</c> (see
-`Install Functions Reference`_). The format of the file should be a series of
-lines in the form <c>VARIABLE="the value"</c>.
+<uri link="::function-reference/install-functions/"/>). The format of the file
+should be a series of lines in the form <c>VARIABLE="the value"</c>.
</p>
<p>
diff --git a/tasks-reference/init-scripts/text.xml b/tasks-reference/init-scripts/text.xml
index 4a4fba8..51df865 100644
--- a/tasks-reference/init-scripts/text.xml
+++ b/tasks-reference/init-scripts/text.xml
@@ -7,10 +7,10 @@
<p>
Init scripts should be installed into <c>/etc/init.d</c> using the <c>doinitd</c> or
-<c>newinitd</c> functions (see `Install Functions Reference`_). Any configuration
-(commandline parameters or environment variables) for these scripts should be
-handled via entries in <c>/etc/conf.d</c> with the same filename <d /> <c>doconfd</c> or
-<c>newconfd</c> can be used to install these.
+<c>newinitd</c> functions (see <uri link="::function-reference/install-functions/"/>).
+Any configuration (commandline parameters or environment variables) for these scripts
+should be handled via entries in <c>/etc/conf.d</c> with the same filename <d />
+<c>doconfd</c> or <c>newconfd</c> can be used to install these.
</p>
<p>
diff --git a/tools-reference/bash/text.xml b/tools-reference/bash/text.xml
index 69e68ca..6e17ca5 100644
--- a/tools-reference/bash/text.xml
+++ b/tools-reference/bash/text.xml
@@ -320,7 +320,7 @@ following are available:
<p>
The general form of a file test is <c>-operator "filename"</c>. The following are
-available (lifted from `bash-1`_):
+available (lifted from <c>man bash</c>):
</p>
<table>
@@ -511,7 +511,7 @@ available (lifted from `bash-1`_):
<p>
The general form of a file comparison is <c>"file1" -operator "file2"</c>. The
-following are available (lifted from `bash-1`_):
+following are available (lifted from <c>man bash</c>):
</p>
<table>
@@ -669,7 +669,8 @@ done &lt; some_file
</codesample>
<p>
-See `die and Subshells`_ for an explanation of why <c>while read &lt; file</c> should
+See <uri link="::ebuild-writing/error-handling/#die and Subshells"/>
+for an explanation of why <c>while read &lt; file</c> should
be used over <c>cat file | while read</c>.
</p>
@@ -824,10 +825,12 @@ with the first match of <c>pattern</c> replaced with <c>replacement</c>. To repl
</p>
<note>
-`bash-1`_ incorrectly describes what will be matched. Of all the possible
+<c>man bash</c> incorrectly describes what will be matched. Of all the possible
leftmost matches, the longest will be taken. Yes, really, the longest, even if
it involves favouring later groups or later branches. This is <b>not</b> like
-<c>perl</c> or <c>sed</c>. See `IEEE1003.1-2004-9.1`_ for details.
+<c>perl</c> or <c>sed</c>. See <uri
+link="http://www.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap09.html#tag_09_01">
+IEEE1003.1-2004-9.1</uri> for details.
</note>
<p>