aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.additional.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.committers.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml4
-rw-r--r--en_US.ISO8859-1/articles/custom-gcc/article.xml12
-rw-r--r--en_US.ISO8859-1/articles/freebsd-update-server/article.xml10
-rw-r--r--en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml4
-rw-r--r--en_US.ISO8859-1/articles/portbuild/article.xml4
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/chapters.ent2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml26
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/Makefile36
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/audit/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/boot/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/chapters.ent184
-rw-r--r--en_US.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/config/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml10
-rw-r--r--en_US.ISO8859-1/books/handbook/desktop/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/disks/chapter.xml17
-rw-r--r--en_US.ISO8859-1/books/handbook/dtrace/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/eresources/chapter.xml7
-rw-r--r--en_US.ISO8859-1/books/handbook/filesystems/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/firewalls/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/geom/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/install/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/jails/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/l10n/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/mac/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/mail/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.xml10
-rw-r--r--en_US.ISO8859-1/books/handbook/multimedia/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/network-servers/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/preface/preface.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/printing/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/security/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/vinum/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/virtualization/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/answers/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/basics/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/glossary/glossary.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/gods/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/intro/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/book.xml16
99 files changed, 179 insertions, 343 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 1bbae473b3..4ebe7151c0 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -3843,7 +3843,7 @@ U stable/9/share/man/man4/netmap.4
specifically permitted by portmgr. Complete details
about what qualifies as a sweeping change can be found
on the <ulink
- url="&url.base/portmgr/implementation.html">Portmgr
+ url="&url.base;/portmgr/implementation.html">Portmgr
Implementation page</ulink>.</para>
<para>The benefit of a slush as opposed to a complete
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
index 1d9100b739..398ff330aa 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 78b401a1a1..02ba44b40c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 2adb6cb171..ba64dac81c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index d971803318..0f42288312 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
index 02b6c2ced3..7ab3b549b0 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
index 12fa30b4cf..4c7d03fe7c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
@@ -7,7 +7,7 @@
<para>
<ulink url="http://hub.opensolaris.org/bin/view/Community+Group+ogb/In+Memoriam">John</ulink>
made major contributions to FreeBSD, the best known of which
- is the import of the &man.dtrace.1 code. John's unique sense
+ is the import of the &man.dtrace.1; code. John's unique sense
of humor and plain-spokenness either ruffled feathers or
made him quick friends. At the end of his life, he had
moved to a rural area and was attempting to live with
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 95c88263d6..8d2bf73b6d 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -77,7 +77,7 @@
<application>binutils</application> using the &os; ports tree,
issue the following command:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils &amp;&amp; make install</userinput></screen>
</sect2>
<sect2 id="installing-gcc">
@@ -94,7 +94,7 @@
<application>GCC</application> ports, run the following
command:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> &amp;&amp; make install</userinput></screen>
</sect2>
</sect1>
@@ -113,7 +113,7 @@
<filename>/etc/make.conf</filename> file (or modify
appropriately):</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -172,7 +172,7 @@ libstdc++.so.6 gcc44/libstdc++.so.6</programlisting>
<filename>/etc/make.conf</filename> according to the following
example:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -195,7 +195,7 @@ CFLAGS+=-mssse3
<filename>/etc/make.conf</filename> according to the following
example:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
.if empty(.CURDIR:M/usr/ports/net/openldap*)
CC=gcc44
CXX=g++44
@@ -208,7 +208,7 @@ CPP=cpp44
<filename role="package">net/openldap</filename>* ports. It is
also possible to specify more ports on a single line:</para>
- <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+ <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) &amp;&amp; empty(.CURDIR:M/usr/ports/xxx/yyy) &amp;&amp; ...</programlisting>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index d5ed5655ea..ca0400d20a 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -792,14 +792,14 @@ the new builds.</screen>
<screen> # Build the world
log "Building world"
- cd /usr/src &&
- make -j 2 ${COMPATFLAGS} buildworld 2>&1
+ cd /usr/src &amp;&amp;
+ make -j 2 ${COMPATFLAGS} buildworld 2>&amp;1
# Distribute the world
log "Distributing world"
- cd /usr/src/release &&
- make -j 2 obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+ cd /usr/src/release &amp;&amp;
+ make -j 2 obj &amp;&amp;
+ make ${COMPATFLAGS} release.1 release.2 2>&amp;1</screen>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 35c9897cf5..949f37fe59 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -127,8 +127,8 @@
<para>We expect mentors to make sure their mentees read the
<ulink url="&url.books.porters-handbook;">Porter's
Handbook</ulink>, the <ulink
- url="&url.articles.pr-guidelines">PR handling guide</ulink>, and
- the <ulink url="&url.articles.committers-guide">Committer's
+ url="&url.articles.pr-guidelines;">PR handling guide</ulink>, and
+ the <ulink url="&url.articles.committers-guide;">Committer's
Guide</ulink>. While it's not necessary to memorize all the
details, every committer needs to have an overview of these
things to be an effective part of the community (and avoid as
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 1fee3cae2b..b1cbd0bf61 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -54,7 +54,7 @@
<note>
<para>Many of the details in this article will be of interest only to
- those on the <ulink url="&url.base/portmgr">Ports Management</ulink>
+ those on the <ulink url="&url.base;/portmgr">Ports Management</ulink>
team.</para>
</note>
@@ -2566,7 +2566,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
</listitem>
<listitem>
- <para><screen>cd .ssh && ssh-keygen</screen></para>
+ <para><screen>cd .ssh &amp;&amp; ssh-keygen</screen></para>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
index 08776a032e..014d603427 100644
--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/chapters.ent b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
index d36157997c..7fdd3df4ad 100644
--- a/en_US.ISO8859-1/books/arch-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
@@ -33,7 +33,7 @@
<!ENTITY chap.pccard SYSTEM "pccard/chapter.xml">
<!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
<!ENTITY chap.index SYSTEM "index.xml">
]]>
<!ENTITY chap.index "">
diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
index 9b653e41ca..f70027a2e9 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
index d046c2aa88..20a2996f02 100644
--- a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
index 0cd77ee50e..b89c74b760 100644
--- a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
index ee0c27679b..ef59555739 100644
--- a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
index 0818c0fbdd..4486cfb648 100644
--- a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
index 483889c9dc..0fbd8d6440 100644
--- a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Copyright (c) 2002-2005 Networks Associates Technology, Inc.
All rights reserved.
diff --git a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
index 7fd0152d02..3f62902a88 100644
--- a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
index 301de79aee..14e9e36995 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
index 272b6aab3e..b6f5aff26d 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
index bdd4fd3928..9d0c293e2b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
index 0d0f001e6c..69acb41e19 100644
--- a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
index b21a45a2bd..4ce5564a02 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
index 01b91357c1..7898ee7e2e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
index 95f0a6e5c5..938519b241 100644
--- a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
index af2d1d5f50..47726b04c3 100644
--- a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index 6c53a7d0ee..0f7e8270b7 100644
--- a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index 15cfb17c23..66c0ff75b9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 0857fc51d4..0c147b8eb6 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 1f78263b6e..3f90f40252 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index dd13a7a2fc..cced92ce05 100644
--- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 01cb12ae08..2451e051e2 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
index e35fe1afdd..4a655c189c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 89b29f957a..7cb263be69 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 9470863c45..0ac3cbdd6a 100644
--- a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
index d1df3354ae..bba1da5520 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
index 65e17b742b..dafbb31103 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 7b969da21a..05d5abbea4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 95bd162179..ee6b7e139e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 2930c47f9f..c62fbc470e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 9901723f10..6e8dd4ef35 100644
--- a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 64da1923c8..65f4df3962 100644
--- a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 1a1e9d9372..9ada557496 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 7a9929df52..f24a2b0848 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -828,28 +828,6 @@ example.xml:5: element head: validity error : Element head content does not foll
-- doing multiline comments -->]]></programlisting>
</example>
- <![%output.print;[
- <important>
- <title>Use 2 Dashes</title>
-
- <para>There is a problem with producing the Postscript and PDF
- versions of this document. The above example probably shows
- just one hyphen symbol, <literal>-</literal> after the
- <literal>&lt;!</literal> and before the
- <literal>&gt;</literal>.</para>
-
- <para>You <emphasis>must</emphasis> use two
- <literal>-</literal>, <emphasis>not</emphasis> one. The
- Postscript and PDF versions have translated the two
- <literal>-</literal> in the original to a longer, more
- professional <emphasis>em-dash</emphasis>, and broken this
- example in the process.</para>
-
- <para>The XHTML, plain text, and RTF versions of this document
- are not affected.</para>
- </important>
- ]]>
-
<para>If you have used XHTML before you may have been shown
different rules for comments. In particular, you may think that
the string <literal>&lt;!--</literal> opens a comment, and it is
@@ -1357,7 +1335,7 @@ example.xml:5: element head: validity error : Element head content does not foll
</example>
<para>As you would expect, being an XML construct, a marked
- section starts with <literal>&lt!</literal>.</para>
+ section starts with <literal>&lt;!</literal>.</para>
<para>The first square bracket begins to delimit the marked
section.</para>
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0111965b9e..7a688264b4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 23126ed4b8..bfdbca8f4e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 4a621e79b5..c72ecfa11a 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 979b907ffd..f915276fb0 100644
--- a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 296142dbb9..2219e73282 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 3c4f95790d..b272a6f880 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -185,7 +185,7 @@
<emphasis>not</emphasis> <sgmltag>PARA</sgmltag>.</para>
<para>Text that appears in SGML contexts is generally written in
- upper case, <literal>&lt!ENTITY&hellip;&gt;</literal>, and
+ upper case, <literal>&lt;!ENTITY&hellip;&gt;</literal>, and
<literal>&lt;!DOCTYPE&hellip;&gt;</literal>,
<emphasis>not</emphasis>
<literal>&lt;!entity&hellip;&gt;</literal> and
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index c95d4c46b8..8f09bff7a2 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -315,30 +315,56 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
+
+lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
+ mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index de262b5ddf..57bf23600b 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/audit/chapter.xml b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
index be5714458e..f8ed65c041 100644
--- a/en_US.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 587749831b..2b45e4a68d 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
index 03d8a27211..2b7bdece60 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.xml b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
index ab2478c416..2e865047b1 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 5cfcc52f2c..0be0d592eb 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -162,7 +162,7 @@
multiple CPUs.</para>
<para>A 32-bit kernel can only use the first 2&nbsp;GB of RAM.
- &firewire; is not supported on the Blue & White PowerMac
+ &firewire; is not supported on the Blue &amp; White PowerMac
G3.</para>
</sect3>
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index a2a9455f59..6ac388f3c9 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -10,235 +10,63 @@
$FreeBSD$
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+<!-- XXX -->
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/en_US.ISO8859-1/books/handbook/colophon.xml b/en_US.ISO8859-1/books/handbook/colophon.xml
index 18d093364b..b639a4f7dc 100644
--- a/en_US.ISO8859-1/books/handbook/colophon.xml
+++ b/en_US.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index 43f5b1ebab..ff90d311f0 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -807,7 +807,7 @@ sshd is running as pid 433.</screen>
system can be found in the &man.rc.8; and &man.rc.subr.8; manual
pages. If you are interested in writing your own
<filename>rc.d</filename> scripts or improving the existing
- ones, you may find <ulink url="&url.articles.rc-scripting">this
+ ones, you may find <ulink url="&url.articles.rc-scripting;">this
article</ulink> also useful.</para>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f32ff4680d..f1c6f3a5c9 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1149,7 +1149,7 @@ Fetching 133 new ports or files... done.</screen>
</sect2>
<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
+<!--
<sect2 id="docsnap">
<sect2info>
<authorgroup>
@@ -1206,14 +1206,14 @@ Fetching 133 new ports or files... done.</screen>
above.</para>
</note>
- <para>Do not use the <option>--delete</option> flag here as there
+ <para>Do not use the <option>&dash;&dash;delete</option> flag here as there
are some items installed
into <filename class="directory">/usr/share/doc</filename>
during <command>make installworld</command>, which would
accidentally be removed. To clean up, use this command
instead:</para>
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>rsync -rltvz &dash;&dash;delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
<para>If a subset of documentation needs to be updated, for
example, the English documentation only, the following command
@@ -1221,7 +1221,7 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
</sect2>
-]]>
+-->
</sect1>
<sect1 id="current-stable">
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index c7b5e1ca4e..b20e512869 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index 99156deaa8..55c4031eea 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2902,15 +2902,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
again. Another hour spent now may save you from further
distress later.</para>
</sect3>
-
-<![%not.published;[
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
</sect2>
</sect1>
@@ -4707,7 +4698,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
sleep 1
done
@@ -4722,7 +4713,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] &amp;&amp; break
sleep 0.5
done
@@ -4755,7 +4746,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&amp;1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
index 5bbc4a08de..1e7bad38b2 100644
--- a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
index a9744a272c..b7091fe6ae 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2105,6 +2105,11 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
index cf3ad85d5d..96018296fb 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index f84d9aaddf..a01704080a 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index ff7ec9a29e..f201885f67 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index 6e43a0518a..1ca328c639 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
index c36ee52aa7..d5ae98c174 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.xml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
index 71cf55c7f3..90507c7984 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 095e1a69dd..83e72a8b50 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 8fe790686f..36fb3dba9b 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index b9c42c0b42..34a8b41443 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -923,7 +923,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.xml b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
index f94e9d5aa1..9daede6b5e 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 5a5c57de21..2f5cc6578d 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index f7421e5581..4113f96b2e 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -204,6 +204,10 @@
methods available for each site are provided in parentheses
after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2403,6 +2407,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers for &os; are running
at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
index 6856ac9abe..db06863523 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1569,7 +1569,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>Set up the MythTV database:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>Configure the backend:</para>
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 44c3233cf4..3ff29e58f8 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index ecd7b81155..3fef27e198 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index 05fe018a4b..263dbc5be3 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 24ea0b2498..659e374ad3 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.xml b/en_US.ISO8859-1/books/handbook/preface/preface.xml
index 1f9ecf4534..bc726c4789 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.xml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.xml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
index 540f91c64d..7d0cdb3bee 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
index 7f6ff6cab4..bea005d836 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 5dc07269b4..1c6fe1d5e1 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index bad97251c8..af618fda07 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index a631b66326..90aed1c718 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index 3960c880d8..3f48a37d20 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1028,7 +1028,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename>
package in the &os; guest.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
<para>Add these lines to
<filename>/etc/rc.conf</filename>:</para>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index 188155f246..795cf3063b 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/pmake/answers/chapter.xml b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
index e3f96181fa..68d86a9db3 100644
--- a/en_US.ISO8859-1/books/pmake/answers/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/basics/chapter.xml b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
index 12df062549..4ae0a8b799 100644
--- a/en_US.ISO8859-1/books/pmake/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
index 9b59545ea8..d983027d75 100644
--- a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
+++ b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/gods/chapter.xml b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
index bc57aba8c9..6bca57995b 100644
--- a/en_US.ISO8859-1/books/pmake/gods/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/intro/chapter.xml b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
index 39597afc0b..b1cfcec310 100644
--- a/en_US.ISO8859-1/books/pmake/intro/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
PMake - A Tutorial
diff --git a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
index 417e3b65a5..9c7a90cac9 100644
--- a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 4397956653..06d45e78ea 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -4053,8 +4053,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+ ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -6564,7 +6564,7 @@ PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_REL} \
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>Note the similarity to the <command>qmake</command> line
@@ -9339,7 +9339,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
url="&url.books.handbook;/configtuning-rcd.html">the rc.d
Handbook chapter</ulink>. Detailed explanation of available
commands is provided in &man.rc.8; and &man.rc.subr.8;.
- Finally, there is <ulink url="&url.articles.rc-scripting">an
+ Finally, there is <ulink url="&url.articles.rc-scripting;">an
article</ulink> on practical aspects of
<filename>rc.d</filename> scripting.</para>
@@ -9932,7 +9932,7 @@ etc/orbit.conf.sample
<para>Store the directory structure in a new file.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>Create an empty <filename>pkg-plist</filename>
file:</para>
@@ -9944,12 +9944,12 @@ etc/orbit.conf.sample
list.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>You must also add any newly created directories to the
packing list.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para>Finally, you need to tidy up the packing list by hand; it
is not <emphasis>all</emphasis> automated. Manual pages
@@ -10533,7 +10533,7 @@ as .putsy.conf and edit it.</programlisting>
<sect1 id="svn-diff">
<title>Using <literal>SVN</literal> to Make Patches</title>
- <para>If you can, please submit a &man.svn.1 diff; they are
+ <para>If you can, please submit a &man.svn.1; diff; they are
easier to handle than diffs between <quote>new and old</quote>
directories. Plus it is easier for you to see what you have
changed and to update your diff if something is modified in