<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-guide.

</pre>
<p><a href="https://github.com/macports/macports-guide/commit/a5ef96ad21a3ae4c18769b5131c2b25d8d22d276">https://github.com/macports/macports-guide/commit/a5ef96ad21a3ae4c18769b5131c2b25d8d22d276</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new a5ef96a  Convert from docbook 4.5 -> 5.0
</span>a5ef96a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a5ef96ad21a3ae4c18769b5131c2b25d8d22d276
</span>Author: Eitan Adler <lists@eitanadler.com>
AuthorDate: Sun Nov 5 10:07:23 2017 -0800

<span style='display:block; white-space:pre;color:#404040;'>    Convert from docbook 4.5 -> 5.0
</span>---
 Makefile                            |   4 +-
 README                              |   2 +-
 guide/resources/tabs.xsl            |   4 +-
 guide/xml/glossary.xml              |  10 +--
 guide/xml/guide.xml                 |  39 ++++++----
 guide/xml/installing.xml            |  90 +++++++++++-----------
 guide/xml/internals-hier.xml        |   6 +-
 guide/xml/internals.xml             |  24 +++---
 guide/xml/intro.xml                 |  10 +--
 guide/xml/macports.conf.xml         |  12 +--
 guide/xml/macros.xml                |   6 +-
 guide/xml/portfile-dependencies.xml |   8 +-
 guide/xml/portfile-keywords.xml     |   8 +-
 guide/xml/portfile-livecheck.xml    |   6 +-
 guide/xml/portfile-phase.xml        |  72 +++++++++---------
 guide/xml/portfile-startupitem.xml  |  20 ++---
 guide/xml/portfile-tcl.xml          |  24 +++---
 guide/xml/portfile-variables.xml    |   6 +-
 guide/xml/portfile-variants.xml     |  12 +--
 guide/xml/portfiledev.xml           |  80 ++++++++++----------
 guide/xml/portfileref.xml           |   8 +-
 guide/xml/portgroup-gnustep.xml     |  12 +--
 guide/xml/portgroup-haskell.xml     |  10 +--
 guide/xml/portgroup-perl.xml        |  12 +--
 guide/xml/portgroup-python.xml      |  12 +--
 guide/xml/portgroup-ruby.xml        |   8 +-
 guide/xml/portgroup-xcode.xml       |  12 +--
 guide/xml/portgroups.xml            |   6 +-
 guide/xml/project.xml               | 146 +++++++++++++++---------------------
 guide/xml/using.xml                 | 116 ++++++++++++++--------------
 30 files changed, 385 insertions(+), 400 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cab679..dc0410e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ endif
</span>   # Convert all sections (h1-h9) to a link so it's easy to link to them.
        # If someone knows a better way to do this please change it.
        $(REINPLACE) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       's|(<h[0-9] [^>]*><a xml:id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
</span>       $(GUIDE_RESULT)/index.html
 
 # Generate the chunked HTML guide with one section per file.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,7 @@ endif
</span>   # Convert all sections (h1-h9) to a link so it's easy to link to them.
        # If someone knows a better way to do this please change it.
        $(REINPLACE) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       's|(<h[0-9] [^>]*><a xml:id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
