diff --git a/guide/adoc/README.md b/guide/adoc/README.md
index ae7ca0d..fa7a972 100644
--- a/guide/adoc/README.md
+++ b/guide/adoc/README.md
@@ -58,9 +58,6 @@ locations in the sources.
This would break all links to the guide. As docbookrx does not take
configuration parameters, this has to be changed in the visitor directly.
-* ``
- This is not converted correctly. All external links are broken.
-
* Missing distinction between `>>>`, ``, and ``
They all result in similar [source] blocks at the moment. Based on how they
are used in the guide, we should keep the semantics by adding style
diff --git a/guide/xml/glossary.xml b/guide/xml/glossary.xml
index 3af1dc8..659592e 100644
--- a/guide/xml/glossary.xml
+++ b/guide/xml/glossary.xml
@@ -1,7 +1,7 @@
-
+MacPorts Guide GlossaryThis section defines a number of words which may be new to
diff --git a/guide/xml/guide.xml b/guide/xml/guide.xml
index d4100a0..4ad2acc 100644
--- a/guide/xml/guide.xml
+++ b/guide/xml/guide.xml
@@ -4,7 +4,7 @@
-
+MacPorts Guide
diff --git a/guide/xml/installing.xml b/guide/xml/installing.xml
index 9011d98..80b125e 100644
--- a/guide/xml/installing.xml
+++ b/guide/xml/installing.xml
@@ -5,7 +5,7 @@
"http://docbook.org/xml/5.0/dtd/docbook.dtd"[
]>
-
+Installing MacPortsThis chapter shows you how to install MacPorts and its prerequisites step-by-step. Note that the section about
diff --git a/guide/xml/internals-hier.xml b/guide/xml/internals-hier.xml
index 2cca4d9..bbe4355 100644
--- a/guide/xml/internals-hier.xml
+++ b/guide/xml/internals-hier.xml
@@ -1,7 +1,7 @@
-
+PORTHIER
diff --git a/guide/xml/internals-tests.xml b/guide/xml/internals-tests.xml
index a65c218..cc47233 100644
--- a/guide/xml/internals-tests.xml
+++ b/guide/xml/internals-tests.xml
@@ -1,7 +1,7 @@
-
+Tests
diff --git a/guide/xml/internals.xml b/guide/xml/internals.xml
index c43160c..c861188 100644
--- a/guide/xml/internals.xml
+++ b/guide/xml/internals.xml
@@ -1,7 +1,7 @@
-
+MacPorts InternalsThis chapter contains information about the MacPorts file layout,
diff --git a/guide/xml/intro.xml b/guide/xml/intro.xml
index 85e945b..019c790 100644
--- a/guide/xml/intro.xml
+++ b/guide/xml/intro.xml
@@ -3,7 +3,7 @@
-->
-
+IntroductionMacPorts is an easy to use system for compiling, installing, and managing open source software. MacPorts may
diff --git a/guide/xml/macports.conf.xml b/guide/xml/macports.conf.xml
index 0bed976..9c28f17 100644
--- a/guide/xml/macports.conf.xml
+++ b/guide/xml/macports.conf.xml
@@ -1,7 +1,7 @@
-
+Configuration FilesThe MacPorts configuration files often do not need to be modified for the
diff --git a/guide/xml/macros.xml b/guide/xml/macros.xml
index 50669f8..7d4c4d7 100644
--- a/guide/xml/macros.xml
+++ b/guide/xml/macros.xml
@@ -3,7 +3,7 @@
"http://docbook.org/xml/5.0/dtd/docbook.dtd">
-
+Macros
diff --git a/guide/xml/portfile-dependencies.xml b/guide/xml/portfile-dependencies.xml
index 8f39a22..7ed3412 100644
--- a/guide/xml/portfile-dependencies.xml
+++ b/guide/xml/portfile-dependencies.xml
@@ -1,7 +1,7 @@
-
+DependenciesFree and open source software is highly modular, and MacPorts ports
diff --git a/guide/xml/portfile-keywords.xml b/guide/xml/portfile-keywords.xml
index 77559a4..37477dc 100644
--- a/guide/xml/portfile-keywords.xml
+++ b/guide/xml/portfile-keywords.xml
@@ -1,7 +1,7 @@
-
+Global KeywordsMacPorts keywords are used to specify required or optional items
diff --git a/guide/xml/portfile-livecheck.xml b/guide/xml/portfile-livecheck.xml
index 5b2e210..4de24c0 100644
--- a/guide/xml/portfile-livecheck.xml
+++ b/guide/xml/portfile-livecheck.xml
@@ -2,7 +2,7 @@
-
+Livecheck / DistcheckOptions livecheck and distcheck are especially useful for port
diff --git a/guide/xml/portfile-phase.xml b/guide/xml/portfile-phase.xml
index f5316e5..13eda29 100644
--- a/guide/xml/portfile-phase.xml
+++ b/guide/xml/portfile-phase.xml
@@ -1,7 +1,7 @@
-
+Port Phases
diff --git a/guide/xml/portfile-startupitem.xml b/guide/xml/portfile-startupitem.xml
index b349f83..59dc2a9 100644
--- a/guide/xml/portfile-startupitem.xml
+++ b/guide/xml/portfile-startupitem.xml
@@ -1,7 +1,7 @@
-
+StartupItemsA StartupItem is a MacPorts facility to run daemons, a Unix term for
diff --git a/guide/xml/portfile-tcl.xml b/guide/xml/portfile-tcl.xml
index 237e30a..ed7a6f5 100644
--- a/guide/xml/portfile-tcl.xml
+++ b/guide/xml/portfile-tcl.xml
@@ -1,7 +1,7 @@
-
+Tcl Extensions & Useful Tcl CommandsA MacPorts Portfile is a Tcl script, so it may contain any arbitrary
diff --git a/guide/xml/portfile-variables.xml b/guide/xml/portfile-variables.xml
index 838b808..e5af512 100644
--- a/guide/xml/portfile-variables.xml
+++ b/guide/xml/portfile-variables.xml
@@ -1,7 +1,7 @@
-
+Global VariablesGlobal variables are variables available to any Portfile. For a list
diff --git a/guide/xml/portfile-variants.xml b/guide/xml/portfile-variants.xml
index 0913ad8..d419642 100644
--- a/guide/xml/portfile-variants.xml
+++ b/guide/xml/portfile-variants.xml
@@ -1,7 +1,7 @@
-
+VariantsMacPorts variants are conditional modifications of port installation
diff --git a/guide/xml/portfiledev.xml b/guide/xml/portfiledev.xml
index 51ea6b6..c7f9c84 100644
--- a/guide/xml/portfiledev.xml
+++ b/guide/xml/portfiledev.xml
@@ -1,7 +1,7 @@
-
+Portfile DevelopmentA port is a distribution of software that can be compiled and
diff --git a/guide/xml/portfileref.xml b/guide/xml/portfileref.xml
index c68b788..368eb3e 100644
--- a/guide/xml/portfileref.xml
+++ b/guide/xml/portfileref.xml
@@ -1,7 +1,7 @@
-
+Portfile ReferenceThis chapter serves as a reference for the major elements of a
diff --git a/guide/xml/portgroup-github.xml b/guide/xml/portgroup-github.xml
index 4566ce1..9dff2aa 100644
--- a/guide/xml/portgroup-github.xml
+++ b/guide/xml/portgroup-github.xml
@@ -1,7 +1,7 @@
-
+PortGroup github
diff --git a/guide/xml/portgroup-gnustep.xml b/guide/xml/portgroup-gnustep.xml
index 2527d68..c5121f2 100644
--- a/guide/xml/portgroup-gnustep.xml
+++ b/guide/xml/portgroup-gnustep.xml
@@ -1,7 +1,7 @@
-
+PortGroup gnustep
diff --git a/guide/xml/portgroup-haskell.xml b/guide/xml/portgroup-haskell.xml
index c69d3c2..915da5a 100644
--- a/guide/xml/portgroup-haskell.xml
+++ b/guide/xml/portgroup-haskell.xml
@@ -1,7 +1,7 @@
-
+PortGroup haskell
diff --git a/guide/xml/portgroup-perl.xml b/guide/xml/portgroup-perl.xml
index 948f3db..6d17cf8 100644
--- a/guide/xml/portgroup-perl.xml
+++ b/guide/xml/portgroup-perl.xml
@@ -1,7 +1,7 @@
-
+PortGroup perl5
diff --git a/guide/xml/portgroup-python.xml b/guide/xml/portgroup-python.xml
index 8a0408e..5153f56 100644
--- a/guide/xml/portgroup-python.xml
+++ b/guide/xml/portgroup-python.xml
@@ -1,7 +1,7 @@
-
+PortGroup python
diff --git a/guide/xml/portgroup-ruby.xml b/guide/xml/portgroup-ruby.xml
index 6017e5c..afd8e84 100644
--- a/guide/xml/portgroup-ruby.xml
+++ b/guide/xml/portgroup-ruby.xml
@@ -1,7 +1,7 @@
-
+PortGroup ruby
diff --git a/guide/xml/portgroup-xcode.xml b/guide/xml/portgroup-xcode.xml
index a7a47c4..a74729f 100644
--- a/guide/xml/portgroup-xcode.xml
+++ b/guide/xml/portgroup-xcode.xml
@@ -1,7 +1,7 @@
-
+PortGroup xcodePortGroup xcode allows for efficient porting of
diff --git a/guide/xml/portgroups.xml b/guide/xml/portgroups.xml
index 9fe8e87..9ea6671 100644
--- a/guide/xml/portgroups.xml
+++ b/guide/xml/portgroups.xml
@@ -1,7 +1,7 @@
-
+PortGroup Introduction
diff --git a/guide/xml/project.xml b/guide/xml/project.xml
index 56d9b92..90cfc7a 100644
--- a/guide/xml/project.xml
+++ b/guide/xml/project.xml
@@ -1,7 +1,7 @@
-
+MacPorts Project
diff --git a/guide/xml/using.xml b/guide/xml/using.xml
index 224d214..ecdfc60 100644
--- a/guide/xml/using.xml
+++ b/guide/xml/using.xml
@@ -6,7 +6,7 @@
]>
-
+Using MacPortsThis chapter describes using port, port variants, common tasks and port