path: root/en_US.ISO8859-1
diff options
Diffstat (limited to 'en_US.ISO8859-1')
153 files changed, 13559 insertions, 16818 deletions
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index f1043f3ed3..85db178021 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
@@ -1,24 +1,18 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <title>Why you should use a BSD style license for your Open Source Project</title>
- <articleinfo>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Why you should use a BSD style license for your Open Source Project</title>
- <author>
- <firstname>Bruce</firstname>
-<!-- middle initial: R. -->
- <surname>Montague</surname>
- <affiliation>
+ <author><personname><firstname>Bruce</firstname><surname>Montague</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -27,9 +21,9 @@
- </articleinfo>
+ </info>
-<sect1 id="intro">
+<sect1 xml:id="intro">
<para>This document makes a case for using a BSD style license for
@@ -38,13 +32,13 @@
GPL Open Source License introduction and summary.</para>
-<sect1 id="history">
+<sect1 xml:id="history">
<title>Very Brief Open Source History</title>
<para>Long before the term <quote>Open Source</quote> was used, software was
developed by loose associations of programmers and freely
exchanged. Starting in the early 1950's, organizations such as
- <ulink url="http://www.share.org">SHARE</ulink> and <ulink url="http://www.decus.org">DECUS</ulink> developed much of the
+ <link xlink:href="http://www.share.org">SHARE</link> and <link xlink:href="http://www.decus.org">DECUS</link> developed much of the
software that computer hardware companies bundled with their
hardware offerings. At that time computer companies were in the
hardware business; anything that reduced software cost and made
@@ -74,7 +68,7 @@
the customer.</para>
-<sect1 id="unix-license">
+<sect1 xml:id="unix-license">
<title>Unix from a BSD Licensing Perspective</title>
<para>AT&amp;T, who owned the original Unix implementation, was a
@@ -129,11 +123,11 @@
soon terminated its support for BSD.</para>
-<sect1 id="current-bsdl">
+<sect1 xml:id="current-bsdl">
<title>The Current State of FreeBSD and BSD Licenses</title>
- <para>The so-called <ulink url="http://www.opensource.org/licenses/bsd-license.php"> new BSD
- license</ulink> applied to FreeBSD within the last few years is
+ <para>The so-called <link xlink:href="http://www.opensource.org/licenses/bsd-license.php"> new BSD
+ license</link> applied to FreeBSD within the last few years is
effectively a statement that you can do anything with the program
or its source, but you do not have any warranty and none of the
authors has any liability (basically, you cannot sue anybody). This
@@ -148,7 +142,7 @@
-<sect1 id="origins-gpl">
+<sect1 xml:id="origins-gpl">
<title>The origins of the GPL</title>
<para>While the future of Unix had been so muddled in the late 1980s
@@ -164,8 +158,8 @@
disagreement over access to the source code for this software).
Stallman devised an alternative to the commercial software license
and called it the GPL, or "GNU Public License". He also started a
- non-profit foundation, the <ulink url="http://www.fsf.org">Free
- Software Foundation</ulink> (FSF), which intended to develop an entire
+ non-profit foundation, the <link xlink:href="http://www.fsf.org">Free
+ Software Foundation</link> (FSF), which intended to develop an entire
operating system, including all associated software, that would
not be subject to proprietary licensing. This system was called
GNU, for "GNU is Not Unix".</para>
@@ -183,7 +177,7 @@
incorporating your program into proprietary
- <para>The <ulink url="http://www.opensource.org/licenses/gpl-license.php">GPL</ulink>
+ <para>The <link xlink:href="http://www.opensource.org/licenses/gpl-license.php">GPL</link>
is a complex license so here are some rules of thumb when using
the GPL:</para>
@@ -226,7 +220,7 @@
-<sect1 id="origins-lgpl">
+<sect1 xml:id="origins-lgpl">
<title>The origins of Linux and the LGPL</title>
<para>While the commercial Unix wars raged, the Linux kernel was
@@ -241,7 +235,7 @@
of the GPL. Pressure to put proprietary applications on Linux
became overwhelming. Such applications often must link with system
libraries. This resulted in a modified version of the GPL called
- the <ulink url="http://www.opensource.org/licenses/lgpl-license.php">LGPL</ulink>
+ the <link xlink:href="http://www.opensource.org/licenses/lgpl-license.php">LGPL</link>
("Library", since renamed to "Lesser", GPL). The LGPL allows
proprietary code to be linked to the GNU C library, glibc. You do
not have to release the source to code which has been dynamically
@@ -255,7 +249,7 @@
-<sect1 id="orphaning">
+<sect1 xml:id="orphaning">
<title>Open Source licenses and the Orphaning Problem</title>
<para>One of the serious problems associated with proprietary
@@ -283,7 +277,7 @@
-<sect1 id="license-cannot">
+<sect1 xml:id="license-cannot">
<title>What a license cannot do</title>
<para>No license can guarantee future software
@@ -315,7 +309,7 @@
-<sect1 id="gpl-advantages">
+<sect1 xml:id="gpl-advantages">
<title>GPL Advantages and Disadvantages</title>
<para>A common reason to use the GPL is when modifying or extending
@@ -377,7 +371,7 @@
-<sect1 id="bsd-advantages">
+<sect1 xml:id="bsd-advantages">
<title>BSD Advantages</title>
<para>A BSD style license is a good choice for long duration
@@ -446,7 +440,7 @@
-<sect1 id="recommendations">
+<sect1 xml:id="recommendations">
<title>Specific Recommendations for using a BSD license</title>
@@ -531,7 +525,7 @@
-<sect1 id="conclusion">
+<sect1 xml:id="conclusion">
<para>In contrast to the GPL, which is designed to prevent the
@@ -549,7 +543,7 @@
-<sect1 id="addenda">
+<sect1 xml:id="addenda">
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index 86ae7b5600..6689e1a69b 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -1,22 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Building Products with FreeBSD</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Building Products with FreeBSD</title>
- <author>
- <firstname>Joseph</firstname>
- <surname>Koshy</surname>
- <affiliation>
+ <author><personname><firstname>Joseph</firstname><surname>Koshy</surname></personname><affiliation>
<orgname>The FreeBSD Project</orgname>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -44,9 +39,9 @@
few <quote>best practices</quote> for organizations
collaborating with the FreeBSD project.</para>
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>FreeBSD today is well-known as a high-performance server
@@ -58,8 +53,7 @@
commercial shrink-wrapped software (see
<xref linkend="freebsd-intro"/>).</para>
- <para>In this article we look at the <ulink
- url="&url.base;/">FreeBSD project</ulink> as a software
+ <para>In this article we look at the <link xlink:href="&url.base;/">FreeBSD project</link> as a software
engineering resource&mdash;as a collection of building blocks
and processes which you can use to build products.</para>
@@ -166,7 +160,7 @@
- <sect1 id="freebsd-intro">
+ <sect1 xml:id="freebsd-intro">
<title>FreeBSD as a set of building blocks</title>
<para>FreeBSD makes an excellent foundation on which to build
@@ -254,9 +248,7 @@
<simpara>As a development environment supporting
- cross-development for embedded OSes like <ulink
- url="http://www.rtems.com/">RTEMS</ulink> and <ulink
- url="http://ecos.sourceware.org/">eCOS</ulink>.</simpara>
+ cross-development for embedded OSes like <link xlink:href="http://www.rtems.com/">RTEMS</link> and <link xlink:href="http://ecos.sourceware.org/">eCOS</link>.</simpara>
<simpara>There are many full-fledged development environments
in the &os.numports;-strong collection of applications ported and
packaged with FreeBSD.</simpara>
@@ -280,7 +272,7 @@
- <sect2 id="freebsd-technologies">
+ <sect2 xml:id="freebsd-technologies">
<para>There are a large number of technologies supported by the
@@ -403,9 +395,8 @@
<para>FreeBSD does not have <quote>corporate</quote> committers.
Individual committers are required to take responsibility for
- the changes they introduce to the code. The <ulink
- url="&url.articles.committers-guide;">FreeBSD Committer's
- guide</ulink> <citation>ComGuide</citation> documents the
+ the changes they introduce to the code. The <link xlink:href="&url.articles.committers-guide;">FreeBSD Committer's
+ guide</link> <citation>ComGuide</citation> documents the
rules and responsibilities for committers.</para>
<para>FreeBSD's project model is examined in detail in
@@ -441,7 +432,7 @@
- <figure id="fig-freebsd-branches">
+ <figure xml:id="fig-freebsd-branches">
<title>FreeBSD Release Branches</title>
@@ -459,13 +450,11 @@
engineering and security teams, <firstterm>Tier 2</firstterm>
architectures are supported on a best effort basis, and
experimental architectures comprise <firstterm>Tier
- 3</firstterm>. The list of <ulink
- url="&url.articles.committers-guide;/archs.html">supported
- architectures</ulink> is part of the FreeBSD documentation
+ 3</firstterm>. The list of <link xlink:href="&url.articles.committers-guide;/archs.html">supported
+ architectures</link> is part of the FreeBSD documentation
- <para>The release engineering team publishes a <ulink
- url="&url.base;/releng/">road map</ulink> for future
+ <para>The release engineering team publishes a <link xlink:href="&url.base;/releng/">road map</link> for future
releases of FreeBSD on the project's web site. The dates laid
down in the road map are not deadlines; FreeBSD is released
when its code and documentation are ready.</para>
@@ -476,7 +465,7 @@
- <sect1 id="freebsd-collaboration">
+ <sect1 xml:id="freebsd-collaboration">
<title>Collaborating with FreeBSD</title>
<para>Open-source projects like FreeBSD offer finished code of a
@@ -520,16 +509,15 @@
<simpara>FreeBSD enjoys an open and transparent working
culture. Nearly all discussion in the project happens by
- email, on <ulink url="&a.mailman.listinfo;">public mailing
- lists</ulink> that are also archived for posterity. The
- project's policies are <ulink
- url="&url.base;/internal/policies.html">documented</ulink>
+ email, on <link xlink:href="&a.mailman.listinfo;">public mailing
+ lists</link> that are also archived for posterity. The
+ project's policies are <link xlink:href="&url.base;/internal/policies.html">documented</link>
and maintained under revision control. Participation in the
project is open to all.</simpara>
- <sect2 id="freebsd-org">
+ <sect2 xml:id="freebsd-org">
<title>Understanding FreeBSD culture</title>
<para>To be able to work effectively with the FreeBSD project,
@@ -559,12 +547,10 @@
<para>FreeBSD traces its roots back nearly twenty years to the
work of the Computer Science Research Group at the
University of California Berkeley.<footnote>
- <simpara>FreeBSD's <ulink
- url="http://cvsweb.freebsd.org/">source
- repository</ulink> contains a history of the project
- since its inception, and there are <ulink
- url="http://www.mckusick.com/csrg/">CDROMs
- available</ulink> that contain earlier code from the
+ <simpara>FreeBSD's <link xlink:href="http://cvsweb.freebsd.org/">source
+ repository</link> contains a history of the project
+ since its inception, and there are <link xlink:href="http://www.mckusick.com/csrg/">CDROMs
+ available</link> that contain earlier code from the
</footnote> A number of the original CSRG developers remain
associated with the project.</para>
@@ -592,7 +578,7 @@
consensus and running code</quote>
- <figure id="fig-change-log">
+ <figure xml:id="fig-change-log">
<title>A sample change log entry</title>
bde 2005-10-29 16:34:50 UTC
@@ -647,9 +633,8 @@ bde 2005-10-29 16:34:50 UTC
<title>Track FreeBSD source code</title>
<para>The project makes it easy to mirror its CVS
- repository using <ulink
- url="&url.articles.cvsup-advanced;"><!--
- --><application>CVSup</application></ulink>. Having
+ repository using <link xlink:href="&url.articles.cvsup-advanced;"><!--
+ --><application>CVSup</application></link>. Having
the complete history of the source is useful when
debugging complex problems and offers valuable insight
into the intentions of the original developers. Use a
@@ -662,10 +647,9 @@ bde 2005-10-29 16:34:50 UTC
change log in <xref linkend="fig-change-log"/>. The
ancestry of each line of the source is clearly visible.
Annotated listings showing the history of every file
- that is part of FreeBSD are <ulink
- url="http://cvsweb.freebsd.org/">available on the
- web</ulink>.</para>
- <figure id="fig-cvs-annotate">
+ that is part of FreeBSD are <link xlink:href="http://cvsweb.freebsd.org/">available on the
+ web</link>.</para>
+ <figure xml:id="fig-cvs-annotate">
<title>An annotated source listing generated using <command>cvs annotate</command></title>
@@ -709,8 +693,8 @@ bde 2005-10-29 16:34:50 UTC
<title>Report bugs upstream</title>
<para>If you notice bug in the FreeBSD code that you are
- using, file a <ulink url="&url.base;/send-pr.html">bug
- report</ulink>. This step helps ensure that you do
+ using, file a <link xlink:href="&url.base;/send-pr.html">bug
+ report</link>. This step helps ensure that you do
not have to fix the bug the next time you take a code
drop from upstream.</para>
@@ -750,18 +734,15 @@ bde 2005-10-29 16:34:50 UTC
agreement with a developer or firm with FreeBSD
experience. The &a.jobs; is a useful communication
channel to find talent. The FreeBSD project maintains a
- <ulink
- url="&url.base;/commercial/consult_bycat.html">gallery
- of consultants and consulting firms</ulink>
- undertaking FreeBSD work. The <ulink
- url="http://www.bsdcertification.org/">BSD
- Certification Group</ulink> offers certification for
+ <link xlink:href="&url.base;/commercial/consult_bycat.html">gallery
+ of consultants and consulting firms</link>
+ undertaking FreeBSD work. The <link xlink:href="http://www.bsdcertification.org/">BSD
+ Certification Group</link> offers certification for
all the major BSD derived OSes.</simpara>
<simpara>For less critical needs, you can ask for help on
- the <ulink
- url="http://lists.FreeBSD.org/mailman/listinfo">project
- mailing lists</ulink>. A useful guide to follow when
+ the <link xlink:href="http://lists.FreeBSD.org/mailman/listinfo">project
+ mailing lists</link>. A useful guide to follow when
asking for help is given in
@@ -791,15 +772,12 @@ bde 2005-10-29 16:34:50 UTC
already looking at a related problem. Help can range
from hardware donations to direct financial assistance.
In some countries, donations to the FreeBSD project
- enjoy tax benefits. The project has a dedicated <ulink
- url="&url.base;/donations/">donations liaison</ulink>
+ enjoy tax benefits. The project has a dedicated <link xlink:href="&url.base;/donations/">donations liaison</link>
to assist donors. The project also maintains a web page
- where developers <ulink
- url="&url.base;/donations/wantlist.html">list their
- needs</ulink>.
+ where developers <link xlink:href="&url.base;/donations/wantlist.html">list their
+ needs</link>.
- <simpara>As a policy the FreeBSD project <ulink
- url="&url.articles.contributors;">acknowledges</ulink>
+ <simpara>As a policy the FreeBSD project <link xlink:href="&url.articles.contributors;">acknowledges</link>
all contributions received on its web site.</simpara>
@@ -807,7 +785,7 @@ bde 2005-10-29 16:34:50 UTC
- <sect1 id="conclusion">
+ <sect1 xml:id="conclusion">
<para>The FreeBSD project's goals are to create and give away the
source code for a high-quality operating system. By working
@@ -826,36 +804,25 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink url="http://www.ietf.org/rfc/rfc1958.txt">The
- Architectural Principles of the Internet</ulink></citetitle>
- <author>
- <firstname>B.</firstname>
- <surname>Carpenter</surname>
- <affiliation>
+ <citetitle><link xlink:href="http://www.ietf.org/rfc/rfc1958.txt">The
+ Architectural Principles of the Internet</link></citetitle>
+ <author><personname><firstname>B.</firstname><surname>Carpenter</surname></personname><affiliation>
<orgname>The Internet Architecture Board</orgname>
- </affiliation>
- </author>
+ </affiliation></author>
<biblioentry xreflabel="Com2004">
- <citetitle><ulink
- url="http://csdl.computer.org/comp/mags/so/2004/01/s1028.pdf">How
+ <citetitle><link xlink:href="http://csdl.computer.org/comp/mags/so/2004/01/s1028.pdf">How
is Open-Source Affecting Software
- Development?</ulink></citetitle>
+ Development?</link></citetitle>
- <author>
- <firstname>Diomidis</firstname>
- <surname>Spinellis</surname>
- </author>
- <author>
- <firstname>Clemens</firstname>
- <surname>Szyperski</surname>
- </author>
+ <author><personname><firstname>Diomidis</firstname><surname>Spinellis</surname></personname></author>
+ <author><personname><firstname>Clemens</firstname><surname>Szyperski</surname></personname></author>
- <title>IEEE Computer</title>
+ <citetitle>IEEE Computer</citetitle>
<year>Jan/Feb 2004</year>
@@ -865,11 +832,10 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink
- url="&url.articles.committers-guide;">Committer's
- Guide</ulink></citetitle>
+ <citetitle><link xlink:href="&url.articles.committers-guide;">Committer's
+ Guide</link></citetitle>
- <corpauthor>The FreeBSD Project</corpauthor>
+ <author><orgname>The FreeBSD Project</orgname></author>
@@ -877,34 +843,26 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink
- url="http://www.coverity.com/news/nf_news_06_27_05_story_9.html">Coverity
- study on kernel security holes in Linux and FreeBSD</ulink></citetitle>
+ <citetitle><link xlink:href="http://www.coverity.com/news/nf_news_06_27_05_story_9.html">Coverity
+ study on kernel security holes in Linux and FreeBSD</link></citetitle>
- <corpauthor>Coverity Inc.</corpauthor>
+ <author><orgname>Coverity Inc.</orgname></author>
- <abbrev>GoldGab2005</abbrev> <citetitle><ulink
- url="http://dreamsongs.com/IHE/IHE.html">Innovation Happens
- Elsewhere: Open Source as Business Strategy</ulink></citetitle>
+ <abbrev>GoldGab2005</abbrev> <citetitle><link xlink:href="http://dreamsongs.com/IHE/IHE.html">Innovation Happens
+ Elsewhere: Open Source as Business Strategy</link></citetitle>
- <author>
- <firstname>Ron</firstname>
- <surname>Goldman</surname>
- </author>
- <author>
- <firstname>Richard</firstname>
- <surname>Gabriel</surname>
- </author>
+ <author><personname><firstname>Ron</firstname><surname>Goldman</surname></personname></author>
+ <author><personname><firstname>Richard</firstname><surname>Gabriel</surname></personname></author>
- <isbn>ISBN 1558608893</isbn>
+ <biblioid class="isbn">ISBN 1558608893</biblioid>
@@ -912,12 +870,9 @@ bde 2005-10-29 16:34:50 UTC
<biblioentry xreflabel="Hub1994">
<!-- XXX Get the date of this article right -->
- <citetitle><ulink url="&url.articles.contributing;">Contributing
- to the FreeBSD Project</ulink></citetitle>
- <author>
- <firstname>Jordan</firstname>
- <surname>Hubbard</surname>
- </author>
+ <citetitle><link xlink:href="&url.articles.contributing;">Contributing
+ to the FreeBSD Project</link></citetitle>
+ <author><personname><firstname>Jordan</firstname><surname>Hubbard</surname></personname></author>
@@ -927,19 +882,12 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink
- url="http://www.usenix.org/publications/library/proceedings/usenix99/mckusick.html">Soft
+ <citetitle><link xlink:href="http://www.usenix.org/publications/library/proceedings/usenix99/mckusick.html">Soft
Updates: A Technique for Eliminating Most Synchronous Writes
- in the Fast Filesystem</ulink></citetitle>
+ in the Fast Filesystem</link></citetitle>
- <author>
- <firstname>Kirk</firstname>
- <surname>McKusick</surname>
- </author>
- <author>
- <firstname>Gregory</firstname>
- <surname>Ganger</surname>
- </author>
+ <author><personname><firstname>Kirk</firstname><surname>McKusick</surname></personname></author>
+ <author><personname><firstname>Gregory</firstname><surname>Ganger</surname></personname></author>
<conftitle>USENIX Annual Technical Conference</conftitle>
@@ -950,21 +898,15 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink
- url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"
- >Twenty Years of Berkeley Unix: From AT&amp;T-Owned to
- Freely Redistributable</ulink></citetitle>
+ <citetitle><link xlink:href="http://www.oreilly.com/catalog/opensources/book/kirkmck.html">Twenty Years of Berkeley Unix: From AT&amp;T-Owned to
+ Freely Redistributable</link></citetitle>
- <author>
- <firstname>Marshall Kirk</firstname>
- <surname>McKusick</surname>
- </author>
+ <author><personname><firstname>Marshall Kirk</firstname><surname>McKusick</surname></personname></author>
- <title><ulink
- url="http://www.oreilly.com/catalog/opensources/book/toc.html">Open
+ <citetitle><link xlink:href="http://www.oreilly.com/catalog/opensources/book/toc.html">Open
Sources: Voices from the Open Source
- Revolution</ulink></title>
- <isbn>ISBN 1-56592-582-3</isbn>
+ Revolution</link></citetitle>
+ <biblioid class="isbn">ISBN 1-56592-582-3</biblioid>
<publishername>O'Reilly Inc.</publishername>
@@ -974,13 +916,10 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink url="&url.articles.bsdl-gpl;/article.html">Why you should
+ <citetitle><link xlink:href="&url.articles.bsdl-gpl;/article.html">Why you should
use a BSD style license for your Open Source
- Project</ulink></citetitle>
- <author>
- <firstname>Bruce</firstname>
- <surname>Montague</surname>
- </author>
+ Project</link></citetitle>
+ <author><personname><firstname>Bruce</firstname><surname>Montague</surname></personname></author>
<publishername>The FreeBSD Project</publishername>
@@ -990,12 +929,9 @@ bde 2005-10-29 16:34:50 UTC
<biblioentry xreflabel="Nik2005">
- <citetitle><ulink url="&url.books.dev-model;/book.html">A
- project model for the FreeBSD Project</ulink></citetitle>
- <author>
- <firstname>Niklas</firstname>
- <surname>Saers</surname>
- </author>
+ <citetitle><link xlink:href="&url.books.dev-model;/book.html">A
+ project model for the FreeBSD Project</link></citetitle>
+ <author><personname><firstname>Niklas</firstname><surname>Saers</surname></personname></author>
@@ -1005,18 +941,11 @@ bde 2005-10-29 16:34:50 UTC
<biblioentry xreflabel="Nor1993">
- <citetitle><ulink
- url="http://www.norvig.com/luv-slides.ps">Tutorial
- on Good Lisp Programming Style</ulink></citetitle>
+ <citetitle><link xlink:href="http://www.norvig.com/luv-slides.ps">Tutorial
+ on Good Lisp Programming Style</link></citetitle>
- <author>
- <firstname>Peter</firstname>
- <surname>Norvig</surname>
- </author>
- <author>
- <firstname>Kent</firstname>
- <surname>Pitman</surname>
- </author>
+ <author><personname><firstname>Peter</firstname><surname>Norvig</surname></personname></author>
+ <author><personname><firstname>Kent</firstname><surname>Pitman</surname></personname></author>
@@ -1024,26 +953,19 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink url="http://www.norvig.com/21-days.html">Teach
- Yourself Programming in Ten Years</ulink></citetitle>
- <author>
- <firstname>Peter</firstname>
- <surname>Norvig</surname>
- </author>
+ <citetitle><link xlink:href="http://www.norvig.com/21-days.html">Teach
+ Yourself Programming in Ten Years</link></citetitle>
+ <author><personname><firstname>Peter</firstname><surname>Norvig</surname></personname></author>
- <citetitle><ulink
- url="http://www.catb.org/~esr/faqs/smart-questions.html">How
- to ask questions the smart way</ulink></citetitle>
+ <citetitle><link xlink:href="http://www.catb.org/~esr/faqs/smart-questions.html">How
+ to ask questions the smart way</link></citetitle>
- <author>
- <firstname>Eric Steven</firstname>
- <surname>Raymond</surname>
- </author>
+ <author><personname><firstname>Eric Steven</firstname><surname>Raymond</surname></personname></author>
@@ -1051,12 +973,9 @@ bde 2005-10-29 16:34:50 UTC
- <citetitle><ulink url="&url.articles.releng;">FreeBSD Release
- Engineering</ulink></citetitle>
- <author>
- <firstname>Murray</firstname>
- <surname>Stokely</surname>
- </author>
+ <citetitle><link xlink:href="&url.articles.releng;">FreeBSD Release
+ Engineering</link></citetitle>
+ <author><personname><firstname>Murray</firstname><surname>Stokely</surname></personname></author>
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 0e2156becd..051cc41148 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <title>Argentina.com : A Case Study</title>
- <articleinfo>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Argentina.com : A Case Study</title>
- <author>
- <firstname>Carlos</firstname>
- <surname>Horowicz</surname>
- <affiliation>
+ <author><personname><firstname>Carlos</firstname><surname>Horowicz</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -27,9 +22,9 @@
- </articleinfo>
+ </info>
-<sect1 id="overview">
+<sect1 xml:id="overview">
<para>Argentina.Com is an Argentine ISP with a small infrastructure
@@ -69,7 +64,7 @@
business in the corporate and paid email arena.</para>
-<sect1 id="challenge">
+<sect1 xml:id="challenge">
<title>The Challenge</title>
<para>The main challenge for Argentina.Com is to achieve a dialup
@@ -133,10 +128,10 @@
-<sect1 id="freebsd">
+<sect1 xml:id="freebsd">
<title>The FreeBSD solution</title>
- <sect2 id="freebsd-intro">
+ <sect2 xml:id="freebsd-intro">
<para>At the beginning of 2003 we had a CriticalPath mail system
@@ -152,15 +147,14 @@
FreeBSD 4.8 with Linux emulation.</para>
- <sect2 id="freebsd-choice">
+ <sect2 xml:id="freebsd-choice">
<title>The choice of FreeBSD</title>
<para>The FreeBSD operating system is well-known for its great
stability, plus its pragmatism and common sense to put
- applications on-line thanks to its excellent <ulink
- url="http://www.FreeBSD.org/ports">Ports System</ulink>. We
- consider its <ulink url="http://www.FreeBSD.org/releng">release
- engineering process</ulink> to be easily understandable, while
+ applications on-line thanks to its excellent <link xlink:href="http://www.FreeBSD.org/ports">Ports System</link>. We
+ consider its <link xlink:href="http://www.FreeBSD.org/releng">release
+ engineering process</link> to be easily understandable, while
the users' community at the official mailing lists keeps a
polite and civilized style when it comes to asking for support
or reading other people's problems and solutions.</para>
@@ -186,7 +180,7 @@
- <sect2 id="freebsd-engineer">
+ <sect2 xml:id="freebsd-engineer">
<title>Basic re-engineering</title>
<para>The first re-engineering step was to put in place two
@@ -209,7 +203,7 @@
- <sect2 id="freebsd-email">
+ <sect2 xml:id="freebsd-email">
<title>Email migration</title>
<para>The email migration required careful planning due to the
@@ -285,7 +279,7 @@
- <sect2 id="freebsd-web">
+ <sect2 xml:id="freebsd-web">
<title>Web migration</title>
<para>With the adoption of FreeBSD, there was almost no additional
@@ -300,7 +294,7 @@
-<sect1 id="results">
+<sect1 xml:id="results">
<para>We managed to deploy a FreeBSD based email architecture that
@@ -320,5 +314,3 @@
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 5f93df96ba..9b2b472a7f 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd" [
<!ENTITY ga "Google Analytics">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Committer's Guide</title>
-<article lang='en'>
- <articleinfo>
- <title>Committer's Guide</title>
- <corpauthor>The &os; Documentation Project</corpauthor>
+ <author><orgname>The &os; Documentation Project</orgname></author>
@@ -29,7 +28,7 @@
<holder>The &os; Documentation Project</holder>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -52,16 +51,15 @@
more repositories. However, a few developers do not, and some
of the information here applies to them as well. (For
instance, some people only have rights to work with the
- Problem Report database). Please see <xref
- linkend="non-committers"/> for more information.</para>
+ Problem Report database). Please see <xref linkend="non-committers"/> for more information.</para>
<para>This document may also be of interest to members of the
&os; community who want to learn more about how the project
- </articleinfo>
+ </info>
- <sect1 id="admin">
+ <sect1 xml:id="admin">
<title>Administrative Details</title>
<informaltable frame="none" orient="port" pgwide="1">
@@ -76,35 +74,28 @@
<entry><emphasis>Main Shell Host</emphasis></entry>
- <entry><hostid
- role="fqdn">freefall.FreeBSD.org</hostid></entry>
+ <entry><systemitem class="fqdomainname">freefall.FreeBSD.org</systemitem></entry>
<entry><emphasis><literal>src/</literal> Subversion
- <entry><literal>svn+ssh://</literal><hostid
- role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename>
- (see also <xref
- linkend="svn-getting-started-base-layout"/>).</entry>
+ <entry><literal>svn+ssh://</literal><systemitem class="fqdomainname">svn.FreeBSD.org</systemitem><filename>/base</filename>
+ (see also <xref linkend="svn-getting-started-base-layout"/>).</entry>
<entry><emphasis><literal>doc/</literal> Subversion
- <entry><literal>svn+ssh://</literal><hostid
- role="fqdn">svn.FreeBSD.org</hostid><filename>/doc</filename>
- (see also <xref
- linkend="svn-getting-started-doc-layout"/>).</entry>
+ <entry><literal>svn+ssh://</literal><systemitem class="fqdomainname">svn.FreeBSD.org</systemitem><filename>/doc</filename>
+ (see also <xref linkend="svn-getting-started-doc-layout"/>).</entry>
<entry><emphasis><literal>ports/</literal> Subversion
- <entry><literal>svn+ssh://</literal><hostid
- role="fqdn">svn.FreeBSD.org</hostid><filename>/ports</filename>
- (see also <xref
- linkend="svn-getting-started-ports-layout"/>).</entry>
+ <entry><literal>svn+ssh://</literal><systemitem class="fqdomainname">svn.FreeBSD.org</systemitem><filename>/ports</filename>
+ (see also <xref linkend="svn-getting-started-ports-layout"/>).</entry>
@@ -115,10 +106,10 @@
project repository has its own -developers and
-committers mailing lists. Archives for these lists may
be found in files
- <filename>/home/mail/<replaceable>repository-name</replaceable>-developers-archive</filename>
+ <filename>/home/mail/repository-name-developers-archive</filename>
- <filename>/home/mail/<replaceable>repository-name</replaceable>-committers-archive</filename>
- on the <hostid role="domainname">FreeBSD.org</hostid>
+ <filename>/home/mail/repository-name-committers-archive</filename>
+ on the <systemitem class="fqdomainname">FreeBSD.org</systemitem>
@@ -127,7 +118,7 @@
<entry><emphasis>Core Team monthly
- on the <hostid role="domainname">FreeBSD.org</hostid>
+ on the <systemitem class="fqdomainname">FreeBSD.org</systemitem>
@@ -135,7 +126,7 @@
<entry><emphasis>Ports Management Team monthly
- on the <hostid role="domainname">FreeBSD.org</hostid>
+ on the <systemitem class="fqdomainname">FreeBSD.org</systemitem>
@@ -159,25 +150,23 @@
- <para><ulink url="&url.base;/internal/">&os;
- Project Internal Pages</ulink></para>
+ <para><link xlink:href="&url.base;/internal/">&os;
+ Project Internal Pages</link></para>
- <para><ulink
- url="&url.base;/internal/machines.html">&os; Project
- Hosts</ulink></para>
+ <para><link xlink:href="&url.base;/internal/machines.html">&os; Project
+ Hosts</link></para>
- <para><ulink
- url="&url.base;/administration.html">&os; Project
- Administrative Groups</ulink></para>
+ <para><link xlink:href="&url.base;/administration.html">&os; Project
+ Administrative Groups</link></para>
- <sect1 id="committer.types">
+ <sect1 xml:id="committer.types">
<title>Commit Bit Types</title>
<para>The &os; repository has a number of components which,
@@ -274,7 +263,7 @@
- <sect1 id="subversion-primer">
+ <sect1 xml:id="subversion-primer">
<title>Subversion Primer</title>
<para>It is assumed that you are already familiar with the basic
@@ -284,13 +273,12 @@
May 2012 and the <literal>ports</literal> tree as of July
- <para><ulink url="http://wiki.freebsd.org/SubversionMissing">There
+ <para><link xlink:href="http://wiki.freebsd.org/SubversionMissing">There
is a list of things missing in Subversion when compared to
- CVS</ulink>. The notes at <ulink
- url="http://people.freebsd.org/~peter/svn_notes.txt"></ulink>
+ CVS</link>. The notes at <uri xlink:href="http://people.freebsd.org/~peter/svn_notes.txt">http://people.freebsd.org/~peter/svn_notes.txt</uri>
might also be useful.</para>
- <sect2 id="svn-intro">
+ <sect2 xml:id="svn-intro">
<para>The &os; source repository switched from
@@ -310,8 +298,8 @@
The most notable change is the location of the
&os;&nbsp;website <literal>www</literal> tree, which has
been moved from
- <literal>www/<replaceable>lang</replaceable>/</literal> to
- <literal>head/<replaceable>lang</replaceable>/htdocs/</literal>.</para>
+ <literal>www/lang/</literal> to
+ <literal>head/lang/htdocs/</literal>.</para>
<para>The &os; <literal>ports</literal> repository switched
@@ -386,13 +374,13 @@
&prompt.root; <userinput>make clean install</userinput></screen>
- <sect2 id="svn-getting-started">
+ <sect2 xml:id="svn-getting-started">
<title>Getting Started</title>
<para>There are a few ways to obtain a working copy of the tree
from Subversion. This section will explain them.</para>
- <sect3 id="svn-getting-started-direct-checkout">
+ <sect3 xml:id="svn-getting-started-direct-checkout">
<title>Direct Checkout</title>
<para>The first is to check out directly from the main
@@ -421,8 +409,7 @@
<para>The above command will check out a
- <literal>CURRENT</literal> source tree as <filename
- class="directory"><replaceable>/usr/src/</replaceable></filename>,
+ <literal>CURRENT</literal> source tree as <filename>/usr/src/</filename>,
which can be any target directory on the local filesystem.
Omitting the final argument of that command causes the
working copy, in this case, to be named <quote>head</quote>,
@@ -459,7 +446,7 @@
- <sect3 id="svn-getting-started-checkout-from-a-mirror">
+ <sect3 xml:id="svn-getting-started-checkout-from-a-mirror">
<title>Checkout from a Mirror</title>
<para>Check out a working copy from a mirror by
@@ -486,7 +473,7 @@
information on how to set one up.</para>
- <sect3 id="svn-getting-started-base-layout">
+ <sect3 xml:id="svn-getting-started-base-layout">
<title><literal>RELENG_*</literal> Branches and General
@@ -512,19 +499,19 @@
which corresponds to
- <literal>RELENG_<replaceable>n</replaceable></literal>.</para>
+ <literal>RELENG_n</literal>.</para>
which corresponds to
- <literal>RELENG_<replaceable>n_n</replaceable></literal>.</para>
+ <literal>RELENG_n_n</literal>.</para>
which corresponds to
- <literal>RELENG_<replaceable>n_n_n</replaceable>_RELEASE</literal>.</para>
+ <literal>RELENG_n_n_n_RELEASE</literal>.</para>
@@ -546,7 +533,7 @@
- <sect3 id="svn-getting-started-doc-layout">
+ <sect3 xml:id="svn-getting-started-doc-layout">
<title>&os; Documentation Project Branches and
@@ -587,7 +574,7 @@
- <sect3 id="svn-getting-started-ports-layout">
+ <sect3 xml:id="svn-getting-started-ports-layout">
<title>&os; Ports Tree Branches and Layout</title>
<para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
@@ -603,7 +590,7 @@
which corresponds to
- <literal>RELENG_<replaceable>n_n_n</replaceable></literal>
+ <literal>RELENG_n_n_n</literal>
is used to merge back security updates in preparation
for a release.</para>
@@ -611,7 +598,7 @@
which corresponds to
- <literal>RELEASE_<replaceable>n_n_n</replaceable></literal>
+ <literal>RELEASE_n_n_n</literal>
represents a release tag of the ports tree.</para>
@@ -624,13 +611,13 @@
- <sect2 id="svn-daily-use">
+ <sect2 xml:id="svn-daily-use">
<title>Daily Use</title>
<para>This section will explain how to perform common day-to-day
operations with Subversion.</para>
- <sect3 id="svn-daily-use-help">
+ <sect3 xml:id="svn-daily-use-help">
<para><acronym>SVN</acronym> has built in help documentation.
@@ -639,11 +626,11 @@
<screen>&prompt.user; <userinput>svn help</userinput></screen>
<para>Additional information can be found in the
- <ulink url="http://svnbook.red-bean.com/">Subversion
- Book</ulink>.</para>
+ <link xlink:href="http://svnbook.red-bean.com/">Subversion
+ Book</link>.</para>
- <sect3 id="svn-daily-use-checkout">
+ <sect3 xml:id="svn-daily-use-checkout">
<para>As seen earlier, to check out the &os; head
@@ -706,7 +693,7 @@
- <sect3 id="svn-daily-use-anonymous-checkout">
+ <sect3 xml:id="svn-daily-use-anonymous-checkout">
<title>Anonymous Checkout</title>
<para>It is possible to anonymously check out the &os;
@@ -714,25 +701,24 @@
read-only tree that can be updated, but not committed back
to the main repository. To do this, use the following command:</para>
- <screen>&prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/base/head /usr/src</userinput></screen>
+ <screen>&prompt.user; <userinput>svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src</userinput></screen>
<para>Select the closest mirror and verify the mirror server
- certificate from the list of <ulink
- url="&url.books.handbook;/svn-mirrors.html">Subversion
- mirror sites</ulink>.</para>
+ certificate from the list of <link xlink:href="&url.books.handbook;/svn-mirrors.html">Subversion
+ mirror sites</link>.</para>
- <sect3 id="svn-daily-use-updating-the-tree">
+ <sect3 xml:id="svn-daily-use-updating-the-tree">
<title>Updating the Tree</title>
<para>To update a working copy to either the latest revision,
or a specific revision:</para>
<screen>&prompt.user; <userinput>svn update</userinput>
-&prompt.user; <userinput>svn update -<replaceable>r12345</replaceable></userinput></screen>
+&prompt.user; <userinput>svn update -r12345</userinput></screen>
- <sect3 id="svn-daily-use-status">
+ <sect3 xml:id="svn-daily-use-status">
<para>To view the local changes that have been made to the
@@ -746,7 +732,7 @@
<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
- <sect3 id="svn-daily-use-editing-and-committing">
+ <sect3 xml:id="svn-daily-use-editing-and-committing">
<title>Editing and Committing</title>
<para>Unlike Perforce, <acronym>SVN</acronym> does not need to
@@ -758,13 +744,11 @@
<screen>&prompt.user; <userinput>svn commit</userinput></screen>
- <para>To commit all changes in, for example, <filename
- class="directory"><replaceable>lib/libfetch/</replaceable></filename>
- and <filename
- class="directory"><replaceable>usr/bin/fetch/</replaceable></filename>
+ <para>To commit all changes in, for example, <filename>lib/libfetch/</filename>
+ and <filename>usr/bin/fetch/</filename>
in a single operation:</para>
- <screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn commit lib/libfetch usr/bin/fetch</userinput></screen>
<para>There is also a commit wrapper for the ports tree to
handle the properties and sanity checking your
@@ -774,15 +758,13 @@
- <sect3 id="svn-daily-use-adding-and-removing">
+ <sect3 xml:id="svn-daily-use-adding-and-removing">
<title>Adding and Removing Files</title>
- <para>Before adding files, get a copy of <ulink
- url="http://people.freebsd.org/~peter/auto-props.txt">auto-props.txt</ulink>
- (there is also a <ulink
- url="http://people.freebsd.org/~beat/cvs2svn/auto-props.txt">
- ports tree specific version</ulink>)
+ <para>Before adding files, get a copy of <link xlink:href="http://people.freebsd.org/~peter/auto-props.txt">auto-props.txt</link>
+ (there is also a <link xlink:href="http://people.freebsd.org/~beat/cvs2svn/auto-props.txt">
+ ports tree specific version</link>)
and add it to <filename>~/.subversion/config</filename>
according to the instructions in the file. If you added
something before reading this, use
@@ -798,7 +780,7 @@
add</command>. To add a file named
<emphasis>foo</emphasis>, edit it, then:</para>
- <screen>&prompt.user; <userinput>svn add <replaceable>foo</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn add foo</userinput></screen>
<para>Most new source files should include a
@@ -814,7 +796,7 @@
<para>Files can be removed with <command>svn
- <screen>&prompt.user; <userinput>svn remove <replaceable>foo</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn remove foo</userinput></screen>
<para>Subversion does not require deleting the file before
using <command>svn rm</command>, and indeed complains if
@@ -823,30 +805,30 @@
<para>It is possible to add directories with
<command>svn add</command>:</para>
- <screen>&prompt.user; <userinput>mkdir <replaceable>bar</replaceable></userinput>
-&prompt.user; <userinput>svn add <replaceable>bar</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>mkdir bar</userinput>
+&prompt.user; <userinput>svn add bar</userinput></screen>
<para>Although <command>svn mkdir</command> makes this easier
by combining the creation of the directory and the adding of
- <screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn mkdir bar</userinput></screen>
<para>Like files, directories are removed with
<command>svn rm</command>. There is no separate command
specifically for removing directories.</para>
- <screen>&prompt.user; <userinput>svn rm <replaceable>bar</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn rm bar</userinput></screen>
- <sect3 id="svn-daily-use-copying-and-moving">
+ <sect3 xml:id="svn-daily-use-copying-and-moving">
<title>Copying and Moving Files</title>
<para>This command creates a copy of
<filename>foo.c</filename> named <filename>bar.c</filename>,
with the new file also under version control:</para>
- <screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn copy foo.c bar.c</userinput></screen>
<para>The example above is equivalent to:</para>
@@ -855,10 +837,10 @@
<para>To move and rename a file:</para>
- <screen>&prompt.user; <userinput>svn move <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn move foo.c bar.c</userinput></screen>
- <sect3 id="svn-daily-use-log-and-annotate">
+ <sect3 xml:id="svn-daily-use-log-and-annotate">
<title>Log and Annotate</title>
<para><command>svn log</command> shows revisions and commit
@@ -872,7 +854,7 @@
revision for each line of a file.</para>
- <sect3 id="svn-daily-use-diffs">
+ <sect3 xml:id="svn-daily-use-diffs">
<para><command>svn diff</command> displays changes to the
@@ -893,7 +875,7 @@
<screen>&prompt.user; <userinput>svn diff -c179454 .</userinput></screen>
- <sect3 id="svn-daily-use-reverting">
+ <sect3 xml:id="svn-daily-use-reverting">
<para>Local changes (including additions and deletions) can be
@@ -902,7 +884,7 @@
pristine copies of the original version.</para>
- <sect3 id="svn-daily-use-conflicts">
+ <sect3 xml:id="svn-daily-use-conflicts">
<para>If an <command>svn update</command> resulted in a merge
@@ -912,11 +894,11 @@
The simple, not yet deprecated procedure is the
- <screen>&prompt.user; <userinput>svn resolved <replaceable>foo</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn resolved foo</userinput></screen>
<para>However, the preferred procedure is:</para>
- <screen>&prompt.user; <userinput>svn resolve --accept=working <replaceable>foo</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn resolve --accept=working foo</userinput></screen>
<para>The two examples are equivalent. Possible values for
<literal>--accept</literal> are:</para>
@@ -955,7 +937,7 @@
<title>Advanced Use</title>
- <sect3 id="svn-advanced-use-sparse-checkouts">
+ <sect3 xml:id="svn-advanced-use-sparse-checkouts">
<title>Sparse Checkouts</title>
<para><acronym>SVN</acronym> allows
@@ -999,7 +981,7 @@
Thus, given the working copy produced by the previous
- <screen>&prompt.user; <userinput>cd <replaceable>~/freebsd</replaceable></userinput>
+ <screen>&prompt.user; <userinput>cd ~/freebsd</userinput>
&prompt.user; <userinput>svn update --set-depth=immediates .</userinput></screen>
<para>The above command will populate the working copy in
@@ -1011,10 +993,10 @@
<replaceable>head</replaceable> (in this case) to infinity,
and fully populate it:</para>
- <screen>&prompt.user; <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn update --set-depth=infinity head</userinput></screen>
- <sect3 id="svn-advanced-use-direct-operation">
+ <sect3 xml:id="svn-advanced-use-direct-operation">
<title>Direct Operation</title>
<para>Certain operations can be performed directly on the
@@ -1064,7 +1046,7 @@
&prompt.user; <userinput>svn commit stable/8</userinput></screen>
- <sect3 id="svn-advanced-use-merging">
+ <sect3 xml:id="svn-advanced-use-merging">
<title>Merging with <acronym>SVN</acronym></title>
<para>This section deals with merging code from one branch to
@@ -1090,26 +1072,25 @@
<para>It is <emphasis>not</emphasis> inherited. For
- instance, <filename
- class="directory">stable/6/contrib/openpam/</filename>
+ instance, <filename>stable/6/contrib/openpam/</filename>
does not implicitly inherit mergeinfo from
- <filename class="directory">stable/6/</filename>, or
- <filename class="directory">stable/6/contrib/</filename>.
+ <filename>stable/6/</filename>, or
+ <filename>stable/6/contrib/</filename>.
Doing so would make partial checkouts very hard to manage.
Instead, mergeinfo is explicitly propagated down the tree.
For merging something into
- <filename class="directory">branch/foo/bar/</filename>,
+ <filename>branch/foo/bar/</filename>,
the following rules apply:</para>
- <filename class="directory">branch/foo/bar/</filename>
+ <filename>branch/foo/bar/</filename>
does not already have a mergeinfo record, but a direct
ancestor (for instance,
- <filename class="directory">branch/foo/</filename>)
+ <filename>branch/foo/</filename>)
does, then that record will be propagated down to
- <filename class="directory">branch/foo/bar/</filename>
+ <filename>branch/foo/bar/</filename>
before information about the current merge is
@@ -1122,24 +1103,21 @@
<para>If a direct descendant of
- <filename class="directory">branch/foo/bar/</filename>
- (for instance, <filename
- class="directory">branch/foo/bar/baz/</filename>)
+ <filename>branch/foo/bar/</filename>
+ (for instance, <filename>branch/foo/bar/baz/</filename>)
already has a mergeinfo record, information about the
current merge will be propagated down to it.</para>
<para>If you consider the case where a revision changes
- several separate parts of the tree (for example, <filename
- class="directory">branch/foo/bar/</filename> and
- <filename class="directory">branch/foo/quux/</filename>),
+ several separate parts of the tree (for example, <filename>branch/foo/bar/</filename> and
+ <filename>branch/foo/quux/</filename>),
but you only want to merge some of it (for example,
- <filename class="directory">branch/foo/bar/</filename>),
+ <filename>branch/foo/bar/</filename>),
you will see that these rules make sense. If mergeinfo
was propagated up, it would seem like that revision had
- also been merged to <filename
- class="directory">branch/foo/quux/</filename>, when in
+ also been merged to <filename>branch/foo/quux/</filename>, when in
fact it had not been.</para>
@@ -1170,35 +1148,32 @@
<para>Changes to kernel code should be merged to
- <filename class="directory">sys/</filename>. For
+ <filename>sys/</filename>. For
instance, a change to the &man.ichwd.4; driver should
be merged to
- <filename class="directory">sys/</filename>, not
- <filename class="directory">sys/dev/ichwd/</filename>.
+ <filename>sys/</filename>, not
+ <filename>sys/dev/ichwd/</filename>.
Likewise, a change to the TCP/IP stack should be
- merged to <filename class="directory">sys/</filename>,
- not <filename
- class="directory">sys/netinet/</filename>.</para>
+ merged to <filename>sys/</filename>,
+ not <filename>sys/netinet/</filename>.</para>
<para>Changes to code under
- <filename class="directory">etc/</filename> should be
- merged at <filename class="directory">etc/</filename>,
+ <filename>etc/</filename> should be
+ merged at <filename>etc/</filename>,
not below it.</para>
<para>Changes to vendor code (code in
- <filename class="directory">contrib/</filename>,
- <filename class="directory">crypto/</filename> and so
+ <filename>contrib/</filename>,
+ <filename>crypto/</filename> and so
on) should be merged to the directory where vendor
- imports happen. For instance, a change to <filename
- class="directory">crypto/openssl/util/</filename>
- should be merged to <filename
- class="directory">crypto/openssl/</filename>. This
+ imports happen. For instance, a change to <filename>crypto/openssl/util/</filename>
+ should be merged to <filename>crypto/openssl/</filename>. This
is rarely an issue, however, since changes to vendor
code are usually merged wholesale.</para>
@@ -1207,44 +1182,39 @@
<para>Changes to userland programs should as a general
rule be merged to the directory that contains the
Makefile for that program. For instance, a change to
- <filename
- class="directory">usr.bin/xlint/arch/i386/</filename>
- should be merged to <filename
- class="directory">usr.bin/xlint/</filename>.</para>
+ <filename>usr.bin/xlint/arch/i386/</filename>
+ should be merged to <filename>usr.bin/xlint/</filename>.</para>
<para>Changes to userland libraries should as a general
rule be merged to the directory that contains the
Makefile for that library. For instance, a change to
- <filename class="directory">lib/libc/gen/</filename>
- should be merged to <filename
- class="directory">lib/libc/</filename>.</para>
+ <filename>lib/libc/gen/</filename>
+ should be merged to <filename>lib/libc/</filename>.</para>
<para>There may be cases where it makes sense to deviate
from the rules for userland programs and libraries.
- For instance, everything under <filename
- class="directory">lib/libpam/</filename> is merged
- to <filename class="directory">lib/libpam/</filename>,
+ For instance, everything under <filename>lib/libpam/</filename> is merged
+ to <filename>lib/libpam/</filename>,
even though the library itself and all of the modules
each have their own Makefile.</para>
<para>Changes to manual pages should be merged to
- <filename
- class="directory">share/man/man<replaceable>N</replaceable>/</filename>,
+ <filename>share/man/manN/</filename>,
for the appropriate value of
<para>Other changes to
- <filename class="directory">share/</filename> should
+ <filename>share/</filename> should
be merged to the appropriate subdirectory and not to
- <filename class="directory">share/</filename>
+ <filename>share/</filename>
@@ -1275,15 +1245,13 @@
in one go.</para>
<para>The source will almost invariably be the same as the
- target. For instance, you will always merge <filename
- class="directory">stable/7/lib/libc/</filename> from
- <filename class="directory">head/lib/libc/</filename>.
+ target. For instance, you will always merge <filename>stable/7/lib/libc/</filename> from
+ <filename>head/lib/libc/</filename>.
The only exception would be when merging changes to code
that has moved in the source branch but not in the parent
branch. For instance, a change to &man.pkill.1; would be
- merged from <filename
- class="directory">bin/pkill/</filename> in head to
- <filename class="directory">usr.bin/pkill/</filename> in
+ merged from <filename>bin/pkill/</filename> in head to
+ <filename>usr.bin/pkill/</filename> in
@@ -1381,14 +1349,12 @@ $target - head/$source:$P,$Q,$R</screen>
<para>As a practical example, consider the following
scenario: The changes to <filename>netmap.4</filename>
in r238987 is to be merged from CURRENT to 9-STABLE.
- The file resides in <filename
- class="directory">head/share/man/man4</filename> and
+ The file resides in <filename>head/share/man/man4</filename> and
according to <xref linkend="svn-advanced-use-merging"/>
this is also where to do the merge. Note that in this
example all paths are relative to the top of the svn
repository. For more information on the directory
- layout, see <xref
- linkend="svn-getting-started-base-layout"/>.</para>
+ layout, see <xref linkend="svn-getting-started-base-layout"/>.</para>
<para>The first step is to inspect the existing
@@ -1414,13 +1380,13 @@ U stable/9/share/man/man4/netmap.4
<title>Merging into the Kernel
- (<filename class="directory">sys/</filename>)</title>
+ (<filename>sys/</filename>)</title>
<para>As stated above, merging into the kernel is
different from merging in the rest of the tree. In many
ways merging to the kernel is simpler because there is
always the same merge target
- (<filename class="directory">sys/</filename>).</para>
+ (<filename>sys/</filename>).</para>
<para>Once <command>svn merge</command> has been executed,
<command>svn diff</command> has to be run on the
@@ -1465,7 +1431,7 @@ U stable/9/share/man/man4/netmap.4
- <sect3 id="svn-advanced-use-vendor-imports">
+ <sect3 xml:id="svn-advanced-use-vendor-imports">
<title>Vendor Imports with <acronym>SVN</acronym></title>
@@ -1535,7 +1501,7 @@ U stable/9/share/man/man4/netmap.4
<para>To flatten the <literal>pf</literal> tree:</para>
- <screen>&prompt.user; <userinput>cd <replaceable>vendor/pf/dist/contrib/pf</replaceable></userinput>
+ <screen>&prompt.user; <userinput>cd vendor/pf/dist/contrib/pf</userinput>
&prompt.user; <userinput>svn mv $(svn list) ../..</userinput>
&prompt.user; <userinput>cd ../..</userinput>
&prompt.user; <userinput>svn rm contrib</userinput>
@@ -1580,8 +1546,8 @@ U stable/9/share/man/man4/netmap.4
that corresponds to the last related change to the
vendor tree, prior to importing new sources:</para>
- <screen>&prompt.user; <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput>
-&prompt.user; <userinput>svn merge --record-only svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist@180876</replaceable> .</userinput>
+ <screen>&prompt.user; <userinput>cd head/contrib/pf</userinput>
+&prompt.user; <userinput>svn merge --record-only svn+ssh://svn.freebsd.org/base/vendor/pf/dist@180876 .</userinput>
&prompt.user; <userinput>svn commit</userinput></screen>
@@ -1611,10 +1577,10 @@ U stable/9/share/man/man4/netmap.4
about to be imported is recommended, to facilitate the
- <screen>&prompt.user; <userinput>cd <replaceable>vendor/pf/dist</replaceable></userinput>
-&prompt.user; <userinput>svn list -R | grep -v '/$' | sort >../old</userinput>
-&prompt.user; <userinput>cd <replaceable>../pf-4.3</replaceable></userinput>
-&prompt.user; <userinput>find . -type f | cut -c 3- | sort >../new</userinput></screen>
+ <screen>&prompt.user; <userinput>cd vendor/pf/dist</userinput>
+&prompt.user; <userinput>svn list -R | grep -v '/$' | sort &gt;../old</userinput>
+&prompt.user; <userinput>cd ../pf-4.3</userinput>
+&prompt.user; <userinput>find . -type f | cut -c 3- | sort &gt;../new</userinput></screen>
<para>With these two files,
<command>comm -23 ../old ../new</command> will list
@@ -1628,14 +1594,14 @@ U stable/9/share/man/man4/netmap.4
<title>Importing into the Vendor Tree</title>
<para>Now, the sources must be copied into
- <filename><replaceable>dist</replaceable></filename> and
+ <filename>dist</filename> and
the <command>svn add</command> and
<command>svn rm</command> commands should be used as
- <screen>&prompt.user; <userinput>cd <replaceable>vendor/pf/pf-4.3</replaceable></userinput>
+ <screen>&prompt.user; <userinput>cd vendor/pf/pf-4.3</userinput>
&prompt.user; <userinput>tar cf - . | tar xf - -C ../dist</userinput>
-&prompt.user; <userinput>cd <replaceable>../dist</replaceable></userinput>
+&prompt.user; <userinput>cd ../dist</userinput>
&prompt.user; <userinput>comm -23 ../old ../new | xargs svn rm</userinput>
&prompt.user; <userinput>comm -13 ../old ../new | xargs svn --parents add</userinput></screen>
@@ -1667,11 +1633,11 @@ U stable/9/share/man/man4/netmap.4
future reference. The best and quickest way to do this
is directly in the repository:</para>
- <screen>&prompt.user; <userinput>svn cp svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/4.3</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn cp svn+ssh://svn.freebsd.org/base/vendor/pf/dist svn+ssh://svn.freebsd.org/base/vendor/pf/4.3</userinput></screen>
<para>Once that is complete, <command>svn up</command> the
working copy of
- <filename><replaceable>vendor/pf</replaceable></filename>
+ <filename>vendor/pf</filename>
to get the new tag, although this is rarely
@@ -1679,7 +1645,7 @@ U stable/9/share/man/man4/netmap.4
<command>svn:mergeinfo</command> results must be
- <screen>&prompt.user; <userinput>cd <replaceable>vendor/pf</replaceable></userinput>
+ <screen>&prompt.user; <userinput>cd vendor/pf</userinput>
&prompt.user; <userinput>svn cp dist 4.3</userinput>
&prompt.user; <userinput>svn propdel svn:mergeinfo -R 4.3</userinput></screen>
@@ -1688,9 +1654,9 @@ U stable/9/share/man/man4/netmap.4
<title>Merging to Head</title>
- <screen>&prompt.user; <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput>
+ <screen>&prompt.user; <userinput>cd head/contrib/pf</userinput>
&prompt.user; <userinput>svn up</userinput>
-&prompt.user; <userinput>svn merge --accept=postpone svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> .</userinput></screen>
+&prompt.user; <userinput>svn merge --accept=postpone svn+ssh://svn.freebsd.org/base/vendor/pf/dist .</userinput></screen>
<para>The <literal>--accept=postpone</literal> tells
Subversion that it should not complain because merge
@@ -1705,7 +1671,7 @@ U stable/9/share/man/man4/netmap.4
main tree. To check diffs against the vendor
- <screen>&prompt.user; <userinput>svn diff --no-diff-deleted --old=svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> --new=.</userinput></screen>
+ <screen>&prompt.user; <userinput>svn diff --no-diff-deleted --old=svn+ssh://svn.freebsd.org/base/vendor/pf/dist --new=.</userinput></screen>
<para>The <literal>--no-diff-deleted</literal> tells
Subversion not to complain about files that are in the
@@ -1745,24 +1711,24 @@ U stable/9/share/man/man4/netmap.4
<para>This section is an example of importing and tagging
<application>byacc</application> into
- <filename class="directory">head</filename>.</para>
+ <filename>head</filename>.</para>
<para>First, prepare the directory in
- <filename class="directory">vendor</filename>:</para>
+ <filename>vendor</filename>:</para>
- <screen>&prompt.user; <userinput>svn co --depth immediates <replaceable>$FSVN/vendor</replaceable></userinput>
-&prompt.user; <userinput>cd <replaceable>vendor</replaceable></userinput>
-&prompt.user; <userinput>svn mkdir <replaceable>byacc</replaceable></userinput>
-&prompt.user; <userinput>svn mkdir <replaceable>byacc/dist</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn co --depth immediates $FSVN/vendor</userinput>
+&prompt.user; <userinput>cd vendor</userinput>
+&prompt.user; <userinput>svn mkdir byacc</userinput>
+&prompt.user; <userinput>svn mkdir byacc/dist</userinput></screen>
<para>Now, import the sources into the
- <filename class="directory">dist</filename> directory.
+ <filename>dist</filename> directory.
Once the files are in place, <command>svn add</command>
the new ones, then <command>svn commit</command> and tag
the imported version. To save time and bandwidth,
direct remote committing and tagging is possible:</para>
- <screen>&prompt.user; <userinput>svn cp -m <replaceable>"Tag byacc 20120115"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/vendor/byacc/20120115</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn cp -m "Tag byacc 20120115" $FSVN/vendor/byacc/dist $FSVN/vendor/byacc/20120115</userinput></screen>
@@ -1771,7 +1737,7 @@ U stable/9/share/man/man4/netmap.4
<para>Due to this being a new file, copy it for the
- <screen>&prompt.user; <userinput>svn cp -m <replaceable>"Import byacc to contrib"</replaceable> <replaceable>$FSVN/vendor/byacc/dist</replaceable> <replaceable>$FSVN/head/contrib/byacc</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>svn cp -m "Import byacc to contrib" $FSVN/vendor/byacc/dist $FSVN/head/contrib/byacc</userinput></screen>
<para>Working normally on newly imported sources is still
@@ -1779,7 +1745,7 @@ U stable/9/share/man/man4/netmap.4
- <sect3 id="svn-advanced-use-reverting-a-commit">
+ <sect3 xml:id="svn-advanced-use-reverting-a-commit">
<title>Reverting a Commit</title>
<para>Reverting a commit to a previous version is fairly
@@ -1822,7 +1788,7 @@ U stable/9/share/man/man4/netmap.4
cause history to be lost.</para>
- <sect3 id="svn-advanced-use-fixing-mistakes">
+ <sect3 xml:id="svn-advanced-use-fixing-mistakes">
<title>Fixing Mistakes</title>
<para>While we can do surgery in an emergency, do not plan on
@@ -1848,7 +1814,7 @@ U stable/9/share/man/man4/netmap.4
This is a waste.</para>
- <sect3 id="svn-advanced-use-setting-up-svnsync">
+ <sect3 xml:id="svn-advanced-use-setting-up-svnsync">
<title>Setting up a <application>svnsync</application>
@@ -1872,7 +1838,7 @@ U stable/9/share/man/man4/netmap.4
<screen>&prompt.user; <userinput>fetch ftp://ftp.freebsd.org/pub/FreeBSD/development/subversion/svnmirror-base-r221445.tar.xz</userinput></screen>
<para>Once you have the file, extract it to somewhere like
- <filename class="directory">home/svnmirror/base/</filename>.
+ <filename>home/svnmirror/base/</filename>.
Then, update it, so that it fetches changes since the last
revision in the archive:</para>
@@ -1893,7 +1859,7 @@ U stable/9/share/man/man4/netmap.4
<para>Use <literal>propset</literal> to change things.</para>
- <sect3 id="svn-advanced-use-committing-high-ascii-data">
+ <sect3 xml:id="svn-advanced-use-committing-high-ascii-data">
<title>Committing High-<acronym>ASCII</acronym> Data</title>
<para>Files that have high-<acronym>ASCII</acronym> bits are
@@ -1911,7 +1877,7 @@ U stable/9/share/man/man4/netmap.4
<screen>&prompt.user; <userinput>svn propset fbsd:notbinary yes foo.data</userinput></screen>
- <sect3 id="svn-advanced-use-maintaining-a-project-branch">
+ <sect3 xml:id="svn-advanced-use-maintaining-a-project-branch">
<title>Maintaining a Project Branch</title>
<para>A project branch is one that is synced to head (or
@@ -1926,17 +1892,14 @@ U stable/9/share/man/man4/netmap.4
is dead (although you can have a new branch with the same
name after you delete the branch if you want).</para>
- <para>As per <ulink
- url="http://people.freebsd.org/~peter/svn_notes.txt">http://people.freebsd.org/~peter/svn_notes.txt</ulink>,
+ <para>As per <link xlink:href="http://people.freebsd.org/~peter/svn_notes.txt">http://people.freebsd.org/~peter/svn_notes.txt</link>,
work that is intended to be merged back into HEAD should be
- in <filename class="directory">base/projects/</filename>.
+ in <filename>base/projects/</filename>.
If you are doing work that is beneficial to the &os;
community in some way but not intended to be merged directly
- back into HEAD then the proper location is <filename
- class="directory">base/user/<replaceable>your-name</replaceable>/</filename>.
- <ulink
- url="http://svnweb.freebsd.org/base/projects/GUIDELINES.txt">This
- page</ulink> contains further details.</para>
+ back into HEAD then the proper location is <filename>base/user/your-name/</filename>.
+ <link xlink:href="http://svnweb.freebsd.org/base/projects/GUIDELINES.txt">This
+ page</link> contains further details.</para>
<para>To create a project branch:</para>
@@ -1983,7 +1946,7 @@ ControlPersist yes</screen>
<para>Checking out a working copy with a stock Subversion client
without &os;-specific patches
- (<makevar>OPTIONS_SET=FREEBSD_TEMPLATE</makevar>) will mean
+ (<varname>OPTIONS_SET=FREEBSD_TEMPLATE</varname>) will mean
that <literal>&dollar;FreeBSD&dollar;</literal> tags will not
be expanded. Once the correct version has been installed,
trick Subversion into expanding them like so:</para>
@@ -1995,7 +1958,7 @@ ControlPersist yes</screen>
- <sect1 id="conventions">
+ <sect1 xml:id="conventions">
<title>Conventions and Traditions</title>
<para>As a new developer there are a number of things you should
@@ -2003,14 +1966,14 @@ ControlPersist yes</screen>
you are not a committer, e.g., have GNATS-only access, then your
mentor needs to do these things for you.)</para>
- <sect2 id="conventions-committers">
+ <sect2 xml:id="conventions-committers">
<title>Guidelines for Committers</title>
<para>The <literal>.ent</literal>, <literal>.xml</literal>,
and <literal>.xml</literal> files listed below exist in the
&os; Documentation Project SVN repository at
- <hostid role="fqdn">svn.FreeBSD.org/doc/</hostid>.</para>
+ <systemitem class="fqdomainname">svn.FreeBSD.org/doc/</systemitem>.</para>
<para>If you have been given commit rights to one or more of the
@@ -2048,9 +2011,8 @@ ControlPersist yes</screen>
<para>Add yourself to the <quote>Developers</quote> section
- of the <ulink
- url="&url.articles.contributors;/index.html">Contributors
- List</ulink>
+ of the <link xlink:href="&url.articles.contributors;/index.html">Contributors
+ List</link>
and remove yourself from the
<quote>Additional Contributors</quote> section
@@ -2077,8 +2039,7 @@ ControlPersist yes</screen>
<para>&a.des.email; has written a shell script
(<filename>head/share/pgpkeys/addkey.sh</filename>) to
- make this extremely simple. See the <ulink
- url="http://svnweb.FreeBSD.org/doc/head/share/pgpkeys/README">README</ulink>
+ make this extremely simple. See the <link xlink:href="http://svnweb.FreeBSD.org/doc/head/share/pgpkeys/README">README</link>
file for more information.</para>
@@ -2086,15 +2047,14 @@ ControlPersist yes</screen>
in the Handbook, since the key may be required for
positive identification of a committer, e.g., by the
&a.admins; for account recovery. A complete keyring of
- <hostid role="domainname">FreeBSD.org</hostid> users is
- available for download from <ulink
- url="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</ulink>.</para>
+ <systemitem class="fqdomainname">FreeBSD.org</systemitem> users is
+ available for download from <link xlink:href="&url.base;/doc/pgpkeyring.txt">http://www.FreeBSD.org/doc/pgpkeyring.txt</link>.</para>
<para>Add an entry for yourself to
- <filename>src/share/misc/committers-<replaceable>repository</replaceable>.dot</filename>,
+ <filename>src/share/misc/committers-repository.dot</filename>,
where repository is either doc, ports or src, depending on
the commit privileges you obtained.</para>
@@ -2111,12 +2071,10 @@ ControlPersist yes</screen>
<para>If you already have an account at the
- <ulink url="http://wiki.freebsd.org">&os; wiki</ulink>,
- make sure your mentor moves you from the <ulink
- url="http://wiki.freebsd.org/ContributorsGroup">Contributors
- group</ulink> to the <ulink
- url="http://wiki.freebsd.org/DevelopersGroup">Developers
- group</ulink>. Otherwise, consider signing up for an
+ <link xlink:href="http://wiki.freebsd.org">&os; wiki</link>,
+ make sure your mentor moves you from the <link xlink:href="http://wiki.freebsd.org/ContributorsGroup">Contributors
+ group</link> to the <link xlink:href="http://wiki.freebsd.org/DevelopersGroup">Developers
+ group</link>. Otherwise, consider signing up for an
account so you can publish projects and ideas you are
working on.</para>
@@ -2124,10 +2082,10 @@ ControlPersist yes</screen>
<para>Once you get access to the wiki, you may add yourself
to the
- <ulink url="http://wiki.freebsd.org/HowWeGotHere">How We
- Got Here</ulink> and
- <ulink url="http://wiki.freebsd.org/IrcNicks">Irc
- Nicks</ulink> pages.</para>
+ <link xlink:href="http://wiki.freebsd.org/HowWeGotHere">How We
+ Got Here</link> and
+ <link xlink:href="http://wiki.freebsd.org/IrcNicks">Irc
+ Nicks</link> pages.</para>
@@ -2146,7 +2104,7 @@ ControlPersist yes</screen>
- <sect2 id="conventions-everyone">
+ <sect2 xml:id="conventions-everyone">
<title>Guidelines for Everyone</title>
<para>Whether or not you have commit rights:</para>
@@ -2164,8 +2122,8 @@ ControlPersist yes</screen>
- <para>Log into <hostid>hub.FreeBSD.org</hostid> and create a
- <filename>/var/forward/<replaceable>user</replaceable></filename>
+ <para>Log into <systemitem>hub.FreeBSD.org</systemitem> and create a
+ <filename>/var/forward/user</filename>
(where <replaceable>user</replaceable> is your username)
file containing the e-mail address where you want mail
addressed to
@@ -2173,7 +2131,7 @@ ControlPersist yes</screen>
forwarded. This includes all of the commit messages as
well as any other mail addressed to the &a.committers; and
the &a.developers;. Really large mailboxes which have
- taken up permanent residence on <hostid>hub</hostid> often
+ taken up permanent residence on <systemitem>hub</systemitem> often
get <quote>accidentally</quote> truncated without warning,
so forward it or read it and you will not lose it.</para>
@@ -2187,7 +2145,7 @@ ControlPersist yes</screen>
checks turned off for your email you can place a file
named <filename>.spam_lover</filename> in your home
directory on
- <hostid role="fqdn">freefall.FreeBSD.org</hostid> to
+ <systemitem class="fqdomainname">freefall.FreeBSD.org</systemitem> to
disable the checks for your email.</para>
@@ -2200,7 +2158,7 @@ ControlPersist yes</screen>
- <sect2 id="mentors">
+ <sect2 xml:id="mentors">
<para>All new developers also have a mentor assigned to them for
@@ -2220,7 +2178,7 @@ ControlPersist yes</screen>
- <sect1 id="pref-license">
+ <sect1 xml:id="pref-license">
<title>Preferred License for New Files</title>
<para>Currently the &os; Project suggests and uses the following
@@ -2285,7 +2243,7 @@ ControlPersist yes</screen>
brought to the attention of the core team.</para>
- <sect1 id="developer.relations">
+ <sect1 xml:id="developer.relations">
<title>Developer Relations</title>
<para>If you are working directly on your own code or on code
@@ -2296,11 +2254,11 @@ ControlPersist yes</screen>
areas, to our shame), the same applies. If, however, you are
about to modify something which is clearly being actively
maintained by someone else (and it is only by watching the
- <literal><replaceable>repository</replaceable>-committers</literal>
+ <literal>repository-committers</literal>
mailing list that you can really get a feel for just what is and
is not) then consider sending the change to them instead, just
as you would have before becoming a committer. For ports, you
- should contact the listed <makevar>MAINTAINER</makevar> in the
+ should contact the listed <varname>MAINTAINER</varname> in the
<filename>Makefile</filename>. For other parts of the
repository, if you are unsure who the active maintainer might
be, it may help to scan the revision history to see who has
@@ -2308,7 +2266,7 @@ ControlPersist yes</screen>
shell script that can help determine who the active maintainer
might be. It lists each person who has committed to a given
file along with the number of commits each person has made. It
- can be found on <hostid>freefall</hostid> at
+ can be found on <systemitem>freefall</systemitem> at
<filename>~fenner/bin/whodid</filename>. If your queries go
unanswered or the committer otherwise indicates a lack of
interest in the area affected, go ahead and commit it.</para>
@@ -2347,7 +2305,7 @@ ControlPersist yes</screen>
will review code.</para>
- <sect1 id="if-in-doubt">
+ <sect1 xml:id="if-in-doubt">
<title>If in doubt...</title>
<para>When you are not sure about something, whether it be a
@@ -2386,15 +2344,15 @@ ControlPersist yes</screen>
document it, as others will have the same question.</para>
- <sect1 id="gnats">
+ <sect1 xml:id="gnats">
<para>The &os; Project utilizes
<application>GNATS</application> for tracking bugs and change
requests. Be sure that if you commit a fix or suggestion found
in a <application>GNATS</application> PR, you use
- <command>edit-pr <replaceable>pr-number</replaceable></command>
- on <hostid>freefall</hostid> to close it. It is also considered
+ <command>edit-pr pr-number</command>
+ on <systemitem>freefall</systemitem> to close it. It is also considered
nice if you take time to close any PRs associated with your
commits, if appropriate. You can also make use of
&man.send-pr.1; yourself for proposing any change which you feel
@@ -2406,19 +2364,16 @@ ControlPersist yes</screen>
- <para><ulink
- url="&url.articles.pr-guidelines;/index.html">&os;
- Problem Report Handling Guidelines</ulink></para>
+ <para><link xlink:href="&url.articles.pr-guidelines;/index.html">&os;
+ Problem Report Handling Guidelines</link></para>
- <para><ulink
- url="http://www.cs.utah.edu/csinfo/texinfo/gnats/gnats.html"></ulink></para>
+ <para><uri xlink:href="http://www.cs.utah.edu/csinfo/texinfo/gnats/gnats.html">http://www.cs.utah.edu/csinfo/texinfo/gnats/gnats.html</uri></para>
- <para><ulink
- url="&url.base;/support.html">http://www.FreeBSD.org/support.html</ulink></para>
+ <para><link xlink:href="&url.base;/support.html">http://www.FreeBSD.org/support.html</link></para>
@@ -2436,18 +2391,18 @@ ControlPersist yes</screen>
<title>Mirroring the GNATS Tree</title>
<para>It is possible to mirror the GNATS database by installing
- <filename role="package">net/rsync</filename>, and
+ <package>net/rsync</package>, and
<screen>&prompt.user; <userinput>rsync -va rsync://bit0.us-west.freebsd.org/FreeBSD-bit/gnats .</userinput></screen>
- <sect2 id="gnatstools">
+ <sect2 xml:id="gnatstools">
<title>Useful Tools</title>
<para>Other than <command>edit-pr</command> there are a
collection of tools in <filename>~gnats/tools/</filename>
- on <hostid>freefall</hostid> which can make working with PRs
+ on <systemitem>freefall</systemitem> which can make working with PRs
much easier.</para>
<para><command>open-pr</command>, <command>close-pr</command>,
@@ -2461,15 +2416,15 @@ ControlPersist yes</screen>
<para>For example, to assign PR 123456 to yourself type
- <command>take-pr <replaceable>123456</replaceable></command>.
+ <command>take-pr 123456</command>.
If you want to set the PR to patched awaiting an MFC at
the same time use:
<command>change-pr -t -p -m "awaiting MFC"
- <replaceable>123456</replaceable></command></para>
+ 123456</command></para>
- <sect1 id="people">
+ <sect1 xml:id="people">
<title>Who's Who</title>
<para>Besides the repository meisters, there are other &os;
@@ -2489,12 +2444,10 @@ ControlPersist yes</screen>
to the CVS tree. It is not a conflict resolution body.
The vast majority of documentation related discussion
takes place on the &a.doc;. More details regarding the
- doceng team can be found in its <ulink
- url="http://www.FreeBSD.org/internal/doceng.html">charter</ulink>.
+ doceng team can be found in its <link xlink:href="http://www.FreeBSD.org/internal/doceng.html">charter</link>.
Committers interested in contributing to the documentation
- should familiarize themselves with the <ulink
- url="&url.books.fdp-primer;/index.html">Documentation
- Project Primer</ulink>.</para>
+ should familiarize themselves with the <link xlink:href="&url.books.fdp-primer;/index.html">Documentation
+ Project Primer</link>.</para>
@@ -2546,8 +2499,8 @@ ControlPersist yes</screen>
<para>Dag-Erling is the
- <ulink url="&url.base;/security/">&os; Security
- Officer</ulink> and oversees the
+ <link xlink:href="&url.base;/security/">&os; Security
+ Officer</link> and oversees the
@@ -2621,7 +2574,7 @@ ControlPersist yes</screen>
- <sect1 id="ssh.guide">
+ <sect1 xml:id="ssh.guide">
<title>SSH Quick-Start Guide</title>
@@ -2640,21 +2593,21 @@ ControlPersist yes</screen>
<para>Generate a key pair using &man.ssh-keygen.1;. The key
pair will wind up in your
- <filename><envar>$HOME</envar>/.ssh/</filename>
+ <filename>$HOME/.ssh/</filename>
<para>Send your public key
- (<filename><envar>$HOME</envar>/.ssh/id_dsa.pub</filename>
+ (<filename>$HOME/.ssh/id_dsa.pub</filename>
- <filename><envar>$HOME</envar>/.ssh/id_rsa.pub</filename>)
+ <filename>$HOME/.ssh/id_rsa.pub</filename>)
to the person setting you up as a committer so it can be put
into the
- <filename><replaceable>yourlogin</replaceable></filename>
+ <filename>yourlogin</filename>
file in
- <filename class="directory">/etc/ssh-keys/</filename> on
- <hostid>freefall</hostid>.</para>
+ <filename>/etc/ssh-keys/</filename> on
+ <systemitem>freefall</systemitem>.</para>
@@ -2669,12 +2622,12 @@ ControlPersist yes</screen>
freefall.FreeBSD.org ls /usr</command>.</para>
<para>For more information, see
- <filename role="package">security/openssh</filename>,
+ <package>security/openssh</package>,
&man.ssh.1;, &man.ssh-add.1;, &man.ssh-agent.1;,
&man.ssh-keygen.1;, and &man.scp.1;.</para>
- <sect1 id="coverity">
+ <sect1 xml:id="coverity">
<title>&coverity.prevent; Availability for &os; Committers</title>
<para>In January 2006, the &os;&nbsp;Foundation obtained a license
@@ -2686,7 +2639,7 @@ ControlPersist yes</screen>
<para>&os; developers who are interested in obtaining access to
the analysis results of the automated
<application>Coverity Prevent</application> runs, can find out
- more by logging into <hostid>freefall</hostid> and reading the
+ more by logging into <systemitem>freefall</systemitem> and reading the
relevant bits of the files:</para>
@@ -2731,7 +2684,7 @@ ControlPersist yes</screen>
<para>The &os; Wiki includes a mini-guide for developers who are
interested in working with the &coverity.prevent; analysis
- <ulink url="http://wiki.freebsd.org/CoverityPrevent"></ulink>.
+ <uri xlink:href="http://wiki.freebsd.org/CoverityPrevent">http://wiki.freebsd.org/CoverityPrevent</uri>.
Please note that this mini-guide is only readable by &os;
developers, so if you cannot access this page, you will have to
ask someone to add you to the appropriate Wiki access
@@ -2743,7 +2696,7 @@ ControlPersist yes</screen>
list of the &os; developers.</para>
- <sect1 id="rules">
+ <sect1 xml:id="rules">
<title>The &os; Committers' Big List of Rules</title>
@@ -2762,7 +2715,7 @@ ControlPersist yes</screen>
<para>Respect existing maintainers (if listed in the
- <makevar>MAINTAINER</makevar> field in
+ <varname>MAINTAINER</varname> field in
<filename>Makefile</filename> or in the
<filename>MAINTAINER</filename> file in the top-level
@@ -2861,7 +2814,7 @@ ControlPersist yes</screen>
- <listitem id="respect">
+ <listitem xml:id="respect">
<para>Respect other committers.</para>
<para>This means that you need to treat other committers as
@@ -2960,8 +2913,7 @@ ControlPersist yes</screen>
is to put a maintainer line in the
<filename>Makefile</filename> for any package or subtree
which is being actively maintained by one or more people;
- see <ulink
- url="&url.books.developers-handbook;/policies.html">http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/policies.html</ulink>
+ see <link xlink:href="&url.books.developers-handbook;/policies.html">http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/developers-handbook/policies.html</link>
for documentation on this. Where sections of code have
several maintainers, commits to affected areas by one
maintainer need to be reviewed by at least one other
@@ -2974,8 +2926,7 @@ ControlPersist yes</screen>
<para>Other areas of &os; fall under the control of
someone who manages an overall category of &os;
evolution, such as internationalization or networking.
- See <ulink
- url="&url.base;/administration.html">http://www.FreeBSD.org/administration.html</ulink>
+ See <link xlink:href="&url.base;/administration.html">http://www.FreeBSD.org/administration.html</link>
for more information on this.</para>
@@ -3120,8 +3071,8 @@ ControlPersist yes</screen>
running that code. If you have a change which also may
break another architecture, be sure and test on all
supported architectures. Please refer to the
- <ulink url="http://www.FreeBSD.org/internal/">&os;
- Internal Page</ulink> for a list of available resources.
+ <link xlink:href="http://www.FreeBSD.org/internal/">&os;
+ Internal Page</link> for a list of available resources.
As other architectures are added to the &os; supported
platforms list, the appropriate shared testing resources
will be made available.</para>
@@ -3212,7 +3163,7 @@ ControlPersist yes</screen>
<para>For all on-line manual pages, run <command>manck</command>
(from ports) over the manual page to verify all of the cross
references and file references are correct and that the man
- page has all of the appropriate <makevar>MLINK</makevar>s
+ page has all of the appropriate <varname>MLINK</varname>s
<para>Do not mix style fixes with new functionality. A style
@@ -3257,7 +3208,7 @@ ControlPersist yes</screen>
- <sect1 id="archs">
+ <sect1 xml:id="archs">
<title>Support for Multiple Architectures</title>
<para>&os; is a highly portable operating system intended to
@@ -3454,7 +3405,7 @@ ControlPersist yes</screen>
- <sect1 id="ports">
+ <sect1 xml:id="ports">
<title>Ports Specific FAQ</title>
@@ -3499,14 +3450,13 @@ ControlPersist yes</screen>
<screen>&prompt.root; <userinput>make install</userinput>
&prompt.root; <userinput>make package</userinput>
&prompt.root; <userinput>make deinstall</userinput>
-&prompt.root; <userinput>pkg_add <replaceable>package you built above</replaceable></userinput>
+&prompt.root; <userinput>pkg_add package you built above</userinput>
&prompt.root; <userinput>make deinstall</userinput>
&prompt.root; <userinput>make reinstall</userinput>
&prompt.root; <userinput>make package</userinput></screen>
- <para>The <ulink
- url="&url.books.porters-handbook;/index.html">Porters
- Handbook</ulink> contains more detailed
+ <para>The <link xlink:href="&url.books.porters-handbook;/index.html">Porters
+ Handbook</link> contains more detailed
<para>Use &man.portlint.1; to check the syntax of the
@@ -3516,15 +3466,14 @@ ControlPersist yes</screen>
<para>If the port came from a submitter who has not
contributed to the Project before, add that person's
- name to the <ulink
- url="&url.articles.contributors;/contrib-additional.html">Additional
- Contributors</ulink> section of the &os;
+ name to the <link xlink:href="&url.articles.contributors;/contrib-additional.html">Additional
+ Contributors</link> section of the &os;
Contributors List.</para>
<para>Close the PR if the port came in as a PR. To close
a PR, just do <userinput>edit-pr
- <replaceable>PR#</replaceable></userinput> on
- <hostid>freefall</hostid> and change the
+ PR#</userinput> on
+ <systemitem>freefall</systemitem> and change the
<varname>state</varname> from <constant>open</constant>
to <constant>closed</constant>. You will be asked to
enter a log message and then you are done.</para>
@@ -3574,7 +3523,7 @@ ControlPersist yes</screen>
- <para>Remove the <makevar>SUBDIR</makevar> listing
+ <para>Remove the <varname>SUBDIR</varname> listing
of the port in the parent directory
@@ -3594,8 +3543,7 @@ ControlPersist yes</screen>
<para>Alternatively, you can use the
- <command>rmport</command> script, from <filename
- class="directory">ports/Tools/scripts</filename>.
+ <command>rmport</command> script, from <filename>ports/Tools/scripts</filename>.
This script was written by &a.vd.email;. When sending
questions about this script to the &a.ports;, please
also CC &a.crees.email;, the current maintainer.</para>
@@ -3618,13 +3566,12 @@ ControlPersist yes</screen>
<para>Figure out when the port was removed. Use this
- <ulink
- url="http://people.freebsd.org/~crees/removed_ports/index.xml">list</ulink>
+ <link xlink:href="http://people.freebsd.org/~crees/removed_ports/index.xml">list</link>
and then copy the last living revision of the port:
- <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category
- </replaceable></userinput>
-&prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable>
+ <screen>&prompt.user; <userinput>cd /usr/ports/category
+ </userinput>
+&prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/category/portname/@{YYYY-MM-DD}' portname
Pick a date that is before the removal but after the
@@ -3646,7 +3593,7 @@ ControlPersist yes</screen>
- <para>Restore the <makevar>SUBDIR</makevar> listing of
+ <para>Restore the <varname>SUBDIR</varname> listing of
the port in the parent directory
<filename>Makefile</filename>, and delete the entry
from <filename>ports/MOVED</filename>.</para>
@@ -3729,11 +3676,11 @@ ControlPersist yes</screen>
<para>Upgrade the copied port to the new version.
Remember to change the
- <makevar>LATEST_LINK</makevar> so there are no
+ <varname>LATEST_LINK</varname> so there are no
duplicate ports with the same name. In some
rare cases it may be necessary to change the
- <makevar>PORTNAME</makevar> instead of
- <makevar>LATEST_LINK</makevar>, but this should
+ <varname>PORTNAME</varname> instead of
+ <varname>LATEST_LINK</varname>, but this should
only be done when it is really needed &mdash;
e.g., using an existing port as the base for a
very similar program with a different name, or
@@ -3742,13 +3689,13 @@ ControlPersist yes</screen>
transition from
<filename>textproc/libxml</filename> to
<filename>textproc/libxml2</filename>. In most
- cases, changing <makevar>LATEST_LINK</makevar>
+ cases, changing <varname>LATEST_LINK</varname>
should suffice.</para>
<para>Add the new subdirectory to the
- <makevar>SUBDIR</makevar> listing in the parent
+ <varname>SUBDIR</varname> listing in the parent
directory <filename>Makefile</filename>. You
can run <command>make checksubdirs</command> in
the parent directory to check this.</para>
@@ -3756,7 +3703,7 @@ ControlPersist yes</screen>
<para>If the port changed categories, modify the
- <makevar>CATEGORIES</makevar> line of the port's
+ <varname>CATEGORIES</varname> line of the port's
<filename>Makefile</filename> accordingly</para>
@@ -3792,7 +3739,7 @@ ControlPersist yes</screen>
<para>Remove the old port and the
- old <makevar>SUBDIR</makevar> entry.</para>
+ old <varname>SUBDIR</varname> entry.</para>
@@ -3839,8 +3786,8 @@ ControlPersist yes</screen>
<para>For more information on the background and
policies surrounding a ports freeze, see the
- <ulink url="&url.base;/portmgr/qa.html">Portmgr
- Quality Assurance page</ulink>.</para>
+ <link xlink:href="&url.base;/portmgr/qa.html">Portmgr
+ Quality Assurance page</link>.</para>
@@ -3859,9 +3806,8 @@ ControlPersist yes</screen>
<quote>sweeping changes</quote> are prohibited unless
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
- Implementation page</ulink>.</para>
+ on the <link xlink:href="&url.base;/portmgr/implementation.html">Portmgr
+ Implementation page</link>.</para>
<para>The benefit of a slush as opposed to a complete
freeze is that it allows maintainers to continue adding
@@ -3899,9 +3845,8 @@ ControlPersist yes</screen>
saying, <quote>Go ahead and commit it.</quote></para>
<para>Not everything is allowed to be committed during
- a freeze. Please see the <ulink
- url="&url.base;/portmgr/qa.html">Portmgr Quality
- Assurance page</ulink> for more information.</para>
+ a freeze. Please see the <link xlink:href="&url.base;/portmgr/qa.html">Portmgr Quality
+ Assurance page</link> for more information.</para>
<para>Note that you do not have implicit permission to fix
a port during the freeze just because it is
@@ -3964,9 +3909,8 @@ ControlPersist yes</screen>
- <para>Please see <ulink
- url="&url.books.porters-handbook;/makefile-categories.html#PROPOSING-CATEGORIES">
- Proposing a New Category</ulink> in the Porter's
+ <para>Please see <link xlink:href="&url.books.porters-handbook;/makefile-categories.html#PROPOSING-CATEGORIES">
+ Proposing a New Category</link> in the Porter's
Handbook. Once that procedure has been followed and the
PR has been assigned to &a.portmgr;, it is their
decision whether or not to approve it. If they do, it
@@ -3979,7 +3923,7 @@ ControlPersist yes</screen>
- <para>Update the <makevar>VALID_CATEGORIES</makevar>
+ <para>Update the <varname>VALID_CATEGORIES</varname>
definition in
@@ -4009,11 +3953,11 @@ ControlPersist yes</screen>
<para>Change the port's
- <makevar>CATEGORIES</makevar> (this was the
+ <varname>CATEGORIES</varname> (this was the
point of the exercise, remember?) The new
category should be listed
<emphasis>first</emphasis>. This will help to
- ensure that the <makevar>PKGORIGIN</makevar> is
+ ensure that the <varname>PKGORIGIN</varname> is
@@ -4037,10 +3981,10 @@ ControlPersist yes</screen>
- <para>Check that the <makevar>PKGORIGIN</makevar>s are
+ <para>Check that the <varname>PKGORIGIN</varname>s are
correct. The ports system uses each port's
- <makevar>CATEGORIES</makevar> entry to create its
- <makevar>PKGORIGIN</makevar>, which is used to
+ <varname>CATEGORIES</varname> entry to create its
+ <varname>PKGORIGIN</varname>, which is used to
connect installed packages to the port directory
they were built from. If this entry is wrong,
common port tools like &man.pkg.version.1; and
@@ -4049,28 +3993,28 @@ ControlPersist yes</screen>
<para>To do this, use the
<filename>chkorigin.sh</filename> tool, as follows:
- PORTSDIR=<replaceable>/path/to/ports</replaceable>
+ PORTSDIR=/path/to/ports
sh -e
- <replaceable>/path/to/ports</replaceable>/Tools/scripts/chkorigin.sh</command>.
+ /path/to/ports/Tools/scripts/chkorigin.sh</command>.
This will check <emphasis>every</emphasis> port in
the ports tree, even those not connected to the
build, so you can run it directly after the move
operation. Hint: do not forget to look at the
- <makevar>PKGORIGIN</makevar>s of any slave ports of
+ <varname>PKGORIGIN</varname>s of any slave ports of
the ports you just moved!</para>
<para>On your own local system, test the proposed
changes: first, comment out the
- <makevar>SUBDIR</makevar> entries in the old ports'
+ <varname>SUBDIR</varname> entries in the old ports'
categories' <filename>Makefile</filename>s; then
enable building the new category in
<filename>ports/Makefile</filename>. Run
<command>make checksubdirs</command> in the affected
category directories to check the
- <makevar>SUBDIR</makevar> entries. Next, in the
- <filename class="directory">ports/</filename>
+ <varname>SUBDIR</varname> entries. Next, in the
+ <filename>ports/</filename>
directory, run <command>make index</command>. This
can take over 40 minutes on even modern systems;
however, it is a necessary step to prevent problems
@@ -4096,9 +4040,8 @@ ControlPersist yes</screen>
- <para>the <ulink
- url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">list
- of categories</ulink> in the Porter's
+ <para>the <link xlink:href="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">list
+ of categories</link> in the Porter's
@@ -4125,8 +4068,8 @@ ControlPersist yes</screen>
<para>It is not necessary to manually update the
- <ulink url="&url.base;/ports/index.html">ports web
- pages</ulink> to reflect the new category. This is
+ <link xlink:href="&url.base;/ports/index.html">ports web
+ pages</link> to reflect the new category. This is
now done automatically via your change to
<filename>www/en/ports/categories</filename> and the
daily automated rebuild of
@@ -4146,9 +4089,8 @@ ControlPersist yes</screen>
- <para>the <ulink
- url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">list
- of categories</ulink> in the Porter's
+ <para>the <link xlink:href="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">list
+ of categories</link> in the Porter's
@@ -4170,8 +4112,7 @@ ControlPersist yes</screen>
- <para>First, go check <ulink
- url="http://pointyhat.FreeBSD.org/errorlogs/"></ulink>.
+ <para>First, go check <uri xlink:href="http://pointyhat.FreeBSD.org/errorlogs/">http://pointyhat.FreeBSD.org/errorlogs/</uri>.
There you will find error logs from the latest package
building runs on all supported platforms for the most
recent branches.</para>
@@ -4180,8 +4121,7 @@ ControlPersist yes</screen>
there does not mean it is building correctly. (One of
the dependencies may have failed, for instance.) The
relevant directories are available on
- <hostid>pointyhat</hostid> under <filename
- class="directory">/a/portbuild/&lt;arch&gt;/&lt;major_version&gt;</filename>
+ <systemitem>pointyhat</systemitem> under <filename>/a/portbuild/&lt;arch&gt;/&lt;major_version&gt;</filename>
so feel free to dig around. Each architecture and
version has the following subdirectories:</para>
@@ -4259,7 +4199,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <sect1 id="non-committers">
+ <sect1 xml:id="non-committers">
<title>Issues Specific to Developers Who Are Not
@@ -4280,8 +4220,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <para><link
- linkend="conventions-everyone">Conventions</link></para>
+ <para><link linkend="conventions-everyone">Conventions</link></para>
<para>You should get your mentor to add you to the
@@ -4292,8 +4231,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <para><link
- linkend="developer.relations">Developer
+ <para><link linkend="developer.relations">Developer
@@ -4310,7 +4248,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <sect1 id="google-analytics">
+ <sect1 xml:id="google-analytics">
<title>Information About &ga;</title>
<para>As of December 12, 2012, &ga; was enabled on the
@@ -4319,7 +4257,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
valuable to the &os;&nbsp;Documentation Project, in order to
identify various problems on the &os; website.</para>
- <sect2 id="google-analytics-policy">
+ <sect2 xml:id="google-analytics-policy">
<title>&ga; General Policy</title>
<para>The &os;&nbsp;Project takes visitor privacy very
@@ -4327,8 +4265,8 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
<quote>Do Not Track</quote> header <emphasis>before</emphasis>
fetching the tracking code from Google. For more information,
please see the
- <ulink url="http://www.FreeBSD.org/privacy.html">&os; Privacy
- Policy</ulink>.</para>
+ <link xlink:href="http://www.FreeBSD.org/privacy.html">&os; Privacy
+ Policy</link>.</para>
<para>&ga; access is <emphasis>not</emphasis> arbitrarily
allowed &mdash; access must be requested, voted on by the
@@ -4355,7 +4293,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <sect2 id="google-analytics-data">
+ <sect2 xml:id="google-analytics-data">
<title>Data Available Through &ga;</title>
<para>A few examples of the types of &ga; data available
@@ -4377,7 +4315,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <sect1 id="perks">
+ <sect1 xml:id="perks">
<title>Perks of the Job</title>
<para>Unfortunately, there are not many perks involved with being
@@ -4391,8 +4329,8 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
<para>&os; committers can get a free 4-CD or DVD set at
- conferences from <ulink url="http://www.freebsdmall.com">
- &os; Mall, Inc.</ulink>. The sets are no longer
+ conferences from <link xlink:href="http://www.freebsdmall.com">
+ &os; Mall, Inc.</link>. The sets are no longer
available as a subscription due to the high shipment costs
to countries outside the USA.</para>
@@ -4415,7 +4353,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
- <sect1 id="misc">
+ <sect1 xml:id="misc">
<title>Miscellaneous Questions</title>
@@ -4454,10 +4392,8 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
<literal>ports</literal> trees. The
<literal>src</literal> tree uses SVN and requires more
care because of the <literal>mergeinfo</literal>
- properties. See section 1.4.6 of the <ulink
- url="http://wiki.freebsd.org/SubversionPrimer">Subversion
- Primer</ulink> for details. Refer to <ulink
- url="http://wiki.freebsd.org/SubversionPrimer/Merging">SubversionPrimer/Merging</ulink>
+ properties. See section 1.4.6 of the <link xlink:href="http://wiki.freebsd.org/SubversionPrimer">Subversion
+ Primer</link> for details. Refer to <link xlink:href="http://wiki.freebsd.org/SubversionPrimer/Merging">SubversionPrimer/Merging</link>
for details on how to perform an MFC.</para>
@@ -4558,7 +4494,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
PR: foo/12345
-Submitted by: John Smith &lt;John.Smith@example.com></programlisting>
+Submitted by: John Smith &lt;John.Smith@example.com&gt;</programlisting>
@@ -4641,7 +4577,7 @@ MFC after: <replaceable>2 weeks</replaceable></programlisting>
look something like</para>
<programlisting>PR: foo/54321
-Submitted by: John Smith &lt;John.Smith@example.com>
+Submitted by: John Smith &lt;John.Smith@example.com&gt;
Reviewed by: -arch
Obtained from: NetBSD
MFC after: 1 month</programlisting>
@@ -4651,18 +4587,17 @@ MFC after: 1 month</programlisting>
<para>How do I access
- <hostid role="fqdn">people.FreeBSD.org</hostid> to put up
+ <systemitem class="fqdomainname">people.FreeBSD.org</systemitem> to put up
personal or project information?</para>
- <para><hostid role="fqdn">people.FreeBSD.org</hostid> is the
+ <para><systemitem class="fqdomainname">people.FreeBSD.org</systemitem> is the
same as
- <hostid role="fqdn">freefall.FreeBSD.org</hostid>. Just
+ <systemitem class="fqdomainname">freefall.FreeBSD.org</systemitem>. Just
create a <filename>public_html</filename> directory.
Anything you place in that directory will automatically be
- visible under <ulink
- url="http://people.FreeBSD.org/"></ulink>.</para>
+ visible under <uri xlink:href="http://people.FreeBSD.org/">http://people.FreeBSD.org/</uri>.</para>
@@ -4687,9 +4622,8 @@ MFC after: 1 month</programlisting>
- <para>See the <ulink
- url="http://www.freebsd.org/internal/new-account.html">New
- Account Creation Procedure</ulink> document on the
+ <para>See the <link xlink:href="http://www.freebsd.org/internal/new-account.html">New
+ Account Creation Procedure</link> document on the
internal pages.</para>
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index 951829cb0a..9634942140 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/article.xml
+++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Installing and using Compiz&nbsp;Fusion</title>
-<article lang="en">
- <articleinfo>
- <title>Installing and using Compiz&nbsp;Fusion</title>
- <author>
- <firstname>Manolis</firstname>
- <surname>Kiagias</surname>
- <affiliation>
+ <author><personname><firstname>Manolis</firstname><surname>Kiagias</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
@@ -23,7 +18,7 @@
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -33,19 +28,18 @@
the latest fashion: 3D Desktop effects. While their usefulness is
rather heavily debated, the wow factor behind the composited desktop
holds quite well. Several different programs have emerged, like
- <ulink url="http://compiz.org/"><application>Compiz</application></ulink>,
- <ulink url="http://www.beryl-project.org/"><application>Beryl</application></ulink>,
- and the latest <ulink
- url="http://www.compiz-fusion.org/"><application>Compiz&nbsp;Fusion</application></ulink>.
+ <link xlink:href="http://compiz.org/"><application>Compiz</application></link>,
+ <link xlink:href="http://www.beryl-project.org/"><application>Beryl</application></link>,
+ and the latest <link xlink:href="http://www.compiz-fusion.org/"><application>Compiz&nbsp;Fusion</application></link>.
You do not need to miss these effects when using &os;. These
instructions will help you install and configure your system for the
latest 3D desktop experience using
<application>Compiz Fusion</application> and nVidia drivers
(if applicable).</para>
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>While installing <application>Compiz&nbsp;Fusion</application> from
@@ -82,7 +76,7 @@
- <sect1 id="nvidia-setup">
+ <sect1 xml:id="nvidia-setup">
<title>Setting up the &os; nVidia driver</title>
<para>Desktop effects can cause quite a load on your graphics card.
@@ -92,7 +86,7 @@
desktop effects, you may skip this section and continue with the
<filename>xorg.conf</filename> configuration.</para>
- <sect2 id="determine-driver">
+ <sect2 xml:id="determine-driver">
<title>Determining the correct driver to use</title>
<para>There are various versions of the nVidia drivers in the
@@ -102,13 +96,13 @@
<para>The latest versions of nVidia cards are supported by the
- <filename role="package">x11/nvidia-driver</filename> port.</para>
+ <package>x11/nvidia-driver</package> port.</para>
<para>nVidia cards like the GeForce 2MX/3/4 series are supported by
the 96<replaceable>XX</replaceable> series of drivers, available
- in the <filename role="package">x11/nvidia-driver-96xx</filename>
+ in the <package>x11/nvidia-driver-96xx</package>
@@ -116,18 +110,17 @@
<para>Even older cards, like GeForce and RIVA TNT are supported
by the 71<replaceable>XX</replaceable> series of drivers,
available in the
- <filename role="package">x11/nvidia-driver-71xx</filename>
+ <package>x11/nvidia-driver-71xx</package>
<para>In fact, nVidia provides detailed information on which card is
supported by which driver. This information is available directly
- on their web site: <ulink
- url="http://www.nvidia.com/object/IO_32667.html"></ulink>.</para>
+ on their web site: <uri xlink:href="http://www.nvidia.com/object/IO_32667.html">http://www.nvidia.com/object/IO_32667.html</uri>.</para>
- <sect2 id="install-driver">
+ <sect2 xml:id="install-driver">
<title>Installing the nVidia driver</title>
<para>Having determined the correct driver to use for your card,
@@ -184,8 +177,8 @@
<para>Although not strictly necessary, you may also wish to install
- <filename role="package">x11/nvidia-xconfig</filename> and
- <filename role="package">x11/nvidia-settings</filename> ports. The
+ <package>x11/nvidia-xconfig</package> and
+ <package>x11/nvidia-settings</package> ports. The
former can assist you in writing settings to
<filename>/etc/X11/xorg.conf</filename> from the command line, and
the latter will allow you to modify screen settings from a GUI while
@@ -194,7 +187,7 @@
- <sect1 id="xorg-configuration">
+ <sect1 xml:id="xorg-configuration">
<title>Configuring xorg.conf for desktop effects</title>
<para>Before you install and run
@@ -253,7 +246,7 @@ Load "glx"
<para>If you installed the
- <filename role="package">x11/nvidia-xconfig</filename> port,
+ <package>x11/nvidia-xconfig</package> port,
you should be able to perform most of the above settings by
entering the following commands (as root):</para>
@@ -266,7 +259,7 @@ Load "glx"
- <sect1 id="compiz-fusion">
+ <sect1 xml:id="compiz-fusion">
<title>Installing and configuring Compiz&nbsp;Fusion</title>
<para>Installing <application>Compiz&nbsp;Fusion</application>
@@ -340,7 +333,7 @@ emerald --replace &amp;</programlisting>
- <sect1 id="compiz-troubleshooting">
+ <sect1 xml:id="compiz-troubleshooting">
<title>Troubleshooting Compiz&nbsp;Fusion</title>
<para>The following section covers frequently asked questions regarding
@@ -349,7 +342,7 @@ emerald --replace &amp;</programlisting>
- <question id="no-decorations">
+ <question xml:id="no-decorations">
<para>I have installed
and after running the commands you mention, my windows are left
@@ -365,7 +358,7 @@ emerald --replace &amp;</programlisting>
- <question id="xorg-crash">
+ <question xml:id="xorg-crash">
<para>When I run the command to start
<application>Compiz&nbsp;Fusion</application>, the X server
crashes and I am back at the console. What is wrong?</para>
@@ -384,7 +377,7 @@ emerald --replace &amp;</programlisting>
<para>This is usually the case when you upgrade
<application>&xorg;</application>. You will need to reinstall the
- <filename role="package">x11/nvidia-driver</filename> port so
+ <package>x11/nvidia-driver</package> port so
glx is built again.</para>
diff --git a/en_US.ISO8859-1/articles/console-server/article.xml b/en_US.ISO8859-1/articles/console-server/article.xml
index 0f05f72b2b..49763be90c 100644
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@@ -1,21 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Console Server</title>
-<article lang='en'>
- <articleinfo>
- <title>Console Server</title>
- <author>
- <firstname>Gregory</firstname>
- <surname>Bond</surname>
- <affiliation>
+ <author><personname><firstname>Gregory</firstname><surname>Bond</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -36,11 +30,11 @@
a machine that you can use to monitor the consoles of many other
machines, instead of a bunch of serial terminals.</para>
- </articleinfo>
+ </info>
- <sect1 id="problem">
+ <sect1 xml:id="problem">
<title>The Problem</title>
<para>You have a computer room with lots of &unix; server machines and lots
@@ -103,7 +97,7 @@
- <sect1 id="possible-solutions">
+ <sect1 xml:id="possible-solutions">
<title>Possible Solutions</title>
<para>If you use PC hardware for your servers, then a so-called <quote><acronym>KVM</acronym>
@@ -122,7 +116,7 @@
<para>Actually, Doug Schache has pointed out that you
<emphasis>can</emphasis> get <acronym>KVM</acronym> switches that also do serial consoles
or Sun compatible <acronym>KVM</acronym> switching as well as PCs, but they are
- expensive. See <ulink url="http://www.avocent.com/">Avocent</ulink>
+ expensive. See <link xlink:href="http://www.avocent.com/">Avocent</link>
for example.)</para>
@@ -179,15 +173,15 @@
<para>Or, if your budget exceeds your willingness to hack, you can
buy an off-the-shelf solution. These vary in price and
capability. See, for example,
- <ulink url="http://www.lightwavecom.com/">Lightwave</ulink>,
- <ulink url="http://www.perle.com/">Perle</ulink>,
- <ulink url="http://www.avocent.com/">Avocent</ulink> or
- <ulink url="http://www.blackbox.com/faxbacks/23000/23362.PDF">Black Box</ulink>.
+ <link xlink:href="http://www.lightwavecom.com/">Lightwave</link>,
+ <link xlink:href="http://www.perle.com/">Perle</link>,
+ <link xlink:href="http://www.avocent.com/">Avocent</link> or
+ <link xlink:href="http://www.blackbox.com/faxbacks/23000/23362.PDF">Black Box</link>.
These solutions can be quite expensive - typically $USD100 - $USD400 per
- <sect1 id="our-solution">
+ <sect1 xml:id="our-solution">
<title>Our Solution</title>
<para>In light of the above requirements, we chose a solution based on a
@@ -204,18 +198,16 @@
- <para>A PC &unix; system. We used <ulink
- url="&url.base;/index.html">&os; 4.3</ulink> as that is used for
+ <para>A PC &unix; system. We used <link xlink:href="&url.base;/index.html">&os; 4.3</link> as that is used for
other tasks within our office.</para>
- <para>A multi-port serial card. We chose the <ulink
- url="http://www.stallion.com/html/products/easyio.html">&easyio; PCI</ulink>
- 8-port card from <ulink url="http://www.stallion.com/">Stallion
- Technologies</ulink>. This cost us about $AUD740, or under
- $100/port, from <ulink url="http://www.ht.com.au/">Harris
- Technologies</ulink> (which has lots of stuff but is by no means the
+ <para>A multi-port serial card. We chose the <link xlink:href="http://www.stallion.com/html/products/easyio.html">&easyio; PCI</link>
+ 8-port card from <link xlink:href="http://www.stallion.com/">Stallion
+ Technologies</link>. This cost us about $AUD740, or under
+ $100/port, from <link xlink:href="http://www.ht.com.au/">Harris
+ Technologies</link> (which has lots of stuff but is by no means the
cheapest place in town - shop around and you might get it a lot
cheaper). This card has a big DB80 connector on the back, and a
cable plugs into that which has a block with 8 RJ-45 sockets on it.
@@ -246,8 +238,7 @@
- <para>A program called <ulink
- url="http://www.conserver.com/">conserver</ulink>. This program
+ <para>A program called <link xlink:href="http://www.conserver.com/">conserver</link>. This program
does all the magic required to enable remote access to consoles, and
do the replaying and logging etc. It comes in two parts: a server
called <application>conserver</application> that runs as a daemon
@@ -313,35 +304,33 @@
- <sect1 id="setting-up-server">
+ <sect1 xml:id="setting-up-server">
<title>Setting Up The Server</title>
- <sect2 id="patching-stallion">
+ <sect2 xml:id="patching-stallion">
<title>Checking the Stallion driver</title>
<para>&os; has adequate support for modern Stallion cards since
4.4 release. If you are running an older version of &os;, you
will need to upgrade to a more modern version of &os; (which
you should do anyway, to make sure your system is not
- vulnerable to known security issues). See the <ulink
- url="&url.books.handbook;/makeworld.html">&os;
- Handbook</ulink> for information about updating your
+ vulnerable to known security issues). See the <link xlink:href="&url.books.handbook;/makeworld.html">&os;
+ Handbook</link> for information about updating your
- <sect2 id="configuring-kernel">
+ <sect2 xml:id="configuring-kernel">
<title>Configuring a new kernel</title>
<para>The Stallion driver is not included in the default
<literal>GENERIC</literal> kernel, so you will need to create a kernel
config file with the appropriate entries. See &man.stl.4; and the
- appropriate section of the <ulink
- url="&url.books.handbook;/kernelconfig.html">&os;
- Handbook</ulink>.</para>
+ appropriate section of the <link xlink:href="&url.books.handbook;/kernelconfig.html">&os;
+ Handbook</link>.</para>
- <sect2 id="making-devices">
+ <sect2 xml:id="making-devices">
<title>Making The Devices</title>
<para>You will need to make the device notes for the Stallion card
@@ -364,7 +353,7 @@
for more details.</para>
- <sect2 id="compiling-conserver">
+ <sect2 xml:id="compiling-conserver">
<title>Compiling conserver</title>
@@ -378,17 +367,17 @@
You can either compile
from the source or use the &os; ports framework.</para>
- <sect3 id="using-ports">
+ <sect3 xml:id="using-ports">
<title>Using the ports framework</title>
<para>Using the ports is a bit cleaner, as the package system can then
keep track of installed software and cleanly delete them when not
being used. I recommend using the
- <filename role="package">comms/conserver-com</filename> port.
+ <package>comms/conserver-com</package> port.
Change into the
- port directory and (as <username>root</username>) type:</para>
+ port directory and (as <systemitem class="username">root</systemitem>) type:</para>
- <screen>&prompt.root; <userinput>make DEFAULTHOST=<replaceable>consolehost</replaceable> install</userinput></screen>
+ <screen>&prompt.root; <userinput>make DEFAULTHOST=consolehost install</userinput></screen>
<para>where <replaceable>consolehost</replaceable> is the name of the
machine running the console server. Specifying this when the binary
@@ -405,7 +394,7 @@
a <literal>DEFAULTHOST</literal> argument, and one for all the other
hosts with a <literal>DEFAULTHOST</literal> argument. This will
mean the console client program on the console server machine will
- default to <hostid>localhost</hostid>, which will work in the
+ default to <systemitem>localhost</systemitem>, which will work in the
absence of name servers when the network is busted, and also allow
<quote>trusted</quote> (i.e.&nbsp;no password required) connections
via the localhost IP address for users logged into the console
@@ -417,7 +406,7 @@
<filename>conserver.cf</filename> file on every machine.</para>
- <sect3 id="from-tarball">
+ <sect3 xml:id="from-tarball">
<title>From the source tarball</title>
<para>If you prefer, you can download <application>conserver</application>
@@ -429,9 +418,8 @@
whom have PCs and no &os; host access on their desk) to access
the console server.</para>
- <para>Download the file from the <ulink
- url="ftp://ftp.conserver.com/conserver/conserver-8.1.9.tar.gz">conserver.com
- FTP site</ulink>. Extract it into a handy directory then
+ <para>Download the file from the <link xlink:href="ftp://ftp.conserver.com/conserver/conserver-8.1.9.tar.gz">conserver.com
+ FTP site</link>. Extract it into a handy directory then
configure it by running</para>
<screen>&prompt.user; ./configure <option>--with-master=<replaceable>consoleserver</replaceable></option> <option>--with-port=<replaceable>782</replaceable></option></screen>
@@ -447,7 +435,7 @@
- <sect2 id="configuring-conserver">
+ <sect2 xml:id="configuring-conserver">
<title>Configuring conserver</title>
<para>The <application>conserver</application> program is configured via a file called
@@ -469,24 +457,24 @@ trusted: buzz</programlisting>
the <filename>/var/log/consoles</filename> directory. The
<quote>&amp;</quote> in each line says the log file for that machine
will be
- <filename>/var/log/consoles/<replaceable>machine</replaceable></filename>.</para>
+ <filename>/var/log/consoles/machine</filename>.</para>
<para>The next three lines show three machines to which we need to
connect. We use the
- <devicename>cuaE<replaceable>x</replaceable></devicename> devices
+ <filename>cuaEx</filename> devices
rather than the
- <devicename>ttyE<replaceable>x</replaceable></devicename>
+ <filename>ttyEx</filename>
devices because console ports typically do not show carrier. This
means that opening
- <devicename>ttyE<replaceable>x</replaceable></devicename> would hang
+ <filename>ttyEx</filename> would hang
and <application>conserver</application> would never connect. Using
- <devicename>cuaE<replaceable>x</replaceable></devicename>
+ <filename>cuaEx</filename>
device avoids this problem. Another solution would be to use the
- <devicename>ttyE<replaceable>x</replaceable></devicename>
+ <filename>ttyEx</filename>
devices and enable <quote>soft carrier</quote> on these ports, perhaps by
setting this using the
- <devicename>ttyiE<replaceable>x</replaceable></devicename>
+ <filename>ttyiEx</filename>
device in the <filename>/etc/rc.serial</filename> file. See the
comments in this file for more details. Also see &man.sio.4;
for information on the initial-state and locked-state devices. (The
@@ -504,7 +492,7 @@ trusted: buzz</programlisting>
- <sect2 id="setting-passwords">
+ <sect2 xml:id="setting-passwords">
<title>Setting conserver passwords</title>
<para>The <filename>conserver.passwd</filename> file contains the
@@ -528,7 +516,7 @@ $salt = '$1$' . $salt . '$';
print 'Enter password: ';
`stty -echo`;
-$cleartext = &lt;>;
+$cleartext = &lt;&gt;;
`stty echo`;
print crypt($cleartext, $salt), "\n";</programlisting>
@@ -547,7 +535,7 @@ Password: <userinput>password</userinput>
- <sect2 id="starting-conserver">
+ <sect2 xml:id="starting-conserver">
<title>Starting <application>conserver</application> at system boot time</title>
<para>There are two ways this can be done. Firstly, you could start up
@@ -563,7 +551,7 @@ $1$VTd27V2G$eFu23iHpLvCBM5nQtNlKj/</screen>
crashes so far), and it arranges for standard output of the
process to be directed to the named tty (in this case
- <devicename>cuaE0</devicename>). This is useful because you
+ <filename>cuaE0</filename>). This is useful because you
can plug a terminal into this port, and the
<application>conserver</application> program
will show all console output not otherwise captured by a
@@ -600,8 +588,8 @@ PATH=/usr/bin:/usr/local/bin
case "$1" in
- conserver -d > $TTY
- # get NL->CR+NL mapping so msgs look right
+ conserver -d &gt; $TTY
+ # get NL-&gt;CR+NL mapping so msgs look right
stty &lt; /dev/cuaE7 opost onlcr
echo -n ' conserver'
@@ -618,13 +606,13 @@ esac
exit 0</programlisting>
- <para>Note the use of <devicename>cuaE0</devicename> device
+ <para>Note the use of <filename>cuaE0</filename> device
and the need to set tty modes for proper NL-&lt;CR
- <sect2 id="trimming-logs">
+ <sect2 xml:id="trimming-logs">
<title>Keeping the log files trimmed</title>
<para>&os; has a program called
@@ -650,7 +638,7 @@ exit 0</programlisting>
- <sect1 id="cabling">
+ <sect1 xml:id="cabling">
<para>This is always the hardest part of this kind of problem. We had
@@ -677,7 +665,7 @@ exit 0</programlisting>
represent serial connections on the RJ-45 plug. So the cabling has to
be very careful to use the right mapping.</para>
- <sect2 id="rj45-colors">
+ <sect2 xml:id="rj45-colors">
<title>RJ-45 colors</title>
<para>RJ-45 cables and plugs have 8 pins/conductors. These are used as
@@ -770,9 +758,8 @@ exit 0</programlisting>
<para>Note EIA 468A and EIA 568B are very similar, simply swapping the
colors assigned to pair 2 and pair 3.</para>
- <para>See for example the <ulink
- url="http://www.cabletron.com/support/techtips/tk0231-9.html">Cabletron
- Tech Support Site</ulink> for more details.</para>
+ <para>See for example the <link xlink:href="http://www.cabletron.com/support/techtips/tk0231-9.html">Cabletron
+ Tech Support Site</link> for more details.</para>
<para>The pins in the RJ-45 plug are numbered from 1 to 8. Holding a
patch lead with the cable pointing down and the clip away from you,
@@ -813,14 +800,12 @@ exit 0</programlisting>
into the DB-25 plug as required. This allows us to create a
custom RJ-45-DB-25 mapping. We used a couple of different
sorts, including the
- <ulink url="http://www.molexpn.com.au/">MOD-TAP</ulink>
- part no.&nbsp;<ulink
- url="http://www.molexpn.com.au/products/index.nsx/1/7/0/0/id=340">06-9888-999-00</ulink>
- and the <ulink
- url="http://www.blackbox.com/faxbacks/12000/12654.PDF">FA730
- series</ulink> from
- <ulink url="http://www.blackboxoz.com.au/">Black
- Box</ulink>.</para>
+ <link xlink:href="http://www.molexpn.com.au/">MOD-TAP</link>
+ part no.&nbsp;<link xlink:href="http://www.molexpn.com.au/products/index.nsx/1/7/0/0/id=340">06-9888-999-00</link>
+ and the <link xlink:href="http://www.blackbox.com/faxbacks/12000/12654.PDF">FA730
+ series</link> from
+ <link xlink:href="http://www.blackboxoz.com.au/">Black
+ Box</link>.</para>
<para>On our version of the headshells, these flyleads had the
following colours (from Pin 1-8): Blue, Orange, Black, Red,
@@ -1106,8 +1091,8 @@ exit 0</programlisting>
<para>We run &os; 4 on a couple of &i386; PCs for various peripheral
uses. &os; usually uses a screen and keyboard for the
console, but can be configured to use a serial port (usually the
- first serial port known as <devicename>COM1</devicename> in DOS/&windows; or
- <devicename>ttyd0</devicename> in &unix;).</para>
+ first serial port known as <filename>COM1</filename> in DOS/&windows; or
+ <filename>ttyd0</filename> in &unix;).</para>
<para>The cabling for these servers depends on the PC hardware. If
the PC has DB-25 female socket on board (as most older PCs do),
@@ -1209,7 +1194,7 @@ exit 0</programlisting>
- <sect1 id="solaris">
+ <sect1 xml:id="solaris">
<title>On Sun Systems And Break</title>
<para>Anyone who has turned off a terminal used as a console for a Sun
@@ -1267,27 +1252,27 @@ exit 0</programlisting>
power-on or reboot.</para>
- <sect1 id="freebsd">
+ <sect1 xml:id="freebsd">
<title>Using a Serial Console on &os;</title>
<para>The procedure for doing this is described in detail in the
- <ulink url="&url.books.handbook;/serialconsole-setup.html">&os;
- Handbook</ulink>. This is a quick summary.</para>
+ <link xlink:href="&url.books.handbook;/serialconsole-setup.html">&os;
+ Handbook</link>. This is a quick summary.</para>
- <sect2 id="freebsd-kernconf">
+ <sect2 xml:id="freebsd-kernconf">
<title>Check the kernel configuration</title>
<para>Check that the kernel configuration file has
<literal>flags 0x10</literal> in the config line for the
- <devicename>sio0</devicename> device. This signals this device (known
- as <devicename>COM1</devicename> in DOS/&windows; or
- <devicename>/dev/ttyd0</devicename> in &os;) can be used as a
+ <filename>sio0</filename> device. This signals this device (known
+ as <filename>COM1</filename> in DOS/&windows; or
+ <filename>/dev/ttyd0</filename> in &os;) can be used as a
console. This flag is set on the <filename>GENERIC</filename> and
<filename>LINT</filename> sample configs, so is likely to be set in
your kernel.</para>
- <sect2 id="freebsd-bootconf">
+ <sect2 xml:id="freebsd-bootconf">
<title>Create the <filename>/boot.conf</filename>
@@ -1296,14 +1281,14 @@ exit 0</programlisting>
tells the &os; boot blocks to use the serial console.</para>
- <sect2 id="freebsd-ttys">
+ <sect2 xml:id="freebsd-ttys">
<title>Edit <filename>/etc/ttys</filename></title>
<para>Edit this file and make the following changes.</para>
<para>If you are not going to have any keyboard/video screen on this
server at all, you should find all the lines for
- <devicename>ttyv</devicename> devices like</para>
+ <filename>ttyv</filename> devices like</para>
<programlisting>ttyv1 "/usr/libexec/getty Pc" cons25 on secure</programlisting>
@@ -1311,7 +1296,7 @@ exit 0</programlisting>
will stop login screens being run on the useless video
- <para>Find the line containing <devicename>ttyd0</devicename>. Change
+ <para>Find the line containing <filename>ttyd0</filename>. Change
it from</para>
<programlisting>ttyd0 "/usr/libexec/getty std.9600" dialup off secure</programlisting>
@@ -1329,7 +1314,7 @@ exit 0</programlisting>
- <sect1 id="security">
+ <sect1 xml:id="security">
<title>Security Implications</title>
<para>The client-server protocol for <application>conserver</application>
@@ -1347,7 +1332,7 @@ exit 0</programlisting>
server machine, and run the console client there.</para>
- <sect1 id="conserver-versions">
+ <sect1 xml:id="conserver-versions">
<title>On Conserver Versions</title>
<para>The <application>conserver</application> program has fractured into
@@ -1359,7 +1344,7 @@ exit 0</programlisting>
<para>The &os; ports collection contains a port for version 8.5 of
<application>conserver</application> at
- <filename role="package">comms/conserver</filename>.
+ <package>comms/conserver</package>.
This seems to be older and less featureful than the 8.1.9
version (in particular, it does not support consoles connected to
terminal server ports and does not support a
@@ -1375,18 +1360,18 @@ exit 0</programlisting>
<para>Beginning with December 2001, Brian's version (currently 8.1.9) is
also presented in ports collection at
- <filename role="package">comms/conserver-com</filename>. We therefore
+ <package>comms/conserver-com</package>. We therefore
recommend you to use this version as it is much more appropriate for
console server building.</para>
- <sect1 id="links">
+ <sect1 xml:id="links">
- <term><ulink url="http://www.conserver.com/"></ulink></term>
+ <term><uri xlink:href="http://www.conserver.com/">http://www.conserver.com/</uri></term>
<para>Homepage for the latest version of <application>conserver</application>.</para>
@@ -1394,7 +1379,7 @@ exit 0</programlisting>
- <term><ulink url="ftp://ftp.conserver.com/conserver/conserver-8.1.9.tar.gz">ftp://ftp.conserver.com/conserver/conserver-8.1.9.tar.gz</ulink></term>
+ <term><link xlink:href="ftp://ftp.conserver.com/conserver/conserver-8.1.9.tar.gz">ftp://ftp.conserver.com/conserver/conserver-8.1.9.tar.gz</link></term>
<para>The source tarball for version 8.1.9 of
@@ -1403,7 +1388,7 @@ exit 0</programlisting>
- <term><ulink url="http://www.stallion.com/"></ulink></term>
+ <term><uri xlink:href="http://www.stallion.com/">http://www.stallion.com/</uri></term>
<para>Homepage of Stallion Technologies.</para>
@@ -1411,7 +1396,7 @@ exit 0</programlisting>
- <term><ulink url="http://www.conserver.com/consoles/msock.html"></ulink></term>
+ <term><uri xlink:href="http://www.conserver.com/consoles/msock.html">http://www.conserver.com/consoles/msock.html</uri></term>
<para>Davis Harris' <quote>Minor Scroll of Console Knowledge</quote>
@@ -1421,7 +1406,7 @@ exit 0</programlisting>
- <term><ulink url="http://www.conserver.com/consoles/"></ulink></term>
+ <term><uri xlink:href="http://www.conserver.com/consoles/">http://www.conserver.com/consoles/</uri></term>
<para>The <quote>Greater Scroll of Console Knowledge</quote>
@@ -1431,7 +1416,7 @@ exit 0</programlisting>
- <term><ulink url="http://www.eng.auburn.edu/users/doug/console.html"></ulink></term>
+ <term><uri xlink:href="http://www.eng.auburn.edu/users/doug/console.html">http://www.eng.auburn.edu/users/doug/console.html</uri></term>
<para>Doug Hughes has a similar console server, based on the
@@ -1440,7 +1425,7 @@ exit 0</programlisting>
- <term><ulink url="http://www.realweasel.com/"></ulink></term>
+ <term><uri xlink:href="http://www.realweasel.com/">http://www.realweasel.com/</uri></term>
<para>The Real Weasel company makes a ISA or PCI video card that
@@ -1455,20 +1440,20 @@ exit 0</programlisting>
- <sect1 id="manpages">
+ <sect1 xml:id="manpages">
<title>Manual Pages</title>
- <para><ulink url="http://www.conserver.com/docs/console.man.html">console(8)</ulink></para>
+ <para><link xlink:href="http://www.conserver.com/docs/console.man.html">console(8)</link></para>
- <para><ulink url="http://www.conserver.com/docs/conserver.man.html">conserver(8)</ulink></para>
+ <para><link xlink:href="http://www.conserver.com/docs/conserver.man.html">conserver(8)</link></para>
- <para><ulink url="http://www.conserver.com/docs/conserver.cf.man.html">conserver.cf(5)</ulink></para>
+ <para><link xlink:href="http://www.conserver.com/docs/conserver.cf.man.html">conserver.cf(5)</link></para>
diff --git a/en_US.ISO8859-1/articles/contributing-ports/article.xml b/en_US.ISO8859-1/articles/contributing-ports/article.xml
index c6b198ce22..6bee0dfecd 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/article.xml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Contributing to the FreeBSD Ports Collection</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Contributing to the FreeBSD Ports Collection</title>
@@ -14,17 +13,11 @@
- <author>
- <firstname>Sam</firstname>
- <surname>Lawrance</surname>
- </author>
- <author>
- <firstname>Mark</firstname>
- <surname>Linimon</surname>
- </author>
+ <author><personname><firstname>Sam</firstname><surname>Lawrance</surname></personname></author>
+ <author><personname><firstname>Mark</firstname><surname>Linimon</surname></personname></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -32,7 +25,7 @@
- </articleinfo>
+ </info>
<indexterm><primary>contributing to ports</primary></indexterm>
@@ -57,7 +50,7 @@
to take this into account before deciding to volunteer.</para>
- <sect1 id="what-contribute">
+ <sect1 xml:id="what-contribute">
<title>What you can do to help</title>
<para>There are a number of easy ways you can contribute to
@@ -91,18 +84,17 @@
- <sect1 id="create-port">
+ <sect1 xml:id="create-port">
<title>Creating a new port</title>
<para>There is a separate document available to help guide you
- through creating (and upgrading) a port called the <ulink
- url="&url.books.porters-handbook;">Porter's Handbook</ulink>.
+ through creating (and upgrading) a port called the <link xlink:href="&url.books.porters-handbook;">Porter's Handbook</link>.
The Porter's Handbook is the best reference to working with the
ports system. It provides details about how the ports system
operates and discusses recommended practices.</para>
- <sect1 id="adopt-port">
+ <sect1 xml:id="adopt-port">
<title>Adopting an unmaintained port</title>
@@ -116,12 +108,11 @@
you use regularly.</para>
<para>Unmaintained ports have their
- <makevar>MAINTAINER</makevar> set to
+ <varname>MAINTAINER</varname> set to
<literal>ports@FreeBSD.org</literal>. A list of unmaintained
ports and their current errors and problem reports can be seen
- at the <ulink
- url="http://portsmon.FreeBSD.org/portsconcordanceformaintainer.py?maintainer=ports%40FreeBSD.org">&os;
- Ports Monitoring System</ulink>.</para>
+ at the <link xlink:href="http://portsmon.FreeBSD.org/portsconcordanceformaintainer.py?maintainer=ports%40FreeBSD.org">&os;
+ Ports Monitoring System</link>.</para>
<para>Some ports affect a large number of others due to
dependencies and slave port relationships. Generally, we
@@ -145,13 +136,13 @@
<para>First make sure you understand your
<link linkend="maintain-port">responsibilities as a
maintainer</link>. Also read the
- <ulink url="&url.books.porters-handbook;">Porter's
- Handbook</ulink>. <emphasis>Please do not commit yourself
+ <link xlink:href="&url.books.porters-handbook;">Porter's
+ Handbook</link>. <emphasis>Please do not commit yourself
to more than you feel you can comfortably
<para>You may request maintainership of any unmaintained port
- as soon as you wish. Simply set <makevar>MAINTAINER</makevar>
+ as soon as you wish. Simply set <varname>MAINTAINER</varname>
to your own email address and send a PR (Problem Report) with
the change. If the port has build errors or needs updating,
you may wish to include any other changes in the same PR.
@@ -168,14 +159,14 @@
- <sect1 id="maintain-port">
+ <sect1 xml:id="maintain-port">
<title>The challenge for port maintainers</title>
<para>This section will give you an idea of why ports need to be
maintained and outline the responsibilities of a port
- <sect2 id="why-maintenance">
+ <sect2 xml:id="why-maintenance">
<title>Why ports require maintenance</title>
<para>Creating a port is a once-off task. Ensuring that a
@@ -284,8 +275,8 @@
<para>This is an overview. More information about upgrading a
port is available in the
- <ulink url="&url.books.porters-handbook;">
- Porter's Handbook</ulink>.</para>
+ <link xlink:href="&url.books.porters-handbook;">
+ Porter's Handbook</link>.</para>
@@ -345,8 +336,7 @@
<para>Verify your port using &man.portlint.1; as a
- guide. See <link
- linkend="resources">resources</link> for important
+ guide. See <link linkend="resources">resources</link> for important
information about using
@@ -358,7 +348,7 @@
those ports. This is especially important if your
update changes the shared library version; in this
case, at the very least, the dependent ports will
- need to get a <makevar>PORTREVISION</makevar> bump
+ need to get a <varname>PORTREVISION</varname> bump
so that they will automatically be upgraded by
automated tools such as
<application>portmaster</application> or
@@ -373,9 +363,8 @@
<para>Send your update by submitting a PR with an
explanation of the changes and a patch containing the
differences between the original port and the updated
- one. Please refer to <ulink
- url="&url.articles.problem-reports;">Writing FreeBSD
- Problem Reports</ulink> for information on how to
+ one. Please refer to <link xlink:href="&url.articles.problem-reports;">Writing FreeBSD
+ Problem Reports</link> for information on how to
write a really good PR.</para>
@@ -383,8 +372,7 @@
entire port; instead, use &man.diff.1;
<literal>-ruN</literal>. In this way, committers can
much more easily see exactly what changes are being
- made. The Porter's Handbook section on <ulink
- url="&url.books.porters-handbook;/port-upgrading.html">Upgrading</ulink>
+ made. The Porter's Handbook section on <link xlink:href="&url.books.porters-handbook;/port-upgrading.html">Upgrading</link>
has more information.</para>
@@ -460,12 +448,10 @@
<title>Watch for build failures</title>
<para>Regularly check the automated ports building
- cluster, <ulink
- url="http://pointyhat.FreeBSD.org">pointyhat</ulink>,
- and the <ulink url="http://portscout.FreeBSD.org">distfiles
- scanner</ulink> to see if any of the ports you
- maintain are failing to build or fetch (see <link
- linkend="resources">resources</link> for more
+ cluster, <link xlink:href="http://pointyhat.FreeBSD.org">pointyhat</link>,
+ and the <link xlink:href="http://portscout.FreeBSD.org">distfiles
+ scanner</link> to see if any of the ports you
+ maintain are failing to build or fetch (see <link linkend="resources">resources</link> for more
information about these systems). Reports of failures
may also come to you from other users or automated
systems via email.</para>
@@ -571,9 +557,8 @@
<title>Respond to bug reports</title>
<para>Bugs may be reported to you through email via the
- <ulink
- url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
- GNATS Problem Report database</ulink>. Bugs may also be
+ <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
+ GNATS Problem Report database</link>. Bugs may also be
reported directly to you by users.</para>
<para>You should respond to PRs and other reports within
@@ -716,26 +701,24 @@
- <sect1 id="fix-broken">
+ <sect1 xml:id="fix-broken">
<title>Finding and fixing a broken port</title>
<para>There are two really good places to find a port that needs
some attention.</para>
- <para>You can use the <ulink
- url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">web
- interface</ulink> to the Problem Report database to search
+ <para>You can use the <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">web
+ interface</link> to the Problem Report database to search
through and view unresolved PRs. The majority of ports PRs are
updates, but with a little searching and skimming over synopses
you should be able to find something interesting to work on (the
<literal>sw-bug</literal> class is a good place to
- <para>The other place is the <ulink
- url="http://portsmon.FreeBSD.org/">&os; Ports Monitoring
- System</ulink>. In particular look for unmaintained ports
+ <para>The other place is the <link xlink:href="http://portsmon.FreeBSD.org/">&os; Ports Monitoring
+ System</link>. In particular look for unmaintained ports
with build errors and ports that are marked
- <makevar>BROKEN</makevar>. It is OK to send changes for a
+ <varname>BROKEN</varname>. It is OK to send changes for a
maintained port as well, but remember to ask the maintainer in
case they are already working on the problem.</para>
@@ -745,7 +728,7 @@
and, if everything checks out, committed.</para>
- <sect1 id="mortal-coil">
+ <sect1 xml:id="mortal-coil">
<title>When to call it quits</title>
<para>As your interests and commitments change, you may find that
@@ -766,39 +749,38 @@
have not been worked on during that time.</para>
- <sect1 id="resources">
+ <sect1 xml:id="resources">
<title>Resources for ports maintainers and contributors</title>
- <para>The <ulink url="&url.books.porters-handbook;">Porter's
- Handbook</ulink> is your hitchhiker's guide to the ports
+ <para>The <link xlink:href="&url.books.porters-handbook;">Porter's
+ Handbook</link> is your hitchhiker's guide to the ports
system. Keep it handy!</para>
- <para><ulink url="&url.articles.problem-reports;">Writing FreeBSD
- Problem Reports</ulink> describes how to best formulate and
+ <para><link xlink:href="&url.articles.problem-reports;">Writing FreeBSD
+ Problem Reports</link> describes how to best formulate and
submit a PR. In 2005 more than eleven thousand ports PRs were
submitted! Following this article will greatly assist us in
reducing the time needed to handle your PRs.</para>
- <para>The <ulink
- url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
- Problem Report database</ulink>.</para>
+ <para>The <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
+ Problem Report database</link>.</para>
- <para><ulink url="http://pointyhat.FreeBSD.org/">Pointyhat</ulink>
+ <para><link xlink:href="http://pointyhat.FreeBSD.org/">Pointyhat</link>
is the ports build cluster. You can use Pointyhat to check port
build logs across all architectures and major releases.</para>
- <para>The <ulink url="http://portsmon.FreeBSD.org/">FreeBSD Ports
- Monitoring System</ulink> can show you cross-referenced
+ <para>The <link xlink:href="http://portsmon.FreeBSD.org/">FreeBSD Ports
+ Monitoring System</link> can show you cross-referenced
information about ports such as build errors and problem
reports. If you are a maintainer you can use it to check on the
build status of your ports. As a contributor you can use it to
find broken and unmaintained ports that need to be fixed.</para>
- <para>The <ulink url="http://portscout.FreeBSD.org">FreeBSD Ports
- distfile scanner</ulink> can show you ports for which the
+ <para>The <link xlink:href="http://portscout.FreeBSD.org">FreeBSD Ports
+ distfile scanner</link> can show you ports for which the
distfiles are not fetchable. You can check on your own ports or
use it to find ports that need their
- <makevar>MASTER_SITES</makevar> updated.</para>
+ <varname>MASTER_SITES</varname> updated.</para>
<para>The ports <application>tinderbox</application> is the most
thorough way to test a port through the entire cycle of
@@ -806,9 +788,8 @@
command-line interface but also can be controlled via a web
interface. Please see
<filename>ports/ports-mgmt/tinderbox</filename>. More
- documentation is located at the <ulink
- url="http://tinderbox.marcuscom.com/">marcuscom tinderbox home
- page</ulink>.</para>
+ documentation is located at the <link xlink:href="http://tinderbox.marcuscom.com/">marcuscom tinderbox home
+ page</link>.</para>
<para>&man.portlint.1; is an application which can be used to
verify that your port conforms to many important stylistic and
@@ -816,14 +797,12 @@
simple heuristic application, so you should use it
<emphasis>only as a guide</emphasis>. If
<application>portlint</application> suggests changes which seem
- unreasonable, consult the <ulink
- url="&url.books.porters-handbook;">Porter's Handbook</ulink>
+ unreasonable, consult the <link xlink:href="&url.books.porters-handbook;">Porter's Handbook</link>
or ask for advice.</para>
<para>The &a.ports; is for general ports-related discussion. It
- is a good place to ask for help. You can <ulink
- url="http://lists.freebsd.org/mailman/listinfo">subscribe, or
- read and search the list archives</ulink>. Reading the
+ is a good place to ask for help. You can <link xlink:href="http://lists.freebsd.org/mailman/listinfo">subscribe, or
+ read and search the list archives</link>. Reading the
archives of the &a.ports-bugs; and the &a.cvs-ports; may also be
of interest.</para>
diff --git a/en_US.ISO8859-1/articles/contributing/article.xml b/en_US.ISO8859-1/articles/contributing/article.xml
index da75befadc..069f3c2d67 100644
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Contributing to FreeBSD</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Contributing to FreeBSD</title>
<para>This article describes the different ways in which an
@@ -13,14 +12,10 @@
- <author>
- <firstname>Jordan</firstname>
- <surname>Hubbard</surname>
- <contrib>Contributed by </contrib>
- </author>
+ <author><personname><firstname>Jordan</firstname><surname>Hubbard</surname></personname><contrib>Contributed by </contrib></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -29,7 +24,7 @@
- </articleinfo>
+ </info>
@@ -64,14 +59,14 @@
developed, sold, and maintained, and we urge you to at least give
it a second look.</para>
- <sect1 id="contrib-what">
+ <sect1 xml:id="contrib-what">
<title>What Is Needed</title>
<para>The following list of tasks and sub-projects represents
something of an amalgam of various <filename>TODO</filename>
lists and user requests.</para>
- <sect2 id="non-programmer-tasks">
+ <sect2 xml:id="non-programmer-tasks">
<title>Ongoing Non-Programmer Tasks</title>
<para>Many people who are involved in FreeBSD are not
@@ -94,9 +89,8 @@
language. If documentation already exists for your
language, you can help translate additional documents or
verify that the translations are up-to-date. First take a
- look at the <ulink
- url="&url.books.fdp-primer;/translations.html">Translations
- FAQ</ulink> in the FreeBSD Documentation Project Primer.
+ look at the <link xlink:href="&url.books.fdp-primer;/translations.html">Translations
+ FAQ</link> in the FreeBSD Documentation Project Primer.
You are not committing yourself to translating every
single FreeBSD document by doing this &mdash; as a
volunteer, you can do as much or as little translation as
@@ -117,7 +111,7 @@
- <sect2 id="ongoing-programmer-tasks">
+ <sect2 xml:id="ongoing-programmer-tasks">
<title>Ongoing Programmer Tasks</title>
<para>Most of the tasks listed here require either a
@@ -130,7 +124,7 @@
<para>If you run FreeBSD-CURRENT and have a good Internet
connection, there is a machine
- <hostid role="fqdn">current.FreeBSD.org</hostid> which
+ <systemitem class="fqdomainname">current.FreeBSD.org</systemitem> which
builds a full release once a day&mdash;every now and
again, try to install the latest release from it and
report any failures in the process.</para>
@@ -152,13 +146,13 @@
<para>Move contributed software to
- <filename class="directory">src/contrib</filename> in the
+ <filename>src/contrib</filename> in the
source tree.</para>
<para>Make sure code in
- <filename class="directory">src/contrib</filename> is up
+ <filename>src/contrib</filename> is up
to date.</para>
@@ -183,8 +177,8 @@
<para>Get copies of formal standards like &posix;. You can
get some links about these standards at the
- <ulink url="&url.base;/projects/c99/index.html">FreeBSD
- C99 &amp; POSIX Standards Conformance Project</ulink>
+ <link xlink:href="&url.base;/projects/c99/index.html">FreeBSD
+ C99 &amp; POSIX Standards Conformance Project</link>
web site. Compare FreeBSD's behavior to that required by
the standard. If the behavior differs, particularly in
subtle or obscure corners of the specification, send in a
@@ -207,9 +201,8 @@
<primary>problem reports database</primary>
- <para>The <ulink
- url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">FreeBSD
- PR list</ulink> shows all the current active problem reports
+ <para>The <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">FreeBSD
+ PR list</link> shows all the current active problem reports
and requests for enhancement that have been submitted by
FreeBSD users. The PR database includes both programmer and
non-programmer tasks. Look through the open PRs, and see if
@@ -231,8 +224,8 @@
<title>Pick one of the items from the <quote>Ideas</quote>
- <para>The <ulink url="http://wiki.freebsd.org/IdeasPage">&os;
- list of projects and ideas for volunteers</ulink> is also
+ <para>The <link xlink:href="http://wiki.freebsd.org/IdeasPage">&os;
+ list of projects and ideas for volunteers</link> is also
available for people willing to contribute to the &os;
project. The list is being regularly updated and contains
items for both programmers and non-programmers with
@@ -240,28 +233,27 @@
- <sect1 id="contrib-how">
+ <sect1 xml:id="contrib-how">
<title>How to Contribute</title>
<para>Contributions to the system generally fall into one or more
of the following 5 categories:</para>
- <sect2 id="contrib-general">
+ <sect2 xml:id="contrib-general">
<title>Bug Reports and General Commentary</title>
<para>An idea or suggestion of <emphasis>general</emphasis>
technical interest should be mailed to the &a.hackers;.
Likewise, people with an interest in such things (and a
tolerance for a <emphasis>high</emphasis> volume of mail!) may
- subscribe to the &a.hackers;. See <ulink
- url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">The
- FreeBSD Handbook</ulink> for more information about this and
+ subscribe to the &a.hackers;. See <link xlink:href="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">The
+ FreeBSD Handbook</link> for more information about this and
other mailing lists.</para>
<para>If you find a bug or are submitting a specific change,
please report it using the &man.send-pr.1; program or its
- <ulink url="&url.base;/send-pr.html">WEB-based
- equivalent</ulink>. Try to fill-in each field of the bug
+ <link xlink:href="&url.base;/send-pr.html">WEB-based
+ equivalent</link>. Try to fill-in each field of the bug
report. Unless they exceed 65KB, include any patches directly
in the report. If the patch is suitable to be applied to the
source tree put <literal>[PATCH]</literal> in the synopsis of
@@ -287,9 +279,8 @@
then you may ask someone to file it for you by sending mail to
the &a.bugs;.</para>
- <para>See also <ulink
- url="&url.articles.problem-reports;/article.html">this
- article</ulink> on how to write good problem
+ <para>See also <link xlink:href="&url.articles.problem-reports;/article.html">this
+ article</link> on how to write good problem
@@ -302,8 +293,8 @@
<para>Changes to the documentation are overseen by the &a.doc;.
Please look at the
- <ulink url="&url.books.fdp-primer;/index.html">FreeBSD
- Documentation Project Primer</ulink> for complete
+ <link xlink:href="&url.books.fdp-primer;/index.html">FreeBSD
+ Documentation Project Primer</link> for complete
instructions. Send submissions and changes (even small ones
are welcome!) using &man.send-pr.1; as described in
<link linkend="contrib-general">Bug Reports and General
@@ -321,9 +312,8 @@
There is a special on-going release of FreeBSD known as
<quote>FreeBSD-CURRENT</quote> which is made available in a
variety of ways for the convenience of developers working
- actively on the system. See <ulink
- url="&url.books.handbook;/current-stable.html">The FreeBSD
- Handbook</ulink> for more information about getting and
+ actively on the system. See <link xlink:href="&url.books.handbook;/current-stable.html">The FreeBSD
+ Handbook</link> for more information about getting and
using FreeBSD-CURRENT.</para>
<para>Working from older sources unfortunately means that your
@@ -440,8 +430,8 @@
formatter, etc) it would be silly to refuse additional
contributions under this license. Code under the GPL also
goes into a different part of the tree, that being
- <filename class="directory">/sys/gnu</filename> or
- <filename class="directory">/usr/src/gnu</filename>, and
+ <filename>/sys/gnu</filename> or
+ <filename>/usr/src/gnu</filename>, and
is therefore easily identifiable to anyone for whom the
GPL presents a problem.</para>
peripherals since we generally lack the funds to buy such
items ourselves.</para>
- <sect3 id="donation">
+ <sect3 xml:id="donation">
<title>Donating Funds</title>
<para>The FreeBSD Foundation is a non-profit, tax-exempt
<para>The FreeBSD Foundation is now able to accept donations
through the web with PayPal. To place a donation, please
visit the Foundation
- <ulink url="http://www.freebsdfoundation.org">web
- site</ulink>.</para>
+ <link xlink:href="http://www.freebsdfoundation.org">web
+ site</link>.</para>
<para>More information about the FreeBSD Foundation can be
- found in <ulink
- url="http://people.FreeBSD.org/~jdp/foundation/announcement.html">The
- FreeBSD Foundation -- an Introduction</ulink>. To contact
+ found in <link xlink:href="http://people.FreeBSD.org/~jdp/foundation/announcement.html">The
+ FreeBSD Foundation -- an Introduction</link>. To contact
the Foundation by email, write to
<para>The FreeBSD Project happily accepts donations of
hardware that it can find good use for. If you are
interested in donating hardware, please contact the
- <ulink url="&url.base;/donations/">Donations Liaison
- Office</ulink>.</para>
+ <link xlink:href="&url.base;/donations/">Donations Liaison
+ Office</link>.</para>
diff --git a/en_US.ISO8859-1/articles/contributors/article.xml b/en_US.ISO8859-1/articles/contributors/article.xml
index b0c1671a24..8c30cb7e4a 100644
--- a/en_US.ISO8859-1/articles/contributors/article.xml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd" [
<!ENTITY % contrib.ent SYSTEM "contrib.ent">
<!ENTITY % not.published "IGNORE">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Contributors to FreeBSD</title>
-<article lang='en'>
- <articleinfo>
- <title>Contributors to FreeBSD</title>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -24,15 +23,15 @@
<para>This article lists individuals and organizations who have
made a contribution to FreeBSD.</para>
- </articleinfo>
+ </info>
- <sect1 id="donors">
+ <sect1 xml:id="donors">
<title>Donors Gallery</title>
<para>As of 2010, the following section is several years out-of-date.
Donations from the past several years appear
- <ulink url="&url.base;/donations/donors.html">here</ulink>.
+ <link xlink:href="&url.base;/donations/donors.html">here</link>.
@@ -46,26 +45,24 @@
<para>The following individuals and businesses made it possible for
the FreeBSD Project to build a new central server machine, which
- has replaced <hostid role="fqdn">freefall.FreeBSD.org</hostid> at
+ has replaced <systemitem class="fqdomainname">freefall.FreeBSD.org</systemitem> at
one point, by donating the following items:</para>
- <para>&a.mbarkah.email; and his employer, <ulink
- url="http://www.hemi.com/"> Hemisphere Online</ulink>,
+ <para>&a.mbarkah.email; and his employer, <link xlink:href="http://www.hemi.com/"> Hemisphere Online</link>,
donated a <emphasis>Pentium Pro (P6) 200MHz CPU</emphasis>
- <para><ulink url="http://www.asacomputers.com/">ASA
- Computers</ulink> donated a <emphasis>Tyan 1662
+ <para><link xlink:href="http://www.asacomputers.com/">ASA
+ Computers</link> donated a <emphasis>Tyan 1662
- <para>Joe McGuckin <email>joe@via.net</email> of <ulink
- url="http://www.via.net/">ViaNet Communications</ulink> donated
+ <para>Joe McGuckin <email>joe@via.net</email> of <link xlink:href="http://www.via.net/">ViaNet Communications</link> donated
a <emphasis>Kingston ethernet controller.</emphasis></para>
@@ -76,8 +73,7 @@
- <para>Ulf Zimmermann <email>ulf@Alameda.net</email> of <ulink
- url="http://www.Alameda.net/">Alameda Networks</ulink> donated
+ <para>Ulf Zimmermann <email>ulf@Alameda.net</email> of <link xlink:href="http://www.Alameda.net/">Alameda Networks</link> donated
<emphasis>128MB of memory</emphasis>, a <emphasis>4 Gb disk
drive and the case.</emphasis></para>
@@ -101,13 +97,13 @@
- <para><ulink url="http://www.bluemountain.com/">Blue Mountain
- Arts</ulink></para>
+ <para><link xlink:href="http://www.bluemountain.com/">Blue Mountain
+ Arts</link></para>
- <para><ulink url="http://www.epilogue.com/">Epilogue Technology
- Corporation</ulink></para>
+ <para><link xlink:href="http://www.epilogue.com/">Epilogue Technology
+ Corporation</link></para>
@@ -115,8 +111,8 @@
- <para><ulink url="http://www.gta.com/">Global Technology
- Associates, Inc</ulink></para>
+ <para><link xlink:href="http://www.gta.com/">Global Technology
+ Associates, Inc</link></para>
@@ -142,8 +138,8 @@
<para>Kenneth P. Stox <email>ken@stox.sa.enteract.com</email> of
- <ulink url="http://www.imagescape.com/">Imaginary Landscape,
- LLC.</ulink></para>
+ <link xlink:href="http://www.imagescape.com/">Imaginary Landscape,
+ LLC.</link></para>
@@ -151,41 +147,41 @@
- <para><ulink url="http://www.cdrom.co.jp/">Laser5</ulink> of Japan
+ <para><link xlink:href="http://www.cdrom.co.jp/">Laser5</link> of Japan
(a portion of the profits from sales of their various FreeBSD
- <para><ulink url="http://www.mmjp.or.jp/fuki/">Fuki Shuppan
- Publishing Co.</ulink> donated a portion of their profits from
+ <para><link xlink:href="http://www.mmjp.or.jp/fuki/">Fuki Shuppan
+ Publishing Co.</link> donated a portion of their profits from
<emphasis>Hajimete no FreeBSD</emphasis> (FreeBSD, Getting
started) to the FreeBSD and XFree86 projects.</para>
- <para><ulink url="http://www.ascii.co.jp/">ASCII Corp.</ulink>
+ <para><link xlink:href="http://www.ascii.co.jp/">ASCII Corp.</link>
donated a portion of their profits from several FreeBSD-related
books to the FreeBSD project.</para>
- <para><ulink url="http://www.yokogawa.co.jp/">Yokogawa Electric
- Corp</ulink> has generously donated significant funding to the
+ <para><link xlink:href="http://www.yokogawa.co.jp/">Yokogawa Electric
+ Corp</link> has generously donated significant funding to the
FreeBSD project.</para>
- <para><ulink url="http://www.buffnet.net/">BuffNET</ulink></para>
+ <para><link xlink:href="http://www.buffnet.net/">BuffNET</link></para>
- <para><ulink url="http://www.pacificsolutions.com/">Pacific
- Solutions</ulink></para>
+ <para><link xlink:href="http://www.pacificsolutions.com/">Pacific
+ Solutions</link></para>
- <para><ulink url="http://www.siemens.de/">Siemens AG</ulink>
+ <para><link xlink:href="http://www.siemens.de/">Siemens AG</link>
via Andre Albsmeier
@@ -213,7 +209,7 @@
- <para><ulink url="http://www.compaq.com">Compaq</ulink>
+ <para><link xlink:href="http://www.compaq.com">Compaq</link>
has donated a variety of Alpha systems to the FreeBSD
Project. Among the many generous donations are 4
AlphaStation DS10s, an AlphaServer DS20,
@@ -243,24 +239,23 @@
<para>Larry Altneu <email>larry@ALR.COM</email>, and &a.wilko.email;,
provided Wangtek and Archive QIC-02 tape drives in order to
- improve the <devicename>wt</devicename> driver.</para>
+ improve the <filename>wt</filename> driver.</para>
- <para>Ernst Winter (<ulink url="http://berklix.org/ewinter/">Deceased</ulink>)
+ <para>Ernst Winter (<link xlink:href="http://berklix.org/ewinter/">Deceased</link>)
contributed a 2.88 MB floppy drive to the project. This will hopefully
increase the pressure for rewriting the floppy disk driver.
- <para><ulink url="http://www.tekram.com/">Tekram
- Technologies</ulink> sent one each of their DC-390, DC-390U
+ <para><link xlink:href="http://www.tekram.com/">Tekram
+ Technologies</link> sent one each of their DC-390, DC-390U
and DC-390F FAST and ULTRA SCSI host adapter cards for
regression testing of the NCR and AMD drivers with their cards.
They are also to be applauded for making driver sources for free
- operating systems available from their FTP server <ulink
- url="ftp://ftp.tekram.com/scsi/FreeBSD/"></ulink>.</para>
+ operating systems available from their FTP server <uri xlink:href="ftp://ftp.tekram.com/scsi/FreeBSD/">ftp://ftp.tekram.com/scsi/FreeBSD/</uri>.</para>
@@ -293,22 +288,20 @@
- <para><ulink url="http://www.osd.bsdi.com/">BSDi</ulink> (formerly Walnut Creek CDROM)
+ <para><link xlink:href="http://www.osd.bsdi.com/">BSDi</link> (formerly Walnut Creek CDROM)
has donated almost more than we can say (see the 'About the FreeBSD Project'
- section of the <ulink url="&url.books.handbook;/index.html">FreeBSD Handbook</ulink> for more details).
+ section of the <link xlink:href="&url.books.handbook;/index.html">FreeBSD Handbook</link> for more details).
In particular, we would like to thank them for the original
- hardware used for <hostid
- role="fqdn">freefall.FreeBSD.org</hostid>, our primary
- development machine, and for <hostid
- role="fqdn">thud.FreeBSD.org</hostid>, a testing and build
+ hardware used for <systemitem class="fqdomainname">freefall.FreeBSD.org</systemitem>, our primary
+ development machine, and for <systemitem class="fqdomainname">thud.FreeBSD.org</systemitem>, a testing and build
box. We are also indebted to them for funding various
contributors over the years and providing us with unrestricted
use of their T1 connection to the Internet.</para>
- <para>The <ulink url="http://www.interface-business.de/">interface
- business GmbH, Dresden</ulink> has been patiently supporting
+ <para>The <link xlink:href="http://www.interface-business.de/">interface
+ business GmbH, Dresden</link> has been patiently supporting
&a.joerg.email; who has often preferred FreeBSD work over paid work, and
used to fall back to their (quite expensive) EUnet Internet
connection whenever his private connection became too slow or
@@ -316,8 +309,8 @@
- <para><ulink url="http://www.bsdi.com/">Berkeley Software Design,
- Inc.</ulink> has contributed their DOS emulator code to the
+ <para><link xlink:href="http://www.bsdi.com/">Berkeley Software Design,
+ Inc.</link> has contributed their DOS emulator code to the
remaining BSD world, which is used in the
<emphasis>doscmd</emphasis> command.</para>
@@ -326,7 +319,7 @@
- <sect1 id="staff-committers">
+ <sect1 xml:id="staff-committers">
<title>The FreeBSD Developers</title>
<para>These are the people who have commit privileges and do the
@@ -338,7 +331,7 @@
- <sect1 id="contrib-corealumni">
+ <sect1 xml:id="contrib-corealumni">
<title>Core Team Alumni</title>
<indexterm><primary>core team</primary></indexterm>
@@ -351,7 +344,7 @@
- <sect1 id="contrib-develalumni">
+ <sect1 xml:id="contrib-develalumni">
<title>Development Team Alumni</title>
<indexterm><primary>development team</primary></indexterm>
@@ -364,7 +357,7 @@
- <sect1 id="contrib-portmgralumni">
+ <sect1 xml:id="contrib-portmgralumni">
<title>Ports Management Team Alumni</title>
<indexterm><primary>portmgr team</primary></indexterm>
@@ -377,7 +370,7 @@
- <sect1 id="contrib-develinmemoriam">
+ <sect1 xml:id="contrib-develinmemoriam">
<title>Development Team: In Memoriam</title>
<indexterm><primary>development team</primary></indexterm>
@@ -391,7 +384,7 @@
- <sect1 id="contrib-derived">
+ <sect1 xml:id="contrib-derived">
<title>Derived Software Contributors</title>
<para>This software was originally derived from William F. Jolitz's 386BSD
@@ -406,7 +399,7 @@
all the contributors to NetBSD and OpenBSD for their work.</para>
- <sect1 id="contrib-additional">
+ <sect1 xml:id="contrib-additional">
<title>Additional FreeBSD Contributors</title>
<para>(in alphabetical order by first name):</para>
@@ -414,7 +407,7 @@
- <sect1 id="contrib-386bsd">
+ <sect1 xml:id="contrib-386bsd">
<title>386BSD Patch Kit Patch Contributors</title>
<para>(in alphabetical order by first name):</para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
index 398ff330aa..de54542dfa 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<para>Adam Glass
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index a99cb74711..da89e64cbd 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -4,8 +4,7 @@
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<para>ABURAYA Ryushirou
@@ -2466,7 +2465,7 @@
<para>Denis Generalov
- <email>gd@rambler-co.ru></email></para>
+ <email>gd@rambler-co.ru&gt;</email></para>
@@ -3023,8 +3022,7 @@
- <para>Ernst Winter (<ulink
- url="http://berklix.org/ewinter/">Deceased</ulink>)</para>
+ <para>Ernst Winter (<link xlink:href="http://berklix.org/ewinter/">Deceased</link>)</para>
@@ -6327,7 +6325,7 @@
<para>Martin Kropfinger
- <email>freebsd@rakor-net.de></email></para>
+ <email>freebsd@rakor-net.de&gt;</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 011458eae1..e7e4e64031 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -5,8 +5,7 @@
alphabetical order by last name. Please keep in mind that fact while
adding your entity to the list of developers.
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index e2a4163d48..0a9f3f90c7 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<para>&a.attilio.email; (2012)</para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
index fa3f4f16ba..d9056fdc67 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<para>&a.kmacy.email; (2005 - 2012)</para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
index 52c4849be6..1229621c15 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<para>&a.jb.email; (1997 - 2009; RIP 2009)</para>
- <ulink url="http://hub.opensolaris.org/bin/view/Community+Group+ogb/In+Memoriam">John</ulink>
+ <link xlink:href="http://hub.opensolaris.org/bin/view/Community+Group+ogb/In+Memoriam">John</link>
made major contributions to FreeBSD, the best known of which
is the import of the &man.dtrace.1; code. John's unique sense
of humor and plain-spokenness either ruffled feathers or
@@ -18,10 +17,10 @@
<para>&a.jmz.email; (1994 - 2009; RIP 2009)</para>
- <ulink url="http://www.obs-besancon.fr/article.php3?id_article=323">Jean-Marc</ulink>
+ <link xlink:href="http://www.obs-besancon.fr/article.php3?id_article=323">Jean-Marc</link>
was an astrophysicist who made important contributions to the modeling
of the atmospheres of both planets and comets at
- <ulink url="http://www.obs-besancon.fr/">l'Observatoire de Besan&ccedil;on</ulink>
+ <link xlink:href="http://www.obs-besancon.fr/">l'Observatoire de Besan&ccedil;on</link>
in Besan&ccedil;on, France. While there, he participated in the
conception and construction of the Vega tricanal spectrometer
that studied Halley's Comet. He had also been a long-time
@@ -31,9 +30,9 @@
<para>&a.itojun.email; (1997 - 2001; RIP 2008)</para>
<para>Known to everyone as
- <ulink url="http://astralblue.livejournal.com/350702.html">itojun</ulink>,
+ <link xlink:href="http://astralblue.livejournal.com/350702.html">itojun</link>,
Jun-ichiro Hagino was was a core researcher at the
- <ulink url="http://www.kame.net/">KAME Project</ulink>,
+ <link xlink:href="http://www.kame.net/">KAME Project</link>,
which aimed to provide IPv6 and IPsec technology in freely
redistributable form. Much of this code was incorporated
into FreeBSD. Without his efforts, the state of IPv6 on the
@@ -43,7 +42,7 @@
<para>&a.cg.email; (1999 - 2005; RIP 2005)</para>
- <ulink url="http://www.dbsi.org/cam/">Cameron</ulink>
+ <link xlink:href="http://www.dbsi.org/cam/">Cameron</link>
was a unique individual who contributed to the project
despite serious physical disabilities. He was responsible
for a complete rewrite of our sound system during the
@@ -55,7 +54,7 @@
<para>&a.alane.email; (2002 - 2003; RIP 2003)</para>
- <ulink url="http://freebsd.kde.org/memoriam/alane.php">Alan</ulink>
+ <link xlink:href="http://freebsd.kde.org/memoriam/alane.php">Alan</link>
was a major contributor to the KDE on FreeBSD group. In addition,
he maintained many other difficult and time-consuming ports such
as <application>autoconf</application>,
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
index d422aa16c2..6086fdab04 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
- <itemizedlist>
+<itemizedlist xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
<para>&a.beat.email; (2011 - 2013)</para>
diff --git a/en_US.ISO8859-1/articles/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 107c9e2b60..90a108b519 100644
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@@ -1,21 +1,16 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>CUPS on FreeBSD</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>CUPS on FreeBSD</title>
- <author>
- <firstname>Chess</firstname>
- <surname>Griffin</surname>
- <affiliation>
+ <author><personname><firstname>Chess</firstname><surname>Griffin</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -27,9 +22,9 @@
<para>An article about configuring CUPS on &os;.</para>
- </articleinfo>
+ </info>
- <sect1 id="printing-cups">
+ <sect1 xml:id="printing-cups">
<title>An Introduction to the Common Unix Printing System (CUPS)</title>
@@ -54,11 +49,10 @@
sharing and accessing printers in mixed environments of &os;,
&linux;, &macos;&nbsp;X, or &windows;.</para>
- <para>The main site for <application>CUPS</application> is <ulink
- url="http://www.cups.org/"></ulink>.</para>
+ <para>The main site for <application>CUPS</application> is <uri xlink:href="http://www.cups.org/">http://www.cups.org/</uri>.</para>
- <sect1 id="printing-cups-install">
+ <sect1 xml:id="printing-cups-install">
<title>Installing the CUPS Print Server</title>
<para><application>CUPS</application> can be installed from ports or
@@ -74,15 +68,15 @@
<screen>&prompt.root; <userinput>pkg_add -r cups</userinput></screen>
<para>Other optional, but recommended, ports or packages are
- <filename role="package">print/gutenprint-cups</filename> and
- <filename role="package">print/hplip</filename>, both of which add
+ <package>print/gutenprint-cups</package> and
+ <package>print/hplip</package>, both of which add
drivers and utilities for a variety of printers. Once installed,
the <application>CUPS</application> configuration files can be
found in the directory
- <sect1 id="printing-cups-configuring-server">
+ <sect1 xml:id="printing-cups-configuring-server">
<title>Configuring the CUPS Print Server</title>
<para>After installation, a few files must edited in order to
@@ -91,7 +85,7 @@
<filename>/etc/devfs.rules</filename> and add the following
information to set the proper permissions on all potential printer
devices and to associate printers with the
- <groupname>cups</groupname> user group:</para>
+ <systemitem class="groupname">cups</systemitem> user group:</para>
add path 'unlpt*' mode 0660 group cups
@@ -103,13 +97,12 @@ add path 'usb/<replaceable>X</replaceable>.<replaceable>Y</replaceable>.<replace
<para>Note that <replaceable>X</replaceable>,
<replaceable>Y</replaceable>, and <replaceable>Z</replaceable>
should be replaced with the target USB device listed in the
- <filename class="directory">/dev/usb</filename> directory that
+ <filename>/dev/usb</filename> directory that
corresponds to the printer. To find the correct device, examine
the output of &man.dmesg.8;, where
- <filename>ugen<replaceable>X</replaceable>.<replaceable>Y</replaceable></filename>
+ <filename>ugenX.Y</filename>
lists the printer device, which is a symbolic link to a USB
- device in <filename
- class="directory">/dev/usb</filename>.</para>
+ device in <filename>/dev/usb</filename>.</para>
<para>Next, add two lines to <filename>/etc/rc.conf</filename> as
@@ -139,7 +132,7 @@ devfs_system_ruleset="system"</programlisting>
&prompt.root; <userinput>/usr/local/etc/rc.d/cupsd restart</userinput></screen>
- <sect1 id="printing-cups-configuring-printers">
+ <sect1 xml:id="printing-cups-configuring-printers">
<title>Configuring Printers on the CUPS Print Server</title>
<para>After the <application>CUPS</application> system has been
@@ -153,11 +146,11 @@ devfs_system_ruleset="system"</programlisting>
<para>The primary means for managing and administering the
<application>CUPS</application> server is through the web-based
interface, which can be found by launching a web browser and
- entering <ulink url="http://localhost:631"></ulink> in the
+ entering <uri xlink:href="http://localhost:631">http://localhost:631</uri> in the
browser's URL bar. If the <application>CUPS</application> server
is on another machine on the network, substitute the server's
local <acronym>IP</acronym> address for
- <hostid>localhost</hostid>. The <application>CUPS</application>
+ <systemitem>localhost</systemitem>. The <application>CUPS</application>
web interface is fairly self-explanatory, as there are sections
for managing printers and print jobs, authorizing users, and more.
Additionally, on the right-hand side of the Administration screen
@@ -175,15 +168,13 @@ devfs_system_ruleset="system"</programlisting>
Administration screen. When presented with the
<quote>Device</quote> drop-down box, simply select the desired
locally-attached printer, and then continue through the process.
- If one has added the <filename
- role="package">print/gutenprint-cups</filename> or <filename
- role="package">print/hplip</filename> ports or packages as
+ If one has added the <package>print/gutenprint-cups</package> or <package>print/hplip</package> ports or packages as
referenced above, then additional print drivers will be available
in the subsequent screens that might provide more stability or
- <sect1 id="printing-cups-clients">
+ <sect1 xml:id="printing-cups-clients">
<title>Configuring CUPS Clients</title>
<para>Once the <application>CUPS</application> server has been
@@ -194,7 +185,7 @@ devfs_system_ruleset="system"</programlisting>
desktop machine that is acting as both server and client, then
much of this information may not be needed.</para>
- <sect2 id="printing-cups-clients-unix">
+ <sect2 xml:id="printing-cups-clients-unix">
<title>&unix; Clients</title>
<para><application>CUPS</application> will also need to be
@@ -206,7 +197,7 @@ devfs_system_ruleset="system"</programlisting>
<application>GNOME</application> or
<application>KDE</application>. Alternatively, one can access
the local <application>CUPS</application> interface on the
- client machine at <ulink url="http://localhost:631"></ulink> and
+ client machine at <uri xlink:href="http://localhost:631">http://localhost:631</uri> and
click on <quote>Add Printer</quote> in the Administration
section. When presented with the <quote>Device</quote>
drop-down box, simply select the networked
@@ -235,7 +226,7 @@ devfs_system_ruleset="system"</programlisting>
<application>CUPS</application> server on the network.</para>
- <sect2 id="printing-cups-clients-windows">
+ <sect2 xml:id="printing-cups-clients-windows">
<title>&windows; Clients</title>
<para>Versions of &windows; prior to XP did not have the
@@ -253,20 +244,20 @@ devfs_system_ruleset="system"</programlisting>
<para>If one has an older version of &windows; without native
<acronym>IPP</acronym> printing support, then the general means
of connecting to a <application>CUPS</application> printer is to
- use <filename role="package">net/samba3</filename> and
+ use <package>net/samba3</package> and
<application>CUPS</application> together, which is a topic
outside the scope of this chapter.</para>
- <sect1 id="printing-cups-troubleshooting">
+ <sect1 xml:id="printing-cups-troubleshooting">
<title>CUPS Troubleshooting</title>
<para>Difficulties with <application>CUPS</application> often lies
in permissions. First, double check the &man.devfs.8; permissions
as outlined above. Next, check the actual permissions of the
devices created in the file system. It is also helpful to make
- sure your user is a member of the <groupname>cups</groupname>
+ sure your user is a member of the <systemitem class="groupname">cups</systemitem>
group. If the permissions check boxes in the Administration
section of the <application>CUPS</application> web interface do
not seem to be working, another fix might be to manually backup
@@ -363,7 +354,7 @@ CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default&gt;
- <sect1 id="printing-cups-ports-knobs">
+ <sect1 xml:id="printing-cups-ports-knobs">
<title>Fine Tuning CUPS-Related Ports</title>
<para>If <application>CUPS</application> is going to serve as the
@@ -377,14 +368,14 @@ CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default&gt;
- <para>The first knob, <makevar>WITH_CUPS</makevar>, adds
+ <para>The first knob, <varname>WITH_CUPS</varname>, adds
<application>CUPS</application> support to ports where applicable.
- The second knob, <makevar>CUPS_OVERWRITE_BASE</makevar>, will fix
+ The second knob, <varname>CUPS_OVERWRITE_BASE</varname>, will fix
certain symlinks and paths that would otherwise apply to the
default &os; printing system, <application>LPR</application>, and
will prevent these fixes from being reverted upon the next
- <maketarget>buildworld</maketarget> system upgrade. The third
- knob, <makevar>WITHOUT_LPR</makevar>, will prevent
+ <buildtarget>buildworld</buildtarget> system upgrade. The third
+ knob, <varname>WITHOUT_LPR</varname>, will prevent
<application>LPR</application> support from being added to ports
where applicable.</para>
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index f003443fe1..680d734c94 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -1,22 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Using newer version of <application>GCC</application> and
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Using newer version of <application>GCC</application> and
<application>binutils</application> with the &os; Ports
- <author>
- <firstname>Martin</firstname>
- <surname>Matuska</surname>
- <affiliation>
+ <author><personname><firstname>Martin</firstname><surname>Matuska</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -37,9 +32,9 @@
Custom <application>GCC</application> configurations are also
- </articleinfo>
+ </info>
- <sect1 id="intro">
+ <sect1 xml:id="intro">
<para>The default system compiler as of &os; 8.0 is
@@ -56,10 +51,10 @@
- <sect1 id="prerequisites">
+ <sect1 xml:id="prerequisites">
- <sect2 id="installing-binutils">
+ <sect2 xml:id="installing-binutils">
<title>Installing binutils from ports</title>
<para>To make use of all of the new features in the latest
@@ -77,25 +72,25 @@
<screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils &amp;&amp; make install</userinput></screen>
- <sect2 id="installing-gcc">
+ <sect2 xml:id="installing-gcc">
<title>Installing GCC from ports</title>
<para>The &os; ports tree offers several new versions of
<application>GCC</application>. The following example is for
the stable version 4.4. However, it is possible to install
previous or later development versions (e.g.
- <filename role="package">lang/gcc43</filename> or
- <filename role="package">lang/gcc45</filename>).</para>
+ <package>lang/gcc43</package> or
+ <package>lang/gcc45</package>).</para>
<para>To install one of the mentioned
<application>GCC</application> ports, run the following
- <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> &amp;&amp; make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/lang/gcc44 &amp;&amp; make install</userinput></screen>
- <sect1 id="configuring-ports-gcc">
+ <sect1 xml:id="configuring-ports-gcc">
<title>Configuring ports for custom version of
@@ -103,7 +98,7 @@
custom version of <application>GCC</application> installed from
the &os; ports tree.</para>
- <sect2 id="adjusting-make.conf">
+ <sect2 xml:id="adjusting-make.conf">
<title>Adjusting <filename>make.conf</filename></title>
<para>Add the following lines to the
@@ -129,7 +124,7 @@ CPP=cpp44
- <sect2 id="adjusting-libmap.conf">
+ <sect2 xml:id="adjusting-libmap.conf">
<title>Adjusting <filename>libmap.conf</filename></title>
<para>Many of the ports' binaries and libraries link to libgcc_s
@@ -161,7 +156,7 @@ libstdc++.so.6 gcc44/libstdc++.so.6</programlisting>
- <sect2 id="custom-cflags">
+ <sect2 xml:id="custom-cflags">
<title>Custom <literal>CFLAGS</literal> for the ports tree</title>
<para>To add custom <literal>CFLAGS</literal> for the ports tree
@@ -183,7 +178,7 @@ CFLAGS+=-mssse3
optimizations flags based on this variable.</para>
- <sect2 id="excluding-unbuildable-ports">
+ <sect2 xml:id="excluding-unbuildable-ports">
<title>Excluding ports that do not build with new version of
@@ -202,14 +197,14 @@ CPP=cpp44
<para>The example above excludes the forced use of
<command>gcc</command> 4.4 for the
- <filename role="package">net/openldap</filename>* ports. It is
+ <package>net/openldap</package>* ports. It is
also possible to specify more ports on a single line:</para>
<programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) &amp;&amp; empty(.CURDIR:M/usr/ports/xxx/yyy) &amp;&amp; ...</programlisting>
- <sect1 id="performance-imparct">
+ <sect1 xml:id="performance-imparct">
<title>Impact on the binary performance</title>
<para>Using <application>GCC</application> version 4.4 with
@@ -219,8 +214,7 @@ CPP=cpp44
more than a 20% performance boost (e.g. in multimedia
- <para>The table located at <ulink
- url="http://people.freebsd.org/~mm/benchmarks/perlbench/"></ulink>
+ <para>The table located at <uri xlink:href="http://people.freebsd.org/~mm/benchmarks/perlbench/">http://people.freebsd.org/~mm/benchmarks/perlbench/</uri>
shows a comparison of <application>GCC</application> versions
currently available in base &os; system,
<application>GCC</application> version 4.3 and
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index 234a19f0a9..3ab3fc66f4 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Setting up a CVS repository - the FreeBSD way</title>
-<article lang='en'>
- <articleinfo>
- <title>Setting up a CVS repository - the FreeBSD way</title>
- <author>
- <firstname>Stijn</firstname>
- <surname>Hoop</surname>
- <affiliation>
+ <author><personname><firstname>Stijn</firstname><surname>Hoop</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
@@ -25,7 +20,7 @@
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -37,9 +32,9 @@
granular access control to the source tree and generation of readable
email of every commit.</para>
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>Most of the open source software projects use
@@ -62,7 +57,7 @@
- <sect1 id="first-setup">
+ <sect1 xml:id="first-setup">
<title>First setup</title>
@@ -77,10 +72,10 @@
<para>The first thing to do when setting up a new repository is to tell
<application>CVS</application> to initialize it:</para>
- <screen>&prompt.user; <userinput>cvs -d <replaceable>path-to-repository</replaceable> init</userinput></screen>
+ <screen>&prompt.user; <userinput>cvs -d path-to-repository init</userinput></screen>
<para>This tells <application>CVS</application> to create the
- <filename class="directory">CVSROOT</filename> administrative directory, where all the
+ <filename>CVSROOT</filename> administrative directory, where all the
customization takes place.</para>
@@ -92,12 +87,12 @@
repository. We will assume the FreeBSD default of
<literal>ncvs</literal> for this group.</para>
- <screen>&prompt.root; <userinput>pw groupadd <replaceable>ncvs</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>pw groupadd ncvs</userinput></screen>
<para>Next, you should &man.chown.8; the directory to the group
you just added:</para>
- <screen>&prompt.root; <userinput>chown -R :<replaceable>ncvs</replaceable> <replaceable>path-to-your-repository</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>chown -R :ncvs path-to-your-repository</userinput></screen>
<para>This ensures that no one can write to the repository without proper
group permissions.</para>
@@ -106,25 +101,24 @@
<title>Getting the sources</title>
- <para>Now you need to obtain the <filename class="directory">CVSROOT</filename> directory
+ <para>Now you need to obtain the <filename>CVSROOT</filename> directory
from the FreeBSD repository. This is most easily done by checking it
- out from a FreeBSD anonymous CVS mirror. See <ulink
- url="&url.books.handbook;/anoncvs.html">the relevant chapter in
- the handbook</ulink> for more information. Let us assume that the
- sources are stored in <filename class="directory">CVSROOT-freebsd</filename> in the
+ out from a FreeBSD anonymous CVS mirror. See <link xlink:href="&url.books.handbook;/anoncvs.html">the relevant chapter in
+ the handbook</link> for more information. Let us assume that the
+ sources are stored in <filename>CVSROOT-freebsd</filename> in the
current directory.</para>
<title>Copying the FreeBSD scripts</title>
- <para>Next, we will copy the FreeBSD <filename class="directory">CVSROOT</filename>
+ <para>Next, we will copy the FreeBSD <filename>CVSROOT</filename>
sources into your own repository. If you are accustomed to
<application>CVS</application>, you might be thinking that you can just
import the scripts, in an attempt to make synchronizing with later
versions easier. However, it turns out that
<application>CVS</application> has a deficiency in this area:
- when importing sources into the <filename class="directory">CVSROOT</filename> directory,
+ when importing sources into the <filename>CVSROOT</filename> directory,
it will not update the needed administrative files. In order to make
it recognize those, you will need to checkin each file after importing
them, losing the value of <literal>cvs import</literal>. Therefore,
@@ -132,10 +126,10 @@
<para>It does not matter if the above paragraph did not make sense to
you&mdash;the end result is the same. Simply check out your
- <filename class="directory">CVSROOT</filename> and copy the FreeBSD files over your
+ <filename>CVSROOT</filename> and copy the FreeBSD files over your
local (untouched) copies:</para>
- <screen>&prompt.user; <userinput>cvs -d <replaceable>path-to-your-repository</replaceable> checkout CVSROOT</userinput>
+ <screen>&prompt.user; <userinput>cvs -d path-to-your-repository checkout CVSROOT</userinput>
&prompt.user; <userinput>cd CVSROOT</userinput>
&prompt.user; <userinput>cp ../CVSROOT-freebsd/* .</userinput>
&prompt.user; <userinput>cvs add *</userinput></screen>
@@ -277,7 +271,7 @@
match one of the lines in this file are exempted from this check.
You should add expressions to this file as you checkin files that
cannot have a revision header. For the purpose of installing the
- scripts, it may be best to exclude <filename class="directory">CVSROOT/</filename>
+ scripts, it may be best to exclude <filename>CVSROOT/</filename>
from header checks.</para>
@@ -466,7 +460,7 @@
<para><literal>@LOG_FILE_MAP</literal> - change this array
as you wish - each regexp is matched on the directory of
the commit, and the commit log message gets stored in
- the <filename class="directory">commitlogs</filename> subdirectory in
+ the <filename>commitlogs</filename> subdirectory in
the filename mentioned.</para>
@@ -495,7 +489,7 @@
<literal>^CVSROOT/</literal>, and add one line with only
<literal>^CVSROOT/</literal> on it. After the wrapper is
installed, you can add your header to the files in the
- <filename class="directory">CVSROOT</filename> directory and restore these lines,
+ <filename>CVSROOT</filename> directory and restore these lines,
but for now they will only be in the way when you try to commit
later on.</para>
@@ -533,7 +527,7 @@
<para>The last thing to do before you are finished, is to make sure
the commitlogs can be stored. By default these are stored in
the repository, in the <filename>commitlogs</filename> subdirectory
- of the <filename class="directory">CVSROOT</filename> directory. This directory
+ of the <filename>CVSROOT</filename> directory. This directory
needs to be created, so do the following:</para>
<screen>&prompt.user; <userinput>mkdir commitlogs</userinput>
@@ -543,12 +537,12 @@
<para>Now, after careful review, you should commit your changes. Be
sure that you have granted yourself access to the
- <filename class="directory">CVSROOT</filename> directory in your
+ <filename>CVSROOT</filename> directory in your
<filename>avail</filename> before you do this, because otherwise you
will lock yourself out. So make sure everything is as you intend, and
then do the following:</para>
- <screen>&prompt.user; <userinput>cvs commit -m '<replaceable>- Initial FreeBSD scripts commit</replaceable>'</userinput></screen>
+ <screen>&prompt.user; <userinput>cvs commit -m '- Initial FreeBSD scripts commit'</userinput></screen>
@@ -558,7 +552,7 @@
<filename>avail</filename> file, to make sure everything works as
- <screen>&prompt.user; <userinput>cvs commit -f -m '<replaceable>Forced commit to test the new CVSROOT scripts</replaceable>' avail</userinput></screen>
+ <screen>&prompt.user; <userinput>cvs commit -f -m 'Forced commit to test the new CVSROOT scripts' avail</userinput></screen>
<para>If everything works, congratulations! You now have a working setup
of the FreeBSD scripts for your repository. If
@@ -568,12 +562,12 @@
- <sect1 id="freebsdspecific">
+ <sect1 xml:id="freebsdspecific">
<title>FreeBSD specific setup</title>
<para>The FreeBSD project itself uses a slightly different setup, which
- also uses files from the <filename class="directory">freebsd</filename> subdirectory of
- the FreeBSD <filename class="directory">CVSROOT</filename>. The project uses this because
+ also uses files from the <filename>freebsd</filename> subdirectory of
+ the FreeBSD <filename>CVSROOT</filename>. The project uses this because
of the large number of committers, which all would have to be in the
same group. So, a simple wrapper was written which ensures that people
have the correct credentials to commit, and then sets the group id
@@ -642,7 +636,7 @@
<para>Next up is installing the wrapper to ensure you become the
correct group when committing. The sources for this live in
<filename>cvswrap.c</filename> in your
- <filename class="directory">CVSROOT</filename>.</para>
+ <filename>CVSROOT</filename>.</para>
<para>Compile the sources that you edited to include the correct
@@ -653,7 +647,7 @@
<screen>&prompt.root; <userinput>mv /usr/bin/cvs /usr/bin/ncvs</userinput>
&prompt.root; <userinput>mv cvs /usr/bin/cvs</userinput>
-&prompt.root; <userinput>chown root:<replaceable>ncvs</replaceable> /usr/bin/cvs /usr/bin/ncvs</userinput>
+&prompt.root; <userinput>chown root:ncvs /usr/bin/cvs /usr/bin/ncvs</userinput>
&prompt.root; <userinput>chmod o-rx /usr/bin/ncvs</userinput>
&prompt.root; <userinput>chmod u-w,g+s /usr/bin/cvs</userinput></screen>
@@ -676,7 +670,7 @@
<para>Your wrapper should now be setup. You can of course test this by
making a forced commit to the <filename>access</filename> file:</para>
- <screen>&prompt.user; <userinput>cvs commit -f -m '<replaceable>Forced commit to test the new CVSROOT scripts</replaceable>' access</userinput></screen>
+ <screen>&prompt.user; <userinput>cvs commit -f -m 'Forced commit to test the new CVSROOT scripts' access</userinput></screen>
<para>Again, if this fails, check to see whether all of the above steps have
been executed correctly.</para>
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.xml b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
index eb6f1530d5..688f8bdad7 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,24 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Explaining BSD</title>
-<article lang='en'>
- <articleinfo>
- <title>Explaining BSD</title>
- <author>
- <firstname>Greg</firstname>
- <surname>Lehey</surname>
- <affiliation>
+ <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -39,14 +32,11 @@
<para>In the open source world, the word <quote>Linux</quote> is almost
synonymous with <quote>Operating System</quote>, but it is not the only
open source &unix; operating system. According
- to the <ulink
- url="http://www.leb.net/hzo/ioscount/data/r.9904.txt">Internet
- Operating System Counter</ulink>, as of April 1999 31.3% of the
+ to the <link xlink:href="http://www.leb.net/hzo/ioscount/data/r.9904.txt">Internet
+ Operating System Counter</link>, as of April 1999 31.3% of the
world's network connected machines run Linux. 14.6% run BSD &unix;.
- Some of the world's largest web operations, such as <ulink
- url="http://www.yahoo.com/">Yahoo!</ulink>, run BSD. The world's
- busiest FTP server of 1999 (now defunct), <ulink
- url="ftp://ftp.cdrom.com/">ftp.cdrom.com</ulink>, used BSD to
+ Some of the world's largest web operations, such as <link xlink:href="http://www.yahoo.com/">Yahoo!</link>, run BSD. The world's
+ busiest FTP server of 1999 (now defunct), <link xlink:href="ftp://ftp.cdrom.com/">ftp.cdrom.com</link>, used BSD to
transfer 1.4 TB of data a day. Clearly this is not a niche
market: BSD is a well-kept secret.</para>
@@ -56,9 +46,9 @@
<para>Throughout this paper, differences between BSD and Linux will be
noted <emphasis>like this</emphasis>.</para>
- </articleinfo>
+ </info>
- <sect1 id="what-is-bsd">
+ <sect1 xml:id="what-is-bsd">
<title>What is BSD?</title>
<para>BSD stands for <quote>Berkeley Software Distribution</quote>. It is
@@ -100,7 +90,7 @@
<para>The X Window system used in most versions of BSD is maintained
by the
- <ulink url="http://www.X.org/">X.Org project</ulink>.
+ <link xlink:href="http://www.X.org/">X.Org project</link>.
&os; allows the user to choose from a variety of desktop
environments, such as <application>Gnome</application>,
<application>KDE</application>, or <application>Xfce</application>;
@@ -116,7 +106,7 @@
- <sect1 id="what-a-real-unix">
+ <sect1 xml:id="what-a-real-unix">
<title>What, a real &unix;?</title>
<para>The BSD operating systems are not clones, but open source
@@ -165,29 +155,29 @@
CSRG members, William F. Jolitz, wrote the remaining code and released
it in early 1992 as <emphasis>386BSD</emphasis>. At the same time,
another group of ex-CSRG members formed a commercial company called
- <ulink url="http://www.bsdi.com/">Berkeley Software Design Inc.</ulink>
+ <link xlink:href="http://www.bsdi.com/">Berkeley Software Design Inc.</link>
and released a beta version of an operating system called
- <ulink url="http://www.bsdi.com/">BSD/386</ulink>, which was based on
+ <link xlink:href="http://www.bsdi.com/">BSD/386</link>, which was based on
the same sources. The name of the operating system was later changed
to BSD/OS.</para>
<para>386BSD never became a stable operating system. Instead, two other
projects split off from it in 1993:
- <ulink url="http://www.NetBSD.org/">NetBSD</ulink> and
- <ulink url="&url.base;/index.html">FreeBSD</ulink>. The two projects
+ <link xlink:href="http://www.NetBSD.org/">NetBSD</link> and
+ <link xlink:href="&url.base;/index.html">FreeBSD</link>. The two projects
originally diverged due to differences in patience waiting for
improvements to 386BSD: the NetBSD people started early in the year,
and the first version of FreeBSD was not ready until the end of the
year. In the meantime, the code base had diverged sufficiently to
make it difficult to merge. In addition, the projects had different
aims, as we will see below. In 1996,
- <ulink url="http://www.OpenBSD.org/">OpenBSD</ulink> split off from
+ <link xlink:href="http://www.OpenBSD.org/">OpenBSD</link> split off from
NetBSD, and in 2003,
- <ulink url="http://www.dragonflybsd.org/">DragonFlyBSD</ulink> split
+ <link xlink:href="http://www.dragonflybsd.org/">DragonFlyBSD</link> split
off from FreeBSD.</para>
- <sect1 id="why-is-bsd-not-better-known">
+ <sect1 xml:id="why-is-bsd-not-better-known">
<title>Why is BSD not better known?</title>
<para>For a number of reasons, BSD is relatively unknown:</para>
@@ -213,7 +203,7 @@
<para>In 1992, AT&amp;T sued
- <ulink url="http://www.bsdi.com/">BSDI</ulink>,
+ <link xlink:href="http://www.bsdi.com/">BSDI</link>,
the vendor of BSD/386, alleging that the product contained
AT&amp;T-copyrighted code. The case was settled out of court in
1994, but the spectre of the litigation continues to haunt people.
@@ -232,15 +222,15 @@
<para>There is a perception that the BSD projects are fragmented and
belligerent. The
- <ulink url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall Street
- Journal</ulink> spoke of <quote>balkanization</quote> of the
+ <link xlink:href="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall Street
+ Journal</link> spoke of <quote>balkanization</quote> of the
BSD projects. Like the law suit, this perception bases mainly
on ancient history.</para>
- <sect1 id="comparing-bsd-and-linux">
+ <sect1 xml:id="comparing-bsd-and-linux">
<title>Comparing BSD and Linux</title>
<para>So what is really the difference between, say, Debian Linux and
@@ -269,8 +259,8 @@
<para>The BSD kernels are developed and updated following the Open
Source development model. Each project maintains a publicly
accessible <emphasis>source tree</emphasis> under the
- <ulink url="http://www.cvshome.org/">Concurrent Versions
- System</ulink> (CVS), which contains all source files for the
+ <link xlink:href="http://www.cvshome.org/">Concurrent Versions
+ System</link> (CVS), which contains all source files for the
project, including documentation and other incidental files. CVS
allows users to <quote>check out</quote> (in other words, to
extract a copy of) any desired version of the system.</para>
@@ -474,12 +464,11 @@
- <para><ulink url="http://www.apple.com/macosx/server/">&macos;
- X</ulink> is the latest version of the operating system for
- <ulink url="http://www.apple.com/">Apple Computer Inc.'s</ulink>
+ <para><link xlink:href="http://www.apple.com/macosx/server/">&macos;
+ X</link> is the latest version of the operating system for
+ <link xlink:href="http://www.apple.com/">Apple Computer Inc.'s</link>
&macintosh; line. The BSD core of this operating
- system, <ulink
- url="http://developer.apple.com/darwin/">Darwin</ulink>,
+ system, <link xlink:href="http://developer.apple.com/darwin/">Darwin</link>,
is available as a fully functional open source operating
system for x86 and PPC computers. The Aqua/Quartz
graphics system and many other proprietary aspects of
@@ -495,13 +484,13 @@
<para>Linux is available under the
- <ulink url="http://www.fsf.org/copyleft/gpl.html">GNU General Public
- License</ulink> (GPL), which is designed to eliminate closed
+ <link xlink:href="http://www.fsf.org/copyleft/gpl.html">GNU General Public
+ License</link> (GPL), which is designed to eliminate closed
source software. In particular, any derivative work of a product
released under the GPL must also be supplied with source code if
requested. By contrast, the
- <ulink url="http://www.opensource.org/licenses/bsd-license.html">BSD
- license</ulink> is less restrictive: binary-only distributions are
+ <link xlink:href="http://www.opensource.org/licenses/bsd-license.html">BSD
+ license</link> is less restrictive: binary-only distributions are
allowed. This is particularly attractive for embedded
@@ -578,15 +567,15 @@
<title>Who provides support, service, and training for BSD?</title>
- <para>BSDi / <ulink url="http://www.freebsdmall.com">FreeBSD
- Mall, Inc.</ulink> have been providing support contracts for
+ <para>BSDi / <link xlink:href="http://www.freebsdmall.com">FreeBSD
+ Mall, Inc.</link> have been providing support contracts for
FreeBSD for nearly a decade.</para>
<para>In addition, each of the projects has a list of consultants for
- <ulink url="&url.base;/commercial/consult_bycat.html">FreeBSD</ulink>,
- <ulink url="http://www.netbsd.org/gallery/consultants.html">NetBSD</ulink>,
- and <ulink url="http://www.openbsd.org/support.html">OpenBSD</ulink>.</para>
+ <link xlink:href="&url.base;/commercial/consult_bycat.html">FreeBSD</link>,
+ <link xlink:href="http://www.netbsd.org/gallery/consultants.html">NetBSD</link>,
+ and <link xlink:href="http://www.openbsd.org/support.html">OpenBSD</link>.</para>
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 4a45888513..16ae1f14fe 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,26 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd" [
-<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd" [
+<!ENTITY scratch.ap "<application xmlns='http://docbook.org/ns/docbook'>FreeBSD From Scratch</application>">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>FreeBSD From Scratch</title>
-<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
- <articleinfo>
- <title>FreeBSD From Scratch</title>
- <author>
- <firstname>Jens</firstname>
- <surname>Schweikhardt</surname>
- <affiliation>
+ <author><personname><firstname>Jens</firstname><surname>Schweikhardt</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
<holder>Jens Schweikhardt</holder>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -38,16 +33,16 @@
think <command>make world</command> is a wonderful concept,
&scratch.ap; extends it to <command>make evenmore</command>.</para>
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>Have you ever upgraded your system with <command>make world</command>?
There is a problem if you have only one system on your disks. If
- the <maketarget>installworld</maketarget> fails partway through,
+ the <buildtarget>installworld</buildtarget> fails partway through,
you are left with a broken system that might not even boot any
- longer. Or maybe the <maketarget>installworld</maketarget> runs
+ longer. Or maybe the <buildtarget>installworld</buildtarget> runs
smoothly but the new kernel does not boot. Then it is time to
reach for the Fixit CD and dig for those backups you have taken
half a year ago.</para>
@@ -61,7 +56,7 @@
If you think that this task should be automated as well, read on.</para>
- <sect1 id="why">
+ <sect1 xml:id="why">
<title>Why would I (not) want &scratch.ap;?</title>
<para>This is a legitimate question. We have
@@ -104,8 +99,8 @@
<para>The well known way to build and install the world, as
- described in <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">the
- Handbook</ulink>, by default replaces
+ described in <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">the
+ Handbook</link>, by default replaces
the existing system. Only the kernel and modules are saved.
System binaries, headers and a lot of other files are overwritten;
obsolete files are still present and can cause surprises. If the
@@ -148,8 +143,7 @@
you feel like an update is in order, you simply toggle the
partitions you want to wipe and reinstall.</para>
- <para>Maybe you have heard of or even tried <ulink
- url="http://www.linuxfromscratch.org/">Linux From Scratch</ulink>,
+ <para>Maybe you have heard of or even tried <link xlink:href="http://www.linuxfromscratch.org/">Linux From Scratch</link>,
or LFS for short. LFS also describes how to build and install a
system from scratch in empty partitions using a running system.
The focus in LFS seems to be to show the role of each system
@@ -186,7 +180,7 @@
- <sect1 id="prerequisites">
+ <sect1 xml:id="prerequisites">
<para>For going the &scratch.ap; way, you need to have:</para>
@@ -224,7 +218,7 @@
- <sect1 id="stage1">
+ <sect1 xml:id="stage1">
<title>Stage One: System Installation</title>
<para>The first version of this article used a single shell script
@@ -239,7 +233,7 @@
argument, like</para>
- <screen>&prompt.root; <userinput>./stage_1.sh <replaceable>default</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>./stage_1.sh default</userinput></screen>
<para>will read its configuration from
@@ -292,7 +286,7 @@
call, these binaries will die with <literal>SIGSYS, Bad
system call</literal>, because the old kernel does not have
that system call. I have seen other issues when I tried
- building <filename role="package">lang/perl5.8</filename>.</para>
+ building <package>lang/perl5.8</package>.</para>
@@ -312,7 +306,7 @@
<para>successfully completed <command>make buildkernel
- KERNCONF=<replaceable>whatever</replaceable></command></para>
+ KERNCONF=whatever</command></para>
@@ -376,16 +370,14 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
<para>The answer does not matter since <filename>stage_1.sh</filename> will
run &man.cap.mkdb.1; for you in any case.</para>
- <para>Here is the author's <ulink
- url="stage_1.conf.default"><filename>stage_1.conf.default</filename></ulink>,
+ <para>Here is the author's <link xlink:href="stage_1.conf.default"><filename>stage_1.conf.default</filename></link>,
which you need to modify substantially. The comments give you
enough information what to change.</para>
-<programlisting><xi:include href="stage_1.conf.default" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stage_1.conf.default" parse="text"/></programlisting>
- <para>Download <ulink
- url="stage_1.conf.default"><filename>stage_1.conf.default</filename>
- </ulink>.</para>
+ <para>Download <link xlink:href="stage_1.conf.default"><filename>stage_1.conf.default</filename>
+ </link>.</para>
<para>Running this script installs a system that when booted
@@ -414,7 +406,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
libraries and programs.</para>
- <sect1 id="stage2">
+ <sect1 xml:id="stage2">
<title>Stage Two: Ports Installation</title>
@@ -434,7 +426,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
with exactly one argument to denote a config file, e.g.</para>
- <screen>&prompt.root; <userinput>./stage_2.sh <replaceable>default</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>./stage_2.sh default</userinput></screen>
<para>which will read the list of ports from
@@ -454,14 +446,14 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
<para>In fact you can specify arbitrary shell commands, so you are
not restricted to simple <command>make</command> invocations:</para>
- <programlisting>java jdk16 echo true > files/license.sh; make install BATCH=yes &lt; /dev/null
+ <programlisting>java jdk16 echo true &gt; files/license.sh; make install BATCH=yes &lt; /dev/null
print acroread8 yes accept | make install PAGER=ls
x11-fonts gnu-unifont make install &amp;&amp; mkfontdir /usr/local/lib/X11/fonts/local
news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make install</programlisting>
<para>The first two lines are examples how you can handle ports
asking you to accept a licence. Note how the line for
- <filename role="package">news/inn-stable</filename> is an example
+ <package>news/inn-stable</package> is an example
for a one-shot shell variable assignment to
<literal>CONFIGURE_ARGS</literal>. The port
<filename>Makefile</filename> will use this as an initial value
@@ -485,13 +477,12 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
<filename>LOGDIR/category+port</filename> is created for each port
it actually installs.</para>
-<programlisting><xi:include href="stage_2.conf.default" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stage_2.conf.default" parse="text"/></programlisting>
- <para>Download <ulink
- url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
+ <para>Download <link xlink:href="stage_2.conf.default"><filename>stage_2.conf.default</filename></link>.</para>
- <sect1 id="stage3">
+ <sect1 xml:id="stage3">
<title>Stage Three</title>
<para>You have installed your beloved ports during stage two. Some
@@ -507,7 +498,7 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
what you want to configure simply by running:</para>
- <screen>&prompt.root; <userinput>make -f stage_3.mk <replaceable>target</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>make -f stage_3.mk target</userinput></screen>
<para>As with <filename>stage_2.sh</filename> make sure you have
@@ -516,7 +507,7 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
somewhere on the new system.</para>
- <sect1 id="limitations">
+ <sect1 xml:id="limitations">
<para>The automated installation of a port may prove difficult if it
@@ -528,8 +519,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
make install</command>. For other ports you need to investigate
where exactly the interactive command is located and deal with it
appropriately. See the examples above for
- <filename role="package">print/acroread8</filename> and
- <filename role="package">java/jdk16</filename>.</para>
+ <package>print/acroread8</package> and
+ <package>java/jdk16</package>.</para>
<para>You should also be aware of upgrade issues for config files.
In general you do not know when and if the format or contents of a
@@ -576,39 +567,33 @@ fi
- <sect1 id="files">
+ <sect1 xml:id="files">
<title>The Files</title>
<para>Here are the three files you need beside the config files
already shown above.</para>
- <para>This is the <ulink
- url="stage_1.sh"><filename>stage_1.sh</filename></ulink>
+ <para>This is the <link xlink:href="stage_1.sh"><filename>stage_1.sh</filename></link>
script, which you should not need to modify.</para>
-<programlisting><xi:include href="stage_1.sh" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stage_1.sh" parse="text"/></programlisting>
- <para>Download <ulink
- url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
+ <para>Download <link xlink:href="stage_1.sh"><filename>stage_1.sh</filename></link>.</para>
- <para>This is the <ulink
- url="stage_2.sh"><filename>stage_2.sh</filename></ulink>
+ <para>This is the <link xlink:href="stage_2.sh"><filename>stage_2.sh</filename></link>
script. You may want to modify the variables at the
-<programlisting><xi:include href="stage_2.sh" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stage_2.sh" parse="text"/></programlisting>
- <para>Download <ulink
- url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
+ <para>Download <link xlink:href="stage_2.sh"><filename>stage_2.sh</filename></link>.</para>
- <para>This is my <ulink
- url="stage_3.mk"><filename>stage_3.mk</filename></ulink> to
+ <para>This is my <link xlink:href="stage_3.mk"><filename>stage_3.mk</filename></link> to
give you an idea how to automate all reconfiguration.</para>
-<programlisting><xi:include href="stage_3.mk" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stage_3.mk" parse="text"/></programlisting>
- <para>Download <ulink
- url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
+ <para>Download <link xlink:href="stage_3.mk"><filename>stage_3.mk</filename></link>.</para>
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.xml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index bf122f7872..efc0542f48 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,22 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Filtering Bridges</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Filtering Bridges</title>
- <author>
- <firstname>Alex</firstname>
- <surname>Dupre</surname>
- <affiliation>
+ <author><personname><firstname>Alex</firstname><surname>Dupre</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -41,9 +36,9 @@
segments. Under many points of view a bridge is similar to an Ethernet
switch with only two ports.</para>
- </articleinfo>
+ </info>
- <sect1 id="filtering-bridges-why">
+ <sect1 xml:id="filtering-bridges-why">
<title>Why use a filtering bridge?</title>
<para>More and more frequently, thanks to the lowering costs of broad band
@@ -63,7 +58,7 @@
- <sect1 id="filtering-bridges-how">
+ <sect1 xml:id="filtering-bridges-how">
<title>How to Install</title>
<para>Adding bridge functionalities to a FreeBSD system is not difficult.
@@ -89,7 +84,7 @@
which interface is connected to the router and which to the inner
- <sect2 id="filtering-bridges-kernel">
+ <sect2 xml:id="filtering-bridges-kernel">
<title>Kernel Configuration</title>
<para>So you have decided to use the older but well tested installation
@@ -105,13 +100,12 @@ options IPFIREWALL_VERBOSE</programlisting>
<para>Now it is necessary to build and install the new kernel. You may
- find detailed instructions in the <ulink
- url="&url.books.handbook;/kernelconfig-building.html">Building
- and Installing a Custom Kernel</ulink> section of the FreeBSD
+ find detailed instructions in the <link xlink:href="&url.books.handbook;/kernelconfig-building.html">Building
+ and Installing a Custom Kernel</link> section of the FreeBSD
- <sect2 id="filtering-bridges-modules">
+ <sect2 xml:id="filtering-bridges-modules">
<title>Modules Loading</title>
<para>If you have chosen to use the new and simpler installation
@@ -129,7 +123,7 @@ options IPFIREWALL_VERBOSE</programlisting>
- <sect1 id="filtering-bridges-finalprep">
+ <sect1 xml:id="filtering-bridges-finalprep">
<title>Final Preparation</title>
<para>Before rebooting in order to load the new kernel or the required
@@ -164,9 +158,9 @@ firewall_logging="YES"</programlisting>
assign an IP to the external interface (the one connected to Internet,
where <acronym>DNS</acronym> server resides), since the bridge will be
activated at the end of the startup procedure. It means that the
- <devicename>fxp0</devicename> interface (in our case) must be mentioned
+ <filename>fxp0</filename> interface (in our case) must be mentioned
in the ifconfig section of the <filename>/etc/rc.conf</filename> file,
- while the <devicename>xl0</devicename> is not. Assigning an IP to both
+ while the <filename>xl0</filename> is not. Assigning an IP to both
the network cards does not make much sense, unless, during the start
procedure, applications should access to services on both Ethernet
@@ -193,13 +187,13 @@ firewall_logging="YES"</programlisting>
before proceeding.</para>
- <sect1 id="filtering-bridges-enabling">
+ <sect1 xml:id="filtering-bridges-enabling">
<title>Enabling the Bridge</title>
<para>At this point, to enable the bridge, you have to execute the
following commands (having the shrewdness to replace the names of the
- two network interfaces <devicename>fxp0</devicename> and
- <devicename>xl0</devicename> with your own ones):</para>
+ two network interfaces <filename>fxp0</filename> and
+ <filename>xl0</filename> with your own ones):</para>
<screen>&prompt.root; <userinput>sysctl net.link.ether.bridge.config=fxp0:0,xl0:0</userinput>
&prompt.root; <userinput>sysctl net.link.ether.bridge.ipfw=1</userinput>
@@ -217,12 +211,12 @@ firewall_logging="YES"</programlisting>
<para>At this point you should be able to insert the machine between two
sets of hosts without compromising any communication abilities between
them. If so, the next step is to add the
- <literal>net.link.ether.bridge.<replaceable>[blah]</replaceable>=<replaceable>[blah]</replaceable></literal>
+ <literal>net.link.ether.bridge.[blah]=[blah]</literal>
portions of these rows to the <filename>/etc/sysctl.conf</filename>
file, in order to have them execute at startup.</para>
- <sect1 id="filtering-bridges-ipfirewall">
+ <sect1 xml:id="filtering-bridges-ipfirewall">
<title>Configuring The Firewall</title>
<para>Now it is time to create your own file with custom firewall rules,
@@ -257,7 +251,7 @@ firewall_logging="YES"</programlisting>
<para>Let's look at an example setup. Note first that at the top of
<filename>/etc/rc.firewall</filename> there are already standard rules
- for the loopback interface <devicename>lo0</devicename>, so we should not
+ for the loopback interface <filename>lo0</filename>, so we should not
have to care for them anymore. Custom rules should be put in a separate
file (say <filename>/etc/rc.firewall.local</filename>) and loaded at
system startup, by modifying the row of
@@ -272,11 +266,10 @@ firewall_logging="YES"</programlisting>
- <para>For our example imagine to have the <devicename>fxp0</devicename>
+ <para>For our example imagine to have the <filename>fxp0</filename>
interface connected towards the outside (Internet) and the
- <devicename>xl0</devicename> towards the inside
- (<acronym>LAN</acronym>). The bridge machine has the IP <hostid
- role="ipaddr"></hostid> (it is not possible that your
+ <filename>xl0</filename> towards the inside
+ (<acronym>LAN</acronym>). The bridge machine has the IP <systemitem class="ipaddress"></systemitem> (it is not possible that your
<acronym>ISP</acronym> can give you an address quite like this, but for
our example it is good).</para>
@@ -374,13 +367,13 @@ add drop log all from any to any</programlisting>
packet filter. The inside net will go through the bridge, while the
local machine will use the normal IP stack to speak. Thus the two rules
to handle the different cases. The <literal>in via
- <devicename>fxp0</devicename></literal> rules work for both paths. In general, if
+ fxp0</literal> rules work for both paths. In general, if
you use <option>in via</option> rules throughout the filter, you will need to make an
exception for locally generated packets, because they did not come in
via any of our interfaces.</para>
- <sect1 id="filtering-bridges-contributors">
+ <sect1 xml:id="filtering-bridges-contributors">
<para>Many parts of this article have been taken, updated and adapted from
diff --git a/en_US.ISO8859-1/articles/fonts/article.xml b/en_US.ISO8859-1/articles/fonts/article.xml
index 8715ce7311..e2fbf32499 100644
--- a/en_US.ISO8859-1/articles/fonts/article.xml
+++ b/en_US.ISO8859-1/articles/fonts/article.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
<!-- Recently, I wanted to figure out how to use some additional fonts that
I had accumulated. I finally figured out *how to do it* from the various
manual pages and documentation. Since it might be of use to other users,
@@ -21,37 +19,29 @@
it is pretty raw. There are probably better ways to do some of this stuff,
and I would welcome being corrected.
<!-- The section "Setting a virtual console to 80x60 line mode" was
updated to reflect changes in FreeBSD system configuration
files by Mark Ovens <mark@ukug.uk.FreeBSD.org> 27/5/00
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Fonts and FreeBSD</title><subtitle>A Tutorial</subtitle>
-<article lang='en'>
- <articleinfo>
- <title>Fonts and FreeBSD</title>
- <subtitle>A Tutorial</subtitle>
- <author>
- <firstname>Dave</firstname>
- <surname>Bodenstab</surname>
- <affiliation>
+ <author><personname><firstname>Dave</firstname><surname>Bodenstab</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
<pubdate>Wed Aug 7, 1996</pubdate>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -69,9 +59,9 @@
for switching the syscons display to 80x60 mode, and for using
type 1 fonts with the above application programs.</para>
- </articleinfo>
+ </info>
- <sect1 id="intro">
+ <sect1 xml:id="intro">
<para>There are many sources of fonts available, and one might ask
@@ -82,7 +72,7 @@
might be interested.</para>
- <sect1 id="terminology">
+ <sect1 xml:id="terminology">
<title>Basic terminology</title>
<para>There are many different font formats and associated font
@@ -151,7 +141,7 @@
this font format with FreeBSD.</para>
- <sect1 id="font-formats">
+ <sect1 xml:id="font-formats">
<title>What font formats can I use?</title>
<para>Which font file format is useful depends on the application
@@ -234,7 +224,7 @@
other than those provided with FreeBSD.</para>
- <sect1 id="virtual-console">
+ <sect1 xml:id="virtual-console">
<title>Setting a virtual console to 80x60 line mode</title>
<para>First, an 8x8 font must be loaded. To do this,
@@ -272,7 +262,7 @@
<para>References: &man.rc.conf.5;, &man.vidcontrol.1;.</para>
- <sect1 id="type1-fonts-x11">
+ <sect1 xml:id="type1-fonts-x11">
<title>Using type 1 fonts with <application>X11</application></title>
<para><application>X11</application> can use either the <filename>.pfa</filename> or the
@@ -398,9 +388,7 @@ end readonly def
- <para><emphasis remap="bf">r</emphasis>oman, <emphasis
- remap="bf">i</emphasis>talic, <emphasis
- remap="bf">o</emphasis>blique, etc. Since the
+ <para><emphasis remap="bf">r</emphasis>oman, <emphasis remap="bf">i</emphasis>talic, <emphasis remap="bf">o</emphasis>blique, etc. Since the
<emphasis>ItalicAngle</emphasis> is zero,
<emphasis>roman</emphasis> will be used.</para>
@@ -472,7 +460,7 @@ showboat.pfb -type1-showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1
-<lineannotation><filename>fonts.scale</filename> seems to be identical to <filename>fonts.dir</filename>&hellip;</lineannotation>
+<lineannotation>fonts.scale seems to be identical to fonts.dir&hellip;</lineannotation>
&prompt.user; <userinput>cp fonts.dir fonts.scale</userinput>
<lineannotation>Tell X11 that things have changed</lineannotation>
@@ -483,12 +471,11 @@ showboat.pfb -type1-showboat-medium-r-normal-decorative-0-0-0-0-p-0-iso8859-1
<para>References: &man.xfontsel.1;, &man.xset.1;, <citetitle>The X
- Windows System in a Nutshell</citetitle>, <ulink
- url="http://www.ora.com/">O'Reilly &amp;
- Associates</ulink>.</para>
+ Windows System in a Nutshell</citetitle>, <link xlink:href="http://www.ora.com/">O'Reilly &amp;
+ Associates</link>.</para>
- <sect1 id="type1-fonts-ghostscript">
+ <sect1 xml:id="type1-fonts-ghostscript">
<title>Using type 1 fonts with Ghostscript</title>
<para><application>Ghostscript</application> references a font via its <filename>Fontmap</filename>
@@ -532,7 +519,7 @@ GS&gt;<userinput>quit</userinput></screen>
<application>Ghostscript 4.01</application> distribution</para>
- <sect1 id="type1-fonts-groff">
+ <sect1 xml:id="type1-fonts-groff">
<title>Using type 1 fonts with Groff</title>
<para>Now that the new font can be used by both <application>X11</application> and
@@ -566,7 +553,7 @@ GS&gt;<userinput>quit</userinput></screen>
- <screen><lineannotation>Many <filename>.afm</filename> files are in Mac format&hellip; ^M delimited lines
+ <screen><lineannotation>Many .afm files are in Mac format&hellip; ^M delimited lines
We need to convert them to &unix; style ^J delimited lines</lineannotation>
&prompt.user; <userinput>cd /tmp</userinput>
&prompt.user; <userinput>cat /usr/local/share/fonts/type1/showboat.afm |
@@ -594,7 +581,7 @@ We need to convert them to &unix; style ^J delimited lines</lineannotation>
the groff font file as illustrated:</para>
- <screen><lineannotation>Create the <filename>.pfa</filename> font file</lineannotation>
+ <screen><lineannotation>Create the .pfa font file</lineannotation>
&prompt.user; <userinput>pfbtops /usr/local/share/fonts/type1/showboat.pfb &gt;showboat.pfa</userinput></screen>
@@ -658,7 +645,7 @@ EOF</userinput>
&man.groff.font.5;, &man.groff.char.7;, &man.pfbtops.1;.</para>
- <sect1 id="convert-truetype">
+ <sect1 xml:id="convert-truetype">
<title>Converting TrueType fonts to a groff/PostScript format for
@@ -675,8 +662,7 @@ EOF</userinput>
allows conversion of a TrueType font to an ascii font
metric (<filename>.afm</filename>) file.</para>
- <para>Currently available at <ulink
- url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/"></ulink>.
+ <para>Currently available at <uri xlink:href="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/">http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/</uri>.
Note: These files are PostScript programs and must be
downloaded to disk by holding down the
<keycap>Shift</keycap> key when clicking on the link.
@@ -752,7 +738,7 @@ EOF</userinput>
<para>Create the <filename>.afm</filename> file by
- <screen><prompt>%</prompt> <userinput>gs <optional>-dNODISPLAY</optional> <optional>-q</optional> -- ttf2pf.ps <replaceable>TTF_name</replaceable> <optional><replaceable>PS_font_name</replaceable> <optional><replaceable>AFM_name</replaceable></optional></optional></userinput>
+ <screen><prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps TTF_name PS_font_name AFM_name</userinput>
<para>Where, <replaceable>TTF_name</replaceable> is your
@@ -806,7 +792,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
<screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm \
- generate/textmap <replaceable>PS_font_name</replaceable></userinput>
+ generate/textmap PS_font_name</userinput>
<para>Where, <filename>file.afm</filename> is the
@@ -841,7 +827,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
- <sect1 id="truetype-for-other-programs">
+ <sect1 xml:id="truetype-for-other-programs">
<title>Can TrueType fonts be used with other programs?</title>
<para>The TrueType font format is used by Windows, Windows 95, and
@@ -857,8 +843,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
fonts, but I rather doubt many people will be creating documents
as a series of raytraced pages :-).</para>
- <para>This rather dismal situation may soon change. The <ulink
- url="http://www.freetype.org/">FreeType Project</ulink> is
+ <para>This rather dismal situation may soon change. The <link xlink:href="http://www.freetype.org/">FreeType Project</link> is
currently developing a useful set of FreeType tools:</para>
@@ -867,26 +852,22 @@ Converting 3of9.ttf to A.pfa and B.afm.
<para>The <command>xfsft</command> font server for <application>X11</application> can
serve TrueType fonts in addition to regular fonts. Though
currently in beta, it is said to be quite usable. See
- <ulink
- url="http://www.dcs.ed.ac.uk/home/jec/programs/xfsft/">Juliusz
- Chroboczek's page</ulink> for further information.
- Porting instructions for FreeBSD can be found at <ulink
- url="http://math.missouri.edu/~stephen/software/">Stephen
- Montgomery's software page</ulink>.</para>
+ <link xlink:href="http://www.dcs.ed.ac.uk/home/jec/programs/xfsft/">Juliusz
+ Chroboczek's page</link> for further information.
+ Porting instructions for FreeBSD can be found at <link xlink:href="http://math.missouri.edu/~stephen/software/">Stephen
+ Montgomery's software page</link>.</para>
<para><application>xfstt</application> is another font server for
- available under <ulink url="
- ftp://sunsite.unc.edu/pub/Linux/X11/fonts/"></ulink>.</para>
+ available under <uri xlink:href=" ftp://sunsite.unc.edu/pub/Linux/X11/fonts/"> ftp://sunsite.unc.edu/pub/Linux/X11/fonts/</uri>.</para>
<para>A program called <command>ttf2bdf</command> can produce
BDF files suitable for use in an X environment from TrueType
- files. Linux binaries are said to be available from <ulink
- url="ftp://crl.nmsu.edu/CLR/multiling/General/"></ulink>.</para>
+ files. Linux binaries are said to be available from <uri xlink:href="ftp://crl.nmsu.edu/CLR/multiling/General/">ftp://crl.nmsu.edu/CLR/multiling/General/</uri>.</para>
@@ -895,7 +876,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
- <sect1 id="obtaining-additional-fonts">
+ <sect1 xml:id="obtaining-additional-fonts">
<title>Where can additional fonts be obtained?</title>
<para>Many fonts are available on the Internet. They are either
@@ -905,11 +886,11 @@ Converting 3of9.ttf to A.pfa and B.afm.
- <para><ulink url="http://www.simtel.net/"></ulink></para>
+ <para><uri xlink:href="http://www.simtel.net/">http://www.simtel.net/</uri></para>
- <para><ulink url="http://www.freshmeat.net/"></ulink></para>
+ <para><uri xlink:href="http://www.freshmeat.net/">http://www.freshmeat.net/</uri></para>
@@ -919,7 +900,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
- <sect1 id="additional-questions">
+ <sect1 xml:id="additional-questions">
<title>Additional questions</title>
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.xml b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
index 0ea4545f87..824800c866 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,22 +1,16 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>How to get best results from the FreeBSD-questions mailing
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>How to get best results from the FreeBSD-questions mailing
- <author>
- <firstname>Greg</firstname>
- <surname>Lehey</surname>
- <affiliation>
+ <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -37,10 +31,10 @@
<para>This document is regularly posted to the FreeBSD-questions mailing
- </articleinfo>
+ </info>
- <title id="Introduction">Introduction</title>
+ <title xml:id="Introduction">Introduction</title>
<para><literal>FreeBSD-questions</literal> is a mailing list maintained by
the FreeBSD project to help people who have questions about the normal
@@ -54,9 +48,8 @@
activity is <quote>cracker</quote>, but the popular press has not found
out yet. The FreeBSD hackers disapprove strongly of cracking
security, and have nothing to do with it. For a longer description of
- hackers, see Eric Raymond's <ulink
- url="http://www.catb.org/~esr/faqs/hacker-howto.html">How To Become
- A Hacker</ulink></para>
+ hackers, see Eric Raymond's <link xlink:href="http://www.catb.org/~esr/faqs/hacker-howto.html">How To Become
+ A Hacker</link></para>
<para>This is a regular posting aimed to help both those seeking advice
@@ -78,10 +71,10 @@
- <title id="subscribe">How to subscribe to FreeBSD-questions</title>
+ <title xml:id="subscribe">How to subscribe to FreeBSD-questions</title>
<para>FreeBSD-questions is a mailing list, so you need mail access. Point
- your WWW browser to the <ulink url="&a.questions.url;">information page of the FreeBSD-questions mailing list</ulink>.
+ your WWW browser to the <link xlink:href="&a.questions.url;">information page of the FreeBSD-questions mailing list</link>.
In the section titled <quote>Subscribing to freebsd-questions</quote> fill
in the <quote>Your email address</quote> field; the other fields are optional.
@@ -105,7 +98,7 @@
- <title id="unsubscribe">How to unsubscribe from FreeBSD-questions</title>
+ <title xml:id="unsubscribe">How to unsubscribe from FreeBSD-questions</title>
<para>When you subscribed to FreeBSD-questions, you got a welcome message
from <application>mailman</application>. In this message, amongst
@@ -163,7 +156,7 @@ your options page that will email your current password to you.</literallayout>
- <title id="askwho">Should I ask <literal>-questions</literal> or
+ <title xml:id="askwho">Should I ask <literal>-questions</literal> or
<para>Two mailing lists handle general questions about FreeBSD,
@@ -211,7 +204,7 @@ your options page that will email your current password to you.</literallayout>
- <title id="before">Before submitting a question</title>
+ <title xml:id="before">Before submitting a question</title>
<para>You can (and should) do some things yourself before asking a question
on one of the mailing lists:</para>
@@ -230,9 +223,9 @@ your options page that will email your current password to you.</literallayout>
<para>Read the manual pages, and the FreeBSD documentation (either
installed in <filename>/usr/doc</filename> or accessible via WWW at
- <ulink url="http://www.FreeBSD.org"></ulink>), especially the
- <ulink url="&url.books.handbook;/index.html">handbook</ulink>
- and the <ulink url="&url.books.faq;/index.html">FAQ</ulink>.
+ <uri xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri>), especially the
+ <link xlink:href="&url.books.handbook;/index.html">handbook</link>
+ and the <link xlink:href="&url.books.faq;/index.html">FAQ</link>.
@@ -240,25 +233,24 @@ your options page that will email your current password to you.</literallayout>
<para>Browse and/or search the archives for the mailing list, to see if your
question or a similar one has been asked (and possibly answered) on the
list. You can browse and/or search the mailing list archives
- at <ulink url="http://www.FreeBSD.org/mail"></ulink>
- and <ulink url="http://www.FreeBSD.org/search/search.html#mailinglists"></ulink>
+ at <uri xlink:href="http://www.FreeBSD.org/mail">http://www.FreeBSD.org/mail</uri>
+ and <uri xlink:href="http://www.FreeBSD.org/search/search.html#mailinglists">http://www.FreeBSD.org/search/search.html#mailinglists</uri>
respectively. This can be done at other WWW sites as well, for example
- at <ulink url="http://marc.theaimsgroup.com"></ulink>.
+ at <uri xlink:href="http://marc.theaimsgroup.com">http://marc.theaimsgroup.com</uri>.
- <para>Use a search engine such as <ulink url="http://www.google.com">Google</ulink>
- or <ulink url="http://www.yahoo.com">Yahoo</ulink> to find answers to your question.
- Google even has a <ulink
- url="http://www.google.com/bsd">BSD-specific search interface</ulink>.
+ <para>Use a search engine such as <link xlink:href="http://www.google.com">Google</link>
+ or <link xlink:href="http://www.yahoo.com">Yahoo</link> to find answers to your question.
+ Google even has a <link xlink:href="http://www.google.com/bsd">BSD-specific search interface</link>.
- <title id="submit">How to submit a question</title>
+ <title xml:id="submit">How to submit a question</title>
<para>When submitting a question to FreeBSD-questions, consider the
following points:</para>
@@ -301,8 +293,8 @@ your options page that will email your current password to you.</literallayout>
errors, it will give people a poor impression of you.</para>
<para>A lot of badly formatted messages come from
- <ulink url="http://www.lemis.com/email.html">bad mailers or badly
- configured mailers</ulink>. The following mailers are known to
+ <link xlink:href="http://www.lemis.com/email.html">bad mailers or badly
+ configured mailers</link>. The following mailers are known to
send out badly formatted messages without you finding out about
@@ -459,7 +451,7 @@ fine, but when I try to reboot the system, I get the message
- <title id="followup">How to follow up to a question</title>
+ <title xml:id="followup">How to follow up to a question</title>
<para>Often you will want to send in additional information to a question
you have already sent. The best way to do this is to reply to your
@@ -481,7 +473,7 @@ fine, but when I try to reboot the system, I get the message
<para>The message reference numbers in the header will refer to the
previous message. Some mailers, such as
- <ulink url="http://www.mutt.org/">mutt</ulink>, can
+ <link xlink:href="http://www.mutt.org/">mutt</link>, can
<emphasis>thread</emphasis> messages, showing the exact
relationships between the messages.</para>
@@ -489,7 +481,7 @@ fine, but when I try to reboot the system, I get the message
- <title id="answer">How to answer a question</title>
+ <title xml:id="answer">How to answer a question</title>
<para>Before you answer a question to FreeBSD-questions, consider:</para>
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 44890fb6b5..60e14c8010 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd" [
-<!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd" [
+<!ENTITY fbus.ap "<application xmlns='http://docbook.org/ns/docbook'>FreeBSD Update Server</application>">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Build Your Own &os; Update Server</title>
-<article lang="en">
- <articleinfo>
- <title>Build Your Own &os; Update Server</title>
- <author>
- <firstname>Jason</firstname>
- <surname>Helfman</surname>
- <affiliation>
+ <author><personname><firstname>Jason</firstname><surname>Helfman</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
@@ -24,7 +19,7 @@
<holder role="mailto:jgh@FreeBSD.org">Jason Helfman</holder>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -37,8 +32,7 @@
<para>This article describes building an internal &fbus.ap;.
- The <ulink
- url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</ulink>
+ The <link xlink:href="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</link>
is written by &a.cperciva.email;, Security Officer Emeritus of &os;.
For users that think it is convenient to update their systems
against an official update server, building their own &fbus.ap; may
@@ -46,16 +40,15 @@
&os; releases or by providing a local mirror that will allow faster
updates for a number of machines.</para>
- </articleinfo>
+ </info>
- <sect1 id="acknowledgments">
+ <sect1 xml:id="acknowledgments">
- <para>This article was subsequently printed at <ulink
- url="http://bsdmag.org/magazine/1021-bsd-as-a-desktop">BSD
- Magazine</ulink>.</para>
+ <para>This article was subsequently printed at <link xlink:href="http://bsdmag.org/magazine/1021-bsd-as-a-desktop">BSD
+ Magazine</link>.</para>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>Experienced users or administrators are often responsible for
@@ -69,7 +62,7 @@
- <sect1 id="prerequisites">
+ <sect1 xml:id="prerequisites">
<para>To build an internal &fbus.ap; some requirements should be
@@ -98,8 +91,7 @@
- <para>A web server, like <ulink
- url="&url.books.handbook;/network-apache.html">Apache</ulink>,
+ <para>A web server, like <link xlink:href="&url.books.handbook;/network-apache.html">Apache</link>,
with over half of the space required for the build. For instance,
test builds for 7.1 and 7.2 consume a total amount of 4&nbsp;GB,
and the webserver space needed to distribute these updates is
@@ -113,13 +105,11 @@
- <sect1 id="Configuration">
+ <sect1 xml:id="Configuration">
<title>Configuration: Installation &amp; Setup</title>
- <para>Download the <ulink
- url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">
- freebsd-update-server</ulink> software by installing <filename
- role="package">devel/subversion </filename>, and execute:</para>
+ <para>Download the <link xlink:href="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">
+ freebsd-update-server</link> software by installing <package>devel/subversion </package>, and execute:</para>
<screen>&prompt.user; <userinput>svn co http://svn.freebsd.org/base/user/cperciva/freebsd-update-build freebsd-update-server</userinput></screen>
@@ -137,22 +127,22 @@
# the scripts tree.
# Location from which to fetch releases
-export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases<co id="ftp-id"/>
+export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases<co xml:id="ftp-id"/>
# Host platform
export HOSTPLATFORM=`uname -m`
# Host name to use inside jails
-export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net<co id="buildhost-id"/>
+export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net<co xml:id="buildhost-id"/>
# Location of SSH key
-export SSHKEY=/root/.ssh/id_dsa<co id="sshkey-id"/>
+export SSHKEY=/root/.ssh/id_dsa<co xml:id="sshkey-id"/>
# SSH account into which files are uploaded
-MASTERACCT=builder@wadham.daemonology.net<co id="mstacct-id"/>
+MASTERACCT=builder@wadham.daemonology.net<co xml:id="mstacct-id"/>
# Directory into which files are uploaded
-MASTERDIR=update-master.freebsd.org<co id="mstdir-id"/></programlisting>
+MASTERDIR=update-master.freebsd.org<co xml:id="mstdir-id"/></programlisting>
<para>Parameters for consideration would be:</para>
@@ -228,7 +218,7 @@ MASTERDIR=update-master.freebsd.org<co id="mstdir-id"/></programlisting>
<programlisting># SHA256 hash of RELEASE disc1.iso image.
-export RELH=1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5<co id="sha256-id"/>
+export RELH=1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5<co xml:id="sha256-id"/>
# Components of the world, source, and kernels
export WORLDPARTS="base catpages dict doc games info manpages proflibs lib32"
@@ -238,22 +228,20 @@ export SOURCEPARTS="base bin contrib crypto etc games gnu include krb5 \
export KERNELPARTS="generic"
# EOL date
-export EOL=1275289200<co id="eol-id"/></programlisting>
+export EOL=1275289200<co xml:id="eol-id"/></programlisting>
<callout arearefs="sha256-id">
<para>The &man.sha256.1; hash key for the desired release, is
- published within the respective <ulink
- url="&url.base;/releases/">release announcement</ulink>.</para>
+ published within the respective <link xlink:href="&url.base;/releases/">release announcement</link>.</para>
<callout arearefs="eol-id">
<para>To generate the "End of Life" number for
<filename>build.conf</filename>, refer to the "Estimated
- EOL" posted on the <ulink
- url="&url.base;/security/security.html">&os;
- Security Website</ulink>. The value
+ EOL" posted on the <link xlink:href="&url.base;/security/security.html">&os;
+ Security Website</link>. The value
of <literal>EOL</literal> can be derived from the date listed on
the web site, using the &man.date.1; utility, for example:</para>
<screen>&prompt.user; <userinput>date -j -f '%Y%m%d-%H%M%S' '20090401-000000' '+%s'</userinput></screen>
@@ -263,7 +251,7 @@ export EOL=1275289200<co id="eol-id"/></programlisting>
- <sect1 id="build">
+ <sect1 xml:id="build">
<title>Building Update Code</title>
<para>The first step is to run <filename>scripts/make.sh</filename>.
@@ -301,7 +289,7 @@ Verifying - enter aes-256-cbc encryption password:</screen>
<screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server</userinput>
-&prompt.root; <userinput>sh scripts/init.sh <replaceable>amd64 7.2-RELEASE</replaceable></userinput></screen>
+&prompt.root; <userinput>sh scripts/init.sh amd64 7.2-RELEASE</userinput></screen>
<para>What follows is a sample of an <emphasis>initial</emphasis> build
@@ -353,8 +341,7 @@ world|base|/usr/lib/libalias_ftp.a
<para>During this second build cycle, the network time protocol
daemon, &man.ntpd.8;, is turned off. Per &a.cperciva.email;,
- Security Officer Emeritus of &os;, "the <ulink
- url="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</ulink>
+ Security Officer Emeritus of &os;, "the <link xlink:href="http://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/">freebsd-update-server</link>
build code needs to identify timestamps which are stored in files so
that they can be ignored when comparing builds to determine which
files need to be updated. This timestamp-finding works by doing two
@@ -454,7 +441,7 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
<screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server</userinput>
-&prompt.root; <userinput>sh scripts/upload.sh <replaceable>amd64 7.2-RELEASE</replaceable></userinput></screen>
+&prompt.root; <userinput>sh scripts/upload.sh amd64 7.2-RELEASE</userinput></screen>
@@ -464,8 +451,8 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
<emphasis>uploaded</emphasis> file.</para>
- <screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server/pub/<replaceable>7.2-RELEASE/amd64</replaceable></userinput>
-&prompt.root; <userinput>touch -t <replaceable>200801010101.01</replaceable> uploaded</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server/pub/7.2-RELEASE/amd64</userinput>
+&prompt.root; <userinput>touch -t 200801010101.01 uploaded</userinput></screen>
@@ -477,9 +464,8 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
document root of the webserver in order for updates
to be distributed. The exact configuration will vary depending on the
web server used. For the <application>Apache</application> web server,
- please refer to the <ulink
- url="&url.books.handbook;/network-apache.html">Configuration of
- Apache servers</ulink> section in the Handbook.</para>
+ please refer to the <link xlink:href="&url.books.handbook;/network-apache.html">Configuration of
+ Apache servers</link> section in the Handbook.</para>
<!-- This note seems either out of place. I find it hard to read and it
is a bit difficult to understand why it is related to the rest of
@@ -504,9 +490,8 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
<para>Update client's <literal>KeyPrint</literal> and
<literal>ServerName</literal> in
<filename>/etc/freebsd-update.conf</filename>, and perform updates as
- instructed in the <ulink
- url="&url.books.handbook;/updating-upgrading-freebsdupdate.html">&os;
- Update</ulink>
+ instructed in the <link xlink:href="&url.books.handbook;/updating-upgrading-freebsdupdate.html">&os;
+ Update</link>
<!-- One sentence, two instances of 'in'. We can probably reword this
part to avoid repetition. -->
<!-- What about "place client's new keyprint and servername values to
@@ -525,17 +510,15 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
and uploaded to your distribution server for both versions.</para>
- <para>For reference, the entire run of <ulink
- url="init.txt"><filename>init.sh</filename></ulink> is
+ <para>For reference, the entire run of <link xlink:href="init.txt"><filename>init.sh</filename></link> is
- <sect1 id="patch">
+ <sect1 xml:id="patch">
<title>Building a Patch</title>
- <para>Every time a <ulink
- url="&url.base;/security/advisories.html">security advisory</ulink>
- or <ulink url="&url.base;/security/notices.html">security notice</ulink>
+ <para>Every time a <link xlink:href="&url.base;/security/advisories.html">security advisory</link>
+ or <link xlink:href="&url.base;/security/notices.html">security notice</link>
is announced, a patch update can be built.</para>
<para>For this example, 7.1-RELEASE will be used.</para>
@@ -555,8 +538,7 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
<para>Create the patch directory of the respective release
- under <filename
- class="directory">/usr/local/freebsd-update-server/patches/</filename>.</para>
+ under <filename>/usr/local/freebsd-update-server/patches/</filename>.</para>
<screen>&prompt.user; <userinput>mkdir -p /usr/local/freebsd-update-server/patches/7.1-RELEASE/</userinput>
@@ -564,14 +546,11 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
<para>As an example, take the patch for &man.named.8;. Read the advisory,
- and grab the necessary file from <ulink
- url="&url.base;/security/advisories.html">&os; Security
- Advisories</ulink>. More information on interpreting the advisory,
- can be found in the <ulink
- url="&url.books.handbook;/security-advisories.html">&os; Handbook</ulink>.</para>
- <para>In the <ulink
- url="http://security.freebsd.org/advisories/FreeBSD-SA-09:12.bind.asc">security brief</ulink>,
+ and grab the necessary file from <link xlink:href="&url.base;/security/advisories.html">&os; Security
+ Advisories</link>. More information on interpreting the advisory,
+ can be found in the <link xlink:href="&url.books.handbook;/security-advisories.html">&os; Handbook</link>.</para>
+ <para>In the <link xlink:href="http://security.freebsd.org/advisories/FreeBSD-SA-09:12.bind.asc">security brief</link>,
this advisory is called <literal>SA-09:12.bind</literal>. After
downloading the file, it is required to rename the file to an
appropriate patch level. It is suggested to keep this consistent with
@@ -605,7 +584,7 @@ Wed Aug 26 12:50:07 PDT 2009 Cleaning staging area for FreeBSD/amd64 7.2-RELEASE
<screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server</userinput>
-&prompt.root; <userinput>sh scripts/diff.sh <replaceable>amd64 7.1-RELEASE 7</replaceable></userinput></screen>
+&prompt.root; <userinput>sh scripts/diff.sh amd64 7.1-RELEASE 7</userinput></screen>
<para>What follows is a sample of a <emphasis>differential</emphasis>
@@ -722,15 +701,15 @@ the new builds.</screen>
<screen>&prompt.root; <userinput>cd /usr/local/freebsd-update-server</userinput>
-&prompt.root; <userinput>sh scripts/upload.sh <replaceable>amd64 7.1-RELEASE</replaceable></userinput></screen>
+&prompt.root; <userinput>sh scripts/upload.sh amd64 7.1-RELEASE</userinput></screen>
<para>For reference, the entire run of
- <ulink url="diff.txt"><filename>diff.sh</filename></ulink> is
+ <link xlink:href="diff.txt"><filename>diff.sh</filename></link> is
- <sect1 id="tips">
+ <sect1 xml:id="tips">
<!-- These are nice tips, but there are only a few of them and they need a
@@ -753,8 +732,7 @@ the new builds.</screen>
<para>If a custom release is built using the native
- <command>make release</command> <ulink
- url="&url.articles.releng;/release-build.html">procedure</ulink>,
+ <command>make release</command> <link xlink:href="&url.articles.releng;/release-build.html">procedure</link>,
<application>freebsd-update-server</application> code will work
from your release. As an example, a release without ports or
documentation can be built by clearing functionality pertaining
@@ -779,8 +757,8 @@ the new builds.</screen>
<para>Adding <option>-j <replaceable>NUMBER</replaceable></option>
- flags to <maketarget>buildworld</maketarget> and
- <maketarget>obj</maketarget> targets in the
+ flags to <buildtarget>buildworld</buildtarget> and
+ <buildtarget>obj</buildtarget> targets in the
<filename>scripts/build.subr</filename> script may speed up
processing depending on the hardware used, however it is not
necessary. Using these flags in other targets is not
@@ -789,18 +767,17 @@ the new builds.</screen>
<screen> # Build the world
log "Building world"
cd /usr/src &amp;&amp;
- make -j 2 ${COMPATFLAGS} buildworld 2>&amp;1
+ make -j 2 ${COMPATFLAGS} buildworld 2&gt;&amp;1
# Distribute the world
log "Distributing world"
cd /usr/src/release &amp;&amp;
make -j 2 obj &amp;&amp;
- make ${COMPATFLAGS} release.1 release.2 2>&amp;1</screen>
+ make ${COMPATFLAGS} release.1 release.2 2&gt;&amp;1</screen>
- <para>Create an appropriate <ulink
- url="&url.books.handbook;/network-dns.html">DNS</ulink>
+ <para>Create an appropriate <link xlink:href="&url.books.handbook;/network-dns.html">DNS</link>
SRV record for the update server, and put others behind it with
variable weights. Using this facility will provide update
mirrors, however this tip is not necessary unless you wish to
diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml
index e089c2b054..4b399367ad 100644
--- a/en_US.ISO8859-1/articles/geom-class/article.xml
+++ b/en_US.ISO8859-1/articles/geom-class/article.xml
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <title>Writing a GEOM Class</title>
- <articleinfo>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Writing a GEOM Class</title>
- <author>
- <firstname>Ivan</firstname>
- <surname>Voras</surname>
- <affiliation>
+ <author><personname><firstname>Ivan</firstname><surname>Voras</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -35,13 +30,13 @@
- </articleinfo>
+ </info>
<!-- Introduction -->
-<sect1 id="intro">
+<sect1 xml:id="intro">
- <sect2 id="intro-docs">
+ <sect2 xml:id="intro-docs">
<para>Documentation on kernel programming is scarce &mdash; it is one of
@@ -53,30 +48,25 @@
- <listitem><para>The <ulink
- url="&url.books.developers-handbook;/index.html">FreeBSD
- Developer's Handbook</ulink> &mdash; part of the documentation
+ <listitem><para>The <link xlink:href="&url.books.developers-handbook;/index.html">FreeBSD
+ Developer's Handbook</link> &mdash; part of the documentation
project, it does not contain anything specific to kernel
programming, but rather some general useful information.</para></listitem>
- <listitem><para>The <ulink
- url="&url.books.arch-handbook;/index.html">FreeBSD
- Architecture Handbook</ulink> &mdash; also from the documentation
+ <listitem><para>The <link xlink:href="&url.books.arch-handbook;/index.html">FreeBSD
+ Architecture Handbook</link> &mdash; also from the documentation
project, contains descriptions of several low-level facilities
- and procedures. The most important chapter is 13, <ulink
- url="&url.books.arch-handbook;/driverbasics.html">Writing
- FreeBSD device drivers</ulink>.</para></listitem>
+ and procedures. The most important chapter is 13, <link xlink:href="&url.books.arch-handbook;/driverbasics.html">Writing
+ FreeBSD device drivers</link>.</para></listitem>
- <listitem><para>The Blueprints section of <ulink
- url="http://www.freebsddiary.org">FreeBSD Diary</ulink> web
+ <listitem><para>The Blueprints section of <link xlink:href="http://www.freebsddiary.org">FreeBSD Diary</link> web
site &mdash; contains several interesting articles on kernel
<listitem><para>The man pages in section 9 &mdash; for important
documentation on kernel functions.</para></listitem>
- <listitem><para>The &man.geom.4; man page and <ulink
- url="http://phk.freebsd.dk/pubs/">PHK's GEOM slides</ulink>
+ <listitem><para>The &man.geom.4; man page and <link xlink:href="http://phk.freebsd.dk/pubs/">PHK's GEOM slides</link>
&mdash; for general introduction of the GEOM
@@ -95,7 +85,7 @@
- <sect1 id="prelim">
+ <sect1 xml:id="prelim">
<para>The best way to do kernel development is to have (at least)
@@ -112,11 +102,11 @@
<para>But, since not everybody has two or more computers handy, there are
a few things that can be done to prepare an otherwise <quote>live</quote>
system for developing kernel code. This setup is also applicable
- for developing in a <ulink url="http://www.vmware.com/">VMWare</ulink>
- or <ulink url="http://www.qemu.org/">QEmu</ulink> virtual machine (the
+ for developing in a <link xlink:href="http://www.vmware.com/">VMWare</link>
+ or <link xlink:href="http://www.qemu.org/">QEmu</link> virtual machine (the
next best thing after a dedicated development machine).</para>
- <sect2 id="prelim-system">
+ <sect2 xml:id="prelim-system">
<title>Modifying a system for development</title>
<para>For any kernel programming a kernel with
@@ -193,7 +183,7 @@ dumpdir="/usr/core </programlisting>
where in the filesystem to relocate the core dump on reboot.</para>
<para>Writing kernel core dumps is slow and takes a long time so
- if you have lots of memory (>256M) and lots of panics it could
+ if you have lots of memory (&gt;256M) and lots of panics it could
be frustrating to sit and wait while it is done (twice &mdash; first
to write it to swap, then to relocate it to filesystem). It is
convenient then to limit the amount of RAM the system will use
@@ -215,7 +205,7 @@ dumpdir="/usr/core </programlisting>
- <sect2 id="prelim-starting">
+ <sect2 xml:id="prelim-starting">
<title>Starting the project</title>
<para>For the purpose of creating a new GEOM class, an empty
@@ -224,7 +214,7 @@ dumpdir="/usr/core </programlisting>
- <sect2 id="prelim-makefile">
+ <sect2 xml:id="prelim-makefile">
<title>The Makefile</title>
<para>It is good practice to create
@@ -249,10 +239,10 @@ KMOD=geom_journal
- <sect1 id="kernelprog">
+ <sect1 xml:id="kernelprog">
<title>On FreeBSD kernel programming</title>
- <sect2 id="kernelprog-memalloc">
+ <sect2 xml:id="kernelprog-memalloc">
<title>Memory allocation</title>
<para>See &man.malloc.9;. Basic memory allocation is only
@@ -278,7 +268,7 @@ KMOD=geom_journal
example, dynamic arrays of structs).</para>
- <sect2 id="kernelprog-lists">
+ <sect2 xml:id="kernelprog-lists">
<title>Lists and queues</title>
<para>See &man.queue.3;. There are a LOT of cases when a list of
@@ -295,17 +285,17 @@ KMOD=geom_journal
&man.tree.3; and &man.hashinit.9;.</para>
- <sect2 id="kernelprog-bios">
+ <sect2 xml:id="kernelprog-bios">
- <para>Structure <structname>bio</structname> is used for any and
+ <para>Structure <varname remap="structname">bio</varname> is used for any and
all Input/Output operations concerning GEOM. It basically
contains information about what device ('provider') should
satisfy the request, request type, offset, length, pointer to
a buffer, and a bunch of <quote>user-specific</quote> flags
and fields that can help implement various hacks.</para>
- <para>The important thing here is that <structname>bio</structname>s
+ <para>The important thing here is that <varname remap="structname">bio</varname>s
are handled asynchronously. That means that, in most parts of the code,
there is no analogue to userland's &man.read.2; and
&man.write.2; calls that do not return until a request is
@@ -328,10 +318,10 @@ KMOD=geom_journal
- <sect1 id="geom">
+ <sect1 xml:id="geom">
<title>On GEOM programming</title>
- <sect2 id="geom-ggate">
+ <sect2 xml:id="geom-ggate">
<para>If maximum performance is not needed, a much simpler way
@@ -341,7 +331,7 @@ KMOD=geom_journal
two approaches.</para>
- <sect2 id="geom-class">
+ <sect2 xml:id="geom-class">
<title>GEOM class</title>
<para>GEOM classes are transformations on the data. These transformations
@@ -379,14 +369,14 @@ KMOD=geom_journal
copied to the geom instance.</para>
<para>Field <function>.geom</function> in the
- <structname>g_class</structname> structure is a LIST of geoms
+ <varname remap="structname">g_class</varname> structure is a LIST of geoms
instantiated from the class.</para>
<para>These functions are called from the g_event kernel thread.</para>
- <sect2 id="geom-softc">
+ <sect2 xml:id="geom-softc">
<para>The name <quote>softc</quote> is a legacy term for
@@ -410,12 +400,12 @@ KMOD=geom_journal
are created on our behalf by GEOM).</para></listitem>
- <para>The <structname>softc</structname> structure contains all
+ <para>The <varname remap="structname">softc</varname> structure contains all
the state of geom instance. Every geom instance has its own
- <sect2 id="geom-metadata">
+ <sect2 xml:id="geom-metadata">
<para>Format of metadata is more-or-less class-dependent, but
@@ -440,7 +430,7 @@ KMOD=geom_journal
code works like that, and it is supported by libraries.)</para>
- <sect2 id="geom-creating">
+ <sect2 xml:id="geom-creating">
<title>Labeling/creating a geom</title>
<para>The sequence of events is:</para>
@@ -452,7 +442,7 @@ KMOD=geom_journal
<listitem><para>the utility figures out which geom class it is
supposed to handle and searches for
- <filename>geom_<replaceable>CLASSNAME</replaceable>.so</filename>
+ <filename>geom_CLASSNAME.so</filename>
library (usually in
@@ -488,12 +478,12 @@ KMOD=geom_journal
- <sect2 id="geom-command">
+ <sect2 xml:id="geom-command">
<title>Geom command structure</title>
<para>The helper <filename>geom_CLASSNAME.so</filename> library
- exports <structname>class_commands</structname> structure,
- which is an array of <structname>struct g_command</structname>
+ exports <varname remap="structname">class_commands</varname> structure,
+ which is an array of <varname remap="structname">struct g_command</varname>
elements. Commands are of uniform format and look like:</para>
<programlisting> verb [-options] geomname [other]</programlisting>
@@ -518,8 +508,8 @@ KMOD=geom_journal
<para>Many actions, such as labeling and destroying metadata can
- be performed in userland. For this, <structname>struct
- g_command</structname> provides field
+ be performed in userland. For this, <varname remap="structname">struct
+ g_command</varname> provides field
<varname>gc_func</varname> that can be set to a function (in
the same <filename>.so</filename>) that will be called to
process a verb. If <varname>gc_func</varname> is NULL, the
@@ -528,7 +518,7 @@ KMOD=geom_journal
- <sect2 id="geom-geoms">
+ <sect2 xml:id="geom-geoms">
<para>Geoms are instances of GEOM classes. They have internal
@@ -564,7 +554,7 @@ KMOD=geom_journal
managed by a instance of geom class.</para>
- <sect2 id="geom-threads">
+ <sect2 xml:id="geom-threads">
<title>Geom threads</title>
<para>There are three kernel threads created and run by the GEOM
@@ -619,7 +609,7 @@ KMOD=geom_journal
thread. First the partition slicer gets
<function>.done</function>() called in the
<literal>g_up</literal> thread, it uses information stored
- in the bio to free the cloned <structname>bio</structname>
+ in the bio to free the cloned <varname remap="structname">bio</varname>
structure (with <function>g_destroy_bio</function>()) and
calls <function>g_io_deliver</function>() on the original
@@ -629,7 +619,7 @@ KMOD=geom_journal
<para>See &man.g.bio.9; man page for information how the data is
- passed back and forth in the <structname>bio</structname>
+ passed back and forth in the <varname remap="structname">bio</varname>
structure (note in particular the <varname>bio_parent</varname>
and <varname>bio_children</varname> fields and how they are
@@ -667,7 +657,7 @@ KMOD=geom_journal
additional kernel threads.</para>
- <sect2 id="geom-kernelthreads">
+ <sect2 xml:id="geom-kernelthreads">
<title>Kernel threads for use in geom code</title>
<para>Kernel threads are created with &man.kthread.create.9;
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index aadd5cf22c..7d8af3fcd8 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Implementing UFS Journaling on a Desktop PC</title>
-<article lang="en">
- <articleinfo>
- <title>Implementing UFS Journaling on a Desktop PC</title>
- <author>
- <firstname>Manolis</firstname>
- <surname>Kiagias</surname>
- <affiliation>
+ <author><personname><firstname>Manolis</firstname><surname>Kiagias</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
@@ -23,7 +18,7 @@
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -42,9 +37,9 @@
explains how to implement UFS journaling on a typical desktop PC
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>While professional servers are usually well protected from
@@ -120,7 +115,7 @@
- <sect1 id="understanding-journaling">
+ <sect1 xml:id="understanding-journaling">
<title>Understanding Journaling in &os;</title>
<para>The journaling provided by GEOM in &os;&nbsp;7.<replaceable>X</replaceable> is not file system
@@ -151,20 +146,19 @@
<para>You wish to journal your <filename>/usr</filename> file system,
- stored in <filename class="devicefile">/dev/ad0s1f</filename> (which
+ stored in <filename>/dev/ad0s1f</filename> (which
already contains data).</para>
<para>You reserved some free disk space in a partition in
- <filename class="devicefile">/dev/ad0s1g</filename>.</para>
+ <filename>/dev/ad0s1g</filename>.</para>
- <para>Using <command>gjournal</command>, a new <filename
- class="devicefile">/dev/ad0s1f.journal</filename> device is created
- where <filename class="devicefile">/dev/ad0s1f</filename> is the data
- provider, and <filename class="devicefile">/dev/ad0s1g</filename> is
+ <para>Using <command>gjournal</command>, a new <filename>/dev/ad0s1f.journal</filename> device is created
+ where <filename>/dev/ad0s1f</filename> is the data
+ provider, and <filename>/dev/ad0s1g</filename> is
the journal provider. This new device is then used for all
subsequent file operations.</para>
@@ -194,7 +188,7 @@
page of &man.gjournal.8;.</para>
- <sect1 id="reserve-space">
+ <sect1 xml:id="reserve-space">
<title>Steps During the Installation of &os;</title>
@@ -325,7 +319,7 @@
(packages) until you have completely setup journaling.</para>
- <sect2 id="first-boot">
+ <sect2 xml:id="first-boot">
<title>Booting for the first time</title>
<para>Your system will come up normally, but you will need to edit
@@ -340,15 +334,15 @@
- <sect1 id="configure-journal">
+ <sect1 xml:id="configure-journal">
<title>Setting Up Journaling</title>
- <sect2 id="running-gjournal">
+ <sect2 xml:id="running-gjournal">
<title>Executing <command>gjournal</command></title>
<para>Having prepared all the required partitions, it is quite easy
to configure journaling. We will need to switch to single user
- mode, so login as <username>root</username> and type:</para>
+ mode, so login as <systemitem class="username">root</systemitem> and type:</para>
<screen>&prompt.root; <userinput>shutdown now</userinput></screen>
@@ -364,11 +358,10 @@
<para>Now, use your notes to determine which partition will be used
for each journal. In our example, <filename>/usr</filename> is
- <filename class="devicefile">ad0s1f</filename> and its journal will be
- <filename class="devicefile">ad0s1g</filename>, while
- <filename>/var</filename> is <filename
- class="devicefile">ad0s1d</filename> and will
- be journaled to <filename class="devicefile">ad0s1h</filename>.
+ <filename>ad0s1f</filename> and its journal will be
+ <filename>ad0s1g</filename>, while
+ <filename>/var</filename> is <filename>ad0s1d</filename> and will
+ be journaled to <filename>ad0s1h</filename>.
The following commands are required:</para>
<screen>&prompt.root; <userinput>gjournal label ad0s1f ad0s1g</userinput>
@@ -393,8 +386,8 @@ GEOM_JOURNAL: Journal 3193218002: ad0s1h contains journal.</screen>
anything will be actually overwritten.</para></note>
<para>At this point, two new devices are created, namely
- <filename class="devicefile">ad0s1d.journal</filename> and
- <filename class="devicefile">ad0s1f.journal</filename>. These represent
+ <filename>ad0s1d.journal</filename> and
+ <filename>ad0s1f.journal</filename>. These represent
the <filename>/var</filename> and <filename>/usr</filename>
partitions we have to mount. Before mounting, we must however set
the journal flag on them and clear the Soft Updates flag:</para>
@@ -456,14 +449,14 @@ GEOM_JOURNAL: Journal ad0s1f clean.</screen>
- <sect2 id="gjournal-new">
+ <sect2 xml:id="gjournal-new">
<title>Journaling Newly Created Partitions</title>
<para>While the above procedure is necessary for journaling partitions
that already contain data, journaling an empty partition is somewhat
easier, since both the data and the journal provider can be stored
in the same partition. For example, assume a new disk was installed,
- and a new partition <filename class="devicefile">/dev/ad1s1d</filename>
+ and a new partition <filename>/dev/ad1s1d</filename>
was created. Creating the journal would be as simple as:</para>
<screen>&prompt.root; <userinput>gjournal label ad1s1d</userinput></screen>
@@ -486,7 +479,7 @@ GEOM_JOURNAL: Journal ad0s1f clean.</screen>
<screen>&prompt.root; <userinput>newfs -J /dev/ad1s1d.journal</userinput></screen>
- <sect2 id="configure-kernel">
+ <sect2 xml:id="configure-kernel">
<title>Building Journaling into Your Custom Kernel</title>
<para>If you do not wish to load <literal>geom_journal</literal> as a
@@ -499,8 +492,8 @@ GEOM_JOURNAL: Journal ad0s1f clean.</screen>
options GEOM_JOURNAL # You will have to add this one</programlisting>
<para>Rebuild and reinstall your kernel following the relevant
- <ulink url="&url.books.handbook;/kernelconfig.html">instructions in
- the &os;&nbsp;Handbook.</ulink></para>
+ <link xlink:href="&url.books.handbook;/kernelconfig.html">instructions in
+ the &os;&nbsp;Handbook.</link></para>
<para>Do not forget to remove the relevant <quote>load</quote> entry
from <filename>/boot/loader.conf</filename> if you have previously
@@ -508,7 +501,7 @@ options GEOM_JOURNAL # You will have to add this one</programlisting>
- <sect1 id="troubleshooting-gjournal">
+ <sect1 xml:id="troubleshooting-gjournal">
<title>Troubleshooting Journaling</title>
<para>The following section covers frequently asked questions regarding
@@ -516,7 +509,7 @@ options GEOM_JOURNAL # You will have to add this one</programlisting>
- <question id="kernel-panic">
+ <question xml:id="kernel-panic">
<para>I am getting kernel panics during periods of high disk
activity. How is this related to journaling?</para>
@@ -526,13 +519,12 @@ options GEOM_JOURNAL # You will have to add this one</programlisting>
committed (flushed) to disk. Keep in mind the size of the
journal depends on the usage load, and not the size of the data
provider. If your disk activity is high, you need a larger
- partition for the journal. See the note in the <link
- linkend="understanding-journaling">Understanding Journaling</link> section.</para>
+ partition for the journal. See the note in the <link linkend="understanding-journaling">Understanding Journaling</link> section.</para>
- <question id="unable-boot">
+ <question xml:id="unable-boot">
<para>I made some mistake during configuration, and I cannot boot
normally now. Can this be fixed some way?</para>
@@ -572,7 +564,7 @@ GEOM_JOURNAL: Journal ad0s1f clean.
- <question id="remove-journaling">
+ <question xml:id="remove-journaling">
<para>Can I remove journaling and return to my standard file system
with Soft Updates?</para>
@@ -582,7 +574,7 @@ GEOM_JOURNAL: Journal ad0s1f clean.
changes. The partitions you created for the journal providers
can then be used for other purposes, if you so wish.</para>
- <para>Login as <username>root</username> and switch to single user mode:</para>
+ <para>Login as <systemitem class="username">root</systemitem> and switch to single user mode:</para>
<screen>&prompt.root; <userinput>shutdown now</userinput></screen>
@@ -639,7 +631,7 @@ tunefs: soft updates set</screen>
- <sect1 id="further-reading">
+ <sect1 xml:id="further-reading">
<title>Further Reading</title>
<para>Journaling is a fairly new feature of &os;, and as such, it is
@@ -648,17 +640,17 @@ tunefs: soft updates set</screen>
- <para>A <ulink url="&url.books.handbook;/geom-gjournal.html">new section on journaling</ulink>
+ <para>A <link xlink:href="&url.books.handbook;/geom-gjournal.html">new section on journaling</link>
is now part of the &os;&nbsp;Handbook.</para>
- <para><ulink url="http://lists.freebsd.org/pipermail/freebsd-current/2006-June/064043.html">This post</ulink>
+ <para><link xlink:href="http://lists.freebsd.org/pipermail/freebsd-current/2006-June/064043.html">This post</link>
in &a.current.name; by &man.gjournal.8;'s developer, &a.pjd.email;.</para>
- <para><ulink url="http://lists.freebsd.org/pipermail/freebsd-questions/2008-April/173501.html">This post</ulink>
+ <para><link xlink:href="http://lists.freebsd.org/pipermail/freebsd-questions/2008-April/173501.html">This post</link>
in &a.questions.name; by &a.ivoras.email;.</para>
diff --git a/en_US.ISO8859-1/articles/hubs/article.xml b/en_US.ISO8859-1/articles/hubs/article.xml
index 0408d9b70e..aeb46b2192 100644
--- a/en_US.ISO8859-1/articles/hubs/article.xml
+++ b/en_US.ISO8859-1/articles/hubs/article.xml
@@ -1,42 +1,25 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Mirroring FreeBSD</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Mirroring FreeBSD</title>
- <author>
- <firstname>Jun</firstname>
- <surname>Kuriyama</surname>
- <affiliation>
+ <author><personname><firstname>Jun</firstname><surname>Kuriyama</surname></personname><affiliation>
- </affiliation>
- </author>
- <author>
- <firstname>Valentino</firstname>
- <surname>Vaschetto</surname>
- <affiliation>
+ </affiliation></author>
+ <author><personname><firstname>Valentino</firstname><surname>Vaschetto</surname></personname><affiliation>
- </affiliation>
- </author>
- <author>
- <firstname>Daniel</firstname>
- <surname>Lang</surname>
- <affiliation>
+ </affiliation></author>
+ <author><personname><firstname>Daniel</firstname><surname>Lang</surname></personname><affiliation>
- </affiliation>
- </author>
- <author>
- <firstname>Ken</firstname>
- <surname>Smith</surname>
- <affiliation>
+ </affiliation></author>
+ <author><personname><firstname>Ken</firstname><surname>Smith</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -50,13 +33,13 @@
<para>An in-progress article on how to mirror FreeBSD, aimed at
hub administrators.</para>
- </articleinfo>
+ </info>
<para>We are not accepting new mirrors at this time.</para>
- <sect1 id="mirror-contact">
+ <sect1 xml:id="mirror-contact">
<title>Contact Information</title>
<para>The Mirror System Coordinators can be reached through email
@@ -64,9 +47,9 @@
a &a.hubs;.</para>
- <sect1 id="mirror-requirements">
+ <sect1 xml:id="mirror-requirements">
<title>Requirements for FreeBSD mirrors</title>
- <sect2 id="mirror-diskspace">
+ <sect2 xml:id="mirror-diskspace">
<title>Disk Space</title>
Disk space is one of the most important requirements.
@@ -91,10 +74,10 @@
The current disk usage of FTP Distribution can be found at
- <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/dir.sizes">ftp://ftp.FreeBSD.org/pub/FreeBSD/dir.sizes</ulink>.
+ <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/dir.sizes">ftp://ftp.FreeBSD.org/pub/FreeBSD/dir.sizes</link>.
- <sect2 id="mirror-bandwidth">
+ <sect2 xml:id="mirror-bandwidth">
<title>Network Connection/Bandwidth</title>
Of course, you need to be connected to the Internet.
@@ -114,7 +97,7 @@
should be connected as close as possible to your border router.</para></listitem>
- <sect2 id="mirror-system">
+ <sect2 xml:id="mirror-system">
<title>System Requirements, CPU, RAM</title>
One thing this depends on the expected number of clients,
@@ -151,7 +134,7 @@
large number of small modifications to the disk.
- <sect2 id="mirror-services">
+ <sect2 xml:id="mirror-services">
<title>Services to offer</title>
Every mirror site is required to have a set of core services
@@ -160,7 +143,7 @@
server administrators may choose to offer. This section explains
which services you can provide and how to go about implementing them.
- <sect3 id="mirror-serv-ftp">
+ <sect3 xml:id="mirror-serv-ftp">
<title>FTP (required for FTP fileset)</title>
This is one of the most basic services, and
@@ -182,24 +165,24 @@
can be used. Be sure to read &man.ftpd.8;.</para>
- <para><filename role="package">ftp/ncftpd</filename>: A commercial package,
+ <para><package>ftp/ncftpd</package>: A commercial package,
free for educational use.</para>
- <para><filename role="package">ftp/oftpd</filename>: An ftpd designed with
+ <para><package>ftp/oftpd</package>: An ftpd designed with
security as a main focus.</para>
- <para><filename role="package">ftp/proftpd</filename>: A modular and very flexible ftpd.</para>
+ <para><package>ftp/proftpd</package>: A modular and very flexible ftpd.</para>
- <para><filename role="package">ftp/pure-ftpd</filename>: Another ftpd developed with
+ <para><package>ftp/pure-ftpd</package>: Another ftpd developed with
security in mind.</para>
- <listitem><para><filename role="package">ftp/twoftpd</filename>: As above.</para></listitem>
- <listitem><para><filename role="package">ftp/vsftpd</filename>: The <quote>very secure</quote> ftpd.</para></listitem>
+ <listitem><para><package>ftp/twoftpd</package>: As above.</para></listitem>
+ <listitem><para><package>ftp/vsftpd</package>: The <quote>very secure</quote> ftpd.</para></listitem>
- <para><filename role="package">ftp/wu-ftpd</filename>: The ftpd from Washington
+ <para><package>ftp/wu-ftpd</package>: The ftpd from Washington
University. It has become infamous, because of the huge
amount of security issues that have been found in it.
If you do choose to use this software be sure to
@@ -216,7 +199,7 @@
much network bandwidth and system resources are consumed.
- <sect3 id="mirror-serv-rsync">
+ <sect3 xml:id="mirror-serv-rsync">
<title>Rsync (optional for FTP fileset)</title>
<application>Rsync</application> is often offered for access to the
@@ -236,10 +219,10 @@
may be applied. There is just one software package
- <listitem><para><filename role="package">net/rsync</filename></para></listitem>
+ <listitem><para><package>net/rsync</package></para></listitem>
- <sect3 id="mirror-serv-http">
+ <sect3 xml:id="mirror-serv-http">
<title>HTTP (required for web pages, optional for FTP fileset)</title>
If you want to offer the FreeBSD web pages, you will need
@@ -250,14 +233,14 @@
- <para><filename role="package">www/apache22</filename>:
+ <para><package>www/apache22</package>:
<application>Apache</application> is the most widely
deployed web server on the Internet. It is used
extensively by the FreeBSD Project.</para>
- <para><filename role="package">www/thttpd</filename>:
+ <para><package>www/thttpd</package>:
If you are going to be serving a large amount of static content
you may find that using an application such as thttpd is more
efficient than <application>Apache</application>. It is
@@ -265,7 +248,7 @@
- <para><filename role="package">www/boa</filename>:
+ <para><package>www/boa</package>:
<application>Boa</application> is another alternative to
<application>thttpd</application> and
<application>Apache</application>. It should provide
@@ -277,7 +260,7 @@
- <sect3 id="mirror-serv-cvsup">
+ <sect3 xml:id="mirror-serv-cvsup">
<title>CVSup (desired for CVS repository)</title>
<application>CVSup</application> is a very efficient way of distributing files.
@@ -294,26 +277,26 @@
a Modula-3 environment. &a.jdp; has built a
stripped down version of M3 that is sufficient to
run <application>CVSup</application>, and can be installed much easier.
- See <ulink url="http://www.polstra.com/projects/freeware/ezm3/">Ezm3</ulink>
+ See <link xlink:href="http://www.polstra.com/projects/freeware/ezm3/">Ezm3</link>
for details. Related ports are:</para>
- <para><filename role="package">net/cvsup</filename>: The native CVSup port (client and server)
- which requires <filename role="package">lang/ezm3</filename> now.</para>
+ <para><package>net/cvsup</package>: The native CVSup port (client and server)
+ which requires <package>lang/ezm3</package> now.</para>
- <para><filename role="package">net/cvsup-mirror</filename>: The CVSup mirror kit, which requires
- <filename role="package">net/cvsup-without-gui</filename>, and configures it mirror-ready. Some
+ <para><package>net/cvsup-mirror</package>: The CVSup mirror kit, which requires
+ <package>net/cvsup-without-gui</package>, and configures it mirror-ready. Some
site administrators may want a different setup though.
<para>There are a few more like
- <filename role="package">net/cvsup-without-gui</filename> you might want to have
+ <package>net/cvsup-without-gui</package> you might want to have
a look at. If you prefer a static binary package, take a look
- <ulink url="http://people.FreeBSD.org/~jdp/s1g/">here</ulink>.
+ <link xlink:href="http://people.FreeBSD.org/~jdp/s1g/">here</link>.
This page still refers to the S1G bug that was present
in <application>CVSup</application>. Maybe
John will set up a generic download-site to get
@@ -327,7 +310,7 @@
client, since it needs to compare lots of files.
- <sect3 id="mirror-anoncvs">
+ <sect3 xml:id="mirror-anoncvs">
<title>AnonCVS (optional for CVS repository)</title>
If you have the CVS repository, you may want to offer
@@ -344,7 +327,7 @@
For anonymous access, <emphasis>pserver</emphasis> is
very well suited, but some still offer <command>ssh</command>
access as well. There is a custom crafted
- <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS/anoncvs.shar">wrapper</ulink>
+ <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS/anoncvs.shar">wrapper</link>
in the CVS repository, to be used as a login-shell for the
anonymous ssh account. It does a chroot, and therefore
requires the CVS repository to be available under the
@@ -362,7 +345,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
<para>See the manpage for details of the options. Also see the CVS <emphasis>info</emphasis>
page about additional ways to make sure access is read-only.
It is advised that you create an unprivileged account,
- preferably called <username>anoncvs</username>.
+ preferably called <systemitem class="username">anoncvs</systemitem>.
Also you need to create a file <filename>passwd</filename>
in your <filename>/home/ncvs/CVSROOT</filename> and assign a
CVS password (empty or <literal>anoncvs</literal>) to that user.
@@ -382,7 +365,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect1 id="mirror-howto">
+ <sect1 xml:id="mirror-howto">
<title>How to Mirror FreeBSD</title>
Ok, now you know the requirements and how to offer
@@ -391,7 +374,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
the various parts of FreeBSD, what tools to use,
and where to mirror from.
- <sect2 id="mirror-ftp">
+ <sect2 xml:id="mirror-ftp">
The FTP area is the largest amount of data that
@@ -405,21 +388,21 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
for various FreeBSD versions,
and various architectures.
- <sect3 id="mirror-ftp-ftp">
+ <sect3 xml:id="mirror-ftp-ftp">
<title>With FTP mirror</title>
You can use a <application>FTP mirror</application>
program to get the files. Some of the most commonly used are:</para>
- <listitem><para><filename role="package">ftp/mirror</filename></para></listitem>
- <listitem><para><filename role="package">ftp/ftpmirror</filename></para></listitem>
- <listitem><para><filename role="package">ftp/emirror</filename></para></listitem>
- <listitem><para><filename role="package">ftp/spegla</filename></para></listitem>
- <listitem><para><filename role="package">ftp/omi</filename></para></listitem>
- <listitem><para><filename role="package">ftp/wget</filename></para></listitem>
+ <listitem><para><package>ftp/mirror</package></para></listitem>
+ <listitem><para><package>ftp/ftpmirror</package></para></listitem>
+ <listitem><para><package>ftp/emirror</package></para></listitem>
+ <listitem><para><package>ftp/spegla</package></para></listitem>
+ <listitem><para><package>ftp/omi</package></para></listitem>
+ <listitem><para><package>ftp/wget</package></para></listitem>
- <para><filename role="package">ftp/mirror</filename> was very popular, but seemed
+ <para><package>ftp/mirror</package> was very popular, but seemed
to have some drawbacks, as it is written in &man.perl.1;,
and had real problems with mirroring large
directories like a FreeBSD site. There are rumors that
@@ -434,11 +417,11 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
a large TCP congestion window.
- <sect3 id="mirror-ftp-rsync">
+ <sect3 xml:id="mirror-ftp-rsync">
<title>With rsync</title>
A better way to mirror the FTP area is <application>rsync</application>.
- You can install the port <filename role="package">net/rsync</filename> and then use
+ You can install the port <package>net/rsync</package> and then use
rsync to sync with your upstream host.
<application>rsync</application> is already mentioned
in <xref linkend="mirror-serv-rsync"/>.
@@ -461,7 +444,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
<para>Consult the documentation for <application>rsync</application>,
which is also available at
- <ulink url="http://rsync.samba.org/">http://rsync.samba.org/</ulink>,
+ <link xlink:href="http://rsync.samba.org/">http://rsync.samba.org/</link>,
about the various options to be used with rsync.
If you sync the whole module (unlike subdirectories),
be aware that the module-directory (here "FreeBSD")
@@ -471,15 +454,15 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
via &man.cron.8;.
- <sect3 id="mirror-ftp-cvsup">
+ <sect3 xml:id="mirror-ftp-cvsup">
<title>With CVSup</title>
- A few sites, including the one-and-only <hostid role="fqdn">ftp-master.FreeBSD.org</hostid>
+ A few sites, including the one-and-only <systemitem class="fqdomainname">ftp-master.FreeBSD.org</systemitem>
even offer <application>CVSup</application> to mirror the contents of
the FTP space. You need to install a <application>CVSup</application>
- client, preferably from the port <filename role="package">net/cvsup</filename>.
+ client, preferably from the port <package>net/cvsup</package>.
(Also reread <xref linkend="mirror-serv-cvsup"/>.)
- A sample <filename>supfile</filename> suitable for <hostid role="fqdn">ftp-master.FreeBSD.org</hostid>
+ A sample <filename>supfile</filename> suitable for <systemitem class="fqdomainname">ftp-master.FreeBSD.org</systemitem>
looks like this:</para>
@@ -501,7 +484,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
<para>It seems <application>CVSup</application> would be the best
way to mirror the archive in terms of efficiency, but
it is only available from few sites.</para>
- <note id="mirror-cvsup-s-option">
+ <note xml:id="mirror-cvsup-s-option">
Please have look at the <application>CVSup</application> documentation
like &man.cvsup.1; and consider using the <option>-s</option>
@@ -510,12 +493,12 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect2 id="mirror-cvs">
+ <sect2 xml:id="mirror-cvs">
<title>Mirroring the CVS repository</title>
<para>There are various ways to mirror the CVS repository.
<application>CVSup</application> is the most common method.</para>
- <sect3 id="mirror-cvs-cvsup">
+ <sect3 xml:id="mirror-cvs-cvsup">
<title>Using CVSup</title>
<application>CVSup</application> is described in some
@@ -523,7 +506,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
<para>It is very easy to setup a
<application>CVSup</application> mirror. Installing
- <filename role="package">net/cvsup-mirror</filename> will
+ <package>net/cvsup-mirror</package> will
make sure all of the needed programs are installed and then
gather all the needed information to configure the mirror.</para>
@@ -534,7 +517,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect3 id="mirror-cvs-other">
+ <sect3 xml:id="mirror-cvs-other">
<title>Using other methods</title>
Using other methods than <application>CVSup</application> is
@@ -556,7 +539,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect2 id="mirror-www">
+ <sect2 xml:id="mirror-www">
<title>Mirroring the WWW pages</title>
The best way is to check out the <emphasis>www</emphasis>
@@ -593,10 +576,10 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- Using <filename role="package">ftp/wget</filename> or other web-mirror tools is
+ Using <package>ftp/wget</package> or other web-mirror tools is
not recommended.
- <sect3 id="mirror-www-doc">
+ <sect3 xml:id="mirror-www-doc">
<title>Mirroring the FreeBSD documentation</title>
Since the documentation is referenced a lot from the
@@ -628,7 +611,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
Then you need to install a couple of ports.
You are lucky, there is a meta-port:
- <filename role="package">textproc/docproj</filename> to do the work
+ <package>textproc/docproj</package> to do the work
for you. You need to set up some
environment variables, like
@@ -645,15 +628,15 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
The building of the documentation, as well as lots
of side issues, is documented itself in the
- <ulink url="&url.books.fdp-primer;">&os; Documentation
- Project Primer</ulink>.
+ <link xlink:href="&url.books.fdp-primer;">&os; Documentation
+ Project Primer</link>.
Please read this piece of documentation, especially if you
have problems building the documentation.
- <sect2 id="mirror-how-often">
+ <sect2 xml:id="mirror-how-often">
<title>How often should I mirror?</title>
Every mirror should be updated on a regular
@@ -705,37 +688,37 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect1 id="mirror-where">
+ <sect1 xml:id="mirror-where">
<title>Where to mirror from</title>
This is an important issue. So this section will
spend some effort to explain the backgrounds. We will say this
several times: under no circumstances should you mirror from
- <hostid role="fqdn">ftp.FreeBSD.org</hostid>.
+ <systemitem class="fqdomainname">ftp.FreeBSD.org</systemitem>.
- <sect2 id="mirror-where-organization">
+ <sect2 xml:id="mirror-where-organization">
<title>A few words about the organization</title>
Mirrors are organized by country. All
official mirrors have a DNS entry of the form
- <hostid role="fqdn">ftpN.CC.FreeBSD.org</hostid>.
+ <systemitem class="fqdomainname">ftpN.CC.FreeBSD.org</systemitem>.
<emphasis>CC</emphasis> (i.e. country code) is the
<emphasis>top level domain</emphasis> (TLD)
of the country where this mirror is located.
<emphasis>N</emphasis> is a number,
telling that the host would be the <emphasis>Nth</emphasis>
mirror in that country.
- (Same applies to <hostid>cvsupN.CC.FreeBSD.org</hostid>,
- <hostid>wwwN.CC.FreeBSD.org</hostid>, etc.)
+ (Same applies to <systemitem>cvsupN.CC.FreeBSD.org</systemitem>,
+ <systemitem>wwwN.CC.FreeBSD.org</systemitem>, etc.)
There are mirrors with no <emphasis>CC</emphasis> part.
These are the mirror sites that are very well connected and
allow a large number of concurrent users.
- <hostid role="fqdn">ftp.FreeBSD.org</hostid> is actually two machines, one currently
+ <systemitem class="fqdomainname">ftp.FreeBSD.org</systemitem> is actually two machines, one currently
located in Denmark and the other in the United States.
It is <emphasis>NOT</emphasis> a master site and should never be
used to mirror from. Lots of online documentation leads
<quote>interactive</quote>users to
- <hostid role="fqdn">ftp.FreeBSD.org</hostid> so automated mirroring
+ <systemitem class="fqdomainname">ftp.FreeBSD.org</systemitem> so automated mirroring
systems should find a different machine to mirror from.
@@ -758,16 +741,15 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
(this is just a rough hint, and there is no rule).
- <sect2 id="mirror-where-where">
+ <sect2 xml:id="mirror-where-where">
<title>Ok, but where should I get the stuff now?</title>
- Under no circumstances should you mirror from <hostid
- role="fqdn">ftp.FreeBSD.org</hostid>.
+ Under no circumstances should you mirror from <systemitem class="fqdomainname">ftp.FreeBSD.org</systemitem>.
The short answer is: from the
site that is closest to you in Internet terms, or gives you
the fastest access.
- <sect3 id="mirror-where-simple">
+ <sect3 xml:id="mirror-where-simple">
<title>I just want to mirror from somewhere!</title>
If you have no special intentions or
@@ -798,7 +780,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect3 id="mirror-where-official">
+ <sect3 xml:id="mirror-where-official">
<title>I am an official mirror, what is the right site for me?</title>
In general the description in <xref linkend="mirror-where-simple"/>
@@ -809,7 +791,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
mirrors that are described in <xref linkend="mirror-official"/>.
- <sect3 id="mirror-where-master">
+ <sect3 xml:id="mirror-where-master">
<title>I want to access the master sites!</title>
If you have good reasons and good prerequisites,
@@ -834,13 +816,13 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
one for the CVS repository (the web pages and docs are
obtained from CVS, so there is no need for master).
- <sect4 id="mirror-where-master-ftp">
+ <sect4 xml:id="mirror-where-master-ftp">
This is the master site for the FTP fileset.
- <hostid>ftp-master.FreeBSD.org</hostid> provides
+ <systemitem>ftp-master.FreeBSD.org</systemitem> provides
<application>rsync</application> and <application>CVSup</application>
access, in addition to FTP.
Refer to <xref linkend="mirror-ftp-rsync"/> and
@@ -853,43 +835,43 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect4 id="mirror-where-master-cvsup">
+ <sect4 xml:id="mirror-where-master-cvsup">
This is the master site for the CVS repository.
- <hostid>cvsup-master.FreeBSD.org</hostid> provides
+ <systemitem>cvsup-master.FreeBSD.org</systemitem> provides
<application>CVSup</application> access only.
See <xref linkend="mirror-cvs-cvsup"/> for details.
To get access, you need to contact the &a.cvsup-master;.
Make sure you read the
- <ulink url="http://people.FreeBSD.org/~jdp/cvsup-access/">FreeBSD CVSup Access Policy</ulink>
+ <link xlink:href="http://people.FreeBSD.org/~jdp/cvsup-access/">FreeBSD CVSup Access Policy</link>
Set up the required authentication by following
- <ulink url="http://people.FreeBSD.org/~jdp/cvpasswd/">these
- instructions</ulink>. Make sure you specify the server as
- <hostid>freefall.FreeBSD.org</hostid> on the <command>cvpasswd</command>
+ <link xlink:href="http://people.FreeBSD.org/~jdp/cvpasswd/">these
+ instructions</link>. Make sure you specify the server as
+ <systemitem>freefall.FreeBSD.org</systemitem> on the <command>cvpasswd</command>
command line, as described in this document,
even when you are contacting
- <hostid>cvsup-master.FreeBSD.org</hostid>
+ <systemitem>cvsup-master.FreeBSD.org</systemitem>
- <sect1 id="mirror-official">
+ <sect1 xml:id="mirror-official">
<title>Official Mirrors</title>
Official mirrors are mirrors that</para>
- a) have a <hostid>FreeBSD.org</hostid> DNS entry
+ a) have a <systemitem>FreeBSD.org</systemitem> DNS entry
(usually a CNAME).
@@ -906,7 +888,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
However you probably will not find a <emphasis>Tier-1</emphasis>-mirror,
that is not also official.
- <sect2 id="mirror-official-requirements">
+ <sect2 xml:id="mirror-official-requirements">
<title>Special Requirements for official (tier-1) mirrors</title>
It is not so easy to state requirements for all
@@ -933,12 +915,12 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
<para>Furthermore, admins should be subscribed to the &a.hubs;.
- See <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">this link</ulink> for details, how to subscribe.
+ See <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">this link</link> for details, how to subscribe.
<para>It is <emphasis>very</emphasis> important for a hub administrator, especially
Tier-1 hub admins, to check the
- <ulink url="http://www.FreeBSD.org/releng/">release schedule</ulink>
+ <link xlink:href="http://www.FreeBSD.org/releng/">release schedule</link>
for the next FreeBSD release. This is important because it will tell you when the
next release is scheduled
to come out, and thus giving you time to prepare for the big spike of traffic which follows it.
@@ -951,7 +933,7 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect2 id="mirror-official-become">
+ <sect2 xml:id="mirror-official-become">
<title>How to become official then?</title>
@@ -1013,52 +995,51 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
- <sect1 id="mirror-statpages">
+ <sect1 xml:id="mirror-statpages">
<title>Some statistics from mirror sites</title>
Here are links to the stat pages of your favorite mirrors
(a.k.a. the only ones who feel like providing stats).
- <sect2 id="mirror-statpagesftp">
+ <sect2 xml:id="mirror-statpagesftp">
<title>FTP site statistics</title>
<para>ftp.is.FreeBSD.org - <email>hostmaster@is.FreeBSD.org</email> -
- <ulink url="http://www.rhnet.is/status/draupnir/draupnir.html">
- (Bandwidth)</ulink> <ulink url="http://www.rhnet.is/status/ftp/ftp-notendur.html">(FTP
- processes)</ulink> <ulink url="http://www.rhnet.is/status/ftp/http-notendur.html">(HTTP processes)
- </ulink>
+ <link xlink:href="http://www.rhnet.is/status/draupnir/draupnir.html">
+ (Bandwidth)</link> <link xlink:href="http://www.rhnet.is/status/ftp/ftp-notendur.html">(FTP
+ processes)</link> <link xlink:href="http://www.rhnet.is/status/ftp/http-notendur.html">(HTTP processes)
+ </link>
<para>ftp.cz.FreeBSD.org - <email>cejkar@fit.vutbr.cz</email> -
- <ulink url="http://www.cz.FreeBSD.org/stats/mrtg/net.html">(Bandwidth)</ulink>
- <ulink url="http://www.freebsd.cz/stats/mrtg/ftpd.html">(FTP processes)</ulink>
- <ulink url="http://www.freebsd.cz/stats/mrtg/rsyncd.html">(rsync processes)</ulink>
+ <link xlink:href="http://www.cz.FreeBSD.org/stats/mrtg/net.html">(Bandwidth)</link>
+ <link xlink:href="http://www.freebsd.cz/stats/mrtg/ftpd.html">(FTP processes)</link>
+ <link xlink:href="http://www.freebsd.cz/stats/mrtg/rsyncd.html">(rsync processes)</link>
<para>ftp2.ru.FreeBSD.org - <email>mirror@macomnet.ru</email> -
- <ulink url="http://mirror.macomnet.net/mrtg/mirror.macomnet.net_195.128.64.25.html">(Bandwidth)</ulink>
- <ulink url="http://mirror.macomnet.net/mrtg/mirror.macomnet.net_proc.html">(HTTP and FTP users)</ulink>
+ <link xlink:href="http://mirror.macomnet.net/mrtg/mirror.macomnet.net_195.128.64.25.html">(Bandwidth)</link>
+ <link xlink:href="http://mirror.macomnet.net/mrtg/mirror.macomnet.net_proc.html">(HTTP and FTP users)</link>
- <sect2 id="mirror-statpagescvsup">
+ <sect2 xml:id="mirror-statpagescvsup">
<title>CVSup site stats</title>
- <para>cvsup[23456].jp.FreeBSD.org - <email>kuriyama@FreeBSD.org</email> - <ulink
- url="http://home.jp.FreeBSD.org/stats/mrtg/cvsup/index.en.html">(CVSup processes)</ulink></para>
+ <para>cvsup[23456].jp.FreeBSD.org - <email>kuriyama@FreeBSD.org</email> - <link xlink:href="http://home.jp.FreeBSD.org/stats/mrtg/cvsup/index.en.html">(CVSup processes)</link></para>
<para>cvsup.cz.FreeBSD.org - <email>cejkar@fit.vutbr.cz</email> -
- <ulink url="http://www.freebsd.cz/stats/mrtg/cvsupd.html">(CVSup processes)</ulink></para>
+ <link xlink:href="http://www.freebsd.cz/stats/mrtg/cvsupd.html">(CVSup processes)</link></para>
<para>cvsup4.ru.FreeBSD.org - <email>maxim@FreeBSD.org</email> -
- <ulink url="http://ftp.mtu.ru/mrtg/ftp.mtu.ru_proc2.html">(CVSup processes)</ulink></para>
+ <link xlink:href="http://ftp.mtu.ru/mrtg/ftp.mtu.ru_proc2.html">(CVSup processes)</link></para>
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.xml b/en_US.ISO8859-1/articles/ipsec-must/article.xml
index 80abb023d0..492170a30d 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.xml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,29 +1,22 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
The FreeBSD Documentation Project
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Independent Verification of IPsec Functionality in FreeBSD</title>
-<article lang='en'>
- <articleinfo>
- <title>Independent Verification of IPsec Functionality in FreeBSD</title>
- <author>
- <firstname>David</firstname>
- <surname>Honig</surname>
- <affiliation>
+ <author><personname><firstname>David</firstname><surname>Honig</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <pubdate>3 May 1999</pubdate>
+ <pubdate>1999-05-03</pubdate>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -36,9 +29,9 @@
know? I describe a method for experimentally verifying that IPsec is
- </articleinfo>
+ </info>
- <sect1 id="problem">
+ <sect1 xml:id="problem">
<title>The Problem</title>
<para>First, lets assume you have <link linkend="ipsec-install">
@@ -49,7 +42,7 @@
But can you independently confirm it?</para>
- <sect1 id="solution">
+ <sect1 xml:id="solution">
<title>The Solution</title>
<para>First, some crypto-relevant info theory:</para>
@@ -73,20 +66,18 @@
not encrypted---as the outermost IP header must be if the
packet is to be routable.</para>
- <sect2 id="MUST">
+ <sect2 xml:id="MUST">
<para>Ueli Maurer's <quote>Universal Statistical Test for Random
- Bit Generators</quote>(<ulink
- url="http://www.geocities.com/SiliconValley/Code/4704/universal.pdf">
- <acronym>MUST</acronym></ulink>) quickly measures the entropy
- of a sample. It uses a compression-like algorithm. <link
- linkend="code">The code is given below</link> for a variant
+ Bit Generators</quote>(<link xlink:href="http://www.geocities.com/SiliconValley/Code/4704/universal.pdf">
+ <acronym>MUST</acronym></link>) quickly measures the entropy
+ of a sample. It uses a compression-like algorithm. <link linkend="code">The code is given below</link> for a variant
which measures successive (~quarter megabyte) chunks of a
- <sect2 id="tcpdump">
+ <sect2 xml:id="tcpdump">
<para>We also need a way to capture the raw network data. A
@@ -97,7 +88,7 @@
<para>The command:</para>
- <screen><userinput><command>tcpdump</command> -c 4000 -s 10000 -w <replaceable>dumpfile.bin</replaceable></userinput></screen>
+ <screen><userinput>tcpdump -c 4000 -s 10000 -w dumpfile.bin</userinput></screen>
<para>will capture 4000 raw packets to
<replaceable>dumpfile.bin</replaceable>. Up to 10,000 bytes per
@@ -105,7 +96,7 @@
- <sect1 id="experiment">
+ <sect1 xml:id="experiment">
<title>The Experiment</title>
<para>Here is the experiment:</para>
@@ -136,8 +127,8 @@
the <quote>normal</quote> connection has 29% (2.1) of the
expected value.</para>
- <screen>&prompt.user; <userinput>tcpdump -c 4000 -s 10000 -w <replaceable>ipsecdemo.bin</replaceable></userinput>
-&prompt.user; <userinput>uliscan <replaceable>ipsecdemo.bin</replaceable></userinput>
+ <screen>&prompt.user; <userinput>tcpdump -c 4000 -s 10000 -w ipsecdemo.bin</userinput>
+&prompt.user; <userinput>uliscan ipsecdemo.bin</userinput>
Uliscan 21 Dec 98
L=8 256 258560
@@ -154,7 +145,7 @@ Expected value for L=8 is 7.1836656
- <sect1 id="caveat">
+ <sect1 xml:id="caveat">
<para>This experiment shows that IPsec <emphasis>does</emphasis>
@@ -168,7 +159,7 @@ Expected value for L=8 is 7.1836656
- <sect1 id="IPsec">
+ <sect1 xml:id="IPsec">
<para>Internet Protocol security extensions to IPv4; required for
@@ -179,7 +170,7 @@ Expected value for L=8 is 7.1836656
message. IPsec encrypts everything between two hosts.</para>
- <sect1 id="ipsec-install">
+ <sect1 xml:id="ipsec-install">
<title>Installing IPsec</title>
<para>Most of the modern versions of FreeBSD have IPsec support
@@ -189,12 +180,11 @@ Expected value for L=8 is 7.1836656
&man.setkey.8; command.</para>
<para>A comprehensive guide on running IPsec on FreeBSD is
- provided in <ulink
- url="&url.books.handbook;/ipsec.html">FreeBSD
- Handbook</ulink>.</para>
+ provided in <link xlink:href="&url.books.handbook;/ipsec.html">FreeBSD
+ Handbook</link>.</para>
- <sect1 id="kernel">
+ <sect1 xml:id="kernel">
<para>This needs to be present in the kernel config file in order
@@ -205,13 +195,12 @@ Expected value for L=8 is 7.1836656
<programlisting>device bpf</programlisting>
- <sect1 id="code">
+ <sect1 xml:id="code">
<title>Maurer's Universal Statistical Test (for block size=8
- <para>You can find the same code at <ulink
- url="http://www.geocities.com/SiliconValley/Code/4704/uliscanc.txt">
- this link</ulink>.</para>
+ <para>You can find the same code at <link xlink:href="http://www.geocities.com/SiliconValley/Code/4704/uliscanc.txt">
+ this link</link>.</para>
ULISCAN.c ---blocksize of 8
diff --git a/en_US.ISO8859-1/articles/laptop/article.xml b/en_US.ISO8859-1/articles/laptop/article.xml
index c283427099..f619424f9d 100644
--- a/en_US.ISO8859-1/articles/laptop/article.xml
+++ b/en_US.ISO8859-1/articles/laptop/article.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>FreeBSD on Laptops</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>FreeBSD on Laptops</title>
<para>FreeBSD works fine on most laptops, with a few caveats.
@@ -13,7 +12,7 @@
discussed below.</para>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -23,7 +22,7 @@
- </articleinfo>
+ </info>
<para>FreeBSD is often thought of as a server operating system, but
it works just fine on the desktop, and if you want to use it on
@@ -43,15 +42,15 @@
word <quote>&os;</quote> into a search engine of your
choice. Additionally there is a &os;-specific online database
which aims to give information on hardware issues with laptops,
- <ulink url="http://laptop.bsdgroup.de/freebsd/">The &os;
- Laptop Compatibility List</ulink>.</para>
+ <link xlink:href="http://laptop.bsdgroup.de/freebsd/">The &os;
+ Laptop Compatibility List</link>.</para>
<para>If you want to communicate with other &os; laptop users,
check out the &a.mobile.name; list. You can also get additional
information about using Laptops on &os; at
- <ulink url="http://tuxmobil.org/mobile_bsd.html"></ulink>.</para>
+ <uri xlink:href="http://tuxmobil.org/mobile_bsd.html">http://tuxmobil.org/mobile_bsd.html</uri>.</para>
- <sect1 id="xorg">
+ <sect1 xml:id="xorg">
<para>Recent versions of <application>&xorg;</application> work with most display adapters
@@ -91,7 +90,7 @@
- <sect1 id="modems">
+ <sect1 xml:id="modems">
Laptops usually come with internal (on-board) modems.
@@ -99,7 +98,7 @@
<quote>winmodems</quote> whose
functionality is implemented in software, for which only &windows;
drivers are normally available (though a few drivers are beginning
- to show up for other operating systems; for example, if your modem has a Lucent LT chipset it might be supported by the <filename role="package">comms/ltmdm</filename> port). If that is the case, you
+ to show up for other operating systems; for example, if your modem has a Lucent LT chipset it might be supported by the <package>comms/ltmdm</package> port). If that is the case, you
need to buy an external modem: the most compact option is
probably a PC Card (PCMCIA) modem, discussed below, but
serial or USB modems may be cheaper. Generally, regular
@@ -108,16 +107,16 @@
- <sect1 id="pcmcia">
+ <sect1 xml:id="pcmcia">
<title>PCMCIA (PC Card) devices</title>
<para> Most laptops come with PCMCIA (also called PC Card)
slots; these are supported fine under FreeBSD. Look through
your boot-up messages (using &man.dmesg.8;) and see whether these were
detected correctly (they should appear as
- <devicename>pccard0</devicename>,
- <devicename>pccard1</devicename> etc on devices like
- <devicename>pcic0</devicename>).</para>
+ <filename>pccard0</filename>,
+ <filename>pccard1</filename> etc on devices like
+ <filename>pcic0</filename>).</para>
<para>&os;&nbsp;4.X supports 16-bit PCMCIA cards, and
&os;&nbsp;5.X supports both 16-bit and
@@ -156,7 +155,7 @@
- <sect1 id="power-management">
+ <sect1 xml:id="power-management">
<title>Power management</title>
@@ -225,8 +224,7 @@
in your kernel configuration file and recompile your kernel.
Another workaround is to switch to a virtual console (using
- <keycombo
- action="simul"><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F1</keycap></keycombo>
+ <keycombo action="simul"><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F1</keycap></keycombo>
or another function key) and then execute &man.apm.8;.
You can automate this with &man.vidcontrol.1;, if you are
running &man.apmd.8;. Simply edit
diff --git a/en_US.ISO8859-1/articles/ldap-auth/article.xml b/en_US.ISO8859-1/articles/ldap-auth/article.xml
index 7f055fa72a..d52067546f 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/article.xml
+++ b/en_US.ISO8859-1/articles/ldap-auth/article.xml
@@ -1,19 +1,14 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang="en">
- <articleinfo>
- <title>LDAP Authentication</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>LDAP Authentication</title>
- <author>
- <firstname>Toby</firstname>
- <surname>Burress</surname>
- <affiliation>
+ <author><personname><firstname>Toby</firstname><surname>Burress</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
@@ -22,7 +17,7 @@
<holder>The FreeBSD Documentation Project</holder>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -38,16 +33,16 @@
where many servers need the same user accounts, for example as a
replacement for <application>NIS</application>.</para>
- </articleinfo>
+ </info>
- <sect1 id="preface">
+ <sect1 xml:id="preface">
<para>This document is intended to give the reader enough of an
understanding of LDAP to configure an LDAP server. This document will
attempt to provide an
- explanation of <filename role="package">net/nss_ldap</filename>
- and <filename role="package">security/pam_ldap</filename> for use with
+ explanation of <package>net/nss_ldap</package>
+ and <package>security/pam_ldap</package> for use with
client machines services for use with the LDAP server.</para>
<para>When finished, the reader should be able to configure and
@@ -65,32 +60,28 @@
- <sect1 id="ldap">
+ <sect1 xml:id="ldap">
<title>Configuring LDAP</title>
<para>LDAP stands for <quote>Lightweight Directory Access
Protocol</quote> and is a subset of the X.500 Directory Access
- Protocol. Its most recent specifications are in <ulink
- url="http://www.ietf.org/rfc/rfc4510.txt">RFC4510</ulink> and
+ Protocol. Its most recent specifications are in <link xlink:href="http://www.ietf.org/rfc/rfc4510.txt">RFC4510</link> and
friends. Essentially it is a database that expects to be read from
more often than it is written to.</para>
- <para>The LDAP server <ulink
- url="http://www.openldap.org/">OpenLDAP</ulink> will be used in the
+ <para>The LDAP server <link xlink:href="http://www.openldap.org/">OpenLDAP</link> will be used in the
examples in this document; while the principles here should be
generally applicable to many different servers, most of the
concrete administration is
<application>OpenLDAP</application>-specific. There are several
- server versions in ports, for example <filename
- role="package">net/openldap24-server</filename>. Client servers
- will need the corresponding <filename
- role="package">net/openldap24-client</filename> libraries.</para>
+ server versions in ports, for example <package>net/openldap24-server</package>. Client servers
+ will need the corresponding <package>net/openldap24-client</package> libraries.</para>
<para>There are (basically) two areas of the LDAP service which need
configuration. The first is setting up a server to receive
connections properly, and the second is adding entries to the
server's directory so that &os; tools know how to interact with it.</para>
- <sect2 id="ldap-connect">
+ <sect2 xml:id="ldap-connect">
<title>Setting Up the Server for Connections</title>
@@ -100,12 +91,12 @@
- <sect3 id="ldap-connect-install">
+ <sect3 xml:id="ldap-connect-install">
<title>Installing <application>OpenLDAP</application></title>
<para>First, install <application>OpenLDAP</application>:</para>
- <example id="oldap-install">
+ <example xml:id="oldap-install">
<title>Installing <application>OpenLDAP</application></title>
<screen>&prompt.root; <userinput>cd /usr/ports/net/openldap24-server</userinput>
@@ -117,7 +108,7 @@
<application>OpenLDAP</application> libraries.</para>
- <sect3 id="ldap-connect-config">
+ <sect3 xml:id="ldap-connect-config">
<title>Configuring <application>OpenLDAP</application></title>
<para>Next we must configure
@@ -179,7 +170,7 @@ TLSCACertificateFile /path/to/your/cacert.crt</programlisting>
server. If you simply want a server that runs, you can create a
self-signed certificate with OpenSSL:</para>
- <example id="genrsa">
+ <example xml:id="genrsa">
<title>Generating an RSA key</title>
<screen>&prompt.user; <userinput>openssl genrsa -out cert.key 1024</userinput>
@@ -204,7 +195,7 @@ e is 65537 (0x10001)
<para>Finally, the certificate signing request needs to be
- <example id="self-sign">
+ <example xml:id="self-sign">
<title>Self-signing the certificate</title>
<screen>&prompt.user; <userinput>openssl x509 -req -in cert.csr -days 365 -signkey cert.key -out cert.crt</userinput>
@@ -236,16 +227,13 @@ Getting Private key</screen>
ldap slapd 3261 7 tcp4 *:389 *:*</screen>
- <sect3 id="ldap-connect-client">
+ <sect3 xml:id="ldap-connect-client">
<title>Configuring the Client</title>
- <para>Install the <filename
- role="package">net/openldap24-client</filename> port for the
+ <para>Install the <package>net/openldap24-client</package> port for the
<application>OpenLDAP</application> libraries. The client
machines will always have <application>OpenLDAP</application>
- libraries since that is all <filename
- role="package">security/pam_ldap</filename> and <filename
- role="package">net/nss_ldap</filename> support, at least for the
+ libraries since that is all <package>security/pam_ldap</package> and <package>net/nss_ldap</package> support, at least for the
<para>The configuration file for the
@@ -283,7 +271,7 @@ tls_cacert /path/to/your/cacert.crt</programlisting>
- <sect2 id="ldap-database">
+ <sect2 xml:id="ldap-database">
<title>Entries in the Database</title>
<para>Authentication against an LDAP directory is generally
@@ -300,7 +288,7 @@ tls_cacert /path/to/your/cacert.crt</programlisting>
<para>The base entry for our database is
<literal>dc=example,dc=org</literal>. The default location for
users that most clients seem to expect is something like
- <literal>ou=people,<replaceable>base</replaceable></literal>, so
+ <literal>ou=people,base</literal>, so
that is what will be used here. However keep in mind that this is
@@ -366,7 +354,7 @@ cn: tuser</programlisting>
<para>To enter these into your database, you can use
<command>slapadd</command> or <command>ldapadd</command>
on a file containing these entries. Alternatively, you can use
- <filename role="package">sysutils/ldapvi</filename>.</para>
+ <package>sysutils/ldapvi</package>.</para>
<para>The <command>ldapsearch</command> utility on the client machine
should now return these entries. If it does, your database is
@@ -374,25 +362,21 @@ cn: tuser</programlisting>
- <sect1 id="client">
+ <sect1 xml:id="client">
<title>Client Configuration</title>
<para>The client should already have
- <application>OpenLDAP</application> libraries from <xref
- linkend="ldap-connect-client"/>, but if you are installing several
- client machines you will need to install <filename
- role="package">net/openldap24-client</filename> on each of
+ <application>OpenLDAP</application> libraries from <xref linkend="ldap-connect-client"/>, but if you are installing several
+ client machines you will need to install <package>net/openldap24-client</package> on each of
<para>&os; requires two ports to be installed to authenticate
- against an LDAP server, <filename
- role="package">security/pam_ldap</filename> and <filename
- role="package">net/nss_ldap</filename>.</para>
+ against an LDAP server, <package>security/pam_ldap</package> and <package>net/nss_ldap</package>.</para>
- <sect2 id="client-auth">
+ <sect2 xml:id="client-auth">
- <para><filename role="package">security/pam_ldap</filename> is
+ <para><package>security/pam_ldap</package> is
configured via <filename>/usr/local/etc/ldap.conf</filename>.</para>
@@ -410,7 +394,7 @@ cn: tuser</programlisting>
configuration parameters from
<filename>openldap/ldap.conf</filename> to the new
<filename>ldap.conf</filename>. Once this is done, we want to
- tell <filename role="package">security/pam_ldap</filename> what to
+ tell <package>security/pam_ldap</package> what to
look for on the directory server.</para>
<para>We are identifying our users with the <literal>uid</literal>
@@ -418,21 +402,20 @@ cn: tuser</programlisting>
<literal>pam_login_attribute</literal> directive in
- <example id="set-pam-login-attr">
+ <example xml:id="set-pam-login-attr">
<title>Setting <literal>pam_login_attribute</literal></title>
<programlisting>pam_login_attribute uid</programlisting>
- <para>With this set, <filename
- role="package">security/pam_ldap</filename> will search the entire
+ <para>With this set, <package>security/pam_ldap</package> will search the entire
LDAP directory under <literal>base</literal> for the value
- <literal>uid=<replaceable>username</replaceable></literal>. If it
+ <literal>uid=username</literal>. If it
finds one and only one entry, it will attempt to bind as that user
with the password it was given. If it binds correctly, then it
will allow access. Otherwise it will fail.</para>
- <sect3 id="client-auth-pam">
+ <sect3 xml:id="client-auth-pam">
<para>PAM, which stands for <quote>Pluggable Authentication
@@ -501,7 +484,7 @@ cn: tuser</programlisting>
<para>Your <filename>pam.d/sshd</filename> might then end up
looking like this:</para>
- <example id="pam">
+ <example xml:id="pam">
<title>Sample <filename>pam.d/sshd</filename></title>
<programlisting>auth required pam_nologin.so no_warn
@@ -525,7 +508,7 @@ account required /usr/local/lib/pam_ldap.so no_warn ignore_a
- <sect2 id="client-nss">
+ <sect2 xml:id="client-nss">
<title>Name Service Switch</title>
<para><application>NSS</application> is the service that maps
@@ -539,9 +522,8 @@ account required /usr/local/lib/pam_ldap.so no_warn ignore_a
tell <application>NSS</application> to look there when
- <para>The <filename role="package">net/nss_ldap</filename> port
- does this. It uses the same configuration file as <filename
- role="package">security/pam_ldap</filename>, and should not need
+ <para>The <package>net/nss_ldap</package> port
+ does this. It uses the same configuration file as <package>security/pam_ldap</package>, and should not need
any extra parameters once it is installed. Instead, what is left
is simply to edit <filename>/etc/nsswitch.conf</filename> to take
advantage of the directory. Simply replace the following
@@ -562,7 +544,7 @@ passwd: files ldap</programlisting>
- <sect2 id="caveats">
+ <sect2 xml:id="caveats">
<para>Unfortunately, as of the time this was written &os; did not
@@ -570,10 +552,9 @@ passwd: files ldap</programlisting>
this, most administrators are left to implement a solution
themselves. I provide some examples here. Note that if you write
your own password change script, there are some security issues
- you should be made aware of; see <xref
- linkend="security-passwd"/></para>
+ you should be made aware of; see <xref linkend="security-passwd"/></para>
- <example id="chpw-shell">
+ <example xml:id="chpw-shell">
<title>Shell script for changing passwords</title>
@@ -611,7 +592,7 @@ ldappasswd -D uid="$USER",ou=people,dc=example,dc=org \
that can change LDAP passwords. It sees use both on the command
line, and on the web.</para>
- <example id="chpw-ruby">
+ <example xml:id="chpw-ruby">
<title>Ruby script for changing passwords</title>
<programlisting><![CDATA[require 'ldap'
@@ -658,7 +639,7 @@ conn.modify(luser, [replace])]]></programlisting>
- <sect1 id="secure">
+ <sect1 xml:id="secure">
<title>Security Considerations</title>
<para>Now that your machines (and possibly other services) are
@@ -672,20 +653,20 @@ conn.modify(luser, [replace])]]></programlisting>
continually review your configuration and procedures for
- <sect2 id="secure-readonly">
+ <sect2 xml:id="secure-readonly">
<title>Setting attributes read-only</title>
<para>Several attributes in LDAP should be read-only. If left
writable by the user, for example, a user could change his
<literal>uidNumber</literal> attribute to <literal>0</literal> and
- get <username>root</username> access!</para>
+ get <systemitem class="username">root</systemitem> access!</para>
<para>To begin with, the <literal>userPassword</literal> attribute
should not be world-readable. By default, anyone who can connect
to the LDAP server can read this attribute. To disable this, put
the following in <filename>slapd.conf</filename>:</para>
- <example id="hide-userpass">
+ <example xml:id="hide-userpass">
<title>Hide passwords</title>
<programlisting>access to dn.subtree="ou=people,dc=example,dc=org"
@@ -709,7 +690,7 @@ access to *
changes), such as <literal>uidNumber</literal>. To close this
hole, modify the above to</para>
- <example id="attrib-readonly">
+ <example xml:id="attrib-readonly">
<title>Read-only attributes</title>
<programlisting>access to dn.subtree="ou=people,dc=example,dc=org"
@@ -730,25 +711,25 @@ access to *
- <sect2 id="secure-root">
- <title><username>Root</username> account definition</title>
+ <sect2 xml:id="secure-root">
+ <title><systemitem class="username">Root</systemitem> account definition</title>
- <para>Often the <username>root</username> or manager account for
+ <para>Often the <systemitem class="username">root</systemitem> or manager account for
the LDAP service will be defined in the configuration file.
<application>OpenLDAP</application> supports this, for example,
and it works, but it can lead to trouble if
<filename>slapd.conf</filename> is compromised. It may be better
to use this only to bootstrap yourself into LDAP, and then define
- a <username>root</username> account there.</para>
+ a <systemitem class="username">root</systemitem> account there.</para>
<para>Even better is to define accounts that have limited
- permissions, and omit a <username>root</username> account entirely.
+ permissions, and omit a <systemitem class="username">root</systemitem> account entirely.
For example, users to can add or remove user accounts are added to
one group, but they cannot themselves change the membership of
this group. Such a security policy would help mitigate the effects
of a leaked password.</para>
- <sect3 id="manager-acct">
+ <sect3 xml:id="manager-acct">
<title>Creating a management group</title>
<para>Say you want your IT department to be able to change home
@@ -756,7 +737,7 @@ access to *
to add or remove users. The way to do this is to add a group
for these admins:</para>
- <example id="manager-acct-dn">
+ <example xml:id="manager-acct-dn">
<title>Creating a management group</title>
<programlisting>dn: cn=homemanagement,dc=example,dc=org
@@ -771,7 +752,7 @@ memberUid: uid=user2,ou=people,dc=example,dc=org</programlisting>
<para>And then change the permissions attributes in
- <example id="management-acct-acl">
+ <example xml:id="management-acct-acl">
<title>ACLs for a home directory management group</title>
<programlisting>access to dn.subtree="ou=people,dc=example,dc=org"
@@ -780,19 +761,19 @@ memberUid: uid=user2,ou=people,dc=example,dc=org</programlisting>
dnattr=memberUid write</programlisting>
- <para>Now <username>tuser</username> and <username>user2</username>
+ <para>Now <systemitem class="username">tuser</systemitem> and <systemitem class="username">user2</systemitem>
can change other users' home directories.</para>
<para>In this example we've given a subset of administrative
power to certain users without giving them power in other
domains. The idea is that soon no single user account has the
- power of a <username>root</username> account, but every power
- root had is had by at least one user. The <username>root</username>
+ power of a <systemitem class="username">root</systemitem> account, but every power
+ root had is had by at least one user. The <systemitem class="username">root</systemitem>
account then becomes unnecessary and can be removed.</para>
- <sect2 id="security-passwd">
+ <sect2 xml:id="security-passwd">
<title>Password storage</title>
<para>By default <application>OpenLDAP</application> will store
@@ -807,41 +788,41 @@ memberUid: uid=user2,ou=people,dc=example,dc=org</programlisting>
- <appendix id="useful">
+ <appendix xml:id="useful">
<title>Useful Aids</title>
<para>There are a few other programs that might be useful,
particularly if you have many users and do not want to configure
everything manually.</para>
- <para><filename role="package">security/pam_mkhomedir</filename> is
+ <para><package>security/pam_mkhomedir</package> is
a PAM module that always succeeds; its purpose is to create home
directories for users which do not have them. If you have dozens of
client servers and hundreds of users, it is much easier to use this
and set up skeleton directories than to prepare every home
- <para><filename role="package">sysutils/cpu</filename> is a
+ <para><package>sysutils/cpu</package> is a
&man.pw.8;-like utility that can be used to manage users in the LDAP
directory. You can call it directly, or wrap scripts around it. It
can handle both TLS (with the <option>-x</option> flag) and
SSL (directly).</para>
- <para><filename role="package">sysutils/ldapvi</filename> is a great
+ <para><package>sysutils/ldapvi</package> is a great
utility for editing LDAP values in an LDIF-like syntax. The
directory (or subsection of the directory) is presented in the
editor chosen by the <envar>EDITOR</envar> environment variable.
This makes it easy to enable large-scale changes in the directory
without having to write a custom tool.</para>
- <para><filename role="package">security/openssh-portable</filename>
+ <para><package>security/openssh-portable</package>
has the ability to contact an LDAP server to verify
<application>SSH</application> keys. This is extremely nice if you
have many servers and do not want to copy your public keys across
all of them.</para>
- <appendix id="ssl-ca">
+ <appendix xml:id="ssl-ca">
<title><application>OpenSSL</application> Certificates For LDAP</title>
<para>If you are hosting two or more LDAP servers, you will probably
@@ -859,7 +840,7 @@ memberUid: uid=user2,ou=people,dc=example,dc=org</programlisting>
self-signed certificate and key. The steps for this again
- <example id="make-cert">
+ <example xml:id="make-cert">
<title>Creating a certificate</title>
<screen>&prompt.user; <userinput>openssl genrsa -out root.key 1024</userinput>
@@ -890,7 +871,7 @@ memberUid: uid=user2,ou=people,dc=example,dc=org</programlisting>
<option>-CAkey</option> instead of
- <example id="ca-sign">
+ <example xml:id="ca-sign">
<title>Signing as a certificate authority</title>
<screen>&prompt.user; <userinput>openssl x509 -req -days 1024 \
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.xml b/en_US.ISO8859-1/articles/linux-comparison/article.xml
index 4e48dfcc31..aaf41b6491 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.xml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
Copyright (c) 2005 Dru Lavigne
@@ -34,18 +33,13 @@ Copyright (c) 2005 Dru Lavigne
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>FreeBSD: An Open Source Alternative to Linux</title>
-<article lang='en'>
- <articleinfo>
- <title>FreeBSD: An Open Source Alternative to Linux</title>
- <author>
- <firstname>Dru</firstname>
- <surname>Lavigne</surname>
- <affiliation>
+ <author><personname><firstname>Dru</firstname><surname>Lavigne</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
@@ -56,7 +50,7 @@ Copyright (c) 2005 Dru Lavigne
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -72,9 +66,9 @@ Copyright (c) 2005 Dru Lavigne
provides a starting point for those interested in exploring
Open Source alternatives to &linux;.</para>
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>&os; is a &unix; like operating system based on the
@@ -102,8 +96,7 @@ Copyright (c) 2005 Dru Lavigne
roots of Unix development.
- <para>See also <ulink
- url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"></ulink>
+ <para>See also <uri xlink:href="http://www.oreilly.com/catalog/opensources/book/kirkmck.html">http://www.oreilly.com/catalog/opensources/book/kirkmck.html</uri>
for a brief history.</para>
@@ -114,8 +107,7 @@ Copyright (c) 2005 Dru Lavigne
addressed quickly by the security team. When new utilities
or kernel features are added, the user simply needs to read
one file, the Release Notes, which is publicly available on
- the main page of the <ulink
- url="http://www.FreeBSD.org">&os; website</ulink>.</para>
+ the main page of the <link xlink:href="http://www.FreeBSD.org">&os; website</link>.</para>
@@ -142,11 +134,11 @@ Copyright (c) 2005 Dru Lavigne
<para>While both &os; and &linux; use an Open Source
licensing model, the actual licenses used differ. The Linux
- kernel is under the <ulink url="http://www.opensource.org/licenses/gpl-license.php">GPL license</ulink> while
- &os; uses the <ulink url="http://www.opensource.org/licenses/bsd-license.php">BSD license</ulink>. These,
+ kernel is under the <link xlink:href="http://www.opensource.org/licenses/gpl-license.php">GPL license</link> while
+ &os; uses the <link xlink:href="http://www.opensource.org/licenses/bsd-license.php">BSD license</link>. These,
and other Open Source licenses, are described in more detail
- at the website of the <ulink url="http://www.opensource.org/licenses/">Open Source
- Initiative</ulink>.</para>
+ at the website of the <link xlink:href="http://www.opensource.org/licenses/">Open Source
+ Initiative</link>.</para>
<para>The driving philosophy behind the GPL is to ensure that
code remains Open Source; it does this by placing
@@ -157,13 +149,12 @@ Copyright (c) 2005 Dru Lavigne
<para>For a fairly unbiased view of the merits of each
- license, see <ulink
- url="http://en.wikipedia.org/wiki/BSD_and_GPL_licensing"></ulink>.</para>
+ license, see <uri xlink:href="http://en.wikipedia.org/wiki/BSD_and_GPL_licensing">http://en.wikipedia.org/wiki/BSD_and_GPL_licensing</uri>.</para>
stable and reliable code under the attractive BSD license
- means that many operating systems, such as <ulink url="http://developer.apple.com/darwin/projects/darwin/faq.html">Apple OS X</ulink>
+ means that many operating systems, such as <link xlink:href="http://developer.apple.com/darwin/projects/darwin/faq.html">Apple OS X</link>
are based on FreeBSD code. It also means that if you choose
to use BSD licensed code in your own projects, you can do so
without threat of future legal liability.</para>
@@ -171,10 +162,10 @@ Copyright (c) 2005 Dru Lavigne
- <sect1 id="freebsd-features">
+ <sect1 xml:id="freebsd-features">
<title>&os; Features</title>
- <sect2 id="freebsd-features-platforms">
+ <sect2 xml:id="freebsd-features-platforms">
<title>Supported Platforms</title>
<para>&os; has gained a reputation as a secure, stable,
@@ -210,8 +201,8 @@ Copyright (c) 2005 Dru Lavigne
third-party applications,
- <para>Using <ulink url="&url.base;/ports">FreeBSD's ports
- collection</ulink>: software installation is as easy as
+ <para>Using <link xlink:href="&url.base;/ports">FreeBSD's ports
+ collection</link>: software installation is as easy as
<command>pkg_add -r application_name</command>.</para>
@@ -222,23 +213,20 @@ Copyright (c) 2005 Dru Lavigne
&os; as a desktop. The most notable are:</para>
- <listitem><para><ulink
- url="http://www.desktopbsd.net">DesktopBSD</ulink> which
+ <listitem><para><link xlink:href="http://www.desktopbsd.net">DesktopBSD</link> which
aims at being a stable and powerful operating system for
desktop users.</para></listitem>
- <listitem><para><ulink
- url="http://www.freesbie.org">FreeSBIE</ulink> which
+ <listitem><para><link xlink:href="http://www.freesbie.org">FreeSBIE</link> which
provides a LiveCD of &os;.</para></listitem>
- <listitem><para><ulink
- url="http://www.pcbsd.com">PC-BSD</ulink> which provides an
+ <listitem><para><link xlink:href="http://www.pcbsd.com">PC-BSD</link> which provides an
easy-to-use GUI installer for &os; aimed at the desktop
- <sect2 id="freebsd-features-frameworks">
+ <sect2 xml:id="freebsd-features-frameworks">
<title>Extensible Frameworks</title>
<para>&os; provides many extensible frameworks to easily
@@ -306,7 +294,7 @@ Copyright (c) 2005 Dru Lavigne
- <listitem><para><ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/mac.html">MAC</ulink>,
+ <listitem><para><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/mac.html">MAC</link>,
or Mandatory Access Control, provides fine-tuned access to
files and is meant to augment traditional operating system
authorization provided by file permissions. Since MAC is
@@ -331,7 +319,7 @@ Copyright (c) 2005 Dru Lavigne
- <listitem><para>Like &linux;, &os; provides support for <ulink url="&url.base;/doc/en_US.ISO8859-1/articles/pam/">PAM</ulink>,
+ <listitem><para>Like &linux;, &os; provides support for <link xlink:href="&url.base;/doc/en_US.ISO8859-1/articles/pam/">PAM</link>,
Pluggable Authentication Modules. This allows an administrator
to augment the traditional &unix; username/password
authentication model. &os; provides modules to integrate
@@ -353,13 +341,12 @@ Copyright (c) 2005 Dru Lavigne
- <sect1 id="freebsd-security">
+ <sect1 xml:id="freebsd-security">
- <para>Security is very important to the <ulink
+ <para>Security is very important to the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/articles/releng/">FreeBSD
- Engineering Team</ulink>. This
+ Engineering Team</link>. This
manifests itself in several concrete areas:</para>
@@ -369,17 +356,15 @@ Release
resolving known security issues. Full information regarding
FreeBSD's security handling procedures and where to find
security information is available at
- <ulink url="http://www.FreeBSD.org/security/"></ulink>.</para></listitem>
+ <uri xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para></listitem>
<listitem><para>One of the problems associated with Open Source
software is the sheer volume of available applications. There
are literally tens of thousands of Open Source application projects
each with varying levels of responsiveness to security
- incidents. &os; has met this challenge head-on with <ulink
- url="http://www.vuxml.org/freebsd/">VuXML</ulink>. All software
+ incidents. &os; has met this challenge head-on with <link xlink:href="http://www.vuxml.org/freebsd/">VuXML</link>. All software
shipped with the FreeBSD operating system as well any software
- available in the <ulink
- url="&url.base;/ports/">Ports Collection</ulink>
+ available in the <link xlink:href="&url.base;/ports/">Ports Collection</link>
is compared to a database of known, unresolved
vulnerabilities. An administrator can use the &man.portaudit.1;
utility to quickly determine if any software on a &os;
@@ -418,13 +403,13 @@ Release
- <sect1 id="freebsd-support">
+ <sect1 xml:id="freebsd-support">
<para>Like &linux;, &os; offers many venues for support, both
freely available and commercial.</para>
- <sect2 id="freebsd-support-free">
+ <sect2 xml:id="freebsd-support-free">
<title>Free Offerings</title>
@@ -433,26 +418,23 @@ Release
operating systems, and the documentation is available both
as part of the operating system and on the Internet. Manual
pages are clear, concise and provide working
- examples. <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/handbook/">
- The FreeBSD Handbook</ulink>
+ examples. <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/">
+ The FreeBSD Handbook</link>
provides background information and configuration examples
for nearly every task one would wish to complete using
- <listitem><para>&os; provides many support <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">mailing
- lists</ulink>.
+ <listitem><para>&os; provides many support <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">mailing
+ lists</link>.
where answers are archived and fully searchable. If you have
a question that wasn't addressed by the Handbook, it most
likely has already been answered on a mailing list. The
Handbook and mailing lists are also available in several
languages, all of which are easily accessible from
- <ulink url="http://www.FreeBSD.org"></ulink>.</para></listitem>
+ <uri xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri>.</para></listitem>
<listitem><para>There are many FreeBSD IRC channels, forums
- and user groups. See <ulink
- url="http://www.FreeBSD.org/support.html"></ulink> for a
+ and user groups. See <uri xlink:href="http://www.FreeBSD.org/support.html">http://www.FreeBSD.org/support.html</uri> for a
@@ -461,7 +443,7 @@ Release
geographic location to <email>freebsd-jobs@FreeBSD.org</email>.</para>
- <sect2 id="freebsd-support-commercial">
+ <sect2 xml:id="freebsd-support-commercial">
<title>Commercial Offerings</title>
<para>There are many vendors who provide commercial &os;
@@ -470,30 +452,26 @@ Release
<listitem><para>The Commercial Vendors page at the &os;
- site: <ulink
- url="http://www.FreeBSD.org/commercial/"></ulink></para></listitem>
+ site: <uri xlink:href="http://www.FreeBSD.org/commercial/">http://www.FreeBSD.org/commercial/</uri></para></listitem>
<listitem><para>FreeBSDMall, who have been selling support contracts
for nearly 10 years.
- <ulink url="http://www.freebsdmall.com"></ulink></para></listitem>
+ <uri xlink:href="http://www.freebsdmall.com">http://www.freebsdmall.com</uri></para></listitem>
- <listitem><para>The BSDTracker Database at: <ulink
- url="http://www.nycbug.org/index.php?NAV=BSDTracker"></ulink></para></listitem>
+ <listitem><para>The BSDTracker Database at: <uri xlink:href="http://www.nycbug.org/index.php?NAV=BSDTracker">http://www.nycbug.org/index.php?NAV=BSDTracker</uri></para></listitem>
<para>There is also an initiative to provide certification of BSD
- system administrators. <ulink
- url="http://www.bsdcertification.org"></ulink>.</para>
+ system administrators. <uri xlink:href="http://www.bsdcertification.org">http://www.bsdcertification.org</uri>.</para>
<para>If your project requires Common Criteria certification,
- &os; includes the <ulink
- url="http://www.trustedbsd.org">TrustedBSD</ulink> MAC
+ &os; includes the <link xlink:href="http://www.trustedbsd.org">TrustedBSD</link> MAC
framework to ease the certification process.</para>
- <sect1 id="freebsd-advantages">
+ <sect1 xml:id="freebsd-advantages">
<title>Advantages to Choosing &os;</title>
<para>There are many advantages to including &os; solutions in
@@ -510,8 +488,7 @@ Release
<para>In addition, all code is browsable through a
- web-interface: <ulink
- url="http://www.FreeBSD.org/cgi/cvsweb.cgi/"></ulink>.</para>
+ web-interface: <uri xlink:href="http://www.FreeBSD.org/cgi/cvsweb.cgi/">http://www.FreeBSD.org/cgi/cvsweb.cgi/</uri>.</para>
for all releases going back to the original
@@ -525,19 +502,17 @@ Release
<para>An interesting overview of the evolving Linux
- development model can be found at <ulink
- url="http://linuxdevices.com/articles/AT4155251624.html"></ulink>.</para>
+ development model can be found at <uri xlink:href="http://linuxdevices.com/articles/AT4155251624.html">http://linuxdevices.com/articles/AT4155251624.html</uri>.</para>
<listitem><para>In-house developers also have full access to
- FreeBSD's <ulink
- url="http://www.gnu.org/software/gnats/">GNATS</ulink>
+ FreeBSD's <link xlink:href="http://www.gnu.org/software/gnats/">GNATS</link>
bug-tracking database. They are able to query and track
existing bugs as well as submit their own patches for approval
and possible committal into the FreeBSD base code.
- <ulink url="http://www.FreeBSD.org/support.html#gnats"></ulink></para></listitem>
+ <uri xlink:href="http://www.FreeBSD.org/support.html#gnats">http://www.FreeBSD.org/support.html#gnats</uri></para></listitem>
<listitem><para>The BSD license allows you to freely modify the
code to suit your business purposes. Unlike the GPL, there are
@@ -546,7 +521,7 @@ Release
- <sect1 id="freebsd-conclusion">
+ <sect1 xml:id="freebsd-conclusion">
<para>&os; is a mature &unix;-like operating system which
diff --git a/en_US.ISO8859-1/articles/linux-emulation/article.xml b/en_US.ISO8859-1/articles/linux-emulation/article.xml
index eec01db036..7c4191fd72 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/article.xml
+++ b/en_US.ISO8859-1/articles/linux-emulation/article.xml
@@ -1,24 +1,17 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>&linux; emulation in &os;</title>
-<article lang='en'>
- <articleinfo>
- <title>&linux; emulation in &os;</title>
- <author>
- <firstname>Roman</firstname>
- <surname>Divacky</surname>
- <affiliation>
+ <author><personname><firstname>Roman</firstname><surname>Divacky</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -52,9 +45,9 @@
the emulation development team, are working on making the
&linux; 2.6 emulation the default emulation layer in &os;.</para>
- </articleinfo>
+ </info>
- <sect1 id="intro">
+ <sect1 xml:id="intro">
<para>In the last few years the open source &unix; based operating systems
@@ -79,7 +72,7 @@
part of this project.</para>
- <sect1 id="inside">
+ <sect1 xml:id="inside">
<title>A look inside&hellip;</title>
<para>In this section we are going to describe every operating system in
@@ -89,7 +82,7 @@
subsection we talk about how &unix; on &unix; emulation could be done
in general.</para>
- <sect2 id="what-is-unix">
+ <sect2 xml:id="what-is-unix">
<title>What is &unix;</title>
<para>&unix; is an operating system with a long history that has
@@ -110,7 +103,7 @@
&unix; characteristics.</para>
- <sect2 id="tech-details">
+ <sect2 xml:id="tech-details">
<title>Technical details</title>
<para>Every running program constitutes a process that represents a state
@@ -122,7 +115,7 @@
provides a standard unified &unix; API to the user space. The most
important ones are covered below.</para>
- <sect3 id="kern-proc-comm">
+ <sect3 xml:id="kern-proc-comm">
<title>Communication between kernel and user space process</title>
<para>Common &unix; API defines a syscall as a way to issue commands
@@ -145,7 +138,7 @@
(division by zero).</para>
- <sect3 id="proc-proc-comm">
+ <sect3 xml:id="proc-proc-comm">
<title>Communication between processes</title>
<para>There are other APIs (System V IPC, shared memory etc.) but the
@@ -155,7 +148,7 @@
in a predefined action that cannot be altered or ignored.</para>
- <sect3 id="proc-mgmt">
+ <sect3 xml:id="proc-mgmt">
<title>Process management</title>
<para>Kernel instances are processed first in the system (so called
@@ -170,7 +163,7 @@
defined parent (identified by its PID).</para>
- <sect3 id="thread-mgmt">
+ <sect3 xml:id="thread-mgmt">
<title>Thread management</title>
<para>Traditional &unix; does not define any API nor implementation
@@ -218,7 +211,7 @@
- <sect2 id="what-is-freebsd">
+ <sect2 xml:id="what-is-freebsd">
<title>What is &os;?</title>
<para>The &os; project is one of the oldest open source operating
@@ -293,7 +286,7 @@
<para>More info about the &os; operating system can be found
at [2].</para>
- <sect3 id="freebsd-tech-details">
+ <sect3 xml:id="freebsd-tech-details">
<title>Technical details</title>
<para>&os; is traditional flavor of &unix; in the sense of dividing the
@@ -305,7 +298,7 @@
only exists there but the concept is similar on other architectures.
The information was taken from [1] and the source code.</para>
- <sect4 id="freebsd-sys-entries">
+ <sect4 xml:id="freebsd-sys-entries">
<title>System entries</title>
<para>&os; has an abstraction called an execution class loader,
@@ -320,7 +313,7 @@
kernel-space and the user-space at once.</para>
- <sect4 id="freebsd-syscalls">
+ <sect4 xml:id="freebsd-syscalls">
<para>Syscalls on &os; are issued by executing interrupt
@@ -349,7 +342,7 @@
- <sect4 id="freebsd-traps">
+ <sect4 xml:id="freebsd-traps">
<para>Handling of traps in &os; is similar to the handling of
@@ -363,7 +356,7 @@
- <sect4 id="freebsd-exits">
+ <sect4 xml:id="freebsd-exits">
<para>Exits from kernel to userspace happen using the assembler
@@ -372,7 +365,7 @@
status from the stack and returns to the userspace.</para>
- <sect4 id="freebsd-unix-primitives">
+ <sect4 xml:id="freebsd-unix-primitives">
<title>&unix; primitives</title>
<para>&os; operating system adheres to the traditional &unix; scheme,
@@ -419,7 +412,7 @@
- <sect2 id="what-is-linux">
+ <sect2 xml:id="what-is-linux">
<title>What is &linux;</title>
<para>&linux; is a &unix;-like kernel originally developed by Linus
@@ -453,7 +446,7 @@
<para>More information can be obtained from [4].</para>
- <sect3 id="linux-tech-details">
+ <sect3 xml:id="linux-tech-details">
<title>Technical details</title>
<para>&linux; follows the traditional &unix; scheme of dividing the run
@@ -463,7 +456,7 @@
&linux;&nbsp;2.6 on the &i386; architecture. This information was
taken from [3].</para>
- <sect4 id="linux-syscalls">
+ <sect4 xml:id="linux-syscalls">
<para>Syscalls in &linux; are performed (in userspace) using
@@ -483,22 +476,22 @@
- <para>parameter -> <varname>%ebx</varname></para>
+ <para>parameter -&gt; <varname>%ebx</varname></para>
- <para>parameter -> <varname>%ecx</varname></para>
+ <para>parameter -&gt; <varname>%ecx</varname></para>
- <para>parameter -> <varname>%edx</varname></para>
+ <para>parameter -&gt; <varname>%edx</varname></para>
- <para>parameter -> <varname>%esi</varname></para>
+ <para>parameter -&gt; <varname>%esi</varname></para>
- <para>parameter -> <varname>%edi</varname></para>
+ <para>parameter -&gt; <varname>%edi</varname></para>
- <para>parameter -> <varname>%ebp</varname></para>
+ <para>parameter -&gt; <varname>%ebp</varname></para>
@@ -507,7 +500,7 @@
- <sect4 id="linux-traps">
+ <sect4 xml:id="linux-traps">
<para>The trap handlers are introduced in
@@ -516,7 +509,7 @@
where handling of the traps happens.</para>
- <sect4 id="linux-exits">
+ <sect4 xml:id="linux-exits">
<para>Return from the syscall is managed by syscall &man.exit.3;,
@@ -526,7 +519,7 @@
stack and the process returns to the userspace.</para>
- <sect4 id="linux-unix-primitives">
+ <sect4 xml:id="linux-unix-primitives">
<title>&unix; primitives</title>
<para>In the 2.6 version, the &linux; operating system redefined some
@@ -648,7 +641,7 @@
- <sect2 id="what-is-emu">
+ <sect2 xml:id="what-is-emu">
<title>What is emulation</title>
<para>According to a dictionary definition, emulation is the ability of
@@ -719,7 +712,7 @@
- <sect1 id="freebsd-emulation">
+ <sect1 xml:id="freebsd-emulation">
@@ -763,14 +756,14 @@
only things necessary to implement the &linux; emulation layer.</para>
- <sect2 id="freebsd-common-primitives">
+ <sect2 xml:id="freebsd-common-primitives">
<title>Common primitives in the &os; kernel</title>
<para>Emulation layers need some support from the operating system. I am
going to describe some of the supported primitives in the &os;
operating system.</para>
- <sect3 id="freebsd-locking-primitives">
+ <sect3 xml:id="freebsd-locking-primitives">
<title>Locking primitives</title>
<para>Contributed by: &a.attilio.email;</para>
@@ -799,7 +792,7 @@
you should really check the linked manpage (where possible) for
more detailed explanations.</para>
- <sect4 id="freebsd-atomic-op">
+ <sect4 xml:id="freebsd-atomic-op">
<title>Atomic operations and memory barriers</title>
<para>Atomic operations are implemented through a set of functions
@@ -828,7 +821,7 @@
- <sect4 id="freebsd-refcounts">
+ <sect4 xml:id="freebsd-refcounts">
<para>Refcounts are interfaces for handling reference counters.
@@ -843,7 +836,7 @@
existing API.</para>
- <sect4 id="freebsd-locks">
+ <sect4 xml:id="freebsd-locks">
<para>&os; kernel has huge classes of locks. Every lock is defined
@@ -869,7 +862,7 @@
- <sect4 id="freebsd-spinlocks">
+ <sect4 xml:id="freebsd-spinlocks">
<title>Spinning locks</title>
<para>Spin locks let waiters to spin until they cannot acquire the
@@ -884,7 +877,7 @@
requested (explained later).</para>
- <sect4 id="freebsd-blocking">
+ <sect4 xml:id="freebsd-blocking">
<para>Block locks let waiters to be descheduled and blocked until
@@ -896,7 +889,7 @@
particular conditions are met.</para>
- <sect4 id="freebsd-sleeping">
+ <sect4 xml:id="freebsd-sleeping">
<para>Sleep locks let waiters to be descheduled and fall asleep
@@ -958,7 +951,7 @@
supported by mutexes and lockmgrs.</para>
- <sect4 id="freebsd-scheduling">
+ <sect4 xml:id="freebsd-scheduling">
<title>Scheduling barriers</title>
<para>Scheduling barriers are intended to be used in order to drive
@@ -983,7 +976,7 @@
with locking debugging tools (as &man.witness.4;).</para>
- <sect4 id="freebsd-critical">
+ <sect4 xml:id="freebsd-critical">
<title>Critical sections</title>
<para>The &os; kernel has been made preemptive basically to deal with
@@ -1002,7 +995,7 @@
- <sect4 id="freebsd-schedpin">
+ <sect4 xml:id="freebsd-schedpin">
<para>Another way to deal with preemption is the
@@ -1017,7 +1010,7 @@
as a too strong condition for our code.</para>
- <sect4 id="freebsd-schedbind">
+ <sect4 xml:id="freebsd-schedbind">
<para><function>sched_bind</function> is an API used in order to bind
@@ -1034,7 +1027,7 @@
- <sect3 id="freebsd-proc">
+ <sect3 xml:id="freebsd-proc">
<title>Proc structure</title>
<para>Various emulation layers sometimes require some additional
@@ -1055,7 +1048,7 @@
whether the process belongs to our emulation layer. The code
typically looks like:</para>
- <programlisting>if (__predict_true(p->p_sysent != &amp;elf_&linux;_sysvec))
+ <programlisting>if (__predict_true(p-&gt;p_sysent != &amp;elf_&linux;_sysvec))
<para>As you can see, we effectively use the
@@ -1067,7 +1060,7 @@
on i386.</para>
- <sect3 id="freebsd-vfs">
+ <sect3 xml:id="freebsd-vfs">
<para>The &os; VFS subsystem is very complex but the &linux; emulation
@@ -1079,7 +1072,7 @@
an ordinary file. A file handler contains a pointer to its vnode.
More then one file handler can point to the same vnode.</para>
- <sect4 id="freebsd-namei">
+ <sect4 xml:id="freebsd-namei">
<para>The &man.namei.9; routine is a central entry point to pathname
@@ -1092,7 +1085,7 @@
performance is very critical.</para>
- <sect4 id="freebsd-vn">
+ <sect4 xml:id="freebsd-vn">
<para>The &man.vn.fullpath.9; function takes the best effort to
@@ -1104,7 +1097,7 @@
- <sect4 id="freebsd-vnode">
+ <sect4 xml:id="freebsd-vnode">
<title>Vnode operations</title>
@@ -1151,7 +1144,7 @@
- <sect4 id="freebsd-file-handler">
+ <sect4 xml:id="freebsd-file-handler">
<title>File handler operations</title>
@@ -1174,7 +1167,7 @@
- <sect1 id="md">
+ <sect1 xml:id="md">
<title>&linux; emulation layer -MD part</title>
<para>This section deals with implementation of &linux; emulation layer in
@@ -1186,7 +1179,7 @@
independent part of the Linuxulator. This section only covers i386 and ELF
handling. A.OUT is obsolete and untested.</para>
- <sect2 id="syscall-handling">
+ <sect2 xml:id="syscall-handling">
<title>Syscall handling</title>
<para>Syscall handling is mostly written in
@@ -1195,7 +1188,7 @@
&linux; process running on &os; issues a syscall, the general syscall
routine calls linux prepsyscall routine for the &linux; ABI.</para>
- <sect3 id="linux-prepsyscall">
+ <sect3 xml:id="linux-prepsyscall">
<title>&linux; prepsyscall</title>
<para>&linux; passes arguments to syscalls via registers (that is why
@@ -1211,7 +1204,7 @@
in the <function>linux_clone</function> prototype.</para>
- <sect3 id="syscall-writing">
+ <sect3 xml:id="syscall-writing">
<title>Syscall writing</title>
<para>Every syscall implemented in the Linuxulator must have its
@@ -1274,7 +1267,7 @@
with linux as it calls the real &man.close.2; in the kernel.</para>
- <sect3 id="dummy-syscalls">
+ <sect3 xml:id="dummy-syscalls">
<title>Dummy syscalls</title>
<para>The &linux; emulation layer is not complete, as some syscalls are
@@ -1291,7 +1284,7 @@
- <sect2 id="signal-handling">
+ <sect2 xml:id="signal-handling">
<title>Signal handling</title>
<para>Signal handling is done generally in the &os; kernel for all
@@ -1299,7 +1292,7 @@
&linux; compatibility layer defines
<function>linux_sendsig</function> routine for this purpose.</para>
- <sect3 id="linux-sendsig">
+ <sect3 xml:id="linux-sendsig">
<title>&linux; sendsig</title>
<para>This routine first checks whether the signal has been installed
@@ -1315,7 +1308,7 @@
signal handler to run.</para>
- <sect3 id="linux-rt-sendsig">
+ <sect3 xml:id="linux-rt-sendsig">
<para>This routine is similar to <function>linux_sendsig</function>
@@ -1326,7 +1319,7 @@
and possibly even faster execution.</para>
- <sect3 id="linux-sigreturn">
+ <sect3 xml:id="linux-sigreturn">
<para>This syscall is used for return from the signal handler. It does
@@ -1335,7 +1328,7 @@
- <sect2 id="ptrace">
+ <sect2 xml:id="ptrace">
<para>Many &unix; derivates implement the &man.ptrace.2; syscall in order
@@ -1367,7 +1360,7 @@
- <sect2 id="traps">
+ <sect2 xml:id="traps">
<para>Whenever a &linux; process running in the emulation layer traps
@@ -1397,7 +1390,7 @@ translate_traps(int signal, int trap_code)
- <sect2 id="stack-fixup">
+ <sect2 xml:id="stack-fixup">
<title>Stack fixup</title>
<para>The RTLD run-time link-editor expects so called AUX tags on stack
@@ -1410,7 +1403,7 @@ translate_traps(int signal, int trap_code)
smart way.</para>
- <sect2 id="aout-support">
+ <sect2 xml:id="aout-support">
<title>A.OUT support</title>
<para>The &linux; emulation layer on i386 also supports &linux; A.OUT
@@ -1425,7 +1418,7 @@ translate_traps(int signal, int trap_code)
- <sect1 id="mi">
+ <sect1 xml:id="mi">
<title>&linux; emulation layer -MI part</title>
<para>This section talks about machine independent part of the
@@ -1433,7 +1426,7 @@ translate_traps(int signal, int trap_code)
2.6 emulation, the thread local storage (TLS) implementation (on i386)
and futexes. Then we talk briefly about some syscalls.</para>
- <sect2 id="nptl-desc">
+ <sect2 xml:id="nptl-desc">
<title>Description of NPTL</title>
<para>One of the major areas of progress in development of &linux; 2.6
@@ -1464,13 +1457,13 @@ translate_traps(int signal, int trap_code)
- <sect2 id="linux26-emu">
+ <sect2 xml:id="linux26-emu">
<title>&linux; 2.6 emulation infrastructure</title>
<para>These sections deal with the way &linux; threads are managed and
how we simulate that in &os;.</para>
- <sect3 id="linux26-runtime">
+ <sect3 xml:id="linux26-runtime">
<title>Runtime determining of 2.6 emulation</title>
<para>The &linux; emulation layer in &os; supports runtime setting of
@@ -1489,7 +1482,7 @@ translate_traps(int signal, int trap_code)
&linux; binary as it might harm things.</para>
- <sect3 id="linux-proc-thread">
+ <sect3 xml:id="linux-proc-thread">
<title>&linux; processes and thread identifiers</title>
<para>The semantics of &linux; threading are a little confusing and
@@ -1572,7 +1565,7 @@ translate_traps(int signal, int trap_code)
- <sect3 id="pid-mangling">
+ <sect3 xml:id="pid-mangling">
<title>PID mangling</title>
<para>Because of the described different view knowing what a process
@@ -1592,7 +1585,7 @@ translate_traps(int signal, int trap_code)
<function>child_set_tid</function> we copy out &os; PID.</para>
- <sect3 id="clone-syscall">
+ <sect3 xml:id="clone-syscall">
<title>Clone syscall</title>
<para>The <function>clone</function> syscall is the way threads are
@@ -1654,7 +1647,7 @@ void * child_tidptr);</programlisting>
to implement &man.fork.2; and &man.vfork.2; syscalls.</para>
- <sect3 id="locking">
+ <sect3 xml:id="locking">
<para>The locking is implemented to be per-subsystem because we do not
@@ -1671,13 +1664,13 @@ void * child_tidptr);</programlisting>
- <sect2 id="tls">
+ <sect2 xml:id="tls">
<para>This section deals with TLS also known as thread local
- <sect3 id="trheading-intro">
+ <sect3 xml:id="trheading-intro">
<title>Introduction to threading</title>
<para>Threads in computer science are entities within a process that
@@ -1717,7 +1710,7 @@ void * child_tidptr);</programlisting>
- <sect3 id="i386-segs">
+ <sect3 xml:id="i386-segs">
<title>Segments on i386</title>
<para>The i386 architecture implements the so called segments. A
@@ -1743,7 +1736,7 @@ void * child_tidptr);</programlisting>
Both tables define up to 8191 entries.</para>
- <sect3 id="linux-i386">
+ <sect3 xml:id="linux-i386">
<title>Implementation on &linux; i386</title>
<para>There are two main ways of setting up TLS in &linux;. It can be
@@ -1761,10 +1754,10 @@ void * child_tidptr);</programlisting>
emulation and in fact depend on it.</para>
- <sect3 id="tls-emu">
+ <sect3 xml:id="tls-emu">
<title>Emulation of &linux; TLS</title>
- <sect4 id="tls-i386">
+ <sect4 xml:id="tls-i386">
<para>Loading of TLS for the current thread happens by calling
@@ -1799,7 +1792,7 @@ void * child_tidptr);</programlisting>
plain &os;.</para>
- <sect4 id="tls-amd64">
+ <sect4 xml:id="tls-amd64">
<para>The amd64 implementation is similar to the i386 one but there
@@ -1814,10 +1807,10 @@ void * child_tidptr);</programlisting>
- <sect2 id="futexes">
+ <sect2 xml:id="futexes">
- <sect3 id="sync-intro">
+ <sect3 xml:id="sync-intro">
<title>Introduction to synchronization</title>
<para>Threads need some kind of synchronization and &posix; provides
@@ -1847,7 +1840,7 @@ void * child_tidptr);</programlisting>
threaded programs show little locks contention.</para>
- <sect3 id="futex-intro">
+ <sect3 xml:id="futex-intro">
<title>Futexes introduction</title>
<para>&linux; implements 1:1 threading, i.e. it has to use in-kernel
@@ -1872,7 +1865,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
- <sect3 id="futex-api">
+ <sect3 xml:id="futex-api">
<title>Futex API</title>
<para>The futex syscall looks like this:</para>
@@ -1907,7 +1900,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
- <sect4 id="futex-wait">
+ <sect4 xml:id="futex-wait">
<para>This operation verifies that on address
@@ -1919,7 +1912,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
otherwise the sleeping is infinite.</para>
- <sect4 id="futex-wake">
+ <sect4 xml:id="futex-wake">
<para>This operation takes a futex at <varname>uaddr</varname>
@@ -1927,14 +1920,14 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
on this futex.</para>
- <sect4 id="futex-fd">
+ <sect4 xml:id="futex-fd">
<para>This operations associates a file descriptor with a given
- <sect4 id="futex-requeue">
+ <sect4 xml:id="futex-requeue">
<para>This operation takes <varname>val</varname> threads
@@ -1943,7 +1936,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
on futex at <varname>uaddr2</varname>.</para>
- <sect4 id="futex-cmp-requeue">
+ <sect4 xml:id="futex-cmp-requeue">
<para>This operation does the same as
@@ -1952,7 +1945,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
- <sect4 id="futex-wake-op">
+ <sect4 xml:id="futex-wake-op">
<para>This operation performs an atomic operation on
@@ -1995,7 +1988,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
- <sect3 id="futex-emu">
+ <sect3 xml:id="futex-emu">
<title>Futex emulation in &os;</title>
<para>The futex emulation in &os; is taken from NetBSD and further
@@ -2023,7 +2016,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
TAILQ_ENTRY(waiting_proc) wp_list;
- <sect4 id="futex-get">
+ <sect4 xml:id="futex-get">
<title>futex_get / futex_put</title>
<para>A futex is obtained using the <function>futex_get</function>
@@ -2034,7 +2027,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
reaches zero it is released.</para>
- <sect4 id="futex-sleep">
+ <sect4 xml:id="futex-sleep">
<para>When a futex queues a thread for sleeping it creates a
@@ -2050,7 +2043,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
the actual requeueing is done in this function.</para>
- <sect4 id="futex-wake-2">
+ <sect4 xml:id="futex-wake-2">
<para>Waking up a thread sleeping on a futex is performed in the
@@ -2065,7 +2058,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
- <sect4 id="futex-wake-op-2">
+ <sect4 xml:id="futex-wake-op-2">
<para>The <literal>FUTEX_WAKE_OP</literal> operation is quite
@@ -2078,7 +2071,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
<varname>timeout</varname>) waiter on the second futex.</para>
- <sect4 id="futex-atomic-op">
+ <sect4 xml:id="futex-atomic-op">
<title>futex atomic operation</title>
<para>The atomic operation takes two parameters
@@ -2097,7 +2090,7 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
<varname>cmparg</varname> argument with cmp comparator.</para>
- <sect4 id="futex-locking">
+ <sect4 xml:id="futex-locking">
<title>Futex locking</title>
<para>Futex implementation uses two lock lists protecting
@@ -2108,14 +2101,14 @@ pthread_mutex_unlock(&amp;mutex);</programlisting>
- <sect2 id="syscall-impl">
+ <sect2 xml:id="syscall-impl">
<title>Various syscalls implementation</title>
<para>In this section I am going to describe some smaller syscalls that
are worth mentioning because their implementation is not obvious or
those syscalls are interesting from other point of view.</para>
- <sect3 id="syscall-at">
+ <sect3 xml:id="syscall-at">
<title>*at family of syscalls</title>
<para>During development of &linux; 2.6.16 kernel, the *at syscalls
@@ -2168,7 +2161,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
using the modified &man.namei.9; routine and simple
wrapping layer.</para>
- <sect4 id="implementation">
+ <sect4 xml:id="implementation">
<para>The implementation is done by altering the
@@ -2194,7 +2187,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
levels. For example the <function>openat</function> goes like
- <programlisting>openat() --> kern_openat() --> vn_open() -> namei()</programlisting>
+ <programlisting>openat() --&gt; kern_openat() --&gt; vn_open() -&gt; namei()</programlisting>
<para>For this reason <function>kern_open</function> and
<function>vn_open</function> must be altered to incorporate
@@ -2206,7 +2199,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
- <sect3 id="ioctl">
+ <sect3 xml:id="ioctl">
<para>The ioctl interface is quite fragile due to its generality.
@@ -2234,7 +2227,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
because of the easy porting of applications.</para>
- <sect3 id="debugging">
+ <sect3 xml:id="debugging">
<para>Every syscall should be debuggable. For this purpose we
@@ -2246,10 +2239,10 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
- <sect1 id="conclusion">
+ <sect1 xml:id="conclusion">
- <sect2 id="results">
+ <sect2 xml:id="results">
<para>As of April 2007 the &linux; emulation layer is capable of
@@ -2267,9 +2260,9 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
<para>We are able to run the most used applications like
- <filename role="package">www/linux-firefox</filename>,
- <filename role="package">www/linux-opera</filename>,
- <filename role="package">net-im/skype</filename> and some games from
+ <package>www/linux-firefox</package>,
+ <package>www/linux-opera</package>,
+ <package>net-im/skype</package> and some games from
the Ports&nbsp;Collection. Some of the programs exhibit bad behaviour
under 2.6 emulation but this is currently under investigation and
hopefully will be fixed soon. The only big application that is
@@ -2284,7 +2277,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
Fedora&nbsp;Core&nbsp;6 linux_base, which is the ultimate plan.</para>
- <sect2 id="future-work">
+ <sect2 xml:id="future-work">
<title>Future work</title>
<para>Future work should focus on fixing the remaining issues with
@@ -2310,7 +2303,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
improvements can also be made, finer grained locking and others.</para>
- <sect2 id="team">
+ <sect2 xml:id="team">
<para>I cooperated on this project with (in alphabetical order):</para>
@@ -2350,7 +2343,7 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
- <sect1 id="literatures">
+ <sect1 xml:id="literatures">
@@ -2360,13 +2353,13 @@ openat(stdio, bah\, flags, mode) /* returns error because stdio is not a directo
- <para><ulink url="http://www.FreeBSD.org"></ulink></para>
+ <para><uri xlink:href="http://www.FreeBSD.org">http://www.FreeBSD.org</uri></para>
- <para><ulink url="http://tldp.org"></ulink></para>
+ <para><uri xlink:href="http://tldp.org">http://tldp.org</uri></para>
- <para><ulink url="http://www.linux.org"></ulink></para>
+ <para><uri xlink:href="http://www.linux.org">http://www.linux.org</uri></para>
diff --git a/en_US.ISO8859-1/articles/linux-users/article.xml b/en_US.ISO8859-1/articles/linux-users/article.xml
index d5a00d5dd6..e67cbcc2fc 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.xml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>FreeBSD Quickstart Guide for &linux; Users</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>FreeBSD Quickstart Guide for &linux; Users</title>
- <author>
- <firstname>John</firstname>
- <surname>Ferrell</surname>
- </author>
+ <author><personname><firstname>John</firstname><surname>Ferrell</surname></personname></author>
@@ -22,7 +18,7 @@
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -35,9 +31,9 @@
<para>This document is intended to quickly familiarize intermediate to
advanced &linux; users with the basics of FreeBSD.</para>
- </articleinfo>
+ </info>
- <sect1 id="intro">
+ <sect1 xml:id="intro">
<para>This document will highlight the differences between &os; and
@@ -50,11 +46,11 @@
<para>This document assumes that you have already installed &os;.
If you have not installed &os; or need help with the installation
process please refer to the
- <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/install.html">
- Installing FreeBSD</ulink> chapter of the &os;&nbsp;Handbook.</para>
+ <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/install.html">
+ Installing FreeBSD</link> chapter of the &os;&nbsp;Handbook.</para>
- <sect1 id="shells">
+ <sect1 xml:id="shells">
<title>Shells: No Bash?</title>
<para>Those coming from &linux; are often surprised to find that
@@ -62,35 +58,32 @@
In fact, <application>Bash</application> is not even in the default
installation. Instead, &os; uses &man.tcsh.1; as the default shell.
Although, <application>Bash</application> and your other favorite
- shells are available in &os;'s <ulink
- url="article.html#SOFTWARE">Packages and Ports&nbsp;Collection</ulink>.</para>
+ shells are available in &os;'s <link xlink:href="article.html#SOFTWARE">Packages and Ports&nbsp;Collection</link>.</para>
<para>If you do install other shells you can use &man.chsh.1; to set
a user's default shell. It is, however, recommended that the
- <username>root</username>'s default shell remain unchanged. The
+ <systemitem class="username">root</systemitem>'s default shell remain unchanged. The
reason for this is that shells not included in the base distribution
are normally installed in <filename>/usr/local/bin</filename> or
<filename>/usr/bin</filename>. In the event of a problem the file
systems where <filename>/usr/local/bin</filename> and
<filename>/usr/bin</filename> are located may not be mounted. In this
- case <username>root</username> would not have access to its default
- shell, preventing <username>root</username> from logging in. For this
- reason a second <username>root</username> account, the
- <username>toor</username> account, was created for use with non-default
- shells. See the security FAQ for information regarding the <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/faq/security.html#TOOR-ACCOUNT">toor account</ulink>.</para>
+ case <systemitem class="username">root</systemitem> would not have access to its default
+ shell, preventing <systemitem class="username">root</systemitem> from logging in. For this
+ reason a second <systemitem class="username">root</systemitem> account, the
+ <systemitem class="username">toor</systemitem> account, was created for use with non-default
+ shells. See the security FAQ for information regarding the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/faq/security.html#TOOR-ACCOUNT">toor account</link>.</para>
- <sect1 id="software">
+ <sect1 xml:id="software">
<title>Packages and Ports: Adding software in &os;</title>
<para>In addition to the traditional &unix; method of installing software
(download source, extract, edit source code, and compile), &os; offers
two other methods for installing applications: packages and ports. A
- complete list of of all available ports and packages can be found <ulink
- url="http://www.freebsd.org/ports/master-index.html">here</ulink>.</para>
+ complete list of of all available ports and packages can be found <link xlink:href="http://www.freebsd.org/ports/master-index.html">here</link>.</para>
- <sect2 id="packages">
+ <sect2 xml:id="packages">
<para>Packages are pre-compiled applications, the &os; equivalents
@@ -100,13 +93,13 @@
the following command installs
<application>Apache 2.2</application>:</para>
- <screen>&prompt.root; <userinput>pkg_add <replaceable>/tmp/apache-2.2.6_2.tbz</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>pkg_add /tmp/apache-2.2.6_2.tbz</userinput></screen>
<para>Using the <option>-r</option> switch will tell &man.pkg.add.1;
to automatically fetch a package and install it, as well as any
- <screen>&prompt.root; <userinput>pkg_add -r <replaceable>apache22</replaceable></userinput>
+ <screen>&prompt.root; <userinput>pkg_add -r apache22</userinput>
Fetching ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6.2-release/Latest/apache22.tbz... Done.
Fetching ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6.2-release/All/expat-2.0.0_1.tbz... Done.
Fetching ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6.2-release/All/perl-5.8.8_1.tbz... Done.
@@ -123,17 +116,16 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
version of the application. You can use the
<envar>PACKAGESITE</envar> variable to override this default
behavior. For example, set <envar>PACKAGESITE</envar> to
- <ulink url="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/"></ulink>
+ <uri xlink:href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/">ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/</uri>
to download the most recent packages built for the
6.X series.</para>
<para>For more information on packages please refer to section 4.4 of
- the &os; Handbook: <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/handbook/packages-using.html">Using the Packages System</ulink>.</para>
+ the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/packages-using.html">Using the Packages System</link>.</para>
- <sect2 id="ports">
+ <sect2 xml:id="ports">
<para>&os;'s second method for installing applications is the
@@ -151,8 +143,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
added from the installation discs using &man.sysinstall.8;, or pulled
from the &os; servers using &man.csup.1; or &man.portsnap.8;.
Detailed instructions for installing the Ports&nbsp;Collection can be
- found in <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 4.5.1</ulink>
+ found in <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 4.5.1</link>
of the handbook.</para>
<para>Installing a port is as simple (generally) as changing in to the
@@ -167,18 +158,17 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
ability to customize the installation options. For example, when
installing <application>Apache 2.2</application> from ports you can
enable <application>mod_ldap</application> by setting the
- <makevar>WITH_LDAP</makevar> &man.make.1; variable:</para>
+ <varname>WITH_LDAP</varname> &man.make.1; variable:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/www/apache22</userinput>
&prompt.root; <userinput>make WITH_LDAP="YES" install clean</userinput></screen>
- <para>Please see section 4.5 of the &os; Handbook, <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Using
- the Ports&nbsp;Collection</ulink>, for more information about the
+ <para>Please see section 4.5 of the &os; Handbook, <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Using
+ the Ports&nbsp;Collection</link>, for more information about the
- <sect2 id="which">
+ <sect2 xml:id="which">
<title>Ports or packages, which one should I use?</title>
<para>Packages are just pre-compiled ports, so it is really a matter
@@ -215,12 +205,12 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
customize, ports are the way to go. (And remember, if you
need to customize but prefer packages, you can build a custom
package from ports using <command>make</command>
- <maketarget>package</maketarget> and then copy the package to
+ <buildtarget>package</buildtarget> and then copy the package to
other servers.)</para>
- <sect1 id="startup">
+ <sect1 xml:id="startup">
<title>System Startup: Where are the run-levels?</title>
<para>&linux; uses the SysV init system, whereas &os; uses the
@@ -257,8 +247,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
the <quote>base</quote> system, such as
<application>Apache</application>, <application>X11</application>,
<application>Mozilla&nbsp;Firefox</application>, etc. These
- user-installed applications are generally installed using &os;'s <ulink
- url="article.html#SOFTWARE">Packages and Ports&nbsp;Collection</ulink>.
+ user-installed applications are generally installed using &os;'s <link xlink:href="article.html#SOFTWARE">Packages and Ports&nbsp;Collection</link>.
In order to keep them separate from the <quote>base</quote> system,
user-installed applications are normally installed under
<filename>/usr/local/</filename>. Therefore the user-installed
@@ -268,7 +257,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
<para>Services are enabled by specifying
- <literal><replaceable>ServiceName</replaceable>_enable="YES"</literal> in
+ <literal>ServiceName_enable="YES"</literal> in
<filename>/etc/rc.conf</filename> (&man.rc.conf.5;). Take a look at
<filename>/etc/defaults/rc.conf</filename> for the system defaults,
these default settings are overridden by settings in
@@ -291,25 +280,25 @@ apache22_flags="-DSSL"</programlisting>
the service can be started from the command line (without rebooting the
- <screen>&prompt.root; <userinput><replaceable>/etc/rc.d/sshd</replaceable> start</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/sshd start</userinput></screen>
<para>If a service has not been enabled it can be started from the
command line using <option>forcestart</option>:</para>
- <screen>&prompt.root; <userinput><replaceable>/etc/rc.d/sshd</replaceable> forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/sshd forcestart</userinput></screen>
- <sect1 id="network">
+ <sect1 xml:id="network">
<title>Network configuration</title>
- <sect2 id="interfaces">
+ <sect2 xml:id="interfaces">
<title>Network Interfaces</title>
<para>Instead of a generic <emphasis>ethX</emphasis> identifier that
&linux; uses to identify a network interface, &os; uses the driver
name followed by a number as the identifier. The following output
from &man.ifconfig.8; shows two &intel;&nbsp;Pro&nbsp;1000 network
- interfaces (<devicename>em0</devicename> and <devicename>em1</devicename>):</para>
+ interfaces (<filename>em0</filename> and <filename>em1</filename>):</para>
<screen>&prompt.user; <userinput>ifconfig</userinput>
em0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
@@ -326,7 +315,7 @@ em1: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
status: active</screen>
- <sect2 id="ipaddress">
+ <sect2 xml:id="ipaddress">
<title>IP Configuration</title>
<para>An IP address can be assigned to an interface using
@@ -347,16 +336,16 @@ ifconfig_em0="DHCP"</programlisting>
- <sect1 id="firewall">
+ <sect1 xml:id="firewall">
<para>Like <application>IPTABLES</application> in &linux;, &os; also offers
a kernel level firewall; actually &os; offers three firewalls:</para>
- <listitem><simpara><ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipfw.html">IPFIREWALL</ulink></simpara></listitem>
- <listitem><simpara><ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipf.html">IPFILTER</ulink></simpara></listitem>
- <listitem><simpara><ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-pf.html">PF</ulink></simpara></listitem>
+ <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipfw.html">IPFIREWALL</link></simpara></listitem>
+ <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipf.html">IPFILTER</link></simpara></listitem>
+ <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-pf.html">PF</link></simpara></listitem>
<para><application>IPFIREWALL</application> or
@@ -395,7 +384,7 @@ ifconfig_em0="DHCP"</programlisting>
<programlisting>pass in on $ext_if inet proto tcp from any to ($ext_if) port 22</programlisting>
- <sect1 id="updates">
+ <sect1 xml:id="updates">
<title>Updating &os;</title>
<para>There are three methods for updating a &os; system: from source,
@@ -407,7 +396,7 @@ ifconfig_em0="DHCP"</programlisting>
<application>Subversion</application> servers.
Once the local source code is up to date you can build new versions of
the kernel and userland. For more information on source updates see
- <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</ulink>
+ <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</link>
in the &os;&nbsp;Handbook.</para>
<para>Binary updates are similar to using <command>yum</command> or
@@ -429,7 +418,7 @@ ifconfig_em0="DHCP"</programlisting>
the option to upgrade.</para>
- <sect1 id="procfs">
+ <sect1 xml:id="procfs">
<title>procfs: Gone But Not Forgotten</title>
<para>In &linux;, you may have looked at
@@ -472,7 +461,7 @@ kern.posix1version: 200112
<para>There are occasions where procfs is required, such as running
older software, using &man.truss.1; to trace system calls, and
- <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/linuxemu.html">&linux; Binary Compatibility</ulink>.
+ <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/linuxemu.html">&linux; Binary Compatibility</link>.
(Although, &linux; Binary Compatibility uses its own procfs, &man.linprocfs.5;.)
If you need to mount procfs you can add the following to
@@ -489,10 +478,10 @@ kern.posix1version: 200112
<screen>&prompt.root; <userinput>mount /proc</userinput></screen>
- <sect1 id="commands">
+ <sect1 xml:id="commands">
<title>Common Commands</title>
- <sect2 id="packageCommands">
+ <sect2 xml:id="packageCommands">
<title>Package Management</title>
@@ -508,14 +497,14 @@ kern.posix1version: 200112
- <entry><command>yum install <replaceable>package</replaceable></command> / <command>apt-get install <replaceable>package</replaceable></command></entry>
- <entry><command>pkg_add -r <replaceable>package</replaceable></command></entry>
+ <entry><command>yum install package</command> / <command>apt-get install package</command></entry>
+ <entry><command>pkg_add -r package</command></entry>
<entry>Install <replaceable>package</replaceable> from remote repository</entry>
- <entry><command>rpm -ivh <replaceable>package</replaceable></command> / <command>dpkg -i <replaceable>package</replaceable></command></entry>
- <entry><command>pkg_add -v <replaceable>package</replaceable></command></entry>
+ <entry><command>rpm -ivh package</command> / <command>dpkg -i package</command></entry>
+ <entry><command>pkg_add -v package</command></entry>
<entry>Install package</entry>
@@ -530,7 +519,7 @@ kern.posix1version: 200112
- <sect2 id="systemCommands">
+ <sect2 xml:id="systemCommands">
<title>System Management</title>
@@ -575,12 +564,11 @@ kern.posix1version: 200112
- <sect1 id="conclusion">
+ <sect1 xml:id="conclusion">
<para>Hopefully this document has provided you with enough to get
- started with &os;. Be sure to take a look at the <ulink
- url="&url.base;/doc/en_US.ISO8859-1/books/handbook/index.html">&os;&nbsp;Handbook</ulink>
+ started with &os;. Be sure to take a look at the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/index.html">&os;&nbsp;Handbook</link>
for more in depth coverage of the topics touched on as well as
the many topics not covered in this document.</para>
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
index d1423db9ca..6fc2bcbea0 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
-<article lang='en'>
- <articleinfo>
- <title>Frequently Asked Questions About The &os; Mailing Lists</title>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Frequently Asked Questions About The &os; Mailing Lists</title>
- <author>
- <surname>The &os; Documentation Project</surname>
- </author>
+ <author><personname><surname>The &os; Documentation Project</surname></personname></author>
@@ -29,19 +25,16 @@
<para>This is the FAQ for the &os; mailing lists. If you are
interested in helping with this project, send email to the &a.doc;.
The latest version of this document is always available from the
- <ulink
- url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/mailing-list-faq/index.html">&os;
- World Wide Web server</ulink>. It may also be downloaded as
- one large <ulink url="article.html">HTML</ulink> file with HTTP
- or as plain text, PostScript, PDF, etc. from the <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os; FTP
- server</ulink>. You may also want to <ulink
- url="&url.base;/search/index.html">Search the
- FAQ</ulink>.</para>
+ <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/mailing-list-faq/index.html">&os;
+ World Wide Web server</link>. It may also be downloaded as
+ one large <link xlink:href="article.html">HTML</link> file with HTTP
+ or as plain text, PostScript, PDF, etc. from the <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os; FTP
+ server</link>. You may also want to <link xlink:href="&url.base;/search/index.html">Search the
+ FAQ</link>.</para>
- </articleinfo>
+ </info>
- <sect1 id="introduction">
+ <sect1 xml:id="introduction">
<para>As is usual with FAQs, this document aims to cover the
@@ -59,7 +52,7 @@
- <question id="purpose">
+ <question xml:id="purpose">
<para>What is the purpose of the &os; mailing lists?</para>
@@ -71,21 +64,20 @@
- <question id="audience">
+ <question xml:id="audience">
<para>Who is the audience for the &os; mailing lists?</para>
<para>This depends on charter of each individual list. Some
lists are more oriented to developers; some are more oriented
- towards the &os; community as a whole. Please see <ulink
- url="http://lists.FreeBSD.org/mailman/listinfo">this list</ulink>
+ towards the &os; community as a whole. Please see <link xlink:href="http://lists.FreeBSD.org/mailman/listinfo">this list</link>
for the current summary.</para>
- <question id="participation-who">
+ <question xml:id="participation-who">
<para>Are the &os; mailing lists open for anyone to participate?</para>
@@ -111,20 +103,19 @@
- <question id="subscribe">
+ <question xml:id="subscribe">
<para>How can I subscribe?</para>
- <para>You can use <ulink
- url="http://lists.FreeBSD.org/mailman/listinfo">
- the Mailman web interface</ulink> to subscribe to any
+ <para>You can use <link xlink:href="http://lists.FreeBSD.org/mailman/listinfo">
+ the Mailman web interface</link> to subscribe to any
of the public lists.</para>
- <question id="unsubscribe">
+ <question xml:id="unsubscribe">
<para>How can I unsubscribe?</para>
@@ -143,31 +134,30 @@
- <question id="archives">
+ <question xml:id="archives">
<para>Are archives available?</para>
<para>Yes. Threaded archives are available
- <ulink url="http://docs.FreeBSD.org/mail/">here</ulink>.</para>
+ <link xlink:href="http://docs.FreeBSD.org/mail/">here</link>.</para>
- <question id="digest">
+ <question xml:id="digest">
<para>Are mailing lists available in a digest format?</para>
- <para>Yes. See <ulink
- url="http://lists.FreeBSD.org/mailman/listinfo">
- the Mailman web interface</ulink>.</para>
+ <para>Yes. See <link xlink:href="http://lists.FreeBSD.org/mailman/listinfo">
+ the Mailman web interface</link>.</para>
- <sect1 id="etiquette">
+ <sect1 xml:id="etiquette">
<title>Mailing List Etiquette</title>
<para>Participation in the mailing lists, like participation
@@ -177,7 +167,7 @@
- <question id="before-posting">
+ <question xml:id="before-posting">
<para>What should I do before I post?</para>
@@ -187,23 +177,18 @@
you may first need to familiarize yourself with the
software, and all the social history around it, by
reading the numerous
- <ulink url="&url.base;/docs/books.html">books and articles</ulink>
+ <link xlink:href="&url.base;/docs/books.html">books and articles</link>
that are available. Items of particular interest
- include the <ulink
- url="&url.books.faq;/index.html">
- &os; Frequently Asked Questions (FAQ)</ulink> document,
- the <ulink
- url="&url.books.handbook;/index.html">
- &os; Handbook</ulink>,
- and the articles <ulink
- url="&url.articles.freebsd-questions;/article.html">
- How to get best results from the FreeBSD-questions mailing list</ulink>,
- <ulink
- url="&url.articles.explaining-bsd;/article.html">
- Explaining BSD</ulink>,
- and <ulink
- url="&url.articles.new-users;/article.html">
- &os; First Steps</ulink>.</para>
+ include the <link xlink:href="&url.books.faq;/index.html">
+ &os; Frequently Asked Questions (FAQ)</link> document,
+ the <link xlink:href="&url.books.handbook;/index.html">
+ &os; Handbook</link>,
+ and the articles <link xlink:href="&url.articles.freebsd-questions;/article.html">
+ How to get best results from the FreeBSD-questions mailing list</link>,
+ <link xlink:href="&url.articles.explaining-bsd;/article.html">
+ Explaining BSD</link>,
+ and <link xlink:href="&url.articles.new-users;/article.html">
+ &os; First Steps</link>.</para>
<para>It is always considered bad form to ask a question that is
already answered in the above documents. This is not because
@@ -219,7 +204,7 @@
- <question id="inappropriate">
+ <question xml:id="inappropriate">
<para>What constitutes an inappropriate posting?</para>
@@ -245,7 +230,7 @@
- <question id="etiquette-posting">
+ <question xml:id="etiquette-posting">
<para>What is considered proper etiquette when posting
to the mailing lists?</para>
@@ -284,8 +269,8 @@
<para>Please use an appropriate human language for a
particular mailing list. Many non-English mailing
lists are
- <ulink url="&url.base;/community/mailinglists.html">
- available</ulink>.</para>
+ <link xlink:href="&url.base;/community/mailinglists.html">
+ available</link>.</para>
<para>For the ones that are not, we do appreciate that many
people do not speak English as their first language,
@@ -299,8 +284,8 @@
<para>Please use a standards-compliant Mail User Agent (MUA).
A lot of badly formatted messages come from
- <ulink url="http://www.lemis.com/email.html">bad mailers
- or badly configured mailers</ulink>. The following mailers
+ <link xlink:href="http://www.lemis.com/email.html">bad mailers
+ or badly configured mailers</link>. The following mailers
are known to send out badly formatted messages without you
finding out about them:</para>
@@ -360,8 +345,8 @@
<filename>Makefiles</filename>, where <literal>tab</literal>
is a significant character. This is a very common,
and very annoying, problem with submissions to the
- <ulink url="&url.base;/support.html#gnats">
- GNATS Problem Reports database</ulink>.
+ <link xlink:href="&url.base;/support.html#gnats">
+ GNATS Problem Reports database</link>.
<filename>Makefiles</filename> with tabs changed to either
spaces, or the annoying <literal>=3B</literal> escape
sequence, create a great deal of aggravation for
@@ -372,7 +357,7 @@
- <question id="etiquette-replying">
+ <question xml:id="etiquette-replying">
<para>What are the special etiquette consideration when replying
to an existing posting on the mailing lists?</para>
@@ -431,7 +416,7 @@
- <sect1 id="recurring">
+ <sect1 xml:id="recurring">
<title>Recurring Topics On The Mailing Lists</title>
<para>Participation in the mailing lists, like participation
@@ -445,12 +430,11 @@
and probably save yourself being flamed in the process.</para>
<para>The best method to avoid this is to familiarize yourself
- with the <ulink url="http://docs.FreeBSD.org/mail/">
- mailing list archives</ulink>,
+ with the <link xlink:href="http://docs.FreeBSD.org/mail/">
+ mailing list archives</link>,
to help yourself understand the background of
- what has gone before. In this, the <ulink
- url="http://www.FreeBSD.org/search/search.html#mailinglists">
- mailing list search interface</ulink>
+ what has gone before. In this, the <link xlink:href="http://www.FreeBSD.org/search/search.html#mailinglists">
+ mailing list search interface</link>
is invaluable. (If that method does not yield useful results,
please supplement it with a search with your favorite major
search engine).</para>
@@ -469,16 +453,15 @@
to help avoid these recurring topics.</para>
- <sect1 id="bikeshed">
+ <sect1 xml:id="bikeshed">
<title>What Is A "Bikeshed"?</title>
<para>Literally, a <literal>bikeshed</literal> is a small outdoor
shelter into which one may store one's two-wheeled form of
transportation. However, in &os; parlance, the term refers to
topics that are simple enough that (nearly) anyone can offer an
opinion about, and often (nearly) everyone does. The
- genesis of this term is explained in more detail <ulink
- url="&url.books.faq;/misc.html#BIKESHED-PAINTING">
- in this document</ulink>. You simply must have a working
+ genesis of this term is explained in more detail <link xlink:href="&url.books.faq;/misc.html#BIKESHED-PAINTING">
+ in this document</link>. You simply must have a working
knowledge of this concept before posting to any &os; mailing
@@ -491,7 +474,7 @@
- <sect1 id="acknowledgments">
+ <sect1 xml:id="acknowledgments">
@@ -499,9 +482,8 @@
<para>Original author of most of the material on mailing
- list etiquette, taken from the article on <ulink
- url="&url.articles.freebsd-questions;/article.html">
- How to get best results from the FreeBSD-questions mailing list</ulink>.</para>
+ list etiquette, taken from the article on <link xlink:href="&url.articles.freebsd-questions;/article.html">
+ How to get best results from the FreeBSD-questions mailing list</link>.</para>
diff --git a/en_US.ISO8859-1/articles/mh/article.xml b/en_US.ISO8859-1/articles/mh/article.xml
index 5f31506852..9c3ff1518f 100644
--- a/en_US.ISO8859-1/articles/mh/article.xml
+++ b/en_US.ISO8859-1/articles/mh/article.xml
@@ -1,31 +1,23 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
-<article lang='en'>
- <articleinfo>
- <title>An <application>MH</application> Primer</title>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>An <application>MH</application> Primer</title>
- <author>
- <firstname>Matt</firstname>
- <surname>Midboe</surname>
- <affiliation>
+ <author><personname><firstname>Matt</firstname><surname>Midboe</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
<pubdate>v1.0, 16 January 1996</pubdate>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -37,9 +29,9 @@
<para>This document contains an introduction to using
<application>MH</application> on FreeBSD</para>
- </articleinfo>
+ </info>
- <sect1 id="mhintro">
+ <sect1 xml:id="mhintro">
<para><application>MH</application> started back in 1977 at the
@@ -82,23 +74,18 @@
You will notice that it created a <filename>/usr/local/lib/mh</filename>
directory for you as well as adding several binaries to the
<filename>/usr/local/bin</filename> directory. If you would prefer to
- compile it yourself then you can anonymous ftp it from <ulink
- url="ftp://ftp.ics.uci.edu/">ftp.ics.uci.edu</ulink> or <ulink
- url="ftp://louie.udel.edu/">louie.udel.edu</ulink>.</para>
+ compile it yourself then you can anonymous ftp it from <link xlink:href="ftp://ftp.ics.uci.edu/">ftp.ics.uci.edu</link> or <link xlink:href="ftp://louie.udel.edu/">louie.udel.edu</link>.</para>
<para>This primer is not a full comprehensive explanation of how
<application>MH</application> works. This is just intended to
get you started on the road to happier, faster mail reading. You
should read the manual pages for the various commands. You might
- also want to read the <ulink
- url="news:comp.mail.mh">comp.mail.mh</ulink> newsgroup. Also you
- can read the <ulink
- url="http://www.faqs.org/faqs/mail/mh-faq/">FAQ for
- <application>MH</application></ulink>. The best resource for
- <application>MH</application> is <ulink
- url="http://www.ics.uci.edu/~mh/book/">Jerry Peek's
+ also want to read the <link xlink:href="news:comp.mail.mh">comp.mail.mh</link> newsgroup. Also you
+ can read the <link xlink:href="http://www.faqs.org/faqs/mail/mh-faq/">FAQ for
+ <application>MH</application></link>. The best resource for
+ <application>MH</application> is <link xlink:href="http://www.ics.uci.edu/~mh/book/">Jerry Peek's
<application>MH</application> &amp; nmh: Email for Users &amp;
- Programmers</ulink>.</para>
+ Programmers</link>.</para>
@@ -128,7 +115,7 @@
that refer to the current, last or first message in the
- <sect2 id="inc">
+ <sect2 xml:id="inc">
<command>msgchk</command>&mdash;read in your new email or
check it</title>
@@ -162,7 +149,7 @@
command line arguments.</para>
- <screen>&prompt.user; <userinput>inc -host mail.pop.org -user <replaceable>username</replaceable> -norpop</userinput></screen>
+ <screen>&prompt.user; <userinput>inc -host mail.pop.org -user username -norpop</userinput></screen>
<para>That tells <command>inc</command> to go to
@@ -183,7 +170,7 @@
options that <command>inc</command> takes.</para>
- <sect2 id="show">
+ <sect2 xml:id="show">
<title><command>show</command>, <command>next</command> and
<command>prev</command>&mdash;displaying and moving through
@@ -211,7 +198,7 @@
- <sect2 id="scan">
+ <sect2 xml:id="scan">
<title><command>scan</command>&mdash;shows you a scan of your
@@ -241,11 +228,11 @@
have it read from a file. If you want to scan your incoming
mailbox on FreeBSD without having to <command>inc</command> it you
can do <command>scan -file
- /var/mail/<replaceable>username</replaceable></command>. This can be used
+ /var/mail/username</command>. This can be used
with any file that is in the <database>mbox</database> format.</para>
- <sect2 id="rmm">
+ <sect2 xml:id="rmm">
<title><command>rmm</command> and <command>rmf</command>&mdash;remove the
current message or folder</title>
@@ -262,7 +249,7 @@
- <sect2 id="samplereading">
+ <sect2 xml:id="samplereading">
<title>A typical session of reading with MH</title>
<para>The first thing that you will want to do is
@@ -541,8 +528,7 @@ which I am probably the guilty party).</screen>
<screen>&prompt.user; <userinput>pick -to freebsd-hackers -or -cc freebsd-hackers</userinput></screen>
- <para>That will grab all the email in your <filename
- class="directory">inbox</filename> that was sent to
+ <para>That will grab all the email in your <filename>inbox</filename> that was sent to
freebsd-hackers or cc'd to that list. The brace options allow
you to group search criteria together. This is sometimes very
necessary as in the following example</para>
@@ -576,7 +562,7 @@ which I am probably the guilty party).</screen>
manipulating your folders. The <command>folder</command>
program is used to switch between folders, pack them, and list
them. At its simplest level you can do a <command>folder
- +<replaceable>newfolder</replaceable></command> and you will
+ +newfolder</command> and you will
be switched into <replaceable>newfolder</replaceable>. From
there on out all your <application>MH</application> commands
like <command>comp</command>, <command>repl</command>,
diff --git a/en_US.ISO8859-1/articles/nanobsd/article.xml b/en_US.ISO8859-1/articles/nanobsd/article.xml
index 64113c394e..52d64f9bd6 100644
--- a/en_US.ISO8859-1/articles/nanobsd/article.xml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Introduction to NanoBSD</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Introduction to NanoBSD</title>
- <author>
- <firstname>Daniel</firstname>
- <surname>Gerzo</surname>
- <!-- 14 March 2006 -->
- </author>
+ <author><personname><firstname>Daniel</firstname><surname>Gerzo</surname></personname></author>
@@ -19,7 +14,7 @@
<holder>The FreeBSD Documentation Project</holder>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -34,9 +29,9 @@
create &os; system images for embedded applications, suitable for
use on a Compact Flash card (or other mass storage medium).</para>
- </articleinfo>
+ </info>
- <sect1 id="intro">
+ <sect1 xml:id="intro">
<title>Introduction to NanoBSD</title>
@@ -87,10 +82,10 @@
- <sect1 id="howto">
+ <sect1 xml:id="howto">
<title>NanoBSD Howto</title>
- <sect2 id="design">
+ <sect2 xml:id="design">
<title>The design of NanoBSD</title>
<para>Once the image is present on the medium, it is possible to
@@ -105,24 +100,24 @@
<para>The configuration file partition, which can be mounted
- under the <filename class="directory">/cfg</filename> directory
+ under the <filename>/cfg</filename> directory
at run time.</para>
<para>These partitions are normally mounted read-only.</para>
- <para>The <filename class="directory">/etc</filename> and
- <filename class="directory">/var</filename> directories are
+ <para>The <filename>/etc</filename> and
+ <filename>/var</filename> directories are
&man.md.4; (malloc) disks.</para>
<para>The configuration file partition persists under the
- <filename class="directory">/cfg</filename> directory. It
- contains files for <filename class="directory">/etc</filename>
+ <filename>/cfg</filename> directory. It
+ contains files for <filename>/etc</filename>
directory and is briefly mounted read-only right after the
system boot, therefore it is required to copy modified files
- from <filename class="directory">/etc</filename> back to the
- <filename class="directory">/cfg</filename> directory if changes
+ from <filename>/etc</filename> back to the
+ <filename>/cfg</filename> directory if changes
are expected to persist after the system restarts.</para>
@@ -137,11 +132,11 @@
<para>The partition containing
- <filename class="directory">/cfg</filename> should be mounted
+ <filename>/cfg</filename> should be mounted
only at boot time and while overriding the configuration
- <para>Keeping <filename class="directory">/cfg</filename> mounted at
+ <para>Keeping <filename>/cfg</filename> mounted at
all times is not a good idea, especially if
the <application>NanoBSD</application> system runs off a mass
storage medium that may be adversely affected by a large number
@@ -156,17 +151,17 @@
<para>A <application>NanoBSD</application> image is built using a
simple <filename>nanobsd.sh</filename> shell script, which can
be found in the
- <filename class="directory"><replaceable>/usr</replaceable>/src/tools/tools/nanobsd</filename>
+ <filename>/usr/src/tools/tools/nanobsd</filename>
directory. This script creates an image, which can be copied on
the storage medium using the &man.dd.1; utility.</para>
<para>The necessary commands to build a
<application>NanoBSD</application> image are:</para>
- <screen>&prompt.root; <userinput>cd /usr/src/tools/tools/nanobsd</userinput> <co id="nbsd-cd"/>
-&prompt.root; <userinput>sh nanobsd.sh</userinput> <co id="nbsd-sh"/>
-&prompt.root; <userinput>cd /usr/obj/nanobsd.full</userinput> <co id="nbsd-cd2"/>
-&prompt.root; <userinput>dd if=_.disk.full of=/dev/da0 bs=64k</userinput> <co id="nbsd-dd"/></screen>
+ <screen>&prompt.root; <userinput>cd /usr/src/tools/tools/nanobsd</userinput> <co xml:id="nbsd-cd"/>
+&prompt.root; <userinput>sh nanobsd.sh</userinput> <co xml:id="nbsd-sh"/>
+&prompt.root; <userinput>cd /usr/obj/nanobsd.full</userinput> <co xml:id="nbsd-cd2"/>
+&prompt.root; <userinput>dd if=_.disk.full of=/dev/da0 bs=64k</userinput> <co xml:id="nbsd-dd"/></screen>
<callout arearefs="nbsd-cd">
@@ -221,8 +216,8 @@
<title>Configuration options</title>
<para>With configuration settings, it is possible to configure options
- passed to both the <maketarget>buildworld</maketarget>
- and <maketarget>installworld</maketarget> stages of the
+ passed to both the <buildtarget>buildworld</buildtarget>
+ and <buildtarget>installworld</buildtarget> stages of the
<application>NanoBSD</application> build process, as well as internal
options passed to the main build process of
<application>NanoBSD</application>. Through these options it is
@@ -253,18 +248,18 @@
<para><literal>CONF_BUILD</literal> &mdash; Options passed
- to the <maketarget>buildworld</maketarget> stage of the build.</para>
+ to the <buildtarget>buildworld</buildtarget> stage of the build.</para>
<para><literal>CONF_INSTALL</literal> &mdash; Options passed
- to the <maketarget>installworld</maketarget> stage of the build.</para>
+ to the <buildtarget>installworld</buildtarget> stage of the build.</para>
<para><literal>CONF_WORLD</literal> &mdash; Options passed to both
- the <maketarget>buildworld</maketarget> and
- the <maketarget>installworld</maketarget> stage of the build.</para>
+ the <buildtarget>buildworld</buildtarget> and
+ the <buildtarget>installworld</buildtarget> stage of the build.</para>
@@ -291,7 +286,7 @@ customize_cmd cust_foo</programlisting>
<para>A more useful example of a customization function is the
following, which changes the default size of the
- <filename class="directory">/etc</filename> directory
+ <filename>/etc</filename> directory
from 5MB to 30MB:</para>
<programlisting>cust_etc_size () (
@@ -313,13 +308,13 @@ customize_cmd cust_etc_size</programlisting>
<para><literal>cust_allow_ssh_root</literal> &mdash; Allow
- <username>root</username> to login via &man.sshd.8;.</para>
+ <systemitem class="username">root</systemitem> to login via &man.sshd.8;.</para>
<para><literal>cust_install_files</literal> &mdash;
Installs files from the
- <filename class="directory">nanobsd/Files</filename>
+ <filename>nanobsd/Files</filename>
directory, which contains some useful scripts for system
@@ -447,7 +442,7 @@ customize_cmd cust_nobeastie</programlisting>
<application>NanoBSD</application> system, it is possible to use
either the <filename>updatep1</filename> or
<filename>updatep2</filename> script located in the
- <filename class="directory">/root</filename> directory, depending
+ <filename>/root</filename> directory, depending
from which partition is running the current system.</para>
<para>According to which services are available on host serving
@@ -485,7 +480,7 @@ get _.disk.image "| sh updatep1"</userinput></screen>
<para>At first, open a TCP listener on host serving the
image and make it send the image to client:</para>
- <screen>myhost&prompt.root; <userinput>nc -l <replaceable>2222</replaceable> &lt; _.disk.image</userinput></screen>
+ <screen>myhost&prompt.root; <userinput>nc -l 2222 &lt; _.disk.image</userinput></screen>
<para>Make sure that the used port is not blocked to
@@ -498,7 +493,7 @@ get _.disk.image "| sh updatep1"</userinput></screen>
<para>Connect to the host serving new image and execute
<filename>updatep1</filename> script:</para>
- <screen>&prompt.root; <userinput>nc myhost <replaceable>2222</replaceable> | sh updatep1</userinput></screen>
+ <screen>&prompt.root; <userinput>nc myhost 2222 | sh updatep1</userinput></screen>
diff --git a/en_US.ISO8859-1/articles/new-users/article.xml b/en_US.ISO8859-1/articles/new-users/article.xml
index d298a80c6d..2caedf67e1 100644
--- a/en_US.ISO8859-1/articles/new-users/article.xml
+++ b/en_US.ISO8859-1/articles/new-users/article.xml
@@ -1,29 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
-<article lang='en'>
- <articleinfo>
- <title>For People New to Both FreeBSD and &unix;</title>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>For People New to Both FreeBSD and &unix;</title>
- <author>
- <firstname>Annelise</firstname>
- <surname>Anderson</surname>
- <affiliation>
+ <author><personname><firstname>Annelise</firstname><surname>Anderson</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <pubdate>August 15, 1997</pubdate>
+ <pubdate>1997-08-15</pubdate>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -42,21 +34,21 @@
(you)&mdash;and you are probably pretty good with DOS/&windows;
or &os2;.</para>
- </articleinfo>
+ </info>
- <sect1 id="in-and-out">
+ <sect1 xml:id="in-and-out">
<title>Logging in and Getting Out</title>
- <para>Log in (when you see <prompt >login:</prompt>) as a user you
- created during installation or as <username>root</username>.
+ <para>Log in (when you see <prompt>login:</prompt>) as a user you
+ created during installation or as <systemitem class="username">root</systemitem>.
(Your FreeBSD installation will already have an account for
- <username>root</username>; who can go anywhere and do anything, including deleting
+ <systemitem class="username">root</systemitem>; who can go anywhere and do anything, including deleting
essential files, so be careful!) The symbols &prompt.user; and
&prompt.root; in the following stand for the prompt (yours may
be different), with &prompt.user; indicating an ordinary user
- and &prompt.root; indicating <username>root</username>.</para>
+ and &prompt.root; indicating <systemitem class="username">root</systemitem>.</para>
- <para>To log out (and get a new <prompt >login:</prompt> prompt)
+ <para>To log out (and get a new <prompt>login:</prompt> prompt)
@@ -94,11 +86,11 @@
do not want to have to reinstall this thing, do you?</para>
- <sect1 id="adding-a-user">
+ <sect1 xml:id="adding-a-user">
<title>Adding A User with Root Privileges</title>
<para>If you did not create any users when you installed the system
- and are thus logged in as <username>root</username>, you should probably create a
+ and are thus logged in as <systemitem class="username">root</systemitem>, you should probably create a
user now with</para>
@@ -112,39 +104,39 @@
enter to accept each default. These defaults are saved in
<filename>/etc/adduser.conf</filename>, an editable file.</para>
- <para>Suppose you create a user <username>jack</username> with
- full name <emphasis>Jack Benimble</emphasis>. Give <username>jack</username> a
+ <para>Suppose you create a user <systemitem class="username">jack</systemitem> with
+ full name <emphasis>Jack Benimble</emphasis>. Give <systemitem class="username">jack</systemitem> a
password if security (even kids around who might pound on the
keyboard) is an issue. When it asks you if you want to invite
- <username>jack</username> into other groups, type <groupname>wheel</groupname></para>
+ <systemitem class="username">jack</systemitem> into other groups, type <systemitem class="groupname">wheel</systemitem></para>
<screen>Login group is ``jack''. Invite jack into other groups: <userinput>wheel</userinput></screen>
<para>This will make it possible to log in as
- <username>jack</username> and use the &man.su.1;
- command to become <username>root</username>. Then you will not get scolded any more for
- logging in as <username>root</username>.</para>
+ <systemitem class="username">jack</systemitem> and use the &man.su.1;
+ command to become <systemitem class="username">root</systemitem>. Then you will not get scolded any more for
+ logging in as <systemitem class="username">root</systemitem>.</para>
<para>You can quit <command>adduser</command> any time by typing
and at the end you will have a chance to approve your new user or
simply type <keycap>n</keycap> for no. You might want to create
- a second new user so that when you edit <username>jack</username>'s login
+ a second new user so that when you edit <systemitem class="username">jack</systemitem>'s login
files, you will have a hot spare in case something goes
<para>Once you have done this, use <command>exit</command> to get
- back to a login prompt and log in as <username>jack</username>.
+ back to a login prompt and log in as <systemitem class="username">jack</systemitem>.
In general, it is a good idea to do as much work as possible as
an ordinary user who does not have the power&mdash;and
- risk&mdash;of <username>root</username>.</para>
+ risk&mdash;of <systemitem class="username">root</systemitem>.</para>
<para>If you already created a user and you want the user to be
- able to <command>su</command> to <username>root</username>, you can log in as <username>root</username>
- and edit the file <filename>/etc/group</filename>, adding <username>jack</username>
- to the first line (the group <groupname>wheel</groupname>). But
+ able to <command>su</command> to <systemitem class="username">root</systemitem>, you can log in as <systemitem class="username">root</systemitem>
+ and edit the file <filename>/etc/group</filename>, adding <systemitem class="username">jack</systemitem>
+ to the first line (the group <systemitem class="groupname">wheel</systemitem>). But
first you need to practice &man.vi.1;, the text editor&mdash;or
use the simpler text editor, &man.ee.1;, installed on recent
versions of FreeBSD.</para>
@@ -153,7 +145,7 @@
- <sect1 id="looking-around">
+ <sect1 xml:id="looking-around">
<title>Looking Around</title>
<para>Logged in as an ordinary user, look around and try out some
@@ -189,7 +181,7 @@
- <term><command>ls <option>-F</option></command></term>
+ <term><command>ls -F</command></term>
<para>Lists the files in the current directory with a
@@ -200,7 +192,7 @@
- <term><command>ls <option>-l</option></command></term>
+ <term><command>ls -l</command></term>
<para>Lists the files in long format&mdash;size, date,
@@ -209,11 +201,11 @@
- <term><command>ls <option>-a</option></command></term>
+ <term><command>ls -a</command></term>
<para>Lists hidden <quote>dot</quote> files with the others.
- If you are <username>root</username>, the <quote>dot</quote> files show up
+ If you are <systemitem class="username">root</systemitem>, the <quote>dot</quote> files show up
without the <option>-a</option> switch.</para>
@@ -223,13 +215,13 @@
<para>Changes directories. <command>cd
- <parameter>..</parameter></command> backs up one level;
+ ..</command> backs up one level;
note the space after <command>cd</command>. <command>cd
- <parameter>/usr/local</parameter></command> goes there.
- <command>cd <parameter>~</parameter></command> goes to the
+ /usr/local</command> goes there.
+ <command>cd ~</command> goes to the
home directory of the person logged in&mdash;e.g.,
<filename>/usr/home/jack</filename>. Try <command>cd
- <parameter>/cdrom</parameter></command>, and then
+ /cdrom</command>, and then
<command>ls</command>, to find out if your CDROM is
mounted and working.</para>
@@ -237,20 +229,20 @@
- <replaceable>filename</replaceable></command></term>
+ filename</command></term>
<para>Lets you look at a file (named
<replaceable>filename</replaceable>) without changing it.
Try <command>view
- <parameter>/etc/fstab</parameter></command>.
+ /etc/fstab</command>.
Type <command>:q</command> to quit.</para>
- <replaceable>filename</replaceable></command></term>
+ filename</command></term>
<para>Displays <replaceable>filename</replaceable> on
@@ -261,9 +253,9 @@
<keycap>ScrollLock</keycap> again to quit scrolling. You
might want to try <command>cat</command> on some of the
dot files in your home directory&mdash;<command>cat
- <parameter>.cshrc</parameter></command>, <command>cat
- <parameter>.login</parameter></command>, <command>cat
- <parameter>.profile</parameter></command>.</para>
+ .cshrc</command>, <command>cat
+ .login</command>, <command>cat
+ .profile</command>.</para>
@@ -277,7 +269,7 @@
- <sect1 id="getting-help">
+ <sect1 xml:id="getting-help">
<title>Getting Help and Information</title>
<para>Here are some useful sources of help.
@@ -288,7 +280,7 @@
- <replaceable>text</replaceable></command></term>
+ text</command></term>
<para>Everything containing string
@@ -299,12 +291,12 @@
- <replaceable>text</replaceable></command></term>
+ text</command></term>
<para>The manual page for <replaceable>text</replaceable>. The
major source of documentation for &unix; systems.
- <command>man <parameter>ls</parameter></command> will tell
+ <command>man ls</command> will tell
you all the ways to use the <command>ls</command> command.
Press <keycap>Enter</keycap> to move through text,
@@ -318,7 +310,7 @@
- <replaceable>text</replaceable></command></term>
+ text</command></term>
<para>Tells you where in the user's path the command
@@ -328,7 +320,7 @@
- <replaceable>text</replaceable></command></term>
+ text</command></term>
<para>All the paths where the string
@@ -338,7 +330,7 @@
- <replaceable>text</replaceable></command></term>
+ text</command></term>
<para>Tells you what the command
@@ -350,7 +342,7 @@
- <replaceable>text</replaceable></command></term>
+ text</command></term>
<para>Finds the file <replaceable>text</replaceable>, giving
@@ -368,7 +360,7 @@
<command>script</command>. <command>more</command> lets you
read a page at a time as it does in DOS, e.g., <command>ls -l |
more</command> or <command>more
- <replaceable>filename</replaceable></command>. The
+ filename</command>. The
<literal>*</literal> works as a wildcard&mdash;e.g., <command>ls
w*</command> will show you files beginning with
@@ -378,7 +370,7 @@
on a database that is rebuilt weekly. If your machine is not
going to be left on over the weekend (and running FreeBSD), you
might want to run the commands for daily, weekly, and monthly
- maintenance now and then. Run them as <username>root</username> and, for now, give each one
+ maintenance now and then. Run them as <systemitem class="username">root</systemitem> and, for now, give each one
time to finish before you start the next one.</para>
@@ -404,7 +396,7 @@
<para>Running such commands is part of system
administration&mdash;and as a single user of a &unix; system,
you are your own system administrator. Virtually everything you
- need to be <username>root</username> to do is system administration. Such
+ need to be <systemitem class="username">root</systemitem> to do is system administration. Such
responsibilities are not covered very well even in those big fat
books on &unix;, which seem to devote a lot of space to pulling
down menus in windows managers. You might want to get one of
@@ -417,12 +409,12 @@
ISBN 0-596-00343-9). I used Nemeth.</para>
- <sect1 id="editing-text">
+ <sect1 xml:id="editing-text">
<title>Editing Text</title>
<para>To configure your system, you need to edit text files. Most
of them will be in the <filename>/etc</filename> directory; and
- you will need to <command>su</command> to <username>root</username> to be able to
+ you will need to <command>su</command> to <systemitem class="username">root</systemitem> to be able to
change them. You can use the easy <command>ee</command>, but in
the long run the text editor <command>vi</command> is worth
learning. There is an excellent tutorial on vi in
@@ -465,7 +457,7 @@
<para>To edit a file, type</para>
- <screen>&prompt.root; <userinput>vi <replaceable>filename</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>vi filename</userinput></screen>
<para>Move through the text with the arrow keys.
@@ -538,11 +530,11 @@
- <term><command>/<replaceable>text</replaceable></command></term>
+ <term><command>/text</command></term>
<para>to move the cursor to <replaceable>text</replaceable>;
- <command>/<keycap>Enter</keycap></command> (the enter key)
+ <command>/Enter</command> (the enter key)
to find the next instance of
@@ -557,7 +549,7 @@
- <term><command><replaceable>n</replaceable>G</command></term>
+ <term><command>nG</command></term>
<para>to go to line <replaceable>n</replaceable> in the
@@ -587,7 +579,7 @@
<para>Practice with <command>vi</command> in your home directory
by creating a new file with <command>vi
- <replaceable>filename</replaceable></command> and adding and
+ filename</command> and adding and
deleting text, saving the file, and calling it up again.
<command>vi</command> delivers some surprises because it is
really quite complex, and sometimes you will inadvertently issue a
@@ -601,9 +593,9 @@
<command>:w</command>) when you need to.</para>
<para>Now you can <command>cd</command> to
- <filename>/etc</filename>, <command>su</command> to <username>root</username>, use
+ <filename>/etc</filename>, <command>su</command> to <systemitem class="username">root</systemitem>, use
<command>vi</command> to edit the file
- <filename>/etc/group</filename>, and add a user to <groupname>wheel</groupname> so the
+ <filename>/etc/group</filename>, and add a user to <systemitem class="groupname">wheel</systemitem> so the
user has root privileges. Just add a comma and the user's login
name to the end of the first line in the file, press
<keycap>Esc</keycap>, and use <command>:wq</command> to write
@@ -611,7 +603,7 @@
put a space after the comma, did you?)</para>
- <sect1 id="printing-files-from-dos">
+ <sect1 xml:id="printing-files-from-dos">
<title>Printing Files from DOS</title>
<para>At this point you probably do not have the printer working,
@@ -628,7 +620,7 @@
<para>will remove formatting codes and send the manual page to the
<filename>chmod.txt</filename> file instead of showing it on
your screen. Now put a dos-formatted diskette in your floppy
- drive <devicename>a</devicename>, <command>su</command> to <username>root</username>, and type</para>
+ drive <filename>a</filename>, <command>su</command> to <systemitem class="username">root</systemitem>, and type</para>
<screen>&prompt.root; <userinput>/sbin/mount -t msdosfs /dev/fd0 /mnt</userinput></screen>
@@ -637,7 +629,7 @@
<para>to mount the floppy drive on
- <para>Now (you no longer need to be <username>root</username>, and you can type
+ <para>Now (you no longer need to be <systemitem class="username">root</systemitem>, and you can type
<command>exit</command> to get back to being user jack) you can
go to the directory where you created
<filename>chmod.txt</filename> and copy the file to the floppy
@@ -666,7 +658,7 @@
what do I do?</quote>&mdash;people will want to know what
<command>dmesg</command> has to say.</para>
- <para>You can now unmount the floppy drive (as <username>root</username>) to get the
+ <para>You can now unmount the floppy drive (as <systemitem class="username">root</systemitem>) to get the
disk out with</para>
@@ -688,18 +680,17 @@
<filename>/var/spool/output</filename>. If your printer is on
<hardware>lpt0</hardware> (what DOS calls
<hardware>LPT1</hardware>), you may only need to go to
- <filename>/var/spool/output</filename> and (as <username>root</username>) create the
+ <filename>/var/spool/output</filename> and (as <systemitem class="username">root</systemitem>) create the
directory <filename>lpd</filename> by typing: <command>mkdir
lpd</command>, if it does not already exist. Then the printer
should respond if it is turned on when the system is booted, and
<command>lp</command> or <command>lpr</command> should send a
file to the printer. Whether or not the file actually prints
- depends on configuring it, which is covered in the <ulink
- url="&url.books.handbook;/index.html">FreeBSD
- handbook.</ulink></para>
+ depends on configuring it, which is covered in the <link xlink:href="&url.books.handbook;/index.html">FreeBSD
+ handbook.</link></para>
- <sect1 id="other-useful-commands">
+ <sect1 xml:id="other-useful-commands">
<title>Other Useful Commands</title>
@@ -721,7 +712,7 @@
- <term><command>rm <replaceable>filename</replaceable></command></term>
+ <term><command>rm filename</command></term>
<para>remove <replaceable>filename</replaceable>.</para>
@@ -729,7 +720,7 @@
- <term><command>rm -R <replaceable>dir</replaceable></command></term>
+ <term><command>rm -R dir</command></term>
<para>removes a directory <replaceable>dir</replaceable> and all
@@ -754,7 +745,7 @@
- <para>to change user's password (or <username>root</username>'s password)</para>
+ <para>to change user's password (or <systemitem class="username">root</systemitem>'s password)</para>
@@ -772,7 +763,7 @@
- <screen>&prompt.user; <userinput>find /usr -name "<replaceable>filename</replaceable>"</userinput></screen>
+ <screen>&prompt.user; <userinput>find /usr -name "filename"</userinput></screen>
<para>You can use <literal>*</literal> as a wildcard in
@@ -789,18 +780,17 @@
There is also a lot of &unix; information on the Internet.</para>
- <sect1 id="next-steps">
+ <sect1 xml:id="next-steps">
<title>Next Steps</title>
<para>You should now have the tools you need to get around and
edit files, so you can get everything up and running. There is
a great deal of information in the FreeBSD handbook (which is
- probably on your hard drive) and <ulink
- url="&url.base;/index.html">FreeBSD's web site</ulink>. A
+ probably on your hard drive) and <link xlink:href="&url.base;/index.html">FreeBSD's web site</link>. A
wide variety of packages and ports are on the CDROM as well as
the web site. The handbook tells you more about how to use them
(get the package if it exists, with <command>pkg_add
- /cdrom/packages/All/<replaceable>packagename</replaceable></command>,
+ /cdrom/packages/All/packagename</command>,
where <replaceable>packagename</replaceable> is the filename of
the package). The CDROM has lists of the packages and ports
with brief descriptions in
@@ -880,7 +870,7 @@
space after the slash.)</para>
- <sect1 id="your-working-environment">
+ <sect1 xml:id="your-working-environment">
<title>Your Working Environment</title>
<para>Your shell is the most important part of your working
@@ -920,7 +910,7 @@
- <para>As <username>root</username>, edit <filename>/etc/shells</filename>, adding a
+ <para>As <systemitem class="username">root</systemitem>, edit <filename>/etc/shells</filename>, adding a
line in the file for the new shell, in this case
<filename>/usr/local/bin/tcsh</filename>, and save the file.
(Some ports may do this for you.)</para>
@@ -935,13 +925,13 @@
- <para>It can be dangerous to change <username>root</username>'s shell to something
+ <para>It can be dangerous to change <systemitem class="username">root</systemitem>'s shell to something
other than <command>sh</command> or <command>csh</command> on
early versions of FreeBSD and many other versions of &unix;; you
may not have a working shell when the system puts you into
single user mode. The solution is to use <command>su
- -m</command> to become <username>root</username>, which will give you the
- <command>tcsh</command> as <username>root</username>, because the shell is part of
+ -m</command> to become <systemitem class="username">root</systemitem>, which will give you the
+ <command>tcsh</command> as <systemitem class="username">root</systemitem>, because the shell is part of
the environment. You can make this permanent by adding it to
your <filename>.tcshrc</filename> file as an alias with:</para>
<programlisting>alias su su -m</programlisting>
@@ -962,8 +952,8 @@
for <command>tcsh</command>, but here is a line to put in your
<filename>.tcshrc</filename> that will tell you how many
commands you have typed, what time it is, and what directory you
- are in. It also produces a <literal>></literal> if you are an
- ordinary user and a <literal>#</literal> if you are <username>root</username>, but
+ are in. It also produces a <literal>&gt;</literal> if you are an
+ ordinary user and a <literal>#</literal> if you are <systemitem class="username">root</systemitem>, but
tsch will do that in any case:</para>
<para>set prompt = "%h %t %~ %# "</para>
@@ -984,10 +974,10 @@
- <sect1 id="other">
+ <sect1 xml:id="other">
- <para>As <username>root</username>, you can unmount the CDROM with
+ <para>As <systemitem class="username">root</systemitem>, you can unmount the CDROM with
<command>/sbin/umount /cdrom</command>, take it out of the
drive, insert another one, and mount it with
<command>/sbin/mount_cd9660 /dev/cd0a /cdrom</command> assuming
@@ -1007,7 +997,7 @@
<command>man lndir</command>.</para>
- <sect1 id="comments-welcome">
+ <sect1 xml:id="comments-welcome">
<title>Comments Welcome</title>
<para>If you use this guide I would be interested in knowing where it
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index d93580c45b..8b9eb87dad 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.xml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
@@ -1,24 +1,19 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
-<article lang='en'>
- <title>Perforce in &os; Development</title>
- <articleinfo>
+ <info><title>Perforce in &os; Development</title>
- <author>
- <firstname>Scott</firstname>
- <surname>Long</surname>
- <affiliation>
+ <author><personname><firstname>Scott</firstname><surname>Long</surname></personname><affiliation>
- </affiliation>
- </author>
+ </affiliation></author>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -27,25 +22,24 @@
- </articleinfo>
+ </info>
-<sect1 id="intro">
+<sect1 xml:id="intro">
<para>The &os; project uses the <application>Perforce</application>
version control system to manage experimental projects that are
not ready for the main Subversion repository.</para>
- <sect2 id="resources">
+ <sect2 xml:id="resources">
<title>Availability, Documentation, and Resources</title>
<para>While <application>Perforce</application> is a commercial
product, the client software for interacting with the server is
freely available from Perforce. It can be easily installed on
- &os; via the <filename role="package">devel/p4</filename>
+ &os; via the <package>devel/p4</package>
port or can be downloaded from the <application>Perforce</application>
- web site at <ulink
- url="http://www.perforce.com/perforce/loadprog.html"></ulink>,
+ web site at <uri xlink:href="http://www.perforce.com/perforce/loadprog.html">http://www.perforce.com/perforce/loadprog.html</uri>,
which also offers client applications for other OS's.</para>
<para>While there is a GUI client available, most people use the
@@ -53,8 +47,7 @@
document is written from the point of view of using this
- <para>Detailed documentation is available online at <ulink
- url="http://www.perforce.com/perforce/technical.html"></ulink>.</para>
+ <para>Detailed documentation is available online at <uri xlink:href="http://www.perforce.com/perforce/technical.html">http://www.perforce.com/perforce/technical.html</uri>.</para>
<para>Reading the <quote>Perforce User's Guide</quote> and
<quote>Perforce Command Reference</quote> is highly recommended.
@@ -63,28 +56,25 @@
help</command> command.</para>
<para>The &os; <application>Perforce</application> server is
- hosted on <hostid role="fqdn">perforce.freebsd.org</hostid>,
+ hosted on <systemitem class="fqdomainname">perforce.freebsd.org</systemitem>,
port <literal>1666</literal>. The repository is browsable
- online at <ulink url="http://p4web.freebsd.org"></ulink>.
+ online at <uri xlink:href="http://p4web.freebsd.org">http://p4web.freebsd.org</uri>.
Some portions of the repository are also automatically exported
to a number of legacy <application>CVSup</application> servers.</para>
-<sect1 id="start">
+<sect1 xml:id="start">
<title>Getting Started</title>
<para>The first step to using <application>Perforce</application> is
- to obtain an account on the server. If you already have a <hostid
- role="domainname">FreeBSD.org</hostid> account, log into <hostid
- role="hostname">freefall</hostid>, run the following command, and
+ to obtain an account on the server. If you already have a <systemitem class="fqdomainname">FreeBSD.org</systemitem> account, log into <systemitem class="fqdomainname">freefall</systemitem>, run the following command, and
enter a password that is not the same as your &os; login or any
other SSH passphrase:</para>
<screen>&prompt.user; <userinput>/usr/local/bin/p4newuser</userinput></screen>
- <para>Of course if you do not have a <hostid
- role="domainname">FreeBSD.org</hostid> account, you will need to
+ <para>Of course if you do not have a <systemitem class="fqdomainname">FreeBSD.org</systemitem> account, you will need to
coordinate with your sponsor.</para>
@@ -104,8 +94,7 @@
<screen>&prompt.user; <userinput>export P4PORT=perforce.freebsd.org:1666</userinput></screen>
- <para>Users with shell access on the <hostid
- role="domainname">FreeBSD.org</hostid> cluster may wish to tunnel
+ <para>Users with shell access on the <systemitem class="fqdomainname">FreeBSD.org</systemitem> cluster may wish to tunnel
the <application>Perforce</application> client-server protocol via
an SSH tunnel, in which case the above string should be set to
@@ -115,8 +104,8 @@
and <envar>P4PASSWD</envar> variables be set. Use the username
and password from above, like so:</para>
- <screen>&prompt.user; <userinput>export P4USER=<replaceable>username</replaceable></userinput>
-&prompt.user; <userinput>export P4PASSWD=<replaceable>password</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>export P4USER=username</userinput>
+&prompt.user; <userinput>export P4PASSWD=password</userinput></screen>
<para>Test that this works by running the following command:</para>
@@ -127,7 +116,7 @@
variable set correctly.</para>
-<sect1 id="clients">
+<sect1 xml:id="clients">
<para><application>Perforce</application> provides access to the
@@ -156,7 +145,7 @@
you want, but it must be unique within the
<application>Perforce</application> server. A naming
convention that is commonly used is
- <literal><replaceable>username</replaceable>_<replaceable>machinename</replaceable></literal>,
+ <literal>username_machinename</literal>,
which makes it easy to identify clients when browsing them.
A default name will be filled in that is just the machine
@@ -217,13 +206,12 @@
<para>This will map the entire
<application>Perforce</application> repository to the
- <filename class="directory">Root</filename> directory of your
+ <filename>Root</filename> directory of your
client. <emphasis>DO NOT USE THIS DEFAULT!</emphasis> The
&os; repo is huge, and trying to map and sync it all will
take an enormous amount of resources. Instead, only map the
section of the repo that you intend to work on. For
- example, there is the smpng project tree at <filename
- class="directory">//depot/projects/smpng</filename>. A
+ example, there is the smpng project tree at <filename>//depot/projects/smpng</filename>. A
mapping for this might look like:</para>
<programlisting>//depot/projects/smpng/... //<replaceable>client</replaceable>/...</programlisting>
@@ -264,14 +252,14 @@
<para>Existing clients can be listed via the <command>p4
clients</command> command. They can be viewed without being
modified via the <command>p4 client -o
- <replaceable>clientname</replaceable></command> command.</para>
+ clientname</command> command.</para>
<para>Whenever you are interacting with files in
<application>Perforce</application>, the <envar>P4CLIENT</envar>
environment variable must be set to the name of the client that
you are using, like so:</para>
- <screen>&prompt.user; <userinput>export P4CLIENT=<replaceable>myclientname</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>export P4CLIENT=myclientname</userinput></screen>
<para>Note that client mappings in the repository are not exclusive;
multiple clients can map in the same part of the repository. This
@@ -280,7 +268,7 @@
-<sect1 id="syncing">
+<sect1 xml:id="syncing">
<para>Once you have a client specification defined and the
@@ -304,18 +292,18 @@
<para>You can sync a subset of your tree or client by specifying a
relative path to the sync command. For example, to only sync the
- <filename class="directory">ufs</filename> directory of the
+ <filename>ufs</filename> directory of the
<literal>smpng</literal> project, you might do the
- <screen>&prompt.user; <userinput>cd <replaceable>projectroot</replaceable>/smpng</userinput>
+ <screen>&prompt.user; <userinput>cd projectroot/smpng</userinput>
&prompt.user; <userinput>p4 sync src/sys/ufs/...</userinput></screen>
<para>Specifying a local relative path works for many other
<command>p4</command> commands.</para>
-<sect1 id="branches">
+<sect1 xml:id="branches">
<para>One of the strongest features of
@@ -335,10 +323,9 @@
<application>Perforce</application> repository (the
<quote>depot</quote>) is a single flat tree. Every file, whether
a unique creation or a derivative from a branch, is accessible via
- a simple path under the server <filename
- class="directory">//depot</filename> directory. When you create a
+ a simple path under the server <filename>//depot</filename> directory. When you create a
branch, all you are doing is creating a new path under the
- <filename class="directory">//depot</filename>. This is in sharp
+ <filename>//depot</filename>. This is in sharp
contrast to systems like CVS, where each branch lives in the same
path as its parent. With <application>Perforce</application>, the
server tracks the relationship between the files in the parent and
@@ -347,7 +334,7 @@
<para>The first step to creating a branch is to create a branch
specification. This is similar to a client specification, but is
created via the command <command>p4 branch
- <replaceable>branchname</replaceable></command>.</para>
+ branchname</command>.</para>
<para>The following important fields are explained:</para>
@@ -411,7 +398,7 @@
command, as described in the next section.</para>
-<sect1 id="Integrations">
+<sect1 xml:id="Integrations">
<para><quote>Integration</quote> is the term used by
@@ -431,7 +418,7 @@
<para>The common way to do an integration is with the following
- <screen>&prompt.user; <userinput>p4 integrate -b <replaceable>branchname</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 integrate -b branchname</userinput></screen>
<para><replaceable>branchname</replaceable> is the name given to a
branch spec, as discussed in the previous section. This command
@@ -467,7 +454,7 @@
-<sect1 id="submit">
+<sect1 xml:id="submit">
<para>Changes that are made locally should be committed back to the
@@ -521,7 +508,7 @@
case-by-case basis.</para>
-<sect1 id="editing">
+<sect1 xml:id="editing">
<para>The state of each file in the client is tracked and saved on
@@ -534,7 +521,7 @@
<para>To open a file for editing, use the <command>p4 edit</command>
command like so:</para>
- <screen>&prompt.user; <userinput>p4 edit <replaceable>filename</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 edit filename</userinput></screen>
<para>This marks the file on the server as being in the <emphasis>edit</emphasis> state,
which then allows it to be submitted after changes are made, or
@@ -558,7 +545,7 @@
your changes and revert it to its original state, run the
<command>p4 revert</command> command like so:</para>
- <screen>&prompt.user; <userinput>p4 revert <replaceable>filename</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 revert filename</userinput></screen>
<para>This resyncs the file to the contents of the server, and
removes the edit attribute from the server. Any local changes
@@ -576,7 +563,7 @@
-<sect1 id="changes">
+<sect1 xml:id="changes">
<title>Changes, Descriptions, and History</title>
<para>Changes to the <application>Perforce</application> depot can
@@ -584,7 +571,7 @@
will provide a brief description of each change, who made the
change, and what its change number was. A change can be examined
in detail via the <command>p4 describe
- <replaceable>changenumber</replaceable></command> command. This
+ changenumber</command> command. This
will provide the submit log and the diffs of the actual change.</para>
<para>Commonly, the <command>p4&nbsp;describe</command> command is used in one
@@ -592,7 +579,7 @@
- <term><command>p4 describe -s <replaceable>CHANGE</replaceable></command></term>
+ <term><command>p4 describe -s CHANGE</command></term>
<para>List a short description of
@@ -602,7 +589,7 @@
- <term><command>p4 describe -du <replaceable>CHANGE</replaceable></command></term>
+ <term><command>p4 describe -du CHANGE</command></term>
<para>List a description of changeset <emphasis>CHANGE</emphasis>,
@@ -614,7 +601,7 @@
- <term><command>p4 describe -dc <replaceable>CHANGE</replaceable></command></term>
+ <term><command>p4 describe -dc CHANGE</command></term>
<para>List a description of changeset <emphasis>CHANGE</emphasis>,
@@ -627,12 +614,12 @@
<para>The <command>p4 filelog
- <replaceable>filename</replaceable></command> command will show
+ filename</command> command will show
the history of a file, including all submits, integrations, and
branches of it.</para>
-<sect1 id="diffs">
+<sect1 xml:id="diffs">
<para>There are two methods of producing file diffs in
@@ -667,11 +654,11 @@
<option>-dc</option> flags do work. The two forms of this
command are:</para>
- <screen>&prompt.user; <userinput>p4 diff2 -b <replaceable>branchname</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 diff2 -b branchname</userinput></screen>
- <screen>&prompt.user; <userinput>p4 diff2 //depot/<replaceable>path1</replaceable> //depot/<replaceable>path2</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 diff2 //depot/path1 //depot/path2</userinput></screen>
@@ -686,11 +673,10 @@
(the <option>-u</option> flag of <option>diff2</option> will
produce unified diffs that are somewhat compatible, but it does
not include files that have been added or deleted). There is a
- post-processing script at: <ulink
- url="http://people.freebsd.org/~scottl/awkdiff"></ulink>.</para>
+ post-processing script at: <uri xlink:href="http://people.freebsd.org/~scottl/awkdiff">http://people.freebsd.org/~scottl/awkdiff</uri>.</para>
-<sect1 id="add-rm-files">
+<sect1 xml:id="add-rm-files">
<title>Adding and Removing Files</title>
<para>Integrating a branch will bring existing files into your tree,
@@ -698,7 +684,7 @@
Adding files is easily done be creating the file and then running
the <command>p4 add</command> command like so:</para>
- <screen>&prompt.user; <userinput>p4 add <replaceable>filename</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 add filename</userinput></screen>
<para>If you want to add a whole tree of files, run a command
@@ -723,7 +709,7 @@
<para>Removing a file is just as easy with the <command>p4</command>
delete command like so:</para>
- <screen>&prompt.user; <userinput>p4 delete <replaceable>filename</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>p4 delete filename</userinput></screen>
<para>This will mark the file for deletion from the depot the next
time that a submit is run. It will also remove the local copy of
@@ -739,7 +725,7 @@
admin access.</para>
-<sect1 id="working-with-diffs">
+<sect1 xml:id="working-with-diffs">
<title>Working with diffs</title>
<para>Sometimes you might need to apply a diff from another source
@@ -775,7 +761,7 @@
<para>and just do a <command>p4 submit</command> after that.</para>
-<sect1 id="renaming-files">
+<sect1 xml:id="renaming-files">
<title>Renaming files</title>
<para><application>Perforce</application> does not have a built-in
@@ -788,9 +774,9 @@
dealing with this is to do a one-time, in-tree integration, like
- <screen>&prompt.user; <userinput>p4 integrate -i <replaceable>oldfile</replaceable> <replaceable>newfile</replaceable></userinput>
+ <screen>&prompt.user; <userinput>p4 integrate -i oldfile newfile</userinput>
&prompt.user; <userinput>p4 resolve</userinput>
-&prompt.user; <userinput>p4 delete <replaceable>oldfile</replaceable></userinput>
+&prompt.user; <userinput>p4 delete oldfile</userinput>
&prompt.user; <userinput>p4 submit</userinput></screen>
<para>The integration will force <application>Perforce</application>
@@ -803,7 +789,7 @@
for normal branch-based integrations.</para>
-<sect1 id="freebsd-cvs-and-p4">
+<sect1 xml:id="freebsd-cvs-and-p4">
<title>Interactions between &os; Subversion and Perforce</title>
<para>The &os; <application>Perforce</application> and <application>Subversion</application>
@@ -811,8 +797,7 @@
tracked at near-real-time in <application>Perforce</application>.
Every 2 minutes, the Subversion server is polled for updates in the HEAD
branch, and those updates are committed to
- <application>Perforce</application> in the <filename
- class="directory">//depot/vendor/freebsd/...</filename> tree. This
+ <application>Perforce</application> in the <filename>//depot/vendor/freebsd/...</filename> tree. This
tree is then available for branching and integrating to derivative
projects. Any project that directly modifies that &os; source
code should have this tree as its branch parent (or grandparent,
@@ -831,7 +816,7 @@
something that you are interested in.</para>
-<sect1 id="offline-ops">
+<sect1 xml:id="offline-ops">
<title>Offline Operation</title>
<para>One weakness of <application>Perforce</application> is that it
@@ -853,7 +838,7 @@
so be extra vigilant with this.</para>
-<sect1 id="soc">
+<sect1 xml:id="soc">
<title>Notes for Google Summer of Code</title>
<para>Most &os; projects under the Google Summer of Code program
@@ -862,20 +847,16 @@
- <para><filename
- class="directory">//depot/projects/soc2005/<replaceable>project-name</replaceable>/...</filename></para>
+ <para><filename>//depot/projects/soc2005/project-name/...</filename></para>
- <para><filename
- class="directory">//depot/projects/soc2006/<replaceable>project-name</replaceable>/...</filename></para>
+ <para><filename>//depot/projects/soc2006/project-name/...</filename></para>
- <para><filename
- class="directory">//depot/projects/soc2007/<replaceable>project-name</replaceable>/...</filename></para>
+ <para><filename>//depot/projects/soc2007/project-name/...</filename></para>
- <para><filename
- class="directory">//depot/projects/soc2008/<replaceable>project-name</replaceable>/...</filename></para>
+ <para><filename>//depot/projects/soc2008/project-name/...</filename></para>
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index bb36177e14..4755b6bec4 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- All rights reserved.
@@ -35,10 +34,9 @@
-<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
- <articleinfo>
- <title>Pluggable Authentication Modules</title>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Pluggable Authentication Modules</title>
<para>This article describes the underlying principles and
@@ -55,14 +53,10 @@
- <author>
- <firstname>Dag-Erling</firstname>
- <surname>Sm&oslash;rgrav</surname>
- <contrib>Contributed by </contrib>
- </author>
+ <author><personname><firstname>Dag-Erling</firstname><surname>Sm&oslash;rgrav</surname></personname><contrib>Contributed by </contrib></author>
- <legalnotice id="pam-legalnotice">
+ <legalnotice xml:id="pam-legalnotice">
<para>This article was written for the FreeBSD Project by
ThinkSec AS and Network Associates Laboratories, the Security
Research Division of Network Associates, Inc. under
@@ -70,7 +64,7 @@
as part of the DARPA CHATS research program.</para>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -79,10 +73,10 @@
- </articleinfo>
+ </info>
- <section id="pam-intro">
- <title id="pam-intro.title">Introduction</title>
+ <section xml:id="pam-intro">
+ <title xml:id="pam-intro.title">Introduction</title>
<para>The Pluggable Authentication Modules (PAM) library is a
generalized API for authentication-related services which allows
@@ -104,11 +98,11 @@
Linux and &solaris;.</para>
- <section id="pam-terms">
- <title id="pam-terms.title">Terms and conventions</title>
+ <section xml:id="pam-terms">
+ <title xml:id="pam-terms.title">Terms and conventions</title>
- <section id="pam-definitions">
- <title id="pam-definitions.title">Definitions</title>
+ <section xml:id="pam-definitions">
+ <title xml:id="pam-definitions.title">Definitions</title>
<para>The terminology surrounding PAM is rather confused.
Neither Samar and Lai's original paper nor the XSSO
@@ -253,8 +247,8 @@
- <section id="pam-usage-examples">
- <title id="pam-usage-examples.title">Usage examples</title>
+ <section xml:id="pam-usage-examples">
+ <title xml:id="pam-usage-examples.title">Usage examples</title>
<para>This section aims to illustrate the meanings of some of
the terms defined above by way of a handful of simple
@@ -392,11 +386,11 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-essentials">
- <title id="pam-essentials.title">PAM Essentials</title>
+ <section xml:id="pam-essentials">
+ <title xml:id="pam-essentials.title">PAM Essentials</title>
- <section id="pam-facilities-primitives">
- <title id="pam-facilities-primitives.title">Facilities and
+ <section xml:id="pam-facilities-primitives">
+ <title xml:id="pam-facilities-primitives.title">Facilities and
<para>The PAM API offers six different authentication primitives
@@ -498,8 +492,8 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-modules">
- <title id="pam-modules.title">Modules</title>
+ <section xml:id="pam-modules">
+ <title xml:id="pam-modules.title">Modules</title>
<para>Modules are a very central concept in PAM; after all,
they are the <quote>M</quote> in <quote>PAM</quote>. A PAM
@@ -509,12 +503,12 @@ sshd password required pam_permit.so</programlisting>
authentication facility, for instance, include the &unix;
password database, NIS, LDAP and Radius.</para>
- <section id="pam-module-naming">
- <title id="pam-module-naming.title">Module Naming</title>
+ <section xml:id="pam-module-naming">
+ <title xml:id="pam-module-naming.title">Module Naming</title>
<para>FreeBSD implements each mechanism in a single module,
- <literal>pam_<replaceable>mechanism</replaceable>.so</literal>
+ <literal>pam_mechanism.so</literal>
(for instance, <literal>pam_unix.so</literal> for the &unix;
mechanism.) Other implementations sometimes have separate
modules for separate facilities, and include the facility
@@ -524,8 +518,8 @@ sshd password required pam_permit.so</programlisting>
commonly used to authenticate dialup users.</para>
- <section id="pam-module-versioning">
- <title id="pam-module-versioning.title">Module Versioning</title>
+ <section xml:id="pam-module-versioning">
+ <title xml:id="pam-module-versioning.title">Module Versioning</title>
<para>FreeBSD's original PAM implementation, based on
Linux-PAM, did not use version numbers for PAM modules.
@@ -549,8 +543,8 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-chains-policies">
- <title id="pam-chains-policies.title">Chains and
+ <section xml:id="pam-chains-policies">
+ <title xml:id="pam-chains-policies.title">Chains and
<para>When a server initiates a PAM transaction, the PAM library
@@ -657,8 +651,8 @@ sshd password required pam_permit.so</programlisting>
in the same chain as different, unrelated modules.</para>
- <section id="pam-transactions">
- <title id="pam-transactions.title">Transactions</title>
+ <section xml:id="pam-transactions">
+ <title xml:id="pam-transactions.title">Transactions</title>
<para>The lifecycle of a typical PAM transaction is described
below. Note that if any of these steps fails, the server
@@ -743,14 +737,14 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-config">
- <title id="pam-config.title">PAM Configuration</title>
+ <section xml:id="pam-config">
+ <title xml:id="pam-config.title">PAM Configuration</title>
- <section id="pam-config-file">
- <title id="pam-config-file.title">PAM policy files</title>
+ <section xml:id="pam-config-file">
+ <title xml:id="pam-config-file.title">PAM policy files</title>
- <section id="pam-config-pam.conf">
- <title id="pam-config-pam.conf.title">The
+ <section xml:id="pam-config-pam.conf">
+ <title xml:id="pam-config-pam.conf.title">The
<filename>/etc/pam.conf</filename> file</title>
<para>The traditional PAM policy file is
@@ -776,8 +770,8 @@ sshd password required pam_permit.so</programlisting>
Either way is fine; either way makes equal sense.</para>
- <section id="pam-config-pam.d">
- <title id="pam-config-pam.d.title">The
+ <section xml:id="pam-config-pam.d">
+ <title xml:id="pam-config-pam.d.title">The
<filename>/etc/pam.d</filename> directory</title>
<para>OpenPAM and Linux-PAM support an alternate configuration
@@ -816,8 +810,8 @@ sshd password required pam_permit.so</programlisting>
software packages.</para>
- <section id="pam-config-file-order">
- <title id="pam-config-file-order.title">The policy search
+ <section xml:id="pam-config-file-order">
+ <title xml:id="pam-config-file-order.title">The policy search
<para>As we have seen above, PAM policies can be found in a
@@ -830,8 +824,8 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-config-breakdown">
- <title id="pam-config-breakdown.title">Breakdown of a
+ <section xml:id="pam-config-breakdown">
+ <title xml:id="pam-config-breakdown.title">Breakdown of a
configuration line</title>
<para>As explained in <xref linkend="pam-config-file"/>, each line in
@@ -864,8 +858,8 @@ sshd password required pam_permit.so</programlisting>
Unsurprisingly, OpenPAM does not support this syntax.</para>
- <section id="pam-policies">
- <title id="pam-policies.title">Policies</title>
+ <section xml:id="pam-policies">
+ <title xml:id="pam-policies.title">Policies</title>
<para>To configure PAM correctly, it is essential to understand
how policies are interpreted.</para>
@@ -896,7 +890,7 @@ sshd password required pam_permit.so</programlisting>
<colspec colwidth="1*" colname="other"/>
- <entry colname="type"></entry>
+ <entry colname="type"/>
<entry colname="success"><literal>PAM_SUCCESS</literal></entry>
<entry colname="ignore"><literal>PAM_IGNORE</literal></entry>
<entry colname="other"><literal>other</literal></entry>
@@ -965,11 +959,11 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-freebsd-modules">
- <title id="pam-freebsd-modules.title">FreeBSD PAM Modules</title>
+ <section xml:id="pam-freebsd-modules">
+ <title xml:id="pam-freebsd-modules.title">FreeBSD PAM Modules</title>
- <section id="pam-modules-deny">
- <title id="pam-modules-deny.title">&man.pam.deny.8;</title>
+ <section xml:id="pam-modules-deny">
+ <title xml:id="pam-modules-deny.title">&man.pam.deny.8;</title>
<para>The &man.pam.deny.8; module is one of the simplest modules
available; it responds to any request with
@@ -979,8 +973,8 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-modules-echo">
- <title id="pam-modules-echo.title">&man.pam.echo.8;</title>
+ <section xml:id="pam-modules-echo">
+ <title xml:id="pam-modules-echo.title">&man.pam.echo.8;</title>
<para>The &man.pam.echo.8; module simply passes its arguments to
the conversation function as a
@@ -990,8 +984,8 @@ sshd password required pam_permit.so</programlisting>
starting the authentication procedure.</para>
- <section id="pam-modules-exec">
- <title id="pam-modules-exec.title">&man.pam.exec.8;</title>
+ <section xml:id="pam-modules-exec">
+ <title xml:id="pam-modules-exec.title">&man.pam.exec.8;</title>
<para>The &man.pam.exec.8; module takes its first argument to be
the name of a program to execute, and the remaining arguments
@@ -1000,14 +994,14 @@ sshd password required pam_permit.so</programlisting>
time which mounts the user's home directory.</para>
- <section id="pam-modules-ftpusers">
- <title id="pam-modules-ftpusers.title">&man.pam.ftpusers.8;</title>
+ <section xml:id="pam-modules-ftpusers">
+ <title xml:id="pam-modules-ftpusers.title">&man.pam.ftpusers.8;</title>
<para>The &man.pam.ftpusers.8; module</para>
- <section id="pam-modules-group">
- <title id="pam-modules-group.title">&man.pam.group.8;</title>
+ <section xml:id="pam-modules-group">
+ <title xml:id="pam-modules-group.title">&man.pam.group.8;</title>
<para>The &man.pam.group.8; module accepts or rejects applicants
on the basis of their membership in a particular file group
@@ -1017,8 +1011,8 @@ sshd password required pam_permit.so</programlisting>
certain groups of users from a particular service.</para>
- <section id="pam-modules-guest">
- <title id="pam-modules-guest.title">&man.pam.guest.8;</title>
+ <section xml:id="pam-modules-guest">
+ <title xml:id="pam-modules-guest.title">&man.pam.guest.8;</title>
<para>The &man.pam.guest.8; module allows guest logins using
fixed login names. Various requirements can be placed on the
@@ -1028,26 +1022,26 @@ sshd password required pam_permit.so</programlisting>
anonymous FTP logins.</para>
- <section id="pam-modules-krb5">
- <title id="pam-modules-krb5.title">&man.pam.krb5.8;</title>
+ <section xml:id="pam-modules-krb5">
+ <title xml:id="pam-modules-krb5.title">&man.pam.krb5.8;</title>
<para>The &man.pam.krb5.8; module</para>
- <section id="pam-modules-ksu">
- <title id="pam-modules-ksu.title">&man.pam.ksu.8;</title>
+ <section xml:id="pam-modules-ksu">
+ <title xml:id="pam-modules-ksu.title">&man.pam.ksu.8;</title>
<para>The &man.pam.ksu.8; module</para>
- <section id="pam-modules-lastlog">
- <title id="pam-modules-lastlog.title">&man.pam.lastlog.8;</title>
+ <section xml:id="pam-modules-lastlog">
+ <title xml:id="pam-modules-lastlog.title">&man.pam.lastlog.8;</title>
<para>The &man.pam.lastlog.8; module</para>
- <section id="pam-modules-login-access">
- <title id="pam-modules-login-access.title">&man.pam.login.access.8;</title>
+ <section xml:id="pam-modules-login-access">
+ <title xml:id="pam-modules-login-access.title">&man.pam.login.access.8;</title>
<para>The &man.pam.login.access.8; module provides an
implementation of the account management primitive which
@@ -1055,8 +1049,8 @@ sshd password required pam_permit.so</programlisting>
&man.login.access.5; table.</para>
- <section id="pam-modules-nologin">
- <title id="pam-modules-nologin.title">&man.pam.nologin.8;</title>
+ <section xml:id="pam-modules-nologin">
+ <title xml:id="pam-modules-nologin.title">&man.pam.nologin.8;</title>
<para>The &man.pam.nologin.8; module refuses non-root logins
when <filename>/var/run/nologin</filename> exists. This file
@@ -1064,8 +1058,8 @@ sshd password required pam_permit.so</programlisting>
minutes remain until the scheduled shutdown time.</para>
- <section id="pam-modules-opie">
- <title id="pam-modules-opie.title">&man.pam.opie.8;</title>
+ <section xml:id="pam-modules-opie">
+ <title xml:id="pam-modules-opie.title">&man.pam.opie.8;</title>
<para>The &man.pam.opie.8; module implements the &man.opie.4;
authentication method. The &man.opie.4; system is a
@@ -1078,8 +1072,8 @@ sshd password required pam_permit.so</programlisting>
answered, it is not vulnerable to replay attacks.</para>
- <section id="pam-modules-opieaccess">
- <title id="pam-modules-opieaccess.title">&man.pam.opieaccess.8;</title>
+ <section xml:id="pam-modules-opieaccess">
+ <title xml:id="pam-modules-opieaccess.title">&man.pam.opieaccess.8;</title>
<para>The &man.pam.opieaccess.8; module is a companion module to
&man.pam.opie.8;. Its purpose is to enforce the restrictions
@@ -1096,14 +1090,14 @@ sshd password required pam_permit.so</programlisting>
<literal>auth</literal> chain.</para>
- <section id="pam-modules-passwdqc">
- <title id="pam-modules-passwdqc.title">&man.pam.passwdqc.8;</title>
+ <section xml:id="pam-modules-passwdqc">
+ <title xml:id="pam-modules-passwdqc.title">&man.pam.passwdqc.8;</title>
<para>The &man.pam.passwdqc.8; module</para>
- <section id="pam-modules-permit">
- <title id="pam-modules-permit.title">&man.pam.permit.8;</title>
+ <section xml:id="pam-modules-permit">
+ <title xml:id="pam-modules-permit.title">&man.pam.permit.8;</title>
<para>The &man.pam.permit.8; module is one of the simplest
modules available; it responds to any request with
@@ -1112,20 +1106,20 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-modules-radius">
- <title id="pam-modules-radius.title">&man.pam.radius.8;</title>
+ <section xml:id="pam-modules-radius">
+ <title xml:id="pam-modules-radius.title">&man.pam.radius.8;</title>
<para>The &man.pam.radius.8; module</para>
- <section id="pam-modules-rhosts">
- <title id="pam-modules-rhosts.title">&man.pam.rhosts.8;</title>
+ <section xml:id="pam-modules-rhosts">
+ <title xml:id="pam-modules-rhosts.title">&man.pam.rhosts.8;</title>
<para>The &man.pam.rhosts.8; module</para>
- <section id="pam-modules-rootok">
- <title id="pam-modules-rootok.title">&man.pam.rootok.8;</title>
+ <section xml:id="pam-modules-rootok">
+ <title xml:id="pam-modules-rootok.title">&man.pam.rootok.8;</title>
<para>The &man.pam.rootok.8; module reports success if and only
if the real user id of the process calling it (which is
@@ -1135,14 +1129,14 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-modules-securetty">
- <title id="pam-modules-securetty.title">&man.pam.securetty.8;</title>
+ <section xml:id="pam-modules-securetty">
+ <title xml:id="pam-modules-securetty.title">&man.pam.securetty.8;</title>
<para>The &man.pam.securetty.8; module</para>
- <section id="pam-modules-self">
- <title id="pam-modules-self.title">&man.pam.self.8;</title>
+ <section xml:id="pam-modules-self">
+ <title xml:id="pam-modules-self.title">&man.pam.self.8;</title>
<para>The &man.pam.self.8; module reports success if and only if
the names of the applicant matches that of the target account.
@@ -1151,8 +1145,8 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-modules-ssh">
- <title id="pam-modules-ssh.title">&man.pam.ssh.8;</title>
+ <section xml:id="pam-modules-ssh">
+ <title xml:id="pam-modules-ssh.title">&man.pam.ssh.8;</title>
<para>The &man.pam.ssh.8; module provides both authentication
and session services. The authentication service allows users
@@ -1166,14 +1160,14 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-modules-tacplus">
- <title id="pam-modules-tacplus.title">&man.pam.tacplus.8;</title>
+ <section xml:id="pam-modules-tacplus">
+ <title xml:id="pam-modules-tacplus.title">&man.pam.tacplus.8;</title>
<para>The &man.pam.tacplus.8; module</para>
- <section id="pam-modules-unix">
- <title id="pam-modules-unix.title">&man.pam.unix.8;</title>
+ <section xml:id="pam-modules-unix">
+ <title xml:id="pam-modules-unix.title">&man.pam.unix.8;</title>
<para>The &man.pam.unix.8; module implements traditional &unix;
password authentication, using &man.getpwnam.3; to obtain the
@@ -1187,8 +1181,8 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-appl-prog">
- <title id="pam-appl-prog.title">PAM Application Programming</title>
+ <section xml:id="pam-appl-prog">
+ <title xml:id="pam-appl-prog.title">PAM Application Programming</title>
<para><!--XXX-->This section has not yet been written.</para>
@@ -1207,33 +1201,31 @@ sshd password required pam_permit.so</programlisting>
- <section id="pam-module-prog">
- <title id="pam-module-prog.title">PAM Module Programming</title>
+ <section xml:id="pam-module-prog">
+ <title xml:id="pam-module-prog.title">PAM Module Programming</title>
<para><!--XXX-->This section has not yet been written.</para>
- <appendix id="pam-sample-appl">
- <title id="pam-sample-appl.title">Sample PAM Application</title>
+ <appendix xml:id="pam-sample-appl">
+ <title xml:id="pam-sample-appl.title">Sample PAM Application</title>
<para>The following is a minimal implementation of &man.su.1;
using PAM. Note that it uses the OpenPAM-specific
&man.openpam.ttyconv.3; conversation function, which is
- prototyped in <filename
- class="headerfile">security/openpam.h</filename>. If you wish
+ prototyped in <filename>security/openpam.h</filename>. If you wish
build this application on a system with a different PAM library,
you will have to provide your own conversation function. A
robust conversation function is surprisingly difficult to
- implement; the one presented in <xref
- linkend="pam-sample-conv"/> is a good
+ implement; the one presented in <xref linkend="pam-sample-conv"/> is a good
starting point, but should not be used in real-world
-<programlisting><xi:include href="su.c" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="su.c" parse="text"/></programlisting>
- <appendix id="pam-sample-module">
- <title id="pam-sample-module.title">Sample PAM Module</title>
+ <appendix xml:id="pam-sample-module">
+ <title xml:id="pam-sample-module.title">Sample PAM Module</title>
<para>The following is a minimal implementation of
&man.pam.unix.8;, offering only authentication services. It
@@ -1242,11 +1234,11 @@ sshd password required pam_permit.so</programlisting>
&man.pam.get.authtok.3;, which enormously simplifies prompting
the user for a password.</para>
-<programlisting><xi:include href="pam_unix.c" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_unix.c" parse="text"/></programlisting>
- <appendix id="pam-sample-conv">
- <title id="pam-sample-conv.title">Sample PAM Conversation
+ <appendix xml:id="pam-sample-conv">
+ <title xml:id="pam-sample-conv.title">Sample PAM Conversation
<para>The conversation function presented below is a greatly
@@ -1258,59 +1250,46 @@ sshd password required pam_permit.so</programlisting>
your uses; we believe it to be as robust as a tty-oriented
conversation function can reasonably get.</para>
-<programlisting><xi:include href="converse.c" parse="text"/></programlisting>
+<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="converse.c" parse="text"/></programlisting>
- <bibliography id="pam-further">
- <bibliographyinfo>
- <title id="pam-further.title">Further Reading</title>
+ <bibliography xml:id="pam-further">
+ <info><title xml:id="pam-further.title">Further Reading</title>
<para>This is a list of documents relevant to PAM and related
issues. It is by no means complete.</para>
- </bibliographyinfo>
+ </info>
- <title><ulink
- url="http://www.sun.com/software/solaris/pam/pam.external.pdf">
+ <citetitle><link xlink:href="http://www.sun.com/software/solaris/pam/pam.external.pdf">
Making Login Services Independent of Authentication
- Technologies</ulink></title>
+ Technologies</link></citetitle>
- <author>
- <surname>Samar</surname>
- <firstname>Vipin</firstname>
- </author>
- <author>
- <surname>Lai</surname>
- <firstname>Charlie</firstname>
- </author>
+ <author><personname><surname>Samar</surname><firstname>Vipin</firstname></personname></author>
+ <author><personname><surname>Lai</surname><firstname>Charlie</firstname></personname></author>
<orgname>Sun Microsystems</orgname>
- <title><ulink
- url="http://www.opengroup.org/pubs/catalog/p702.htm">X/Open
- Single Sign-on Preliminary Specification</ulink></title>
+ <citetitle><link xlink:href="http://www.opengroup.org/pubs/catalog/p702.htm">X/Open
+ Single Sign-on Preliminary Specification</link></citetitle>
<orgname>The Open Group</orgname>
- <isbn>1-85912-144-6</isbn>
+ <biblioid class="isbn">1-85912-144-6</biblioid>
<pubdate>June 1997</pubdate>
- <title><ulink
- url="http://www.kernel.org/pub/linux/libs/pam/pre/doc/current-draft.txt">
- Pluggable Authentication Modules</ulink></title>
- <author>
- <surname>Morgan</surname>
- <firstname>Andrew</firstname>
- <othername role="mi">G.</othername>
- </author>
- <pubdate>October 6, 1999</pubdate>
+ <citetitle><link xlink:href="http://www.kernel.org/pub/linux/libs/pam/pre/doc/current-draft.txt">
+ Pluggable Authentication Modules</link></citetitle>
+ <author><personname><surname>Morgan</surname><firstname>Andrew</firstname><othername role="mi">G.</othername></personname></author>
+ <pubdate>1999-10-06</pubdate>
@@ -1318,9 +1297,8 @@ sshd password required pam_permit.so</programlisting>
<title>User Manuals</title>
- <title><ulink
- url="http://www.sun.com/software/solaris/pam/pam.admin.pdf">PAM
- Administration</ulink></title>
+ <citetitle><link xlink:href="http://www.sun.com/software/solaris/pam/pam.admin.pdf">PAM
+ Administration</link></citetitle>
<orgname>Sun Microsystems</orgname>
@@ -1329,25 +1307,18 @@ sshd password required pam_permit.so</programlisting>
<title>Related Web pages</title>
- <title><ulink url="http://openpam.sourceforge.net/">OpenPAM homepage</ulink></title>
- <author>
- <surname>Sm&oslash;rgrav</surname>
- <firstname>Dag-Erling</firstname>
- </author>
+ <citetitle><link xlink:href="http://openpam.sourceforge.net/">OpenPAM homepage</link></citetitle>
+ <author><personname><surname>Sm&oslash;rgrav</surname><firstname>Dag-Erling</firstname></personname></author>
<orgname>ThinkSec AS</orgname>
- <title><ulink url="http://www.kernel.org/pub/linux/libs/pam/">Linux-PAM homepage</ulink></title>
- <author>
- <surname>Morgan</surname>
- <firstname>Andrew</firstname>
- <othername role="mi">G.</othername>
- </author>
+ <citetitle><link xlink:href="http://www.kernel.org/pub/linux/libs/pam/">Linux-PAM homepage</link></citetitle>
+ <author><personname><surname>Morgan</surname><firstname>Andrew</firstname><othername role="mi">G.</othername></personname></author>
- <title><ulink url="http://wwws.sun.com/software/solaris/pam/">Solaris PAM homepage</ulink></title>
+ <citetitle><link xlink:href="http://wwws.sun.com/software/solaris/pam/">Solaris PAM homepage</link></citetitle>
<orgname>Sun Microsystems</orgname>
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 5d98119f6a..06576422f7 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang="en">
- <articleinfo>
- <title>Port Mentor Guidelines</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Port Mentor Guidelines</title>
- <corpauthor>The &os; Ports Management Team</corpauthor>
+ <author><orgname>The &os; Ports Management Team</orgname></author>
@@ -19,9 +18,9 @@
<holder role="mailto:tabthorpe@FreeBSD.org">Thomas Abthorpe</holder>
<holder role="mailto:crees@FreeBSD.org">Chris Rees</holder>
- </articleinfo>
+ </info>
- <sect1 id="port-mentor.guidelines">
+ <sect1 xml:id="port-mentor.guidelines">
<title>Guideline for Mentor/Mentee relationships</title>
<para>This section is intended to help demystify the
@@ -33,7 +32,7 @@
working toward a common goal, maintaining the quality
assurance of the product we call the Ports Tree.</para>
- <sect2 id="why.mentor">
+ <sect2 xml:id="why.mentor">
<title>Why mentor?</title>
@@ -55,7 +54,7 @@
- <sect2 id="mentor.comentor">
+ <sect2 xml:id="mentor.comentor">
<para>Reasons for a co-mentorship:</para>
@@ -109,7 +108,7 @@
- <sect2 id="mentor.expectations">
+ <sect2 xml:id="mentor.expectations">
<para>We expect mentors to review and test-build all proposed
@@ -122,17 +121,16 @@
and implicit.</para>
<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
- Guide</ulink>. While it's not necessary to memorize all the
+ <link xlink:href="&url.books.porters-handbook;">Porter's
+ Handbook</link>, the <link xlink:href="&url.articles.pr-guidelines;">PR handling guide</link>, and
+ the <link xlink:href="&url.articles.committers-guide;">Committer's
+ Guide</link>. 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
many rookie mistakes as possible).</para>
- <sect2 id="mentees">
+ <sect2 xml:id="mentees">
<title>Selecting a mentee</title>
<para>There is no defined rule for what makes a candidate ready; it
@@ -171,15 +169,15 @@
and hope that portmgr agrees.</para>
- <sect2 id="mentorship.duration">
+ <sect2 xml:id="mentorship.duration">
<title>Mentorship duration</title>
<para>As the trust level develops and grows, the mentee may be
granted <quote>implicit</quote> commit rights. This can include
trivial changes to a <filename>Makefile</filename>,
<filename>pkg-descr</filename> etc. Similarly, it may include
- <makevar>PORTVERSION</makevar> updates that do not include
- <makevar>plist</makevar> changes. Other circumstances may be
+ <varname>PORTVERSION</varname> updates that do not include
+ <varname>plist</varname> changes. Other circumstances may be
formulated at the discretion of the Mentor. However, during the
period of mentorship, a port version bump that affects dependent
ports should be checked by a mentor.</para>
@@ -195,7 +193,7 @@
mistakes, they still require mentor guidance.</para>
- <sect2 id="mentor.comentor.debate">
+ <sect2 xml:id="mentor.comentor.debate">
<title>Mentor/Co-Mentor debate</title>
<para>When a request gets to portmgr, it usually reads as,
@@ -206,14 +204,14 @@
<quote>first among equals</quote>, the co-mentor is the backup.</para>
<para>Some reprobate, whose name shall be withheld, made the
- <ulink url="http://lists.freebsd.org/pipermail/cvs-ports/2007-September/134614.html">
- first recorded co-mentor commit</ulink>. Similar co-mentor commits
+ <link xlink:href="http://lists.freebsd.org/pipermail/cvs-ports/2007-September/134614.html">
+ first recorded co-mentor commit</link>. Similar co-mentor commits
have also been spotted in the src tree. Does this make it right?
Does this make it wrong? It seems to be part of the evolution of
how things are done.</para>
- <sect2 id="mentee.expectations">
+ <sect2 xml:id="mentee.expectations">
<para>We expect mentees to be prepared for constructive criticism
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index d882a2ed29..692d23c1e0 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
- "../../../share/xml/freebsd45.dtd">
-<article lang='en'>
- <articleinfo>
- <title>Package Building Procedures</title>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+ "../../../share/xml/freebsd50.dtd">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+ <info><title>Package Building Procedures</title>
- <corpauthor>The &os; Ports Management Team</corpauthor>
+ <author><orgname>The &os; Ports Management Team</orgname></author>
@@ -26,7 +25,7 @@
Management Team</holder>
- <legalnotice id="trademarks" role="trademarks">
+ <legalnotice xml:id="trademarks" role="trademarks">
@@ -36,27 +35,27 @@
- </articleinfo>
+ </info>
- <sect1 id="intro">
+ <sect1 xml:id="intro">
<para>In order to provide pre-compiled binaries of third-party
applications for &os;, the Ports Collection is regularly
built on one of the <quote>Package Building Clusters.</quote>
Currently, the main cluster in use is at
- <ulink url="http://pointyhat.FreeBSD.org"></ulink>.</para>
+ <uri xlink:href="http://pointyhat.FreeBSD.org">http://pointyhat.FreeBSD.org</uri>.</para>
<para>This article documents the internal workings of the
<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 <link xlink:href="&url.base;/portmgr/">Ports Management</link>
- <sect2 id="codebase">
+ <sect2 xml:id="codebase">
<title>The codebase</title>
<para>Most of the package building magic occurs under the
@@ -67,9 +66,9 @@
(e.g., amd64, arm, &i386;, ia64, powerpc, &sparc64;), and
<replaceable>${branch}</replaceable> will be used
to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
- The set of branches that <username>portmgr</username> currently
+ The set of branches that <systemitem class="username">portmgr</systemitem> currently
supports is the same as those that the &os;
- <ulink url="http://www.freebsd.org/security/index.html#sup">security team</ulink>
+ <link xlink:href="http://www.freebsd.org/security/index.html#sup">security team</link>
@@ -79,12 +78,12 @@
<para>The scripts that control all of this live in either
- <filename class="directory">/a/portbuild/scripts/</filename> or.
- <filename class="directory">/a/portbuild/admin/scripts/</filename>.
+ <filename>/a/portbuild/scripts/</filename> or.
+ <filename>/a/portbuild/admin/scripts/</filename>.
These are the checked-out copies from the Subversion repository at
- <ulink url="http://svnweb.freebsd.org/base/projects/portbuild/">
- <filename class="directory">base/projects/portbuild/</filename>
- </ulink>.</para>
+ <link xlink:href="http://svnweb.freebsd.org/base/projects/portbuild/">
+ <filename>base/projects/portbuild/</filename>
+ </link>.</para>
<para>Typically, incremental builds are done that use