</span>       $(GUIDE_RESULT_CHUNK)/*.html
        # Add the table of contents to every junked HTML file.
        # If someone knows a better way to do this please change it.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/README b/README
</span><span style='display:block; white-space:pre;color:#808080;'>index acb42f2..81f7190 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/README
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/README
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> This is the MacPorts documentation directory.
 
 To generate it you have to checkout the entire "macports-guide" repository,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-and you need the "docbook-xsl", "docbook-xml-4.5" and "libxslt" ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and you need the "docbook-xsl", "docbook-xml-5.0" and "libxslt" ports.
</span> If your port installation isn't in /opt/local, edit or override the
 PREFIX Makefile variable.
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/resources/tabs.xsl b/guide/resources/tabs.xsl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4da2d73..c10e446 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/resources/tabs.xsl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/resources/tabs.xsl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
        <xsl:template name="user.header.content">
                <div class="book">
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        <div id="tabswitch">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   <div xml:id="tabswitch">
</span>                           <a href="/index.html">
                                        <xsl:if test="$chunkmode = 0">
                                                <xsl:attribute name="class">selected</xsl:attribute>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,6 @@
</span>                           </a>
                        </div>
                </div>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <div id="vh-test"></div> <!-- needed for the sticky sidebar -->
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           <div xml:id="vh-test"></div> <!-- needed for the sticky sidebar -->
</span>   </xsl:template>
 </xsl:stylesheet>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/glossary.xml b/guide/xml/glossary.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 92e3cee..0c63537 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/glossary.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/glossary.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,15 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="guide-terms">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="guide-terms">
</span>   <title>MacPorts Guide Glossary</title>
 
   <para>This section defines a number of words which may be new to
     the reader. These are all defined in the context of Macports
     instead of as general purpose definition.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <glossary id="glossary">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    <glossdiv id="terms">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <glossary xml:id="glossary">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <glossdiv xml:id="terms">
</span>       <title>MacPorts Guide Terms</title>
 
       <glossentry>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/guide.xml b/guide/xml/guide.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 245a5b7..d45aea9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/guide.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/guide.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +1,45 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
 <!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
 -->
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> <book>
     <title>
         <application>MacPorts</application> Guide
     </title>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <bookinfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <info>
</span>         <authorgroup>
             <author>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <firstname>Mark</firstname>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <surname>Duling</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <personname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <firstname>Mark</firstname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <surname>Duling</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                </personname>
</span>             </author>
             <author>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <honorific>Dr</honorific>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <firstname>Michael</firstname>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <surname>Maibaum</surname>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <othername role="mi">A</othername>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <personname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <honorific>Dr</honorific>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <firstname>Michael</firstname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <surname>Maibaum</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <othername role="mi">A</othername>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                </personname>
</span>             </author>
             <author>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <firstname>Will</firstname>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <surname>Barton</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <personname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <firstname>Will</firstname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <surname>Barton</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                </personname>
</span>             </author>
             <author>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <firstname>Clemens</firstname>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <surname>Lang</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <personname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <firstname>Clemens</firstname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <surname>Lang</surname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                </personname>
</span>             </author>
         </authorgroup>
 
         <copyright>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <year>2007–2014</year>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <year>2007–2017</year>
</span>             <holder>The MacPorts Project</holder>
         </copyright>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +47,7 @@
</span>             <year>2002–2004</year>
             <holder>The OpenDarwin Project</holder>
         </copyright>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    </bookinfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    </info>
</span> 
     <xi:include href="intro.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude" />
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/installing.xml b/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index c664acb..49055d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/installing.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
 <!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
 -->
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd"[
</span> <!ENTITY macports-version "2.4.2">
 ]>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="installing">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="installing">
</span>     <title>Installing MacPorts</title>
 
     <para>This chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,10 +14,10 @@
</span>             linkend="installing.macports.source">installing MacPorts from source</link>, and continue to the end of the
         chapter.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="installing.xcode">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="installing.xcode">
</span>         <title>Install Xcode</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <para><ulink url="https://developer.apple.com/xcode/">Xcode</ulink> is a package provided by Apple containing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <para><link xlink:href="https://developer.apple.com/xcode/">Xcode</link> is a package provided by Apple containing
</span>             compilers, libraries and additional tools required to develop applications for macOS.</para>
 
         <note>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,31 +29,31 @@
</span> 
         <para>Follow the instructions for your version of macOS:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.xcode.mavericks">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.xcode.mavericks">
</span>             <title>Install Xcode on OS X 10.9 or Later</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>Download the latest version of Xcode <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    url="https://developer.apple.com/downloads/index.action">from the Apple developer website</ulink> or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                get it <ulink url="http://itunes.apple.com/us/app/xcode/id497799835">using the Mac App
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    Store</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <para>Download the latest version of Xcode <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    xlink:href="https://developer.apple.com/downloads/index.action">from the Apple developer website</link> or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                get it <link xlink:href="http://itunes.apple.com/us/app/xcode/id497799835">using the Mac App
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    Store</link>.</para>
</span> 
             <para>Once you have Xcode installed, open a terminal, run <userinput>xcode-select --install</userinput>, and
                 click the Install button to install the required command line developer tools. Don't worry if you see
                 a message telling you the software cannot be installed because it is not currently available from the
                 Software Update Server. This usually means you already have the latest version installed. You can also
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                get the command line tools from <ulink url="https://developer.apple.com/downloads/index.action">the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    Apple developer website</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                get the command line tools from <link xlink:href="https://developer.apple.com/downloads/index.action">the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    Apple developer website</link>.</para>
</span>         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.xcode.lion">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.xcode.lion">
</span>             <title>Install Xcode on OS X 10.7 Lion or OS X 10.8 Mountain Lion</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>Download the latest version of Xcode <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    url="https://developer.apple.com/downloads/index.action">from the Apple developer website</ulink> or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                get it <ulink url="http://itunes.apple.com/us/app/xcode/id497799835">using the Mac App
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    Store</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <para>Download the latest version of Xcode <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    xlink:href="https://developer.apple.com/downloads/index.action">from the Apple developer website</link> or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                get it <link xlink:href="http://itunes.apple.com/us/app/xcode/id497799835">using the Mac App
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    Store</link>.</para>
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <section id="installing.xcode.lion.43">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <section xml:id="installing.xcode.lion.43">
</span>                 <title>Xcode 4.3 and Later</title>
 
                 <para>Xcode 4.3 and later do not automatically install the command line tools, but MacPorts requires
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@
</span>             </section>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.xcode.snowleopard">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.xcode.snowleopard">
</span>             <title>Install Xcode on Mac OS X 10.6 Snow Leopard</title>
 
             <para>If you are using Mac OS X 10.6, there are two branches of Xcode which could be considered to be the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,8 +88,8 @@
</span>                     </listitem>
                 </orderedlist>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <para>Both are available from the <ulink url="https://developer.apple.com/downloads/index.action">Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    developer website</ulink>. You may also be able to install Xcode 3.2 from your Mac OS X 10.6 DVD and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <para>Both are available from the <link xlink:href="https://developer.apple.com/downloads/index.action">Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    developer website</link>. You may also be able to install Xcode 3.2 from your Mac OS X 10.6 DVD and
</span>                 then run Software Update to get the latest version.</para>
 
             <para>Ensure that those of the following options that are available in the installer for your version of
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,12 +111,12 @@
</span>                 </itemizedlist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.xcode.other">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.xcode.other">
</span>             <title>Install Xcode on Older Releases of Mac OS X</title>
 
             <para>If you have an earlier release of Mac OS X, you may download the latest version of Xcode for OS X 10.5
                 (Xcode 3.0 and Xcode 3.1 Developer Tools) or 10.4 (Xcode 2.4.1 and Xcode 2.5 Developer Tools) from the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <ulink url="https://developer.apple.com/downloads/index.action">Apple developer website</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <link xlink:href="https://developer.apple.com/downloads/index.action">Apple developer website</link>.</para>
</span> 
             <para>Ensure that those of the following options that are available in the installer for your version of
                 Xcode are selected:</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@
</span>         </section>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="installing.macports">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="installing.macports">
</span>         <title>Install MacPorts</title>
 
         <para>If you are using macOS, you should install MacPorts using the macOS package installer unless you do not wish
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@
</span>             MacPorts on another OS platform, you must <link linkend="installing.macports.source">install MacPorts from
                 the source code</link>.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.macports.binary">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.macports.binary">
</span>             <title>macOS Package Install</title>
 
             <para>The macOS package installer automatically installs MacPorts, <link linkend="installing.shell">sets the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +159,7 @@
</span>                 <listitem>
                     <para>Download the latest
                         <filename>MacPorts-&macports-version;-<replaceable>....</replaceable>pkg</filename> installer from the releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        <ulink url="https://github.com/macports/macports-base/releases/">on GitHub</ulink>. Here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        <link xlink:href="https://github.com/macports/macports-base/releases/">on GitHub</link>. Here
</span>                         are direct links for the latest versions of macOS:</para>
 
                     <variablelist>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,7 +168,7 @@
</span>                                 macOS 10.13 High Sierra:
                             </term>
                             <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                <para><ulink url="https://github.com/macports/macports-base/releases/download/v&macports-version;/MacPorts-&macports-version;-10.13-HighSierra.pkg">MacPorts-&macports-version;-10.13-HighSierra.pkg</ulink></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                <para><link xlink:href="https://github.com/macports/macports-base/releases/download/v&macports-version;/MacPorts-&macports-version;-10.13-HighSierra.pkg">MacPorts-&macports-version;-10.13-HighSierra.pkg</link></para>
</span>                             </listitem>
                         </varlistentry>
                         <varlistentry>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +176,7 @@
</span>                                 macOS 10.12 Sierra:
                             </term>
                             <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                <para><ulink url="https://github.com/macports/macports-base/releases/download/v&macports-version;/MacPorts-&macports-version;-10.12-Sierra.pkg">MacPorts-&macports-version;-10.12-Sierra.pkg</ulink></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                <para><link xlink:href="https://github.com/macports/macports-base/releases/download/v&macports-version;/MacPorts-&macports-version;-10.12-Sierra.pkg">MacPorts-&macports-version;-10.12-Sierra.pkg</link></para>
</span>                             </listitem>
                         </varlistentry>
                         <varlistentry>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +184,7 @@
</span>                                 OS X 10.11 El Capitan:
                             </term>
                             <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                <para><ulink url="https://github.com/macports/macports-base/releases/download/v&macports-version;/MacPorts-&macports-version;-10.11-ElCapitan.pkg">MacPorts-&macports-version;-10.11-ElCapitan.pkg</ulink></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                <para><link xlink:href="https://github.com/macports/macports-base/releases/download/v&macports-version;/MacPorts-&macports-version;-10.11-ElCapitan.pkg">MacPorts-&macports-version;-10.11-ElCapitan.pkg</link></para>
</span>                             </listitem>
                         </varlistentry>
                     </variablelist>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,7 +211,7 @@
</span>             </orderedlist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.macports.source">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.macports.source">
</span>             <title>Source Install</title>
 
             <para>If you installed MacPorts using the package installer, skip this section. To install MacPorts from the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,9 +219,9 @@
</span> 
             <orderedlist>
                 <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    <para>Download and extract the <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            url="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2"> MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            &macports-version; tarball</ulink>. Either do so using your browser and the Finder, or use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <para>Download and extract the <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            xlink:href="https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2"> MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            &macports-version; tarball</link>. Either do so using your browser and the Finder, or use
</span>                         the given commands in a terminal window.</para>
 
                     <programlisting><prompt>$</prompt> <userinput>curl -O https://distfiles.macports.org/MacPorts/MacPorts-&macports-version;.tar.bz2</userinput>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +247,7 @@
</span>             </orderedlist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.macports.git">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.macports.git">
</span>             <title>Git Install</title>
 
             <para>If you installed MacPorts using the package installer, skip this section.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -322,7 +322,7 @@
</span>             </orderedlist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.macports.source.multiple">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.macports.source.multiple">
</span>             <title>Install Multiple MacPorts Copies</title>
 
             <para>Occasionally a MacPorts developer may wish to install more than one MacPorts instance on the same
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,7 +349,7 @@
</span>         </section>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="installing.macports.upgrade">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="installing.macports.upgrade">
</span>         <title>MacPorts Upgrade</title>
 
         <para>MacPorts base upgrades are performed automatically (when a newer release is available) during a <link
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,12 +359,12 @@
</span>             code.</para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="installing.macports.uninstalling">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="installing.macports.uninstalling">
</span>         <title>Uninstall</title>
 
         <para>Uninstalling MacPorts can be a drastic step, and depending on the issue you are experiencing, you may not
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            need to do so. If you are unsure, ask on the <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                url="https://lists.macports.org/mailman/listinfo/macports-users">macports-users</ulink> mailing list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            need to do so. If you are unsure, ask on the <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                xlink:href="https://lists.macports.org/mailman/listinfo/macports-users">macports-users</link> mailing list
</span>             first.</para>
 
         <para>If you need to uninstall MacPorts, and <command>port</command> is functioning, first
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,7 +401,7 @@
</span>             not all of the above paths will exist on your system. This is OK.</para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="installing.shell">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="installing.shell">
</span>         <title>MacPorts and the Shell</title>
 
         <para>MacPorts requires that some environment variables be set in the shell. When MacPorts is installed using
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -415,7 +415,7 @@
</span>             <filename>.profile</filename>, <filename>.bash_login</filename>, <filename>.bash_profile</filename>,
             <filename>.tcshrc</filename>, or <filename>.cshrc</filename>.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.shell.postflight">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.shell.postflight">
</span>             <title>The Postflight Script</title>
 
             <para>The postflight script automatically sets the <varname>PATH</varname> variable, and optionally the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,7 +477,7 @@
</span>             </itemizedlist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.shell.verifyprofile">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.shell.verifyprofile">
</span>             <title>Verify the Configuration File</title>
 
             <para>To verify that the file containing the MacPorts variables is in effect, type <command>env</command> in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -507,7 +507,7 @@
</span> <!--        -->_=/usr/bin/env</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="installing.shell.editorvar">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="installing.shell.editorvar">
</span>             <title>Optional Editor Variables</title>
 
             <para>You can set an environment variable in order to use your favorite text editor with the <command>port edit</command>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -520,8 +520,8 @@
</span> 
             <programlisting>export EDITOR=/usr/bin/nano</programlisting>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>To use the user-friendly GUI editor <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    url="http://www.barebones.com/products/bbedit/">BBEdit</ulink> (installation required),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <para>To use the user-friendly GUI editor <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    xlink:href="http://www.barebones.com/products/bbedit/">BBEdit</link> (installation required),
</span>                 add this line:</para>
 
             <programlisting>export EDITOR=/Applications/BBEdit.app/Contents/Helpers/bbedit_tool</programlisting>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/internals-hier.xml b/guide/xml/internals-hier.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 7eae334..d52b579 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/internals-hier.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/internals-hier.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<refentry id="porthier">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<refentry xml:id="porthier">
</span>   <refmeta>
     <refentrytitle>PORTHIER</refentrytitle>
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/internals.xml b/guide/xml/internals.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 685bbf1..13be48a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/internals.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/internals.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="internals">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="internals">
</span>   <title>MacPorts Internals</title>
 
   <para>This chapter contains information about the MacPorts file layout,
   configuration files, a few fundamental port installation concepts, and the
   MacPorts APIs.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.hierarchy">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.hierarchy">
</span>     <title>File Hierarchy</title>
 
     <xi:include href="internals-hier.xml"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span>   <xi:include href="macports.conf.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.images">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.images">
</span>     <title>Port Images</title>
 
     <para>MacPorts has a unique ability to allow multiple versions,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@
</span>     </para>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.apis">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.apis">
</span>     <title>APIs and Libs</title>
 
     <para>The MacPorts system is composed of three Tcl libraries:</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@
</span>       </listitem>
     </itemizedlist>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="internals.apis.ports">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="internals.apis.ports">
</span>       <title>Ports API</title>
 
       <para>The code for the Port API is located in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +123,7 @@
</span>       </itemizedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="internals.apis.macports">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="internals.apis.macports">
</span>       <title>MacPorts API</title>
 
       <para>The code for the MacPorts API is located in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,7 +274,7 @@
</span>       </itemizedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="internals.apis.pextlib">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="internals.apis.pextlib">
</span>       <title>pextlib</title>
 
       <para>The pextlib Tcl library provides a variety of C extensions to add
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,7 +283,7 @@
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.registry">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.registry">
</span>     <title>The MacPorts Registry</title>
 
     <para>This chapter provides an overview of the MacPorts registry and its
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,7 +312,7 @@
</span>       </listitem>
     </itemizedlist>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="internals.registry.files">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="internals.registry.files">
</span>       <title>Registry Files</title>
 
       <para>The SQLite registry used by default is located at
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,7 +336,7 @@
</span>       </para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="internals.registry.api">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="internals.registry.api">
</span>       <title>The Registry API</title>
 
       <para>The MacPorts registry provides a public API in the registry1.0 Tcl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/intro.xml b/guide/xml/intro.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 2bc6d2b..d62d0e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/intro.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/intro.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
 <!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
 -->
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="introduction">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="introduction">
</span>     <title>Introduction</title>
 
     <para>MacPorts is an easy to use system for compiling, installing, and managing open source software. MacPorts may
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +57,8 @@
</span> 
             <itemizedlist>
                 <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    <para>A hyperlink: <ulink url="http://en.wikipedia.org/wiki/Spontaneous_combustion">spontaneous
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            combustion</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <para>A hyperlink: <link xlink:href="http://en.wikipedia.org/wiki/Spontaneous_combustion">spontaneous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            combustion</link>.</para>
</span>                 </listitem>
                 <listitem>
                     <para>A file: <filename>/var/log/system.log</filename>.</para>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/macports.conf.xml b/guide/xml/macports.conf.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b86838..d42ec07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/macports.conf.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/macports.conf.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="internals.configuration-files">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="internals.configuration-files">
</span>   <title>Configuration Files</title>
 
   <para>The MacPorts configuration files often do not need to be modified for the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span>   separated by either a space or a tab. Lines beginning with '#' are comments,
   empty lines are ignored.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.configuration-files.macports-conf">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.configuration-files.macports-conf">
</span>     <title>macports.conf</title>
 
     <para>macports.conf is the configuration file used to bootstrap the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -415,7 +415,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.configuration-files.sources-conf">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.configuration-files.sources-conf">
</span>     <title>sources.conf</title>
 
     <para>This file enables rsync synchronization of the default ports tree
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -429,7 +429,7 @@
</span>     <replaceable>file:///path/to/localportsrepository</replaceable></para>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="internals.configuration-files.variants-conf">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="internals.configuration-files.variants-conf">
</span>     <title>variants.conf</title>
 
     <para>This optional file specifies any variants you'd like to be invoked
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/macros.xml b/guide/xml/macros.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index ca8319f..3f94328 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/macros.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/macros.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span> 
 <!-- This section will be hidden by a xsl:template in resources/base.xsl -->
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id='macros'>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id='macros'>
</span> <title>Macros</title>
 
 <warning role='macro-outdated'><para>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-dependencies.xml b/guide/xml/portfile-dependencies.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index d7ce191..1e795af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-dependencies.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-dependencies.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.dependencies">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.dependencies">
</span>   <title>Dependencies</title>
 
   <para>Free and open source software is highly modular, and MacPorts ports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@
</span>     </varlistentry>
   </variablelist>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.dependencies.types">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.dependencies.types">
</span>     <title>Port and File Dependencies</title>
 
     <para>There are two types of dependencies: port dependencies and file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-keywords.xml b/guide/xml/portfile-keywords.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 806bea2..28d73d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-keywords.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-keywords.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.keywords">
</span>   <title>Global Keywords</title>
 
   <para>MacPorts keywords are used to specify required or optional items
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span>       </listitem>
     </varlistentry>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <varlistentry id="reference.keywords.maintainers">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <varlistentry xml:id="reference.keywords.maintainers">
</span>       <term>maintainers</term>
 
       <listitem>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-livecheck.xml b/guide/xml/portfile-livecheck.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 2886a2e..b350d9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-livecheck.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-livecheck.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.livecheck">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.livecheck">
</span>   <title>Livecheck / Distcheck</title>
 
   <para>Options livecheck and distcheck are especially useful for port
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-phase.xml b/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index a4fe60a..f21e774 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.phases">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.phases">
</span>   <title>Port Phases</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.introduction">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.introduction">
</span>     <title>Introduction</title>
 
     <para>The MacPorts port installation process has a number of distinct
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +52,8 @@
</span>         <term>patch</term>
 
         <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-          <para>Apply optional <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          url="http://en.wikipedia.org/wiki/Patch_(Unix)">patch</ulink> files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          <para>Apply optional <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          xlink:href="http://en.wikipedia.org/wiki/Patch_(Unix)">patch</link> files
</span>           specified in <varname>${patchfiles}</varname> to modify a port's
           source code file(s).</para>
         </listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +98,9 @@
</span>           <varname>${worksrcpath}</varname>.</para>
 
           <note>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>Using a <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            url="http://www.gnu.org/prep/standards/html_node/DESTDIR.html"><varname>DESTDIR</varname>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            variable</ulink> is a part of standard GNU coding practices, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <para>Using a <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xlink:href="http://www.gnu.org/prep/standards/html_node/DESTDIR.html"><varname>DESTDIR</varname>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            variable</link> is a part of standard GNU coding practices, and
</span>             this variable must be supported in an application's install
             routines for MacPorts' destroot phase to work without manual
             Portfile scripting or source patching. Urge developers to fully
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,7 +161,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.installation">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.installation">
</span>     <title>Installation Phase Keywords</title>
 
     <para>MacPorts keywords are used to specify required or optional items
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +175,7 @@
</span>     phases and set options for those phases, and they take effect whether or
     not phase declarations have been explicitly defined in a Portfile.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.installation.list-modifiers">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.installation.list-modifiers">
</span>       <title>Keyword List Modifiers (-append, -delete, -replace, -strsed)</title>
 
       <para>Keyword list modifiers are keywords that end in -append, -delete or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,7 +259,7 @@
</span>       </orderedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.installation.argument-modifiers">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.installation.argument-modifiers">
</span>       <title>Keyword Argument Modifiers (.pre_args / .post_args)</title>
 
       <para>Keywords that support pre_args and post_args are used to assemble
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +272,7 @@
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.fetch">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.fetch">
</span>     <title>Fetch Phase Keywords</title>
 
     <para>The list of keywords related to the fetch phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -516,14 +516,14 @@ distfiles           file_one.tar.gz:tagone \
</span>       </varlistentry>
     </variablelist>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.fetch.advanced">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.fetch.advanced">
</span>       <title>Advanced Fetch Options</title>
 
       <para>Some mirrors require special options for a resource to be properly
       fetched.</para>
 
       <variablelist>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <varlistentry id="reference.phases.fetch.advanced.fetch-type">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <varlistentry xml:id="reference.phases.fetch.advanced.fetch-type">
</span>           <term>fetch.type</term>
 
           <listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -642,10 +642,10 @@ svn.revision        2100</programlisting>
</span>       </variablelist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.fetch.bzr">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.fetch.bzr">
</span>       <title>Fetch from BZR</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para><ulink url="http://bazaar.canonical.com/en/">Bzr</ulink> may be used as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para><link xlink:href="http://bazaar.canonical.com/en/">Bzr</link> may be used as
</span>       an alternative method of fetching distribution files using the keywords
       in this section. However, fetching via bzr may cause non-reproducible
       builds, so it is strongly discouraged.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -700,10 +700,10 @@ svn.revision        2100</programlisting>
</span>       </variablelist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.fetch.cvs">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.fetch.cvs">
</span>       <title>Fetch from CVS</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para><ulink url="http://www.nongnu.org/cvs/">CVS</ulink> may be used as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para><link xlink:href="http://www.nongnu.org/cvs/">CVS</link> may be used as
</span>       an alternative method of fetching distribution files using the keywords
       in this section. However, fetching via CVS may cause non-reproducible
       builds, so it is strongly discouraged.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -817,10 +817,10 @@ svn.revision        2100</programlisting>
</span>     </section>
 
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.fetch.git">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.fetch.git">
</span>       <title>Fetch from Git</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para><ulink url="http://git-scm.com/">Git</ulink> may be used as an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para><link xlink:href="http://git-scm.com/">Git</link> may be used as an
</span>       alternative method of fetching distribution files using the keywords in
       this section. However, fetching via Git may cause non-reproducible
       builds, so it is strongly discouraged.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -878,10 +878,10 @@ svn.revision        2100</programlisting>
</span>       </variablelist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.fetch.hg">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.fetch.hg">
</span>       <title>Fetch from Mercurial</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para><ulink url="http://mercurial.selenic.com/">Mercurial</ulink> may be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para><link xlink:href="http://mercurial.selenic.com/">Mercurial</link> may be
</span>       used as an alternative method of fetching distribution files using the
       keywords in this section. However, fetching via Mercurial may cause
       non-reproducible builds, so it is strongly discouraged.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -939,10 +939,10 @@ svn.revision        2100</programlisting>
</span>       </variablelist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.fetch.svn">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.fetch.svn">
</span>       <title>Fetch from Subversion</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para><ulink url="http://subversion.apache.org/">Subversion</ulink> may
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para><link xlink:href="http://subversion.apache.org/">Subversion</link> may
</span>       be used as an alternative method of fetching distribution files using
       the keywords in this section. However, fetching via Subversion may cause
       non-reproducible builds, so it is strongly discouraged.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1024,7 +1024,7 @@ svn.revision        2100</programlisting>
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.checksum">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.checksum">
</span>     <title>Checksum Phase Keywords</title>
 
     <para>The list of keywords related to the checksum phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1065,7 +1065,7 @@ svn.revision        2100</programlisting>
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.extract">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.extract">
</span>     <title>Extract Phase Keywords</title>
 
     <para>The list of keywords related to the extract phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1370,7 +1370,7 @@ extract.post_args   "| gnutar -x"</programlisting>
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.patch">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.patch">
</span>     <title>Patch Phase Keywords</title>
 
     <para>The list of keywords related to the patch phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1497,7 +1497,7 @@ patch.post_args     ???</programlisting>
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.configure">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.configure">
</span>     <title>Configure Phase Keywords</title>
 
     <para>The list of keywords related to the configure phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1588,7 +1588,7 @@ configure.env-delete    TCLROOT=${prefix}</programlisting>
</span>         </listitem>
       </varlistentry>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <varlistentry id="reference.phases.configure.optflags">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <varlistentry xml:id="reference.phases.configure.optflags">
</span>         <term>configure.optflags</term>
 
         <term>configure.optflags-append</term>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1617,7 +1617,7 @@ configure.optflags-delete     -Os</programlisting>
</span>         </listitem>
       </varlistentry>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <varlistentry id="reference.phases.configure.cflags">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <varlistentry xml:id="reference.phases.configure.cflags">
</span>         <term>configure.cflags</term>
 
         <term>configure.cflags-append</term>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2339,7 +2339,7 @@ configure.post_args OPT="-D__DARWIN_UNIX03"</programlisting>
</span>       </varlistentry>
     </variablelist>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.configure.universal">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.configure.universal">
</span>       <title>Configure Universal</title>
 
       <para>Universal keywords are used to make a port compile on OS X for
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2474,7 +2474,7 @@ configure.post_args OPT="-D__DARWIN_UNIX03"</programlisting>
</span>       </variablelist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="reference.phases.configure.automake-autoconf">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="reference.phases.configure.automake-autoconf">
</span>       <title>Automake, Autoconf, and Autoreconf</title>
 
       <para>The list of configure keywords available for ports that need
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2664,7 +2664,7 @@ configure.post_args OPT="-D__DARWIN_UNIX03"</programlisting>
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.build">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.build">
</span>     <title>Build Phase Keywords</title>
 
     <para>The list of keywords related to the build phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2874,7 +2874,7 @@ build.target-delete     compat</programlisting>
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.test">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.test">
</span>     <title>Test Phase Keywords</title>
 
     <para>The list of keywords related to the test phase.</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3012,7 +3012,7 @@ build.target-delete     compat</programlisting>
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.phases.destroot">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.phases.destroot">
</span>     <title>Destroot Phase Keywords</title>
 
     <para>The list of keywords related to the destroot phase.</para>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-startupitem.xml b/guide/xml/portfile-startupitem.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index d93906f..ad98e10 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-startupitem.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-startupitem.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.startupitems">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.startupitems">
</span>   <title>StartupItems</title>
 
   <para>A StartupItem is a MacPorts facility to run <quote>daemons,</quote> a Unix term for
   programs that run continuously in the background, rather than under the
   direct control of a user; for example, mail servers, network listeners, etc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  Ports that use StartupItem keywords create OS X scripts for <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  url="http://developer.apple.com/macosx/launchd.html">launchd</ulink>, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  Ports that use StartupItem keywords create OS X scripts for <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  xlink:href="http://developer.apple.com/macosx/launchd.html">launchd</link>, which
</span>   is the Apple facility introduced with Mac OS X 10.4 to replace xinetd for
   starting and managing daemons. To support <command>launchd</command>, a
   program named <command>daemondo</command> is provided by MacPorts base that
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@
</span>     in Portfiles; this prevents StartupItems from being created.</para>
   </note>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.startupitems.attributes">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.startupitems.attributes">
</span>     <title>StartupItem Attributes</title>
 
     <para>The keywords in this section may be used with either
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,7 +145,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.startupitems.executable">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.startupitems.executable">
</span>     <title>Executable StartupItems</title>
 
     <para>Daemons run continuously, so monitoring the health of daemon
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,7 +231,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.startupitems.script">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.startupitems.script">
</span>     <title>Script StartupItems</title>
 
     <para>StartupItems of type <quote>script</quote> create a wrapper during
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,7 +406,7 @@ startupitem.restart     "${prefix}/share/mysql/mysql.server restart"</programlis
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.startupitems.launchd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.startupitems.launchd">
</span>     <title>Loading / Unloading StartupItems into launchd</title>
 
     <para>A port with a StartupItem places a link to a .plist file for the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -425,7 +425,7 @@ startupitem.restart     "${prefix}/share/mysql/mysql.server restart"</programlis
</span>     <programlisting><prompt>%%</prompt> <userinput>sudo launchctl unload -w /Library/LaunchDaemons/org.macports.mysql5.plist</userinput></programlisting>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.startupitems.internals">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.startupitems.internals">
</span>     <title>StartupItem Internals</title>
 
     <para>During port installation a MacPorts StartupItem creates a .plist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-tcl.xml b/guide/xml/portfile-tcl.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 20c9ac4..859e38f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-tcl.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-tcl.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.tcl-extensions">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.tcl-extensions">
</span>   <title>Tcl Extensions &amp; Useful Tcl Commands</title>
 
   <para>A MacPorts Portfile is a Tcl script, so it may contain any arbitrary
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  Tcl code you may learn about in a <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-  url="http://tmml.sourceforge.net/doc/tcl/">Tcl reference manual</ulink>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  Tcl code you may learn about in a <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  xlink:href="http://tmml.sourceforge.net/doc/tcl/">Tcl reference manual</link>.
</span>   However, few authors will use arbitrary Tcl code; the vast majority will use
   a subset of Tcl commands and a number of Tcl extensions that are coded within
   MacPorts for performing the most common tasks needed for Portfiles. The list
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,8 @@
</span>         <para>The standard Tcl <command>file</command> command can be used for
           a number of operations on files, such as moving, renaming, deleting,
           or creating directories, among others. For a complete list, consult
<span style='display:block; white-space:pre;background:#ffe0e0;'>-          the <ulink url="http://tmml.sourceforge.net/doc/tcl/file.html">Tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reference manual for the <command>file</command> command</ulink>,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          the <link xlink:href="http://tmml.sourceforge.net/doc/tcl/file.html">Tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reference manual for the <command>file</command> command</link>,
</span>           or the Tcl file manpage in the <option>n</option> section of manpages
           on your machine using <command>man n file</command></para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,7 +226,7 @@
</span>       </listitem>
     </varlistentry>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <varlistentry id="reference.tcl-extensions.strsed">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <varlistentry xml:id="reference.tcl-extensions.strsed">
</span>         <term>strsed</term>
 
         <listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,8 +325,8 @@
</span> 
         <variablelist>
           <varlistentry>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <term>adduser username [uid=<replaceable>uid</replaceable>]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            [gid=<replaceable>gid</replaceable>]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <term>adduser username [uxml:id=<replaceable>uid</replaceable>]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            [gxml:id=<replaceable>gid</replaceable>]
</span>             [passwd=<replaceable>passwd</replaceable>]
             [realname=<replaceable>realname</replaceable>]
             [home=<replaceable>home</replaceable>]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -365,7 +365,7 @@
</span>         <variablelist>
           <varlistentry>
             <term>addgroup <replaceable>group</replaceable>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            [gid=<replaceable>gid</replaceable>]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            [gxml:id=<replaceable>gid</replaceable>]
</span>             [passwd=<replaceable>passwd</replaceable>]
             [realname=<replaceable>realname</replaceable>]
             [users=<replaceable>users</replaceable>]</term>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,7 +387,7 @@
</span>               gid. This can be used with adduser:</para>
 
               <programlisting>addgroup foo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-adduser foo gid=[existsgroup foo]</programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+adduser foo gxml:id=[existsgroup foo]</programlisting>
</span>             </listitem>
           </varlistentry>
         </variablelist>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-variables.xml b/guide/xml/portfile-variables.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 313dec1..67cee8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-variables.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-variables.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.variables">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.variables">
</span>   <title>Global Variables</title>
 
   <para>Global variables are variables available to any Portfile. For a list
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-variants.xml b/guide/xml/portfile-variants.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b9bb57..74a260f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-variants.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-variants.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.variants">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.variants">
</span>   <title>Variants</title>
 
   <para>MacPorts variants are conditional modifications of port installation
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span>   selected automatically by MacPorts base according to the OS or hardware
   platform (darwin, freebsd, linux, i386, powerpc, etc.).</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.variants.user-selected">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.variants.user-selected">
</span>     <title>User-Selected Variants</title>
 
     <para>User-selected variants are those that are defined so a user can
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +123,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.variants.descriptions">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.variants.descriptions">
</span>     <title>User-Selected Variant Descriptions</title>
 
     <para>User-selected variants ought to provide a description, which will be
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@
</span>     port descriptions and long_descriptions.</para>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.variants.platform">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.variants.platform">
</span>     <title>Platform Variants</title>
 
     <para>Platform variants are either defined by default in MacPorts base, or
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfiledev.xml b/guide/xml/portfiledev.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index c1d67db..878743e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfiledev.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfiledev.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="development">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="development">
</span>   <title>Portfile Development</title>
 
   <para>A port is a distribution of software that can be compiled and
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +19,11 @@
</span>   within. The only required file in a port is the
   <filename>Portfile</filename>.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.introduction">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.introduction">
</span>     <title>Portfile Introduction</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <para>A MacPorts Portfile is a <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    url="http://en.wikipedia.org/wiki/Tcl">Tcl</ulink> script that usually
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <para>A MacPorts Portfile is a <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xlink:href="http://en.wikipedia.org/wiki/Tcl">Tcl</link> script that usually
</span>     contains only the simple keyword/value combinations and Tcl extensions as
     described in the <link linkend="reference">Portfile Reference</link>
     chapter, though it may also contain arbitrary Tcl code. Every port has a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@
</span>     </note>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.creating-portfile">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.creating-portfile">
</span>     <title>Creating a Portfile</title>
 
     <para>Here we list the individual Portfile components for an application
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,7 +302,7 @@ Error: Processing of port rrdtool failed</screen>
</span>     </orderedlist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.examples">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.examples">
</span>     <title>Example Portfiles</title>
 
     <para>In this section we begin by taking a look at a complete simple
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,7 +314,7 @@ Error: Processing of port rrdtool failed</screen>
</span>     linkend="development.examples.eliminate">eliminate port
     phases</link>.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.examples.basic">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.examples.basic">
</span>       <title>A Basic Portfile</title>
 
       <programlisting># -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,7 +344,7 @@ configure.args      --enable-perl-site-install \
</span>                     --mandir=${prefix}/share/man</programlisting>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.examples.augment">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.examples.augment">
</span>       <title>Augment Phases Using pre- / post-</title>
 
       <para>To augment a port's installation phase, and not override it, you
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@ configure.args      --enable-perl-site-install \
</span> }</programlisting>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.examples.override">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.examples.override">
</span>       <title>Overriding Phases</title>
 
       <para>To override the automatic MacPorts installation phase processing,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,7 +371,7 @@ configure.args      --enable-perl-site-install \
</span> }</programlisting>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.examples.eliminate">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.examples.eliminate">
</span>       <title>Eliminating Phases</title>
 
       <para>To eliminate a default phase, simply define a phase with no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -389,7 +389,7 @@ configure.args      --enable-perl-site-install \
</span>       </note>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.examples.startupitem">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.examples.startupitem">
</span>       <title>Creating a StartupItem</title>
 
       <para>Startupitems may be placed in the global section of a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,7 +401,7 @@ startupitem.executable  "${prefix}/bin/nmicmpd"</programlisting>
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.variants">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.variants">
</span>     <title>Port Variants</title>
 
     <para>Variants are a way for port authors to provide options that may be
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,7 +410,7 @@ startupitem.executable  "${prefix}/bin/nmicmpd"</programlisting>
</span>     linkend="reference.variants.descriptions">carefully chosen variant
     descriptions</link>.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.variants.options">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.variants.options">
</span>       <title>Example Variants</title>
 
       <para>The most common actions for user-selected variants is to add or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -472,7 +472,7 @@ variant sqlite description {Build sqlite support} {
</span> }</programlisting>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.variants.phase">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.variants.phase">
</span>       <title>Variant Actions in a Phase</title>
 
       <para>If a variant requires options in addition to those provided by
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -494,7 +494,7 @@ variant sqlite description {Build sqlite support} {
</span> }</programlisting>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.variants.default">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.variants.default">
</span>       <title>Default Variants</title>
 
       <para>Variants are used to specify actions that lie outside the core
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -513,7 +513,7 @@ variant sqlite description {Build sqlite support} {
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.patches">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.patches">
</span>     <title>Patch Files</title>
 
     <para>Patch files are files created with the Unix command
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,7 +521,7 @@ variant sqlite description {Build sqlite support} {
</span>     <command>patch</command> to modify text files to fix bugs or extend
     functionality.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.patches.portfile">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.patches.portfile">
</span>       <title>Creating Portfile Patches</title>
 
       <para>If you wish to contribute modifications or fixes to a Portfile,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -584,7 +584,7 @@ variant sqlite description {Build sqlite support} {
</span>       the port author to evaluate.</para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.patches.source">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.patches.source">
</span>       <title>Creating Source Code Patches</title>
 
       <para>Necessary or useful patches to application source code should
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -610,7 +610,7 @@ variant sqlite description {Build sqlite support} {
</span> 
         <listitem>
           <para>If fixing a particular problem or bug requires changes in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-          multiple files&mdash;in those cases the patch filename should reference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          multiple files the patch filename should reference
</span>           the problem or bug, for example:
           <filename>patch-</filename><replaceable>destdir-variable-fix</replaceable><filename>.diff</filename></para>
         </listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -696,7 +696,7 @@ variant sqlite description {Build sqlite support} {
</span>       </orderedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.patches.applying">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.patches.applying">
</span>       <title>Manually Applying Patches</title>
 
       <para>MacPorts applies patch files automatically, but you may want to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,7 +725,7 @@ variant sqlite description {Build sqlite support} {
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.local-repositories">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.local-repositories">
</span>     <title>Local Portfile Repositories</title>
 
     <para>To create and test Portfiles that are not yet published in the MacPorts ports tree,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -810,14 +810,14 @@ Ports failed:                   0</screen>
</span>     The Best Ever Game</screen>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.practices">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.practices">
</span>     <title>Portfile Best Practices</title>
 
     <para>This section contains practical guidelines for creating Portfiles
     that install smoothly and provide consistency between ports. The following
     sections are on the TODO list.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.portstyle">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.portstyle">
</span>       <title>Port Style</title>
 
       <para>Portfiles may be thought of as a set of declarations rather than
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -873,25 +873,25 @@ Ports failed:                   0</screen>
</span>                      ${destroot}${prefix}/var/cache/mrtg</programlisting>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.dont-overwrite">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.dont-overwrite">
</span>       <title>Don't Overwrite Config Files</title>
 
       <para>TODO:</para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.install-docs">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.install-docs">
</span>       <title>Install Docs and Examples</title>
 
       <para>TODO:</para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.provide-messages">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.provide-messages">
</span>       <title>Provide User Messages</title>
 
       <para>TODO:</para>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.use-variables">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.use-variables">
</span>       <title>Use Variables</title>
 
       <para>TODO: Set variables so changing paths may be done in one place;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -900,7 +900,7 @@ Ports failed:                   0</screen>
</span>     </section>
 
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.rename-replace-port">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.rename-replace-port">
</span>       <title>Renaming or replacing a port</title>
 
       <para>If there is the need to replace a port with another port or a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -916,7 +916,7 @@ Ports failed:                   0</screen>
</span>       <para>At the end of this section the use of the obsolete PortGroup is suggested
       as an even shorter approach to the below described workflow.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <section id="development.replaced_by">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <section xml:id="development.replaced_by">
</span>         <title>The long way</title>
 
         <para>Skrooge's original devel port file looked like this:</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1087,7 +1087,7 @@ To report a bug, see &lt;http://guide.macports.org/#project.tickets&gt;</screen>
</span> 
       </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <section id="development.obsolete-portgroup">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <section xml:id="development.obsolete-portgroup">
</span>         <title>The shortcut: PortGroup obsolete</title>
 
         <para>Using the PortGroup obsolete makes the task described in the previous subsection
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1121,7 +1121,7 @@ categories          kde finance
</span> 
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="development.practices.removing-port">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="development.practices.removing-port">
</span>       <title>Removing a port</title>
 
       <para>If a port has to be removed from MacPorts one should consider
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1138,13 +1138,13 @@ categories          kde finance
</span> 
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="development.buildbot">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="development.buildbot">
</span>     <title>MacPorts' buildbot</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <para>The <ulink url="https://build.macports.org/">buildbot</ulink> is a port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <para>The <link xlink:href="https://build.macports.org/">buildbot</link> is a port
</span>       build-service currently supporting building of all committed ports for Snow Leopard,
       Lion, and Mountain Lion using the MacPorts AutoBuild
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      (<ulink url="http://svn.macports.org/repository/macports/contrib/mpab/">MPAB</ulink>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      (<link xlink:href="http://svn.macports.org/repository/macports/contrib/mpab/">MPAB</link>)
</span>       scripts.</para>
 
     <para>Every time a maintainer commits changes to MacPorts' ports Git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1152,8 +1152,8 @@ categories          kde finance
</span>       port(s) would be necessary. If the port(s) in question are distributable
       their binary archives will be kept for subsequent distribution for all
       versions of the Mac operating system for which build machines are
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      available. See the <ulink url="https://build.macports.org/builders">list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        of builders</ulink> to find out which platforms these currently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      available. See the <link xlink:href="https://build.macports.org/builders">list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        of builders</link> to find out which platforms these currently
</span>       are.</para>
 
     <para>If a build error occurred for a port its maintainer will be informed via
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1161,9 +1161,9 @@ categories          kde finance
</span>       not go unnoticed.
 
       Port maintainers will find the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <ulink url="https://build.macports.org/waterfall">waterfall</ulink>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <link xlink:href="https://build.macports.org/waterfall">waterfall</link>
</span>       and the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <ulink url="https://build.macports.org/builders">builders</ulink>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <link xlink:href="https://build.macports.org/builders">builders</link>
</span>       views most useful since they give information about the build status and offer
       the possibility to build ones port(s) on specific builders.</para>
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfileref.xml b/guide/xml/portfileref.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c2e8d0..4f9a255 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfileref.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfileref.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="reference">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="reference">
</span>   <title>Portfile Reference</title>
 
   <para>This chapter serves as a reference for the major elements of a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@
</span>   <xi:include href="portfile-livecheck.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup">
</span>     <title>PortGroups</title>
 
     <xi:include href="portgroups.xml"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-gnustep.xml b/guide/xml/portgroup-gnustep.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b4483f..2527d68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-gnustep.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-gnustep.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.gnustep">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.gnustep">
</span> 
   <title>PortGroup gnustep</title>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span>   values for GNUstep-based software. A minimum Portfile using the gnustep
   PortGroup class need only define the fetch and the checksum phases.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.gnustep.portgroup-keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.gnustep.portgroup-keywords">
</span>     <title>gnustep PortGroup Specific Keywords</title>
 
     <para>Portfiles using the gnustep PortGroup allow for port authors to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.gnustep.filesystem-keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.gnustep.filesystem-keywords">
</span>     <title>gnustep FilesystemLayout Keywords</title>
 
     <para>PortGroup gnustep supports both the traditional gnustep file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +153,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.gnustep.sugar">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.gnustep.sugar">
</span>     <title>gnustep PortGroup Sugar</title>
 
     <para>Portfiles using PortGroup gnustep do not need to define the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-haskell.xml b/guide/xml/portgroup-haskell.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a93a0e..ec850d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-haskell.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-haskell.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.haskell">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.haskell">
</span> 
   <title>PortGroup haskell</title>
 
   <para>PortGroup haskell simplifies the addition of Haskell packages.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.haskell.keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.haskell.keywords">
</span>     <title>haskell PortGroup Specific Keywords</title>
 
     <para>Portfiles using the haskell PortGroup allow for port authors to set
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.haskell.sugar">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.haskell.sugar">
</span>     <title>haskell PortGroup Sugar</title>
 
     <para>Portfiles using PortGroup haskell do not need to define the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-perl.xml b/guide/xml/portgroup-perl.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index f48b4f5..67343db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-perl.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-perl.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.perl">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.perl">
</span> 
   <title>PortGroup perl5</title>
 
   <para>PortGroup perl5 allows for efficient porting of perl modules and
   other perl open source software.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.perl.keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.perl.keywords">
</span>     <title>perl5 PortGroup Specific Keywords</title>
 
     <para>Portfiles using the perl5 PortGroup allow for port authors to set
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.perl.sugar">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.perl.sugar">
</span>     <title>perl5 PortGroup Sugar</title>
 
     <para>Portfiles using PortGroup perl5 do not need to define the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.perl.variables">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.perl.variables">
</span>     <title>perl5 PortGroup Specific Variables</title>
 
     <para>When the perl5 PortGroup is declared within a Portfile, the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-python.xml b/guide/xml/portgroup-python.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 79ee2c3..1af0898 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-python.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-python.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.python">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.python">
</span> 
   <title>PortGroup python</title>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span>       </para>
     </note>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.python.keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.python.keywords">
</span>     <title>python PortGroup Specific Keywords</title>
 
     <para>Portfiles using the python PortGroup allow for port authors to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.python.variables">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.python.variables">
</span>     <title>python PortGroup Specific Variables</title>
 
     <para>When the python PortGroup is declared within a Portfile, the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +221,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.python.sugar">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.python.sugar">
</span>     <title>python PortGroup Sugar</title>
 
     <para>Portfiles using PortGroup python do not need to define the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-ruby.xml b/guide/xml/portgroup-ruby.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e8cb96..6017e5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-ruby.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-ruby.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.ruby">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.ruby">
</span> 
   <title>PortGroup ruby</title>
 
   <para>PortGroup ruby allows for efficient porting of ruby-based open
   source software.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.ruby.variables">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.ruby.variables">
</span>     <title>ruby PortGroup Specific Variables</title>
 
     <para>When the ruby PortGroup is declared within a Portfile, the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroup-xcode.xml b/guide/xml/portgroup-xcode.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index e6d8f48..5f3b57b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroup-xcode.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroup-xcode.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.xcode">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.xcode">
</span>   <title>PortGroup xcode</title>
 
   <para><code>PortGroup xcode</code> allows for efficient porting of
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span>   tolerate Xcode version updates because the PortGroup is tested against all
   supported OS X and Xcode versions.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.xcode.keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.xcode.keywords">
</span>     <title>xcode PortGroup Specific Keywords</title>
 
     <para>Portfiles using <code>PortGroup xcode</code> allow for port authors
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,7 +236,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.xcode.sugar">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.xcode.sugar">
</span>     <title>xcode PortGroup Sugar</title>
 
     <para>Portfiles using the xcode PortGroup do not need to define the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +269,7 @@
</span>     </variablelist>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="reference.portgroup.xcode.phase-keywords">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="reference.portgroup.xcode.phase-keywords">
</span>     <title>Portfile-Phase Keywords Affecting the xcode PortGroup</title>
 
     <para>The following Portfile phase keywords affect the xcode PortGroup in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portgroups.xml b/guide/xml/portgroups.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index b058ce1..b35eb23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portgroups.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portgroups.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<section id="reference.portgroup.intro">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<section xml:id="reference.portgroup.intro">
</span> 
   <title>PortGroup Introduction</title>
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/project.xml b/guide/xml/project.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 18dedc0..af9f61b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/project.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/project.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="project">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="project">
</span>   <title>MacPorts Project</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="project.tickets">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="project.tickets">
</span>     <title>Using Trac for Tickets</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <para>The MacPorts Project uses a system called <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    url="https://trac.macports.org/">Trac</ulink> to file tickets to report bugs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <para>The MacPorts Project uses a system called <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xlink:href="https://trac.macports.org/">Trac</link> to file tickets to report bugs
</span>     and enhancement requests. Though anyone may search Trac for tickets,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    you must have a <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    url="https://github.com/join">GitHub account</ulink> in order to login to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    <ulink url="https://trac.macports.org/">Trac</ulink> to create tickets.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    you must have a <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xlink:href="https://github.com/join">GitHub account</link> in order to login to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <link xlink:href="https://trac.macports.org/">Trac</link> to create tickets.</para>
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.tickets.prerequisites">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.tickets.prerequisites">
</span>       <title>Before Filing a New Ticket</title>
 
       <itemizedlist>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,9 @@
</span>         <listitem>
           <para>Check the problem hotlist</para>
           <para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            The <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              url="https://trac.macports.org/wiki/ProblemHotlist">Problem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              Hotlist</ulink> contains possible solutions to problems that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            The <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              xlink:href="https://trac.macports.org/wiki/ProblemHotlist">Problem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              Hotlist</link> contains possible solutions to problems that
</span>             affect many MacPorts users. If a solution to your problem listed
             there works, don't file a ticket.
           </para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,9 @@
</span>           </para>
             <itemizedlist>
                 <listitem><para>using the search bar that appears on each page</para></listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <listitem><para>using <ulink url="https://trac.macports.org/search?portsummarysearch=on">the search page</ulink></para></listitem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <listitem><para>browsing the list of <ulink url="https://trac.macports.org/report">categorized reports</ulink></para></listitem>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                <listitem><para>making an advanced search by constructing a <ulink url="https://trac.macports.org/query">custom query</ulink></para></listitem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <listitem><para>using <link xlink:href="https://trac.macports.org/search?portsummarysearch=on">the search page</link></para></listitem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <listitem><para>browsing the list of <link xlink:href="https://trac.macports.org/report">categorized reports</link></para></listitem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <listitem><para>making an advanced search by constructing a <link xlink:href="https://trac.macports.org/query">custom query</link></para></listitem>
</span>             </itemizedlist>
         </listitem>
         <listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,11 +78,11 @@
</span>       </itemizedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.tickets.creating">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.tickets.creating">
</span>       <title>Creating Trac Tickets</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para>Once you are logged into Trac, you may click <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      url="https://trac.macports.org/newticket">New Ticket</ulink> and you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para>Once you are logged into Trac, you may click <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      xlink:href="https://trac.macports.org/newticket">New Ticket</link> and you
</span>       will be presented with a new ticket window shown in the graphic below.
       Follow the Trac ticket guidelines below to fill out the form. If you are
       reporting a failed port install and a log was mentioned in the error,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,9 @@
</span>       checkbox to add that log file to the ticket.</para>
 
       <screenshot>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <screeninfo>A new Trac ticket</screeninfo>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <info>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          <title>A new Trac ticket</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        </info>
</span> 
         <mediaobject>
           <textobject>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +105,7 @@
</span>       </screenshot>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.tickets.guidelines">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.tickets.guidelines">
</span>       <title>Trac Ticket Guidelines</title>
 
       <para>This is a short overview of the guidelines for Trac tickets. Please
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,8 +227,8 @@
</span>                 <entry><guilabel>Keywords</guilabel></entry>
                 <entry><literal>maintainer</literal> if you are the port's
                   maintainer. <literal>haspatch</literal> if you are attaching
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                  a patch. <ulink url="https://trac.macports.org/wiki/TicketsKeywordGuidelines">Full
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    list</ulink>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  a patch. <link xlink:href="https://trac.macports.org/wiki/TicketsKeywordGuidelines">Full
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    list</link>.
</span>                 </entry>
               </row>
               <row>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,9 +277,9 @@
</span>         <listitem>
           <para><guilabel>Description:</guilabel> All details that might
           be relevant to someone reading the ticket. Be sure to mention
<span style='display:block; white-space:pre;background:#ffe0e0;'>-          the versions of your operating system and Xcode install. <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          url="https://trac.macports.org/wiki/WikiFormatting">Wiki
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          formatting</ulink> should be used to ensure that text is formatted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          the versions of your operating system and Xcode install. <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          xlink:href="https://trac.macports.org/wiki/WikiFormatting">Wiki
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          formatting</link> should be used to ensure that text is formatted
</span>           correctly. Use the Preview button before submitting. If you want to
           post preformatted text such as a log or terminal output, make sure
           you use <literal>{{{<replaceable>...</replaceable>}}}</literal>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,8 +428,8 @@
</span>           affects 64-bit platforms.</para>
 
           <para>See
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <ulink url="https://trac.macports.org/wiki/TicketsKeywordGuidelines">the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              TicketsKeywordGuidelines wiki page</ulink> for a clickable list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <link xlink:href="https://trac.macports.org/wiki/TicketsKeywordGuidelines">the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              TicketsKeywordGuidelines wiki page</link> for a clickable list
</span>             of all keywords.</para>
         </listitem>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -489,19 +491,19 @@
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="project.contributing">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="project.contributing">
</span>     <title>Contributing to MacPorts</title>
 
     <para>You may contribute new ports and enhancements of any kind to already
         existing ports using Trac tickets. As an alternative, you may instead open a pull request on
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <ulink url="https://github.com/macports/macports-ports/pulls">GitHub</ulink>,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <link xlink:href="https://github.com/macports/macports-ports/pulls">GitHub</link>,
</span>         in which case no Trac ticket is required.
     </para>
 
     <!-- Should we have similar sections about committing to base sources and
     documentation, or alternatively add this to the following? -->
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.contributing.new">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.contributing.new">
</span>       <title>New Ports</title>
 
       <para>Ports are contributed by following these steps. See the <link
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -551,7 +553,7 @@
</span>       </orderedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.contributing.updates">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.contributing.updates">
</span>       <title>Port Enhancements</title>
 
       <para>Enhancements to existing ports may comprise new functionality for
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -624,7 +626,7 @@
</span>       </orderedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.contributing.maintaining">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.contributing.maintaining">
</span>       <title>Becoming a Port Maintainer</title>
 
       <para>MacPorts is always looking for people that want to take care of
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -642,8 +644,8 @@
</span>             on that below.</para>
         </listitem>
         <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-          <para>An account in the <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              url="https://trac.macports.org/">MacPorts Trac</ulink>,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          <para>An account in the <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              xlink:href="https://trac.macports.org/">MacPorts Trac</link>,
</span>             preferably with the email address you want to use for your
             port.</para>
         </listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -827,9 +829,9 @@ To use the current port, you must be in a port's directory.</screen>
</span>         </listitem>
 
         <listitem>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-          <para>If you are only changing the maintainer, <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              url="https://trac.macports.org/newticket">file a new ticket in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-              Trac</ulink>. Set <guilabel>type</guilabel> to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          <para>If you are only changing the maintainer, <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              xlink:href="https://trac.macports.org/newticket">file a new ticket in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              Trac</link>. Set <guilabel>type</guilabel> to
</span>             <guilabel>enhancement</guilabel>. Leave the
             <guilabel>milestone</guilabel> field empty. If you added yourself
             as co-maintainer, add the other maintainers in the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -869,7 +871,7 @@ To use the current port, you must be in a port's directory.</screen>
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="project.update-policies">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="project.update-policies">
</span>     <title>Port Update Policies</title>
 
     <para>Port maintainers normally are given commit privileges to the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -880,7 +882,7 @@ To use the current port, you must be in a port's directory.</screen>
</span>     port it is a good practice to inform a port's maintainer. See details
     below.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.update-policies.nonmaintainer">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.update-policies.nonmaintainer">
</span>       <title>Non-Maintainer Port Updates</title>
 
       <para>If you have a port update or bugfix for a port you do not
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -941,7 +943,7 @@ To use the current port, you must be in a port's directory.</screen>
</span>       </itemizedlist>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.update-policies.abandonment">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.update-policies.abandonment">
</span>       <title>Port Abandonment</title>
 
       <para>A port may be considered abandoned if any of the following apply:</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -993,37 +995,23 @@ To use the current port, you must be in a port's directory.</screen>
</span>     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="project.docs">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="project.docs">
</span>     <title>Updating Documentation</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="project.docs.guide">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="project.docs.guide">
</span>       <title>Updating the Guide</title>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <para>The sources for this guide are kept in a <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      url="https://github.com/macports/macports-guide"> Git repository on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      GitHub</ulink>. If you spot any error or outdated information, you are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      encouraged to submit a pull request following the steps outlined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      below.</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      <section id="project.docs.guide.one-time">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        <title>One Time Preperations</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        The sources for this guide are kept in a <link xlink:href="https://github.com/macports/macports-guide">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        Git repository on GitHub</link>. If you spot any error or outdated information, you are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        encouraged to submit a pull request following the steps outlined below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      </para>
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <para>In order to submit changes you'll need to do some one time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        setup.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <section xml:id="project.docs.guide.one-time">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <title>Preparing Changes</title>
</span> 
         <procedure>
           <step>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>Visit <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            url="https://github.com/macports/macports-guide">the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            macports-guide repository on GitHub</ulink> and press the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <guibutton>Fork</guibutton> button in the upper right corner. This
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            will create a macports-guide repository in your own GitHub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            account.</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          </step>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          <step>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>Clone the sources to your computer:</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>             <programlisting><prompt>$</prompt> <userinput>git clone https://github.com/macports/macports-guide.git</userinput>
 <!--        --><prompt>$</prompt> <userinput>cd macports-guide</userinput>
 <!--        --><prompt>$</prompt> <userinput>git remote add <replaceable>username</replaceable> https://github.com/<replaceable>username</replaceable>/macports-guide.git</userinput></programlisting>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1037,7 +1025,7 @@ To use the current port, you must be in a port's directory.</screen>
</span>         </procedure>
       </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      <section id="project.docs.guide.each-time">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      <section xml:id="project.docs.guide.each-time">
</span>         <title>Proposing a Change</title>
 
         <para>For each change you want to make:</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1070,27 +1058,17 @@ To use the current port, you must be in a port's directory.</screen>
</span> 
           <step>
             <para>Commit your changes to the local branch and describe your
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            changes in the commit message. See also our wiki page <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            url="https://trac.macports.org/wiki/CommitMessages">CommitMessages</ulink>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            that explains how to write good commit messages.</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            changes in the commit message. See also our wiki page <link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xlink:href="https://trac.macports.org/wiki/CommitMessages">CommitMessages</link>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+          that explains how to write good commit messages.</para>
</span>             <programlisting><prompt>$</prompt> <userinput>git commit -a</userinput></programlisting>
           </step>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          <step>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <para>Submit the changes for inclusion in the guide by <ulink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            url="https://help.github.com/articles/creating-a-pull-request/">making
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            a pull request on GitHub</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$</prompt> <userinput>git pull --rebase</userinput>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<prompt>$</prompt> <userinput>git push <replaceable>username</replaceable> my-changes</userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          </step>
</span>         </procedure>
       </section>
     </section>
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="project.membership">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="project.membership">
</span>     <title>MacPorts Membership</title>
 
     <para>A requirement for a person to become a MacPorts committer is to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1122,7 +1100,7 @@ To use the current port, you must be in a port's directory.</screen>
</span> 
     <para>To apply for MacPorts commit rights, send a brief email to the
     PortMgr team at <email>macports-mgr@lists.macports.org</email> entitled
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    &ldquo;Commit access: <replaceable>Your Name</replaceable>&rdquo; with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "Commit access: <replaceable>Your Name</replaceable>" with the
</span>     following contents:</para>
 
     <itemizedlist>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1135,7 +1113,7 @@ To use the current port, you must be in a port's directory.</screen>
</span> 
       <listitem>
         <para>the identity you'd like to use as a member of the project, a.k.a. the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        &ldquo;handle&rdquo;, as part of your <literal><replaceable>handle</replaceable>@macports.org</literal>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "handle", as part of your <literal><replaceable>handle</replaceable>@macports.org</literal>
</span>         alias.</para>
       </listitem>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1149,14 +1127,14 @@ To use the current port, you must be in a port's directory.</screen>
</span> 
   </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  <section id="project.portmgr">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  <section xml:id="project.portmgr">
</span>     <title>The PortMgr Team</title>
 
     <para>The MacPorts PortMgr team is the steering group for The MacPorts
     Project. Its membership is usually determined by public elections among
     project members; the current members of the team can be found on the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <ulink url="https://trac.macports.org/wiki/MacPortsDevelopers">MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    Developers wiki page</ulink>.</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <link xlink:href="https://trac.macports.org/wiki/MacPortsDevelopers">MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    Developers wiki page</link>.</para>
</span> 
     <para>They are responsible for matters such as:</para>
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/using.xml b/guide/xml/using.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 907e014..09ba53e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/using.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/using.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +1,25 @@
</span> <?xml version="1.0" encoding="UTF-8"?>
 <!-- -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4:tw=120
 -->
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"http://docbook.org/xml/5.0/dtd/docbook.dtd"[
</span> <!ENTITY macports-prev-version "2.4.1">
 <!ENTITY macports-version "2.4.2">
 ]>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-<chapter id="using">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<chapter xml:id="using">
</span>     <title>Using MacPorts</title>
 
     <para>This chapter describes using <command>port</command>, port variants, common tasks and port
     binaries.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="using.port">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="using.port">
</span>         <title>The port Command</title>
 
         <para><command>port</command> is the main utility used to interact with MacPorts. It is
             used to update <filename>Portfile</filename>s and the MacPorts infrastructure, and install and manage
             ports.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.help">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.help">
</span>             <title>port help</title>
 
             <para>The <option>help</option> action shows some brief information about the specified action, or if no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ Upgrade MacPorts itself and run the sync target
</span>            MacPorts.</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.selfupdate">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.selfupdate">
</span>             <title>port selfupdate</title>
 
             <para>The <option>selfupdate</option> action should be used regularly to update the local ports tree with
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,7 @@ Upgrade MacPorts itself and run the sync target
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.sync">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.sync">
</span>             <title>port sync</title>
 
             <para>The <option>sync</option> action performs a subset of <option>selfupdate</option>. It synchronizes the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +103,7 @@ Upgrade MacPorts itself and run the sync target
</span>             <para><option>sync</option> does not accept any switches.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.diagnose">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.diagnose">
</span>             <title>port diagnose</title>
 
             <para>The <option>diagnose</option> action checks for common issues in the user's environment and reports all
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,7 @@ Upgrade MacPorts itself and run the sync target
</span>             </note>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.reclaim">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.reclaim">
</span>             <title>port reclaim</title>
 
             <para>The <option>reclaim</option> action attempts to reclaim space by uninstalling inactive ports, and
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@ Upgrade MacPorts itself and run the sync target
</span>             </note>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.list">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.list">
</span>             <title>port list</title>
 
             <para>The <option>list</option> action lists the currently available version of the specified ports, or if
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +163,7 @@ Upgrade MacPorts itself and run the sync target
</span>             </note>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.search">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.search">
</span>             <title>port search</title>
 
             <para>The <option>search</option> action allows finding ports by partial matches of the name or description.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,7 +271,7 @@ Found 11 ports.</screen>
</span>                     <term><option>--glob</option></term>
                     <listitem>
                         <para>Treat the given search string as glob search string (i.e., expand wildcards
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            <option>*</option>, <option>?</option>, and <option>[<varname>chars</varname>]</option>).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            <option>*</option>, <option>?</option>, and <optional>chars</optional>).
</span>                             This is the default behavior.</para>
                     </listitem>
                 </varlistentry>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,7 +284,7 @@ Found 11 ports.</screen>
</span>                 </varlistentry>
 
                 <varlistentry>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    <term><option>--<varname>&lt;field&gt;</varname></option></term>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    <term><option>--field</option></term>
</span>                     <listitem>
                         <para>Test the search string against <varname>&lt;field&gt;</varname>. Can be specified multiple
                             times to test against multiple fields. The default is <option>--name --description</option>.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,7 +361,7 @@ Found 11 ports.</screen>
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.info">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.info">
</span>             <title>port info</title>
 
             <para>The <option>info</option> action is used to get information about a port: name, version, description,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,7 +387,7 @@ License:              BSD
</span> Maintainers:          cal@macports.org</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.deps">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.deps">
</span>             <title>port deps</title>
 
             <para>The <option>deps</option> action lists the dependencies of a port. Dependencies are the packages are
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,7 +431,7 @@ Maintainers:          cal@macports.org</screen>
</span> 
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.variants">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.variants">
</span>             <title>port variants</title>
 
             <para>The <option>variants</option> action allows you to check what variations of a port are available
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -464,7 +464,7 @@ apache2 has the variants:
</span>                 <filename>variants.conf</filename>.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.install">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.install">
</span>             <title>port install</title>
 
             <para>The action <option>install</option> is used to install a port. Once you determined the name of a port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -484,12 +484,12 @@ apache2 has the variants:
</span> 
             <para>All debug information is also kept in <filename>main.log</filename> for the port you
                 installed. Its path will be printed automatically if the installation fails. You can manually get the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                path using <command>port logfile <varname>&lt;portname&gt;</varname></command>. Note that logfiles will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path using <command>port logfile portname</command>. Note that logfiles will
</span>                 automatically be deleted on successful installation.</para>
 
             <para>If the installation of a port fails, you should always clean and try again, i.e., run</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port clean <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port clean <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>and re-execute the command you ran before.</para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -497,7 +497,7 @@ apache2 has the variants:
</span>                 by other ports or in common system locations, such as <filename>/usr/local</filename>. To do that,
                 re-run the installation with the <option>-t</option> flag, i.e.,</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port -t install <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port -t install <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>If the port still fails to install after you have followed these steps, please <link
                     linkend="project.tickets">file a ticket</link> and attach the <filename>main.log</filename> of
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,19 +542,19 @@ apache2 has the variants:
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.clean">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.clean">
</span>             <title>port clean</title>
 
             <para>The action <option>clean</option> deletes intermediate files created by MacPorts while installing
                 a port. A <command>port clean</command> is often necessary when builds fail and should be the first
                 thing to try after a failed installation attempt.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port clean <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port clean <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para><command>port clean</command> can also be used to remove corrupted downloads after a failed
                 <option>fetch</option> phase, by specifying the <option>--dist</option> flag:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port clean --dist <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port clean --dist <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>deletes all files that have been downloaded for the given port.</para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -600,13 +600,13 @@ apache2 has the variants:
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.uninstall">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.uninstall">
</span>             <title>port uninstall</title>
 
             <para>The <option>uninstall</option> action will remove an installed port. It is one of the actions you will
                 use fairly often in MacPorts.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port uninstall <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port uninstall <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>MacPorts will refuse to uninstall ports that are still needed by other ports. For example:</para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -665,7 +665,7 @@ Error: port uninstall failed: Please uninstall the ports that depend on libcomer
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.contents">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.contents">
</span>             <title>port contents</title>
 
             <para>The <option>contents</option> action displays a list of all files that have been installed by a given
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -683,7 +683,7 @@ Port xorg-renderproto contains:
</span>             <para>Common uses for <option>contents</option> are finding the location of a port's executable after
                 installing it. The following line is usually helpful in this case:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port -q contents <varname>&lt;portname&gt;</varname> | grep -E '/s?bin/'</userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>port -q contents <replaceable>portname</replaceable> | grep -E '/s?bin/'</userinput></programlisting>
</span> 
             <para>The <option>-q</option> (quiet) flag suppresses the header line in this case, but is not strictly necessary.</para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -753,7 +753,7 @@ Port xorg-renderproto contains:
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.installed">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.installed">
</span>             <title>port installed</title>
 
             <para>The <option>installed</option> action displays the installed versions and variants of the specified
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -791,7 +791,7 @@ The following ports are currently installed:
</span>   libsdl @1.2.15_3-x11 (active) platform='darwin 13' archs='x86_64'</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.outdated">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.outdated">
</span>             <title>port outdated</title>
 
             <para>The <option>outdated</option> action checks your installed ports against the current ports tree to see
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -818,7 +818,7 @@ p5.16-ipc-run                  0.910.0_1 &lt; 0.920.0_0</screen>
</span>                 version number. If it isn't, more details will be given.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.upgrade">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.upgrade">
</span>             <title>port upgrade</title>
 
             <para>The <option>upgrade</option> action upgrades installed ports and their dependencies to the latest
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -842,11 +842,11 @@ p5.16-ipc-run                  0.910.0_1 &lt; 0.920.0_0</screen>
</span>                     back to the older version if there happens to be a problem with the updated one. To do that,
                     run</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <programlisting><prompt>$ </prompt><userinput>port installed <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <programlisting><prompt>$ </prompt><userinput>port installed <replaceable>portname</replaceable></userinput></programlisting>
</span> 
                 <para>to determine the version number of the old version you want to re-activate, and run</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                <programlisting><prompt>$ </prompt><userinput>sudo port activate <varname>&lt;portname&gt;</varname> @<varname>&lt;old-version&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                <programlisting><prompt>$ </prompt><userinput>sudo port activate <replaceable>portname</replaceable> @<replaceable>old-version</replaceable></userinput></programlisting>
</span> 
                 <para>to go back to the old version.</para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -899,7 +899,7 @@ p5.16-ipc-run                  0.910.0_1 &lt; 0.920.0_0</screen>
</span>             </variablelist>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.dependents">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.dependents">
</span>             <title>port dependents</title>
 
             <para>The <option>dependents</option> action reports what ports depend upon a given (installed) port, if
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -928,12 +928,12 @@ wireshark depends on openssl</screen>
</span>             <para>Note that <option>dependents</option> does not work for ports that are not installed on your system.
                 If you want to find out, which ports depend on a port that you have not installed, you can use</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port echo depends:<varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>port echo depends:<replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>This command will, however, not cover dependencies that are only present in non-default variants.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.livecheck">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.livecheck">
</span>             <title>port livecheck</title>
 
             <para>The <option>livecheck</option> action checks to see if the application corresponding to a given port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -953,7 +953,7 @@ wireshark depends on openssl</screen>
</span>             </note>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.port.lint">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.port.lint">
</span>             <title>port lint</title>
 
             <para>The lint action checks if the <filename>Portfile</filename> conforms to the MacPorts standards
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -992,7 +992,7 @@ Warning: no license set
</span>         </section>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="using.variants">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="using.variants">
</span>         <title>Port Variants</title>
 
         <para>Variants are a way for port authors to provide options for a port that may be chosen at installation.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1000,7 +1000,7 @@ Warning: no license set
</span>             and are thus not enabled by default. To display the available variants for a port, if any, use this
             command:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <programlisting><prompt>$ </prompt><userinput>port variants <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <programlisting><prompt>$ </prompt><userinput>port variants <replaceable>portname</replaceable></userinput></programlisting>
</span> 
         <para>For example:</para>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1026,7 +1026,7 @@ apache2 has the variants:
</span>                     linkend="internals.configuration-files.variants-conf" /> for more information on
             <filename>variants.conf</filename>.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.variants.invoking">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.variants.invoking">
</span>             <title>Invoking Variants</title>
 
             <para>A variant can only be selected when a port is installed. After you have determined what variants
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1061,7 +1061,7 @@ apache2 has the variants:
</span>                 later, the same variants will be used, unless you manually specify different variants.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.variants.negating">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.variants.negating">
</span>             <title>Negating Default Variants</title>
 
             <para>A <filename>Portfile</filename> can specify a default set of variants that will be used when you do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1076,7 +1076,7 @@ apache2 has the variants:
</span>         </section>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="using.common-tasks">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="using.common-tasks">
</span>         <title>Common Tasks</title>
 
         <para>This section lists common operations you may want to perform when managing a MacPorts installation. These
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1088,7 +1088,7 @@ apache2 has the variants:
</span>         <para>Mind the <quote>sudo</quote> for some of the subsequent examples, which is necessary if you have a default
             MacPorts installation.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.updating">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.updating">
</span>             <title>Updating Your Ports Tree</title>
 
             <para>The local ports tree is a collection of files that contain information on which packages are available
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1108,7 +1108,7 @@ apache2 has the variants:
</span> <!--        -->  port upgrade outdated</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.showports">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.showports">
</span>             <title>Show Ports Which Need Updating</title>
 
             <para>To see what's new after running <option>selfupdate</option>, you can use <command>port
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1131,7 +1131,7 @@ apache2 has the variants:
</span> <!--        -->p5.16-ipc-run                  0.910.0_1 &lt; 0.920.0_0</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.upgrading">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.upgrading">
</span>             <title>Upgrading Outdated Ports</title>
 
             <para>To upgrade all your installed and outdated ports, run</para>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1166,7 +1166,7 @@ apache2 has the variants:
</span>                 avoiding the update of the dependency defeats the purpose of the reinstallation.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.removeinactive">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.removeinactive">
</span>             <title>Removing Inactive Version(s) of Upgraded Port(s)</title>
 
             <para>By default, upgrading ports in MacPorts does not remove the older versions. This is a safety measure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1225,22 +1225,20 @@ apache2 has the variants:
</span> 
             <para>To uninstall all inactive ports but a single one, you can use the following shortcut:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port uninstall inactive and not <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port uninstall inactive and not <replaceable>portname</replaceable></userinput></programlisting>
</span>         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.finddepending">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.finddepending">
</span>             <title>Finding Ports Depending on a Certain Port</title>
 
             <para>If you want to find all ports that depend on a given other port, you can use</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port echo depends:<varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>port echo depends:<replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>If you are only interested in the dependent ports that you actually have installed, you can use the
                 quicker and more accurate <option>dependents</option>:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port dependents <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port dependents libksba</userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>port dependents <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <screen>gnupg2 depends on libksba
 <!--        -->gpg-agent depends on libksba</screen>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1257,7 +1255,7 @@ apache2 has the variants:
</span>             <para>Finally, to find out which port you manually installed caused the automatic installation of
                 a dependency, use the following expression:</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port installed requested and rdependentof:<varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>port installed requested and rdependentof:<replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <programlisting><prompt>$ </prompt><userinput>port installed requested and rdependentof:libksba</userinput></programlisting>
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1265,7 +1263,7 @@ apache2 has the variants:
</span> <!--        -->  gnupg2 @2.0.25_0 (active)</screen>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.findleaves">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.findleaves">
</span>             <title>Finding Leaves</title>
 
             <para>After a while of using MacPorts, installing and uninstalling ports, packages that have been
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1305,7 +1303,7 @@ apache2 has the variants:
</span>                 <programlisting><prompt>$ </prompt><userinput>sudo port_cutleaves</userinput></programlisting>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.common-tasks.keeplean">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.common-tasks.keeplean">
</span>             <title>Keep Your Installation Lean by Defining Leaves as Requested Ports</title>
 
             <para>Well, before we come to the procedure of defining your requested ports, let's have a look at a typical
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1449,20 +1447,20 @@ apache2 has the variants:
</span>                 <quote>garbage</quote>. You should also periodically check the list of your requested ports and mark any
                 ports you no longer need as unrequested using</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>sudo port unsetrequested <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>sudo port unsetrequested <replaceable>portname</replaceable></userinput></programlisting>
</span> 
             <para>Then check for new leaves to cut down the number of installed ports and the size of your MacPorts
                 installation.</para>
         </section>
     </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    <section id="using.binaries">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    <section xml:id="using.binaries">
</span>         <title>Port Binaries</title>
 
         <para>MacPorts can pre-compile ports into binaries so applications need not be compiled when installing on
             a target system. MacPorts supports two types of binaries: archives and packages.</para>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.binaries.archives">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.binaries.archives">
</span>             <title>Binary Archives</title>
 
             <para>Binary archives can only be used on a target system running MacPorts. They allow MacPorts utilities to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1520,7 +1518,7 @@ apache2 has the variants:
</span>                 <option>cpgz</option>, and <option>cpio</option>.</para>
         </section>
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        <section id="using.binaries.binary-packages">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        <section xml:id="using.binaries.binary-packages">
</span>             <title>Binary Packages</title>
 
             <para>Binary packages are standalone binary installers that are precompiled; they do not require MacPorts on
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1555,7 +1553,7 @@ apache2 has the variants:
</span>             <programlisting><prompt>$ </prompt><userinput>sudo port mdmg gimp2</userinput></programlisting>
 
             <para>All packages are placed in a port's work directory, which you can locate using:</para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            <programlisting><prompt>$ </prompt><userinput>port work <varname>&lt;portname&gt;</varname></userinput></programlisting>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            <programlisting><prompt>$ </prompt><userinput>port work <replaceable>portname</replaceable></userinput></programlisting>
</span>         </section>
     </section>
 </chapter>
</pre><pre style='margin:0'>

</pre>