aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2012-08-19 23:05:52 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2012-08-19 23:05:52 +0000
commit7ba98a21ad60d519a113cdca26d39d1a5b25e75d (patch)
treeb19c87af81f785c40bb5001157e321746bb99db2 /en_US.ISO8859-1
parentacb8333ccd5233d73bf3b9dc204b3900b94187a3 (diff)
parent421beffdb74571114cfece54aeaf5a7927e3bde5 (diff)
downloaddoc-7ba98a21ad60d519a113cdca26d39d1a5b25e75d.tar.gz
doc-7ba98a21ad60d519a113cdca26d39d1a5b25e75d.zip
MFH
Approved by: doceng (implicit)
Notes
Notes: svn path=/projects/sgml2xml/; revision=39398
Diffstat (limited to 'en_US.ISO8859-1')
-rw-r--r--en_US.ISO8859-1/articles/Makefile1
-rw-r--r--en_US.ISO8859-1/articles/bsdl-gpl/article.sgml6
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.sgml967
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.additional.sgml47
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.committers.sgml8
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml36
-rw-r--r--en_US.ISO8859-1/articles/hubs/article.sgml8
-rw-r--r--en_US.ISO8859-1/articles/linux-users/article.sgml2
-rw-r--r--en_US.ISO8859-1/articles/portbuild/article.sgml4
-rw-r--r--en_US.ISO8859-1/articles/pxe/Makefile28
-rw-r--r--en_US.ISO8859-1/articles/pxe/article.sgml300
-rw-r--r--en_US.ISO8859-1/articles/pxe/dhcpd.conf23
-rw-r--r--en_US.ISO8859-1/articles/pxe/install.cfg203
-rw-r--r--en_US.ISO8859-1/articles/pxe/loader.rc11
-rw-r--r--en_US.ISO8859-1/articles/pxe/pkgmaker.sh9
-rw-r--r--en_US.ISO8859-1/articles/pxe/post36
-rw-r--r--en_US.ISO8859-1/articles/pxe/pre7
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml8
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml31
-rw-r--r--en_US.ISO8859-1/books/faq/book.sgml399
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml9
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml35
-rw-r--r--en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml5
-rw-r--r--en_US.ISO8859-1/books/handbook/config/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/desktop/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/eresources/chapter.sgml62
-rw-r--r--en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml8
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.sgml22
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml7
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml42
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/users/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml18
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.sgml90
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/book.sgml467
-rw-r--r--en_US.ISO8859-1/htdocs/administration.sgml18
-rw-r--r--en_US.ISO8859-1/htdocs/advocacy/index.sgml2
-rw-r--r--en_US.ISO8859-1/htdocs/cgi/cgi-style.pl3
-rwxr-xr-xen_US.ISO8859-1/htdocs/cgi/man.cgi25
-rwxr-xr-xen_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi2
-rw-r--r--en_US.ISO8859-1/htdocs/developers/cvs.sgml4
-rw-r--r--en_US.ISO8859-1/htdocs/internal/Makefile1
-rw-r--r--en_US.ISO8859-1/htdocs/internal/hats.sgml66
-rw-r--r--en_US.ISO8859-1/htdocs/internal/policies.sgml2
-rw-r--r--en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml457
-rw-r--r--en_US.ISO8859-1/htdocs/news/1993/Makefile3
-rw-r--r--en_US.ISO8859-1/htdocs/news/1993/news.xml42
-rw-r--r--en_US.ISO8859-1/htdocs/platforms/xbox.sgml13
-rw-r--r--en_US.ISO8859-1/htdocs/portmgr/charter.sgml4
-rw-r--r--en_US.ISO8859-1/htdocs/portmgr/policies.sgml12
-rw-r--r--en_US.ISO8859-1/htdocs/projects/summerofcode.sgml30
-rw-r--r--en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml4
-rw-r--r--en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml17
-rw-r--r--en_US.ISO8859-1/htdocs/releases/index.sgml188
-rw-r--r--en_US.ISO8859-1/htdocs/releng/index.sgml8
-rw-r--r--en_US.ISO8859-1/htdocs/security/security.sgml30
-rw-r--r--en_US.ISO8859-1/htdocs/send-pr.sgml15
-rw-r--r--en_US.ISO8859-1/htdocs/support/webresources.sgml7
-rw-r--r--en_US.ISO8859-1/htdocs/where.sgml42
-rw-r--r--en_US.ISO8859-1/share/sgml/mailing-lists.ent32
62 files changed, 1154 insertions, 2812 deletions
diff --git a/en_US.ISO8859-1/articles/Makefile b/en_US.ISO8859-1/articles/Makefile
index 11ad6fc5ae..46e8e20a27 100644
--- a/en_US.ISO8859-1/articles/Makefile
+++ b/en_US.ISO8859-1/articles/Makefile
@@ -47,7 +47,6 @@ SUBDIR+= port-mentor-guidelines
SUBDIR+= portbuild
SUBDIR+= pr-guidelines
SUBDIR+= problem-reports
-SUBDIR+= pxe
SUBDIR+= rc-scripting
SUBDIR+= relaydelay
SUBDIR+= releng
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml b/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml
index 634fa7950b..08e29d1c62 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml
@@ -297,7 +297,7 @@
fork.</para>
<para>The GPL explicitly disallows revoking the license. It has
- occurred , however, that a company (Mattel) purchased a GPL
+ occurred, however, that a company (Mattel) purchased a GPL
copyright (cphack), revoked the entire copyright, went to court,
and prevailed [2]. That is, they legally revoked the entire
distribution and all derivative works based on the
@@ -561,10 +561,10 @@
[2] http://archives.cnn.com/2000/TECH/computing/03/28/cyberpatrol.mirrors/
-[3] Open Source: the Unauthorized White Papers, Donald K. Rosenberg, IDG Books,
+[3] Open Source: the Unauthorized White Papers, Donald K. Rosenberg, IDG Books,
2000. Quotes are from page 114, ``Effects of the GNU GPL''.
-[4] In the "What License to Use?" section of
+[4] In the "What License to Use?" section of
http://www.oreilly.com/catalog/opensources/book/brian.html
This whitepaper is a condensation of an original work available at
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 895fcf23a0..58707becd6 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -99,11 +99,12 @@
</row>
<row>
- <entry><emphasis><literal>ports/</literal> CVS Root</emphasis></entry>
+ <entry><emphasis><literal>ports/</literal> Subversion
+ Root</emphasis></entry>
<entry>
- <hostid
- role="fqdn">pcvs.FreeBSD.org</hostid><literal>:</literal><filename>/home/pcvs</filename>
- (see also <xref linkend="vcs.operations"/>).</entry>
+ <literal>svn+ssh://</literal><hostid
+ role="fqdn">svn.FreeBSD.org</hostid><filename>/ports</filename>
+ (see also <xref linkend="subversion-primer"/>).</entry>
</row>
<row>
@@ -268,827 +269,21 @@
</sect1>
- <sect1 id="vcs.operations">
- <title>Version Control System Operations</title>
+ <sect1 id="subversion-primer">
+ <title>Subversion Primer</title>
<para>It is assumed that you are already familiar with the basic
operation of the version control systems in use. Traditionally
this was CVS. Subversion is used for the <literal>src</literal>
- tree as of May 2008 and the <literal>doc/www</literal> tree as
- of May 2012. Subversion is covered in <xref
- linkend="subversion-primer"/>.</para>
-
- <para>The &a.cvsadm; are the <quote>owners</quote> of the
- repository and are responsible for direct modification of it for
- the purposes of cleanup or fixing some unfortunate abuse of the
- version control system by a committer. Should you cause some
- repository accident, say a bad import or a bad tag creation,
- mail the responsible part of &a.cvsadm;, as stated in the table
- below, (or call one of them) and report the problem. For very
- important issues affecting the entire tree&mdash;not just a
- specific area&mdash;you can contact the &a.cvsadm;. Please do
- <emphasis>not</emphasis> contact the &a.cvsadm; for repocopies
- or other things that the more specific teams can handle.</para>
-
- <para><anchor id="repomeisters"/>The only ones able to directly
- fiddle the repository bits on the repository hosts are the
- repomeisters. To enforce this, there are no login shells
- available on the repository machines, except to the
- repomeisters.</para>
-
- <note>
- <para>Depending on the affected area of the repository, you
- should send your request for a repocopy to one of the
- following email addresses. Email sent to these addresses will
- be forwarded to the appropriate repomeisters.</para>
-
- <itemizedlist>
- <listitem><para>pcvs@ - regarding <filename class="directory">
- /home/pcvs</filename>, the ports
- repository</para></listitem>
-
- <listitem><para>projcvs@ - regarding <filename
- class="directory"> /home/projcvs</filename>, the
- third party projects repository</para></listitem>
- </itemizedlist>
- </note>
-
- <para>The &os; repositories are currently split into two distinct
- parts, namely <literal>ports</literal> and
- <literal>projects</literal>. These are combined under a single
- <literal>CVSROOT</literal> when distributed via
- <application>CVSup</application> for the convenience of our
- users. The <literal>src</literal> tree is automatically
- exported to CVS for compatibility reasons only (e.g.,
- <application>CVSup</application>). The <quote>official</quote>
- <literal>src</literal> repository is not stored in
- <application>CVS</application> but in Subversion. The official
- and exported trees are not necessarily equal.</para>
-
- <para>The CVS repositories are hosted on the repository machines.
- Currently, each of the repositories above reside on the same
- physical machine, <hostid
- role="hostname">ncvs.FreeBSD.org</hostid>, but to allow for
- the possibility of placing each on a separate machine in the
- future, there is a separate hostname for each that committers
- should use. Additionally, each repository is stored in a
- separate directory. The following table summarizes the
- situation.</para>
-
- <table frame="none" id="cvs-repositories-and-hosts">
- <title>&os; CVS Repositories, Hosts and Directories</title>
-
- <tgroup cols="3">
- <thead>
- <row>
- <entry>Repository</entry>
- <entry>Host</entry>
- <entry>Directory</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>ports</entry>
- <entry>pcvs.FreeBSD.org</entry>
- <entry>/home/pcvs</entry>
- </row>
-
- <row>
- <entry>projects</entry>
- <entry>projcvs.FreeBSD.org</entry>
- <entry>/home/projcvs</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>CVS operations are done remotely by setting the
- <envar>CVSROOT</envar> environment variable to the appropriate
- host and top-level directory (for example, <hostid
- role="fqdn">pcvs.FreeBSD.org</hostid><literal>:</literal><filename>/home/pcvs</filename>),
- and doing the appropriate check-out/check-in operations. Many
- committers define aliases which expand to the correct
- <application>cvs</application> invocation for the appropriate
- repository. For example, a &man.tcsh.1; user may add the
- following to their <filename>.cshrc</filename> for this
- purpose:</para>
-
- <programlisting>alias pcvs cvs -d <replaceable>user</replaceable>@pcvs.FreeBSD.org:/home/pcvs
-alias projcvs cvs -d <replaceable>user</replaceable>@projcvs.FreeBSD.org:/home/projcvs</programlisting>
-
- <para>This way they can do all CVS operations locally and use
- <command><replaceable>X</replaceable>cvs commit</command> for
- committing to the official CVS repository.
- Refer to the &man.cvs.1; manual page for usage.</para>
-
- <note>
- <para>Please do <emphasis>not</emphasis> use <command>cvs
- checkout</command> or <command>update</command> with the
- official repository machine set as the CVS Root for keeping
- your source tree up to date. Remote CVS is not optimized for
- network distribution and requires a big work/administrative
- overhead on the server side. Please use our advanced
- <command>cvsup</command> distribution method for obtaining the
- repository bits, and only do the actual
- <command>commit</command> operation on the repository host.
- We provide an extensive cvsup replication network for this
- purpose, as well as give access to
- <hostid>cvsup-master</hostid> if you really need to stay
- current to the latest changes. <hostid>cvsup-master</hostid>
- has got the horsepower to deal with this, the repository
- master server does not. &a.kuriyama; is in charge of
- <hostid>cvsup-master</hostid>.</para>
- </note>
-
- <para>If you need to use CVS <command>add</command> and
- <command>delete</command> operations in a manner that is
- effectively a &man.mv.1; operation, then a repository copy is in
- order rather than using CVS <command>add</command> and
- <command>delete</command>. In a repository copy, a <link
- linkend="repomeisters">repomeister</link> will copy the
- file(s) to their new name and/or location and let you know when
- it is done. The purpose of a repository copy is to preserve
- file change history, or logs. We in the FreeBSD Project greatly
- value the change history that a version control system gives to
- the project.</para>
-
- <para>CVS reference information, tutorials, and FAQs can be found
- at: <ulink url="http://www.cvshome.org/docs/"></ulink>. The
- information in <ulink
- url="http://cvsbook.red-bean.com/cvsbook.html">Karl Fogel's
- chapters from <quote>Open Source Development with
- CVS</quote></ulink> is also very useful.</para>
-
- <para>&a.des; also supplied the following <quote>mini
- primer</quote> for CVS.</para>
-
- <orderedlist>
- <listitem>
- <para>Check out a module with the <command>co</command> or
- <command>checkout</command> command.</para>
-
- <screen>&prompt.user; <userinput>cvs checkout shazam</userinput></screen>
-
- <para>This checks out a copy of the
- <filename>shazam</filename> module. If there is no
- <filename>shazam</filename> module in the modules file, it
- looks for a top-level directory named
- <filename>shazam</filename> instead.</para>
-
- <table frame="none">
- <title>Useful <command>cvs checkout</command>
- options</title>
-
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><option>-P</option></entry>
- <entry>Do not create empty directories</entry>
- </row>
-
- <row>
- <entry><option>-l</option></entry>
- <entry>Check out a single level, no
- subdirectories</entry>
- </row>
-
- <row>
- <entry><option>-r<replaceable>rev</replaceable></option></entry>
- <entry>Check out revision, branch or tag
- <replaceable>rev</replaceable></entry>
- </row>
-
- <row>
- <entry><option>-D<replaceable>date</replaceable></option></entry>
- <entry>Check out the sources as they were on date
- <replaceable>date</replaceable></entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>Practical FreeBSD examples:</para>
-
- <itemizedlist>
- <listitem>
- <para>Check out the <filename>Tools</filename> module,
- which corresponds to
- <filename>ports/Tools</filename>:</para>
-
- <screen>&prompt.user; <userinput>cvs co Tools</userinput></screen>
-
- <para>You now have a directory named
- <filename>ports/Tools</filename> with subdirectories
- <filename>portbuild</filename>,
- <filename>scripts</filename>, and
- <filename>CVS</filename>.</para>
- </listitem>
-
- <listitem>
- <para>Check out the same files, but with full path:</para>
-
- <screen>&prompt.user; <userinput>cvs co ports/Tools</userinput></screen>
-
- <para>You now have a directory named
- <filename>ports</filename>, with subdirectories
- <filename>CVS</filename> and <filename>Tools</filename>.
- The <filename>ports/Tools</filename> directory has
- subdirectories <filename>CVS</filename> and
- <filename>scripts</filename>, etc.</para>
- </listitem>
-
- <listitem>
- <para>Check out the directory <filename>Tools</filename>,
- but none of the subdirectories:</para>
-
- <screen>&prompt.user; <userinput>cvs co -l Tools</userinput></screen>
-
- <para>You now have a directory named
- <filename>Tools</filename> with just one subdirectory
- named <filename>CVS</filename>.</para>
- </listitem>
-
- <listitem>
- <para>Check out the <filename>Tools</filename> module as
- it was when support for &os;&nbsp;5.X was
- dropped:</para>
-
- <screen>&prompt.user; <userinput>cvs co -rRELEASE_5_EOL Tools</userinput></screen>
-
- <para>You will not be able to commit modifications, since
- <literal>RELEASE_5_EOL</literal> is a point in time, not
- a branch.</para>
- </listitem>
-
- <listitem>
- <para>Check out the <filename>Tools</filename> module as
- it was on March 25th, 2009:</para>
-
- <screen>&prompt.user; <userinput>cvs co -D'2009-03-25' Tools</userinput></screen>
-
- <para>You will not be able to commit modifications.</para>
- </listitem>
-
- <listitem>
- <para>Check out the <filename>Tools</filename> module as
- it was one week ago:</para>
-
- <screen>&prompt.user; <userinput>cvs co -D'last week' Tools</userinput></screen>
-
- <para>You will not be able to commit modifications.</para>
- </listitem>
- </itemizedlist>
-
- <para>Note that cvs stores metadata in subdirectories named
- <filename>CVS</filename>. Similarly, Subversion stores
- metadata in subdirectories named
- <filename>.svn</filename>.</para>
-
- <para>Arguments to <option>-D</option> and <option>-r</option>
- are sticky, which means cvs will remember them later, e.g.,
- when you do a <command>cvs update</command>.</para>
- </listitem>
-
- <listitem>
- <para>Check the status of checked-out files with the
- <command>status</command> command.</para>
-
- <screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
-
- <para>This displays the status of the file
- <filename>shazam</filename> or of every file in the
- <filename>shazam</filename> directory. For every file, the
- status is given as one of:</para>
-
- <informaltable frame="none" pgwide="1">
- <tgroup cols="2">
- <tbody>
- <row>
- <entry>Up-to-date</entry>
- <entry>File is up-to-date and unmodified.</entry>
- </row>
-
- <row>
- <entry>Needs Patch</entry>
- <entry>File is unmodified, but there is a newer
- revision in the repository.</entry>
- </row>
-
- <row>
- <entry>Locally Modified</entry>
- <entry>File is up-to-date, but modified.</entry>
- </row>
-
- <row>
- <entry>Needs Merge</entry>
- <entry>File is modified, and there is a newer revision
- in the repository.</entry>
- </row>
-
- <row>
- <entry>File had conflicts on merge</entry>
- <entry>There were conflicts the last time this file
- was updated, and they have not been resolved
- yet.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
- <para>You will also see the local revision and date,
- the revision number of the newest applicable version
- (<quote>newest applicable</quote> because if you have a
- sticky date, tag or branch, it may not be the actual newest
- revision), and any sticky tags, dates or options.</para>
- </listitem>
-
- <listitem>
- <para>Once you have checked something out, you can update it
- with the <command>update</command> command.</para>
-
- <screen>&prompt.user; <userinput>cvs update shazam</userinput></screen>
-
- <para>This updates the file <filename>shazam</filename> or the
- contents of the <filename>shazam</filename> directory to the
- latest version along the branch you checked out. If you
- checked out a <quote>point in time</quote>, it does nothing
- unless the tags have moved in the repository or some other
- weird stuff is going on.</para>
-
- <para>Useful options, in addition to those listed above for
- <command>checkout</command>:</para>
-
- <informaltable frame="none" pgwide="1">
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><option>-d</option></entry>
- <entry>Check out any additional missing
- directories.</entry>
- </row>
-
- <row>
- <entry><option>-A</option></entry>
- <entry>Update to head of main branch.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
- <para>If you checked out a module with <option>-r</option> or
- <option>-D</option>, running <command>cvs update</command>
- with a different <option>-r</option> or <option>-D</option>
- argument or with <option>-A</option> will select a new
- branch, revision or date. The <option>-A</option> option
- clears all sticky tags, dates or revisions whereas
- <option>-r</option> and <option>-D</option> set new
- ones.</para>
-
- <para>Theoretically, specifying <literal>HEAD</literal> as the
- argument to <option>-r</option> will give you the same
- result as <option>-A</option>, but that is just
- theory.</para>
-
- <para>The <option>-d</option> option is useful if:</para>
-
- <itemizedlist>
- <listitem>
- <para>somebody has added subdirectories to the module
- you have checked out after you checked it out.</para>
- </listitem>
-
- <listitem>
- <para>you checked out with <option>-l</option>, and later
- change your mind and want to check out the
- subdirectories as well.</para>
- </listitem>
-
- <listitem>
- <para>you deleted some subdirectories and want to check
- them all back out.</para>
- </listitem>
- </itemizedlist>
-
- <para><emphasis>Watch the output of the <command>cvs
- update</command> with care.</emphasis> The letter in
- front of each filename indicates what was done with
- it:</para>
-
- <informaltable frame="none" pgwide="1">
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><literal>U</literal></entry>
- <entry>The file was updated without trouble.</entry>
- </row>
-
- <row>
- <entry><literal>P</literal></entry>
- <entry>The file was updated without trouble (you will
- only see this when working against a remote
- repository).</entry>
- </row>
-
- <row>
- <entry><literal>M</literal></entry>
- <entry>The file had been modified, and was merged
- without conflicts.</entry>
- </row>
-
- <row>
- <entry><literal>C</literal></entry>
- <entry>The file had been modified, and was merged with
- conflicts.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
- <para>Merging is what happens if you check out a copy of some
- file, modify it, then someone else commits a change, and you
- run <command>cvs update</command>. CVS notices that you have
- made local changes, and tries to merge your changes with the
- changes between the version you originally checked out and
- the one you updated to. If the changes are to separate
- portions of the file, it will almost always work fine
- (though the result might not be syntactically or
- semantically correct).</para>
-
- <para>CVS will print an <literal>M</literal> in front of every
- locally modified file even if there is no newer version in
- the repository, so <command>cvs update</command> is handy
- for getting a summary of what you have changed
- locally.</para>
-
- <para>If you get a <literal>C</literal>, then your changes
- conflicted with the changes in the repository (the changes
- were to the same lines, or neighboring lines, or you changed
- the local file so much that <command>cvs</command> can not
- figure out how to apply the repository's changes). You will
- have to go through the file manually and resolve the
- conflicts; they will be marked with rows of
- <literal>&lt;</literal>, <literal>=</literal> and
- <literal>&gt;</literal> signs. For every conflict, there
- will be a marker line with seven <literal>&lt;</literal>
- signs and the name of the file, followed by a chunk of what
- your local file contained, followed by a separator line with
- seven <literal>=</literal> signs, followed by the
- corresponding chunk in the repository version, followed by a
- marker line with seven <literal>&gt;</literal> signs and the
- revision number you updated to.</para>
- </listitem>
-
- <listitem>
- <para>View differences between the local version and the
- repository version with the <command>diff</command>
- command.</para>
-
- <screen>&prompt.user; <userinput>cvs diff shazam</userinput></screen>
-
- <para>shows you every modification you have made to the
- <filename>shazam</filename> file or module.</para>
-
- <table frame="none">
- <title>Useful <command>cvs diff</command> options</title>
-
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><option>-u</option></entry>
- <entry>Uses the unified diff format.</entry>
- </row>
-
- <row>
- <entry><option>-c</option></entry>
- <entry>Uses the context diff format.</entry>
- </row>
-
- <row>
- <entry><option>-N</option></entry>
- <entry>Shows missing or added files.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>You always want to use <option>-u</option>, since
- unified diffs are much easier to read than almost any other
- diff format (in some circumstances, context diffs generated
- with the <option>-c</option> option may be better, but they
- are much bulkier). A unified diff consists of a series of
- hunks. Each hunk begins with a line that starts with two
- <literal>@</literal> signs and specifies where in the file
- the differences are and how many lines they span. This is
- followed by a number of lines; some (preceded by a blank)
- are context; some (preceded by a <literal>-</literal> sign)
- are outtakes and some (preceded by a <literal>+</literal>)
- are additions.</para>
-
- <para>You can also diff against a different version than the
- one you checked out by specifying a version with
- <option>-r</option> or <option>-D</option> as in
- <command>checkout</command> or <command>update</command>, or
- even view the diffs between two arbitrary versions (without
- regard for what you have locally) by specifying
- <emphasis>two</emphasis> versions with <option>-r</option>
- or <option>-D</option>.</para>
- </listitem>
-
- <listitem>
- <para>View log entries with the <command>log</command>
- command.</para>
-
- <screen>&prompt.user; <userinput>cvs log shazam</userinput></screen>
-
- <para>If <filename>shazam</filename> is a file, this will
- print a <emphasis>header</emphasis> with information about
- this file, such as where in the repository this file is
- stored, which revision is the <literal>HEAD</literal> for
- this file, what branches this file is in, and any tags that
- are valid for this file. Then, for each revision of this
- file, a log message is printed. This includes the date and
- time of the commit, who did the commit, how many lines were
- added and/or deleted, and finally the log message that the
- committer who did the change wrote.</para>
-
- <para>If <filename>shazam</filename> is a directory, then the
- log information described above is printed for each file in
- the directory in turn. Unless you give the
- <option>-l</option> to <command>log</command>, the log for
- all subdirectories of <filename>shazam</filename> is printed
- too, in a recursive manner.</para>
-
- <para>Use the <command>log</command> command to view the
- history of one or more files, as it is stored in the CVS
- repository. You can even use it to view the log message of
- a specific revision, if you add the
- <option>-r<replaceable>rev</replaceable></option> to the
- <command>log</command> command:</para>
-
- <screen>&prompt.user; <userinput>cvs log -r1.2 shazam</userinput></screen>
-
- <para>This will print only the log message for revision
- <literal>1.2</literal> of file <filename>shazam</filename>
- if it is a file, or the log message for revision
- <literal>1.2</literal> of each file under
- <filename>shazam</filename> if it is a directory.</para>
- </listitem>
-
- <listitem>
- <para>See who did what with the <command>annotate</command>
- command. This command shows you each line of the specified
- file or files, along with which user most recently changed
- that line.</para>
-
- <screen>&prompt.user; <userinput>cvs annotate shazam</userinput></screen>
- </listitem>
-
- <listitem>
- <para>Add new files with the <command>add</command>
- command.</para>
-
- <para>Create the file, <command>cvs add</command> it, then
- <command>cvs commit</command> it.</para>
-
- <para>Similarly, you can add new directories by creating them
- and then <command>cvs add</command>ing them. Note that you
- do not need to commit directories.</para>
- </listitem>
-
- <listitem>
- <para>Remove obsolete files with the <command>remove</command>
- command.</para>
-
- <para>Remove the file, then <command>cvs rm</command> it, then
- <command>cvs commit</command> it.</para>
- </listitem>
-
- <listitem>
- <para>Commit with the <command>commit</command> or
- <command>checkin</command> command.</para>
-
- <table frame="none">
- <title>Useful <command>cvs commit</command> options</title>
-
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><option>-f</option></entry>
- <entry>Force a commit of an unmodified file.</entry>
- </row>
-
- <row>
- <entry><option>-m<replaceable>msg</replaceable></option></entry>
- <entry>Specify a commit message on the command line
- rather than invoking an editor.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>The following are some Subversion examples related to
- the src repository. More (in-depth) information can be
- found in the Subversion Primer at <xref
- linkend="subversion-primer"/> and <ulink
- url="http://wiki.freebsd.org/SubversionMissing">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>
- might also be useful. Subversion is also described in-depth
- in <ulink url="http://svnbook-red-bean.com/">Version Control
- with Subversion</ulink>.</para>
-
- <itemizedlist>
- <listitem>
- <para>Check out the <literal>head</literal> branch:</para>
-
- <screen>&prompt.user; <userinput>svn co svn+ssh://svn.freebsd.org/base/head /usr/src</userinput></screen>
- </listitem>
- </itemizedlist>
-
- <para>Good commit messages are important. They tell others why
- you did the changes you did, not just right here and now,
- but months or years from now when someone wonders why some
- seemingly illogical or inefficient piece of code sneaked
- into your source file. It is also an invaluable aid to
- deciding which changes to MFC and which not to MFC.</para>
-
- <para>Commit messages should be clear, concise and provide
- a reasonable summary to give an indication of what was
- changed and why.</para>
-
- <para>Commit messages should provide enough information to
- enable a third party to decide if the change is relevant to
- them and if they need to read the change itself.</para>
-
- <para>Avoid committing several unrelated changes in one go. It
- makes merging difficult, and also makes it harder to
- determine which change is the culprit if a bug crops
- up.</para>
-
- <para>Avoid committing style or whitespace fixes and
- functionality fixes in one go. It makes merging difficult,
- and also makes it harder to understand just what functional
- changes were made. In the case of documentation files, it
- can make the job of the translation teams more complicated,
- as it becomes difficult for them to determine exactly what
- content changes need to be translated.</para>
-
- <para>Avoid committing changes to multiple files in one go
- with a generic, vague message. Instead, commit each file (or
- small, related groups of files) with tailored commit
- messages.</para>
-
- <para>Before committing, <emphasis>always</emphasis>:</para>
-
- <itemizedlist>
- <listitem>
- <para>verify which branch you are committing to, using
- <command>svn status</command>. This is only needed for
- the src tree, as the other trees are not branched.</para>
- </listitem>
-
- <listitem>
- <para>review your diffs, using the diff command of the
- version control system.</para>
- </listitem>
- </itemizedlist>
-
- <para>Also, ALWAYS specify which files to commit explicitly on
- the command line, so you do not accidentally commit other
- files than the ones you intended &mdash; a commit operation
- without any arguments usually will commit every modification
- in your current working directory and every
- subdirectory.</para>
- </listitem>
- </orderedlist>
-
- <para>Additional tips and tricks:</para>
-
- <orderedlist>
- <listitem>
-
- <para>You can place commonly used options in your
- <filename>~/.cvsrc</filename>, like this:</para>
-
- <programlisting>cvs -z3
-diff -Nu
-update -Pd
-checkout -P</programlisting>
-
- <para>This example says:</para>
-
- <itemizedlist>
- <listitem>
- <para>always use compression level 3 when talking to a
- remote server. This is a life-saver when working over a
- slow connection.</para>
- </listitem>
-
- <listitem>
- <para>always use the <option>-N</option> (show added or
- removed files) and <option>-u</option> (unified diff
- format) options to &man.diff.1;.</para>
- </listitem>
-
- <listitem>
- <para>always use the <option>-P</option> (prune empty
- directories) and <option>-d</option> (check out new
- directories) options when updating.</para>
- </listitem>
-
- <listitem>
- <para>always use the <option>-P</option> (prune empty
- directories) option when checking out.</para>
- </listitem>
- </itemizedlist>
- </listitem>
-
- <listitem>
- <para>Use Eivind Eklund's <command>cdiff</command> script to
- view unidiffs. It is a wrapper for &man.less.1; that adds
- ANSI color codes to make hunk headers, outtakes and
- additions stand out; context and garbage are unmodified. It
- also expands tabs properly (tabs often look wrong in diffs
- because of the extra character in front of each
- line).</para>
-
- <para><filename
- role="package">textproc/cdiff</filename></para>
-
- <para>Simply use it instead of &man.more.1; or
- &man.less.1;:</para>
-
- <screen>&prompt.user; <userinput>cvs diff -Nu shazam | cdiff</userinput></screen>
-
- <para>Alternatively some editors like &man.vim.1; (<filename
- role="package">editors/vim</filename>) have color support
- and when used as a pager with color syntax highlighting
- switched on will highlight many types of file, including
- diffs, patches, and CVS/RCS logs.</para>
-
- <screen>&prompt.user; <userinput>echo "syn on" &gt;&gt; ~/.vimrc </userinput>
-&prompt.user; <userinput>cvs diff -Nu shazam | vim -</userinput>
-&prompt.user; <userinput>cvs log shazam | vim -</userinput> </screen>
- </listitem>
-
- <listitem>
- <para>CVS is old, arcane, crufty and buggy, and sometimes
- exhibits non-deterministic behavior which some claim as
- proof that it is actually merely the Newtonian manifestation
- of a sentient transdimensional entity. It is not humanly
- possible to know its every quirk inside out, so do not be
- afraid to ask the resident AI (&a.cvsadm;) for help.</para>
- </listitem>
-
- <listitem>
- <para>Do not leave the <command>cvs commit</command> command
- in commit message editing mode for too long (more than
- 2&ndash;3 minutes). It locks the directory you are working
- with and will prevent other developers from committing into
- the same directory. If you have to type a long commit
- message, type it before executing <command>cvs
- commit</command> and insert it into the commit message or
- save it in a file before committing and use the
- <option>-F</option> option of CVS to read the commit message
- from that file, i.e.,</para>
-
- <screen>&prompt.user; <userinput>vi logmsg</userinput>
-&prompt.user; <userinput>cvs ci -F logmsg shazam</userinput></screen>
-
- <para>This is the fastest way of passing a commit message to
- CVS but you should be careful when editing the
- <filename>logmsg</filename> file before the commit, because
- CVS will not give you a chance to edit the message when you
- do the actual commit.</para>
- </listitem>
-
- <listitem>
- <para>Speed up your CVS operation considerably by using a
- persistent ssh connection to the repository machine. First,
- put this configuration into your
- <filename>~/.ssh/config</filename>:</para>
-
- <programlisting>Host pcvs.FreeBSD.org
- ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
-Host projcvs.FreeBSD.org
- ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath</programlisting>
-
- <para>Now open the persistent connection to the
- repoman:</para>
-
- <screen>&prompt.user; <userinput>ssh -fNM ncvs.FreeBSD.org</userinput></screen>
-
- <para>The CVS commands should now respond faster, as they are
- reusing existing connection with the repository. Note that
- all the hostnames are case sensitive.</para>
- </listitem>
- </orderedlist>
- </sect1>
+ tree as of May 2008, the <literal>doc/www</literal> tree as of
+ May 2012 and the <literal>ports</literal> tree as of July 2012.
+ </para>
- <sect1 id="subversion-primer">
- <title>Subversion Primer</title>
+ <para><ulink url="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>
+ might also be useful.</para>
<sect2 id="svn-intro">
<title>Introduction</title>
@@ -1114,6 +309,11 @@ Host projcvs.FreeBSD.org
<literal>head/<replaceable>lang</replaceable>/htdocs/</literal>.</para>
</note>
+ <para>The &os; <literal>ports</literal> repository switched
+ from <acronym>CVS</acronym> to Subversion on July 14th, 2012.
+ The first real <acronym>SVN</acronym> commit is
+ <emphasis>r300894</emphasis>.</para>
+
<para>There are mechanisms in place to automatically merge
changes back from the Subversion repository to the
<acronym>CVS</acronym> one, so regular users should not notice
@@ -1186,12 +386,19 @@ Host projcvs.FreeBSD.org
<screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/doc/head /usr/doc</userinput></screen>
+ <para>For the <literal>ports</literal> tree, use:</para>
+
+ <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/ports/head /usr/ports</userinput></screen>
+
<note>
<para>Though the remaining examples in this document are
written with the workflow of working with the
<literal>src</literal> tree in mind, the underlying
concepts are the same for working with the
- <literal>doc</literal> tree.</para>
+ <literal>doc</literal> and the <literal>ports</literal>
+ tree.
+ Ports related Subversion operations are listed in
+ <xref linkend="ports"/>.</para>
</note>
<para>The above command will check out a
@@ -1460,6 +667,39 @@ Host projcvs.FreeBSD.org
</listitem>
</itemizedlist>
</sect3>
+
+ <sect3>
+ <title>&os; Ports Tree Branches and Layout</title>
+
+ <para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>,
+ <emphasis>ports</emphasis> refers repository root of the
+ ports tree.</para>
+
+ <para>In general, most &os; port work will be done within
+ the <filename>head/</filename> branch of the ports tree
+ which is the actual ports tree used to install software.
+ Some other key locations are:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><emphasis>/branches/RELENG_<replaceable>n_n_n
+ </replaceable></emphasis> which corresponds to
+ <literal>RELENG_<replaceable>n_n_n</replaceable></literal>
+ is used to merge back security updates in preparation
+ for a release.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>/tags/RELEASE_<replaceable>n_n_n</replaceable></emphasis>
+ which corresponds to <literal>RELEASE_<replaceable>n_n_n</replaceable></literal>
+ represents a release tag of the ports tree.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis>/tags/RELEASE_<replaceable>n</replaceable>_EOL</emphasis>
+ represents the end of life tag of a specific &os;
+ branch.</para>
+ </listitem>
+ </itemizedlist>
+ </sect3>
</sect2>
<sect2 id="svn-daily-use">
@@ -1613,6 +853,13 @@ Host projcvs.FreeBSD.org
in a single operation:</para>
<screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
+
+ <para>There is also a commit wrapper for the ports tree
+ to handle the properties and sanity checking your
+ changes:</para>
+
+ <screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/psvn commit
+ </userinput></screen>
</sect3>
<sect3 id="subversion-primer-add-remove">
@@ -1621,6 +868,9 @@ Host projcvs.FreeBSD.org
<note>
<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>)
and add it to <filename>~/.subversion/config</filename>
according to the instructions in the file. If you added
something before you've read this, you may use
@@ -1628,7 +878,8 @@ Host projcvs.FreeBSD.org
files, fix your config file and re-add them again. The
initial config file is created when you first run a svn
command, even something as simple as <command>svn
- help</command>.</para>
+ help</command>.
+ </para>
</note>
<para>As with <acronym>CVS</acronym>, files are added to a
@@ -2728,6 +1979,9 @@ $target - head/$source:$P,$Q,$R</screen>
<para>In commit logs etc., <quote>rev 179872</quote> should be
spelled <quote>r179872</quote> as per convention.</para>
+ <para>Don't remove and re-add the same file in a single commit
+ as this will break the CVS exporter.</para>
+
<para>Speeding up checkouts and minimising network traffic is
possible with the following recipe:</para>
@@ -4291,7 +3545,7 @@ $target - head/$source:$P,$Q,$R</screen>
<procedure>
<step>
- <para>Remove the port's files via <command>cvs remove</command>.</para>
+ <para>Remove the port's files via <command>svn remove</command>.</para>
</step>
<step>
@@ -4333,20 +3587,20 @@ $target - head/$source:$P,$Q,$R</screen>
<para>This is essentially the reverse of deleting a port.</para>
<procedure>
<step>
- <para>Figure out when the port was removed. Use the ports
- <ulink url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/">cvsweb</ulink>
- and then navigate to
- <replaceable>category</replaceable>/<replaceable>portname</replaceable>/<filename>Attic</filename>/ .
+ <para>Figure out when the port was removed. Use this
+ <ulink url="http://people.freebsd.org/~crees/removed_ports/index.xml">list</ulink>
+ 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>
+ </userinput></screen>
+
Pick a date that is before the removal but after the last true
commit.</para>
</step>
<step>
- <para>In the proper directory:
-<command>cvs update -D <replaceable>datespec</replaceable></command>.</para>
- </step>
-
- <step>
<para>Perform whatever changes are necessary to make the port
work again. If it was deleted because the distfiles are
no longer available you will need to volunteer to host them
@@ -4354,7 +3608,8 @@ $target - head/$source:$P,$Q,$R</screen>
</step>
<step>
- <para><command>cvs add</command> the updated files.</para>
+ <para><command>svn add</command> or <command>svn remove</command>
+ any appropriate files.</para>
</step>
<step>
@@ -4369,7 +3624,7 @@ $target - head/$source:$P,$Q,$R</screen>
</step>
<step>
- <para><command>cvs commit</command> these changes, preferably in
+ <para><command>svn commit</command> these changes, preferably in
one step.</para>
</step>
</procedure>
@@ -4406,42 +3661,27 @@ $target - head/$source:$P,$Q,$R</screen>
<qandaentry>
<question>
- <para>When do we <emphasis>not</emphasis> need a
- repository copy?</para>
- </question>
-
- <answer>
- <para>When there is no history to preserve. If a port is
- added into a wrong category and is moved immediately,
- it suffices to simply <command>cvs remove</command> the
- old one and <command>addport</command> the new
- one.</para>
- </answer>
- </qandaentry>
-
- <qandaentry>
- <question>
<para>What do I need to do?</para>
</question>
<answer>
- <para>File a PR in <application>GNATS</application>, listing the
- reasons for the repository copy request. Assign it to
- <literal>portmgr</literal> and set <varname>state</varname> to
- <literal>repocopy</literal>. In a few days,
- <literal>portmgr</literal> will do
- a repository copy from the old to the new location, and
- reassign the PR back to you. Once everything is done, perform the
- following:</para>
+ <para>With Subversion, a repo copy can be done by any
+ committer:</para>
<itemizedlist>
<listitem>
- <para>When a port has been repo copied:</para>
+ <para>Doing a repo copy:</para>
<procedure>
<step>
- <para>Do a force commit on the files of the copied port,
- stating repository copy was performed.</para>
+ <para>First make sure that you were using an up to
+ date port stree and the target directory does not
+ exist.</para>
+ </step>
+
+ <step>
+ <para>Use <command>svn move</command> or <command>svn
+ copy</command> to do the repo copy.</para>
</step>
<step>
@@ -4481,6 +3721,11 @@ $target - head/$source:$P,$Q,$R</screen>
<filename>ports/MOVED</filename>, if you remove the
original port.</para>
</step>
+
+ <step>
+ <para>Commit all changes on one commit. A forced commit
+ is no longer needed with Subversion.</para>
+ </step>
</procedure>
</listitem>
@@ -4958,7 +4203,7 @@ bak/packages packages from last complete &lt;major_version&gt; run on &lt;arch&
<answer>
<para>No, <filename>INDEX</filename> is no longer stored
- in the CVS repository. The file can either be generated
+ in the SVN repository. The file can either be generated
by running <command>make index</command>, or a pre-generated
version can be downloaded with <command>make
fetchindex</command>.</para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 2c3cdd4c52..90af09b5b2 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -1478,11 +1478,6 @@
</listitem>
<listitem>
- <para>Bryan Drewery
- <email>bryan@shatow.net</email></para>
- </listitem>
-
- <listitem>
<para>Byung-Hee HWANG
<email> bh@izb.knu.ac.kr</email></para>
</listitem>
@@ -2608,6 +2603,11 @@
</listitem>
<listitem>
+ <para>Dmitry Pryadko
+ <email>d.pryadko@rambler-co.ru</email></para>
+ </listitem>
+
+ <listitem>
<para>Dmitry Semkin
<email>ds@tic-tac.ru</email></para>
</listitem>
@@ -5307,6 +5307,11 @@
</listitem>
<listitem>
+ <para>Kubilay Kocak
+ <email>koobs.freebsd@gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>KUNISHIMA Takeo
<email>kunishi@c.oka-pu.ac.jp</email></para>
</listitem>
@@ -5929,6 +5934,11 @@
</listitem>
<listitem>
+ <para>Lukasz Stelmach
+ <email>lukasz.stelmach@iem.pw.edu.pl</email></para>
+ </listitem>
+
+ <listitem>
<para>Lupe Christoph
<email>lupe@lupe-christoph.de</email></para>
</listitem>
@@ -6058,6 +6068,11 @@
</listitem>
<listitem>
+ <para>Marcello Silva Coutinho
+ <email>marcellocoutinho@gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Marcelo/Porks Rossi
<email>marcelorossi@gmail.com</email></para>
</listitem>
@@ -6286,6 +6301,11 @@
</listitem>
<listitem>
+ <para>Martin Neubauer
+ <email>m.ne@gmx.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Martin Otto
<email>gamato@users.sf.net</email></para>
</listitem>
@@ -7324,11 +7344,6 @@
</listitem>
<listitem>
- <para>Niclas Zeising
- <email>niclas.zeising@gmail.com</email></para>
- </listitem>
-
- <listitem>
<para>Nikola Lecic
<email>nikola.lecic@anthesphoria.net</email></para>
</listitem>
@@ -8717,6 +8732,11 @@
</listitem>
<listitem>
+ <para>Rodrigo Osorio
+ <email>rodrigo@bebik.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Roger Hardiman
<email>roger@cs.strath.ac.uk</email></para>
</listitem>
@@ -8887,6 +8907,11 @@
</listitem>
<listitem>
+ <para>RyoTa SimaMoto
+ <email>liangtai.s4@gmail.com </email></para>
+ </listitem>
+
+ <listitem>
<para>Ryuichiro IMURA
<email>imura@af.airnet.ne.jp</email></para>
</listitem>
@@ -9303,7 +9328,7 @@
<listitem>
<para>Simon J Gerraty
- <email>sjg@melb.bull.oz.au</email></para>
+ <email>sjg@juniper.net</email></para>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index a3ce3e8401..2f633051b4 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -312,6 +312,10 @@
</listitem>
<listitem>
+ <para>&a.bdrewery;</para>
+ </listitem>
+
+ <listitem>
<para>&a.gad;</para>
</listitem>
@@ -1600,6 +1604,10 @@
</listitem>
<listitem>
+ <para>&a.zeising;</para>
+ </listitem>
+
+ <listitem>
<para>&a.phantom;</para>
</listitem>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml
index 5ea92905ec..a7115ef558 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml
@@ -3,6 +3,26 @@
<itemizedlist>
<listitem>
+ <para>&a.wilko; (2006 - 2012)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.brooks; (2006 - 2012)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.pav; (2010 - 2012)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.cperciva; (2010 - 2012)</para>
+ </listitem>
+
+ <listitem>
+ <para>&a.rwatson; (2000 - 2012)</para>
+ </listitem>
+
+ <listitem>
<para>&a.keramida; (2006 - 2010)</para>
</listitem>
@@ -22,15 +42,15 @@
<para>&a.wes; (2002 - 2008)</para>
</listitem>
+ <!--
<listitem>
<para>&a.peter; (1995 - 2006, 2008 - 2010)</para>
</listitem>
+ -->
- <!--
<listitem>
- <para>&a.imp; (2000 - 2008)</para>
+ <para>&a.imp; (2000 - 2008, 2010 - 2012)</para>
</listitem>
- -->
<listitem>
<para>&a.markm; (2002 - 2006)</para>
@@ -123,7 +143,7 @@
</listitem>
<listitem>
- <para>John Dyson (1993 - 1998)</para>
+ <para>&a.dyson; (1993 - 1998)</para>
</listitem>
<listitem>
@@ -135,7 +155,7 @@
</listitem>
<listitem>
- <para>Andreas Schulz (1992 - 1995)</para>
+ <para>&a.ats; (1992 - 1995)</para>
</listitem>
<listitem>
@@ -151,14 +171,14 @@
</listitem>
<listitem>
- <para>Andrew Moore (1993 - 1994)</para>
+ <para>&a.alm; (1993 - 1994)</para>
</listitem>
<listitem>
- <para>Christoph Robitschko (1993 - 1994)</para>
+ <para>&a.chmr; (1993 - 1994)</para>
</listitem>
<listitem>
- <para>J. T. Conklin (1992 - 1993)</para>
+ <para>&a.jtc; (1992 - 1993)</para>
</listitem>
</itemizedlist>
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index 8ff92594ee..9e4a95f06f 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -256,14 +256,10 @@
<itemizedlist>
<listitem>
- <para><filename role="package">www/apache13</filename>:
+ <para><filename role="package">www/apache22</filename>:
<application>Apache</application> is the most widely
deployed web server on the Internet. It is used
- extensively by the FreeBSD Project. You may also wish to
- use the next generation of the
- <application>Apache</application> web server, available
- in the ports collection as <filename
- role="package">www/apache22</filename>.</para>
+ extensively by the FreeBSD Project.</para>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/articles/linux-users/article.sgml b/en_US.ISO8859-1/articles/linux-users/article.sgml
index 44a4b7a44a..9d4722c051 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.sgml
+++ b/en_US.ISO8859-1/articles/linux-users/article.sgml
@@ -316,7 +316,7 @@ apache22_flags="-DSSL"</programlisting>
&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 (em0 and em1):</para>
+ interfaces (<devicename>em0</devicename> and <devicename>em1</devicename>):</para>
<screen>&prompt.user; <userinput>ifconfig</userinput>
em0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml
index 7b15b227b4..85d102bc47 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.sgml
@@ -2628,8 +2628,8 @@ ln -s ../<replaceable>arch</replaceable>/<replaceable>branch</replaceable>/build
</listitem>
<listitem>
- <para>(Only necessary for old codebase):
- In that
+ <para>
+ In the <filename>/var/portbuild/errorlogs/</filename>
directory, create two more links for the webserver:<screen>
ln -s ../<replaceable>arch</replaceable>/archive/buildlogs <replaceable>arch</replaceable>-buildlogs
ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</replaceable>-errorlogs</screen></para>
diff --git a/en_US.ISO8859-1/articles/pxe/Makefile b/en_US.ISO8859-1/articles/pxe/Makefile
deleted file mode 100644
index 6f545e20a8..0000000000
--- a/en_US.ISO8859-1/articles/pxe/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# $FreeBSD$
-#
-# Article: FreeBSD PXE Jumpstart Guide
-
-DOC?= article
-
-FORMATS?= html
-
-INSTALL_COMPRESSED?=gz
-INSTALL_ONLY_COMPRESSED?=
-
-EXTRAS= dhcpd.conf
-EXTRAS+= install.cfg
-EXTRAS+= loader.rc
-EXTRAS+= pkgmaker.sh
-EXTRAS+= post
-EXTRAS+= pre
-
-SRCS= article.sgml
-
-afterinstall:
-.for entry in ${EXTRAS}
- ${INSTALL_DOCS} ${.CURDIR}/${entry} ${DESTDIR}
-.endfor
-
-DOC_PREFIX?= ${.CURDIR}/../../..
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/pxe/article.sgml b/en_US.ISO8859-1/articles/pxe/article.sgml
deleted file mode 100644
index 9748d9a3b0..0000000000
--- a/en_US.ISO8859-1/articles/pxe/article.sgml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="ISO8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
-%entities;
-]>
-
-<article lang='en'>
- <articleinfo>
- <title>FreeBSD Jumpstart Guide</title>
-
- <authorgroup>
- <author>
- <firstname>Alfred</firstname>
- <surname>Perlstein</surname>
-
- <affiliation>
- <address><email>alfred@FreeBSD.org</email></address>
- </affiliation>
- </author>
- </authorgroup>
-
- <legalnotice id="trademarks" role="trademarks">
- &tm-attrib.freebsd;
- &tm-attrib.intel;
- &tm-attrib.general;
- </legalnotice>
-
- <pubdate>$FreeBSD$</pubdate>
-
- <releaseinfo>$FreeBSD$</releaseinfo>
-
- <abstract>
- <para>This article details the method used to allow machines to install
- FreeBSD using the &intel; PXE method of booting a machine over a network.
- </para>
- </abstract>
- </articleinfo>
-
- <sect1 id="warning-outdated">
- <title>This Article is Outdated</title>
-
- <warning>
- <para>This article is outdated and will be removed in a few
- weeks. Please see the &os;&nbsp;Handbook chapter <ulink
- url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/network-pxe-nfs.html">here</ulink>
- for an updated procedure.</para>
- </warning>
- </sect1>
-
- <sect1 id="introduction">
- <title>Introduction</title>
-
- <warning>
- <para>This procedure will make the <quote>Server</quote> both insecure and dangerous,
- it is best to just keep the <quote>Server</quote> on its own hub and not in any way
- accessible by any machines other than the <quote>Clients</quote>.</para>
- </warning>
-
- <para>Terminology:</para>
-
- <informaltable frame="none" pgwide="1">
- <tgroup cols="2">
-
- <tbody>
- <row>
- <entry>Server</entry>
- <entry>The machine offering netboot and install options.</entry>
- </row>
-
- <row>
- <entry>Client</entry>
- <entry>The machine that will have FreeBSD installed on it.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
-
- <para>Requires:
- Clients supporting the &intel; PXE netboot option, an Ethernet connection.
- </para>
-
- <para>Please let me know if you come across anything you have problems with
- or suggestions for additional documentation.</para>
-
- <para>If you would like someone to train/implement a specific netinstall system
- for you, please send email so that we can discuss terms.</para>
-
- <para>I would also like to thank &a.ps; and &a.jhb; for doing most of the
- programming work on pxeboot, the interface to the &intel; PXE (netboot)
- system.</para>
- </sect1>
-
- <sect1 id="server-config">
- <title>Server Configuration</title>
-
- <procedure>
- <step>
- <para>Install DHCP: Install <filename role="package">net/isc-dhcp3-server</filename> you can use this config file
- <ulink url="dhcpd.conf">
- <filename>dhcpd.conf</filename></ulink>, stick it in <filename>/usr/local/etc/</filename>.</para>
- </step>
-
- <step>
- <para>Enable tftp:</para>
-
- <procedure>
- <step>
- <para>Make a directory <filename>/usr/tftpboot</filename></para>
- </step>
-
- <step>
- <para>Add this line to your
- <filename>/etc/inetd.conf</filename>:</para>
-
-<programlisting>tftp dgram udp wait nobody /usr/libexec/tftpd tftpd /usr/tftpboot</programlisting>
- </step>
- </procedure>
-
- </step>
-
- <step>
- <para>Enable NFS:</para>
-
- <procedure>
- <step>
- <para>Add this to <filename>/etc/rc.conf</filename>:</para>
-
- <programlisting>nfs_server_enable="YES"</programlisting>
- </step>
-
- <step>
- <para>Add this to <filename>/etc/exports</filename>:</para>
-
- <programlisting>/usr -alldirs -ro</programlisting>
- </step>
- </procedure>
- </step>
-
- <step>
- <para>Reboot to enable the new services or start them
- manually.</para>
- </step>
- </procedure>
- </sect1>
-
- <sect1 id="bootstrap-config">
- <title>Bootstrap Setup</title>
-
- <procedure>
- <step>
- <para>Download bootfiles: Download the
- <ulink
- url="&snapshots.stable;/floppies/kern.flp">
- kern.flp</ulink> and
- <ulink
- url="&snapshots.stable;/floppies/mfsroot.flp">
- mfsroot.flp</ulink> floppy images.</para>
- </step>
-
- <step>
- <para>Set up tftp/pxe-boot directory:</para>
-
- <procedure>
- <step>
- <para>Put pxeboot in the boot directory:</para>
-
- <screen>&prompt.root; <userinput>rm -rf /usr/obj/*</userinput>
-&prompt.root; <userinput>cd /usr/src/sys/boot</userinput>
-&prompt.root; <userinput>make</userinput>
-&prompt.root; <userinput>cp /usr/src/sys/boot/i386/pxeldr/pxeboot /usr/tftpboot</userinput></screen>
- </step>
-
- <step>
- <para>Using the vndevice mount the <filename>kern.flp</filename>
- file and copy its contents to
- <filename>/usr/tftpboot</filename>:</para>
-
- <screen>&prompt.root; <userinput>mdconfig -a -t vnode -f kern.flp -u 0</userinput> # (vnconfig vn0 kern.flp) associate a vndevice with the file
-&prompt.root; <userinput>mount /dev/md0 /mnt</userinput> # (mount /dev/vn0 /mnt) mount it
-&prompt.root; <userinput>cp -R /mnt /usr/tftpboot</userinput> # copy the contents to /usr/tftpboot
-&prompt.root; <userinput>umount /mnt</userinput> # unmount it
-&prompt.root; <userinput>vnconfig -u vn0</userinput> # disassociate the vndevice from the file</screen>
- </step>
- </procedure>
- </step>
-
- <step>
- <para>Compile a custom kernel for the clients (particularly to avoid
- the device config screen at boot) and stick it in
- <filename>/usr/tftpboot</filename>.</para>
- </step>
-
- <step>
- <para>Make a special <filename>loader.rc</filename> to and install it
- in <filename>/usr/tftpboot/boot/loader.rc</filename> so that it
- does not prompt for the second disk, here is
- <ulink url="loader.rc">mine</ulink>.</para>
- </step>
-
- <step>
- <para>Extract the installer and helper utilities from the mfsroot disk
- and uncompress them, put them in <filename>/usr/tftpboot</filename>
- as well:</para>
-
- <screen>&prompt.root; <userinput>vnconfig vn0 mfsroot.flp</userinput> # associate a vndevice with the file
-&prompt.root; <userinput>mount /dev/vn0 /mnt</userinput> # mount it
-&prompt.root; <userinput>cp /mnt/mfsroot.gz /usr/tftpboot</userinput> # copy the contents to /usr/tftpboot
-&prompt.root; <userinput>umount /mnt</userinput> # unmount it
-&prompt.root; <userinput>vnconfig -u vn0</userinput> # disassociate the vndevice from the file
-&prompt.root; <userinput>cd /usr/tftpboot</userinput> # get into the pxeboot directory
-&prompt.root; <userinput>gunzip mfsroot.gz</userinput> # uncompress the mfsroot</screen>
- </step>
-
- <step>
- <para>Make your sysinstall script <filename>install.cfg</filename>, you
- can use
- <ulink url="install.cfg">mine</ulink>
- as a template, but you must edit it.</para>
- </step>
-
- <step>
- <para>Copy the sysinstall script into the extracted and uncompressed
- mfsroot image:</para>
-
- <screen>&prompt.root; <userinput>cd /usr/tftpboot</userinput>
-&prompt.root; <userinput>vnconfig vn0 mfsroot</userinput>
-&prompt.root; <userinput>mount /dev/vn0 /mnt</userinput>
-&prompt.root; <userinput>cp install.cfg /mnt</userinput>
-&prompt.root; <userinput>umount /mnt</userinput>
-&prompt.root; <userinput>vnconfig -u vn0</userinput></screen>
- </step>
- </procedure>
- </sect1>
-
- <sect1 id="install-setup">
- <title>Install Setup</title>
-
- <procedure>
- <step>
- <para>Put the install files in an NFS accessible location on the
- Server. Make a directory corresponding the 'nfs' directive in the
- <filename> install.cfg</filename> file and mirror the FreeBSD
- install files there, you will want it to look somewhat like
- this:</para>
-
- <screen>ABOUT.TXT TROUBLE.TXT compat20 floppies ports
-ERRATA.TXT UPGRADE.TXT compat21 games proflibs
-HARDWARE.TXT XF86336 compat22 info src
-INSTALL.TXT bin compat3x kern.flp
-LAYOUT.TXT catpages crypto manpages
-README.TXT cdrom.inf dict mfsroot.flp
-RELNOTES.TXT compat1x doc packages</screen>
- </step>
-
- <step>
- <para>Copy the compressed packages into the packages/All directory
- under <filename>nfs</filename>.</para>
- </step>
-
- <step>
- <para>Make sure you have an <filename>INDEX</filename> file prepared
- in the packages directory. You can make your own
- <filename>INDEX</filename> entries like so:</para>
-
- <programlisting>alfred-1.0||/|Alfred install bootstrap||alfred@FreeBSD.org||||</programlisting>
-
- <para>Then you can install custom packages, particularly your own
- custom post-install package.</para>
- </step>
- </procedure>
- </sect1>
-
- <sect1 id="custom-postinst-package">
- <title>Custom Post-Install Package</title>
-
- <para>You can use the script <ulink url="pkgmaker.sh"><filename>pkgmaker.sh
- </filename></ulink> to create a
- custom package for post install, the idea is to have it install and
- configure any special things you may need done.
- <filename>pkgmaker</filename> is run in the directory above the package
- you wish to create with the single argument of the package (i.e., mypkg)
- which will then create a mypkg.tgz for you to include in your sysinstall
- package.</para>
-
- <para>Inside your custom package dir you will want a file called
- <filename>PLIST</filename> which contains all the files that you wish to
- install and be incorporated into your package.</para>
-
- <para>You will also want files called
- <ulink url="pre"><filename>pre</filename></ulink> and
- <ulink url="post"><filename>post</filename></ulink>
- in the directory, these are shell scripts
- that you want to execute before and after your package is
- installed.</para>
-
- <para>Since this package is in your <filename>install.cfg</filename> file
- it should be run and do the final configuration for you.</para>
- </sect1>
-</article>
diff --git a/en_US.ISO8859-1/articles/pxe/dhcpd.conf b/en_US.ISO8859-1/articles/pxe/dhcpd.conf
deleted file mode 100644
index c0f552817e..0000000000
--- a/en_US.ISO8859-1/articles/pxe/dhcpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# $Wintelcom: src/freebsd/pxe/doc/dhcpd.conf,v 1.2 2000/09/24 09:18:14 bright Exp $
-# $FreeBSD$
-
-option subnet-mask 255.255.255.0;
-option routers 10.8.253.254;
-filename "pxeboot";
-
-ddns-update-style none;
-
-option domain-name "google.com";
-option broadcast-address 10.8.253.255;
-option domain-name-servers 10.8.0.7;
-server-name "DHCPserver";
-server-identifier 10.8.253.201;
-
-default-lease-time 7200;
-max-lease-time 7200;
-
-subnet 10.8.253.0 netmask 255.255.255.0 {
- next-server 10.8.253.201;
- range 10.8.253.29 10.8.253.200;
-}
diff --git a/en_US.ISO8859-1/articles/pxe/install.cfg b/en_US.ISO8859-1/articles/pxe/install.cfg
deleted file mode 100644
index 4f8ab16a0f..0000000000
--- a/en_US.ISO8859-1/articles/pxe/install.cfg
+++ /dev/null
@@ -1,203 +0,0 @@
-
-# $Wintelcom: src/freebsd/pxe/doc/install.cfg,v 1.1 2000/07/14 12:42:05 bright Exp $
-# $FreeBSD$
-
-# This is the installation configuration file for our rackmounted FreeBSD
-# cluster machines
-
-# Turn on extra debugging.
-debug=YES
-
-# Ok, this ought to turn off ALL prompting, don't complain to me that you
-# lost a machine because you netbooted it on the same subnet as this
-# box
-nonInteractive=YES
-noWarn=YES
-tryDHCP=YES
-
-################################
-# My host specific data
-hostname=booter
-domainname=mydomain.com
-# DHCP does this for us
-#nameserver=10.0.0.1
-#defaultrouter=10.0.0.1
-#ipaddr=DHCP
-#netmask=255.255.255.0
-################################
-
-################################
-# Which installation device to use
-nfs=x.x.x.x:/usr/releng4
-netDev=fxp0
-tryDHCP=YES
-mediaSetNFS
-################################
-
-################################
-# Select which distributions we want.
-dists= bin doc games manpages catpages proflibs dict info des compat1x compat20 compat21 compat22 compat3x crypto
-distSetCustom
-################################
-
-################################
-# Now set the parameters for the partition editor on sd0.
-disk=ad0
-partition=all
-bootManager=standard
-diskPartitionEditor
-#diskPartitionWrite
-################################
-
-################################
-# All sizes are expressed in 512 byte blocks!
-#
-# A 96MB root partition, followed by a 0.5G swap partition, followed by
-# a 1G /var, and a /usr using all the remaining space on the disk
-#
-ad0s1-1=ufs 1999999 /
-ad0s1-2=swap 6485760 none
-ad0s1-3=ufs 2097152 /var
-ad0s1-4=ufs 0 /usr
-# Let's do it!
-diskLabelEditor
-#diskLabelCommit
-
-# OK, everything is set. Do it!
-installCommit
-
-package=xorg-server-1.10.4_1,1
-packageAdd
-
-package=arpwatch-2.1.a4
-packageAdd
-
-package=bash-2.04
-packageAdd
-
-package=bison-1.28
-packageAdd
-
-package=bzip2-1.0.0
-packageAdd
-
-package=ctags-3.5.2
-packageAdd
-
-package=dvips2ascii-1.3
-packageAdd
-
-package=electricfence-2.0.5
-packageAdd
-
-package=emacs-20.6
-packageAdd
-
-package=enscript-letter-1.6.1
-packageAdd
-
-package=fping-1.20
-packageAdd
-
-package=gawk-3.0.4
-packageAdd
-
-package=gdbm-1.8.0
-packageAdd
-
-package=gettext-0.10.35
-packageAdd
-
-package=gmake-3.79
-packageAdd
-
-package=ispell-3.1.20c
-packageAdd
-
-package=less-352
-packageAdd
-
-package=libgnugetopt-1.1
-packageAdd
-
-package=libtool-1.3.4
-packageAdd
-
-package=linux_base-6.1
-packageAdd
-
-package=linux_devtools-6.1
-packageAdd
-
-package=lmbench-1.1
-packageAdd
-
-package=m4-1.4
-packageAdd
-
-package=mprof-3.0
-packageAdd
-
-package=mtr-0.42
-packageAdd
-
-package=nmap-2.53
-packageAdd
-
-package=pine-4.21
-packageAdd
-
-package=portscanner-1.0
-packageAdd
-
-package=portsentry-1.0
-packageAdd
-
-package=python-1.5.2
-packageAdd
-
-package=rpm-2.5.6
-packageAdd
-
-package=rsaref-2.0
-packageAdd
-
-package=rsync-2.4.3
-packageAdd
-
-package=screen-3.9.5
-packageAdd
-
-package=stlport-3.01
-packageAdd
-
-package=tcsh-6.09.00
-packageAdd
-
-package=tk-8.0.5
-packageAdd
-
-package=vim-lite-5.6.70
-packageAdd
-
-package=wget-1.5.3
-packageAdd
-
-package=word2x-0.005
-packageAdd
-
-package=zip-2.3
-packageAdd
-
-package=zsh-3.0.7
-packageAdd
-
-#
-# this last package is special. It is used to configure the machine.
-# it installs several files (like /root/.rhosts) and its installation
-# script tweaks several options in /etc/rc.conf
-#
-package=mypkg-1.0
-packageAdd
-
-shutdown
diff --git a/en_US.ISO8859-1/articles/pxe/loader.rc b/en_US.ISO8859-1/articles/pxe/loader.rc
deleted file mode 100644
index 95130eb4df..0000000000
--- a/en_US.ISO8859-1/articles/pxe/loader.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-\ $Wintelcom: src/freebsd/pxe/doc/loader.rc,v 1.1 2000/07/15 07:20:37 bright Exp $
-\ $FreeBSD$
-echo Loading Kernel...
-load /kernel
-echo Loading mfsroot...
-load -t mfs_root /mfsroot
-echo booting...
-echo \007\007
-echo initializing h0h0magic...
-set vfs.root.mountfrom="ufs:/dev/md0c"
-boot
diff --git a/en_US.ISO8859-1/articles/pxe/pkgmaker.sh b/en_US.ISO8859-1/articles/pxe/pkgmaker.sh
deleted file mode 100644
index 0ff380b477..0000000000
--- a/en_US.ISO8859-1/articles/pxe/pkgmaker.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# $Wintelcom: src/freebsd/pxe/doc/pkgmaker.sh,v 1.1 2000/07/14 12:42:05 bright Exp $
-# $FreeBSD$
-
-PKGNAME=${1}
-PKGDIR=`pwd`/${PKGNAME}/
-
-pkg_create -i ${PKGDIR}pre -I ${PKGDIR}post -f ${PKGDIR}PLIST -s ${PKGDIR} -p / -d ${PKGDIR}DESCR -c ${PKGDIR}COMMENT ${PKGNAME}.tgz
diff --git a/en_US.ISO8859-1/articles/pxe/post b/en_US.ISO8859-1/articles/pxe/post
deleted file mode 100644
index b465f55008..0000000000
--- a/en_US.ISO8859-1/articles/pxe/post
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# $Wintelcom: src/freebsd/pxe/doc/post,v 1.1 2000/07/14 12:42:05 bright Exp $
-# $FreeBSD$
-
-echo post-install
-
-set PATH=/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/bin:/usr/bin/X11
-export PATH
-
-# do timezone
-cp /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
-
-conf="/etc/rc.conf.local"
-
-rm $conf
-
-echo 'sendmail_enable="NO"' >> $conf
-echo 'dumpdev="/dev/ad0s1b"' >> $conf
-echo 'sshd_enable="YES"' >> $conf
-echo 'linux_enable="YES"' >> $conf
-
-# set up IP address and hostname
-if=`ifconfig fxp1 inet | grep '[ ]*inet' | sed 's/[ ]*//'`
-echo "ifconfig_fxp1=\"${if}\"" >> $conf
-name=`echo $if | sed 's/[ ][ ]*/ /g' | cut -f2 -d" " | cut -f4 -d.`
-echo "hostname=\"suyy${name}\"" >> $conf
-
-echo "network_interfaces=\"fxp0 fxp1 lo0\"" >> $conf
-
-# set up gateway, parse netstat output
-gw=`netstat -rn | grep '^default' | sed 's/[ ][ ]*/ /g' | cut -f2 -d" "`
-echo "defaultrouter=\"${gw}\"" >> $conf
-
-pwd_mkdb -p /etc/master.passwd
-exit 0
diff --git a/en_US.ISO8859-1/articles/pxe/pre b/en_US.ISO8859-1/articles/pxe/pre
deleted file mode 100644
index afeb6ab73d..0000000000
--- a/en_US.ISO8859-1/articles/pxe/pre
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# $Wintelcom: src/freebsd/pxe/doc/pre,v 1.1 2000/07/14 12:42:05 bright Exp $
-# $FreeBSD$
-
-echo pre-install
-exit 0
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
index 8996025baa..05730d6781 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
@@ -687,13 +687,17 @@
debugging information).</para>
<para>You should configure the kernel in question with <command>config
- -g</command>, include <option>DDB</option> into the configuration, and
+ -g</command> if building the <quote>traditional</quote> way. If
+ building the <quote>new</quote> way, make sure that
+ <literal>makeoptions DEBUG=-g</literal> is in the configuration.
+ In both cases, include <option>DDB</option> in the configuration, and
compile it as usual. This gives a large binary, due to the
debugging information. Copy this kernel to the target machine, strip
the debugging symbols off with <command>strip -x</command>, and boot it
using the <option>-d</option> boot option. Connect the serial line
of the target machine that has "flags 080" set on its sio device
- to any serial line of the debugging host.
+ to any serial line of the debugging host. See &man.sio.4; for
+ information on how to set the flags on an sio device.
Now, on the debugging machine, go to the compile directory of the target
kernel, and start <command>gdb</command>:</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
index d952462f13..e1125bbd16 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
@@ -1675,29 +1675,7 @@ else if (pid == 0) { /* child */
<sect2>
<title>Emacs</title>
- <para>Unfortunately, &unix; systems do not come with the kind of
- everything-you-ever-wanted-and-lots-more-you-did-not-in-one-gigantic-package
- integrated development environments that other systems
- have.
-
- <footnote>
- <para>Some powerful, free IDEs now exist, such as KDevelop
- in the Ports Collection.</para>
- </footnote>
-
- However, it is possible to set up your own environment. It
- may not be as pretty, and it may not be quite as integrated,
- but you can set it up the way you want it. And it is free.
- And you have the source to it.</para>
-
- <para>The key to it all is Emacs. Now there are some people who
- loathe it, but many who love it. If you are one of the former,
- I am afraid this section will hold little of interest to you.
- Also, you will need a fair amount of memory to run it&mdash;I would
- recommend 8MB in text mode and 16MB in X as the bare minimum
- to get reasonable performance.</para>
-
- <para>Emacs is basically a highly customizable
+ <para>Emacs is a highly customizable
editor&mdash;indeed, it has been customized to the point where
it is more like an operating system than an editor! Many
developers and sysadmins do in fact spend practically all
@@ -1749,14 +1727,9 @@ else if (pid == 0) { /* child */
you to look at the source code as you step through your
program.</para>
</listitem>
-
- <listitem>
- <para>You can read Usenet news and mail while your program
- is compiling.</para>
- </listitem>
</itemizedlist>
- <para>And doubtless many more that I have overlooked.</para>
+ <para>And doubtless many more that have been overlooked.</para>
<para>Emacs can be installed on &os; using
the <filename role="package">editors/emacs</filename>
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index d07b375c2a..9eff975fb9 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -1288,28 +1288,21 @@
<answer>
<para>For &os; you will need a 486 or better PC, with
- 24&nbsp;MB or more of RAM and at least 150&nbsp;MB of hard
+ 64&nbsp;MB or more of RAM and at least 1&nbsp;GB of hard
disk space.</para>
- <para>All versions of &os; can run with a low end MDA graphics
- card but to run &xorg;, a VGA or better video card is
- needed.</para>
-
<para>See also <xref linkend="hardware"/>.</para>
</answer>
</qandaentry>
<qandaentry>
<question id="custom-boot-floppy">
- <para>How can I make my own custom install floppy?</para>
+ <para>How can I make my own custom install disk?</para>
</question>
<answer>
- <para>Currently there is no way to <emphasis>just</emphasis>
- make a custom install floppy. You have to cut a whole new
- release, which will include your install floppy.</para>
-
- <para>To make a custom release, follow the instructions in the
+ <para>Customized &os; installation media can be created by
+ building a custom release. Follow the instructions in the
<ulink
url="&url.articles.releng;/article.html">Release Engineering</ulink>
article.</para>
@@ -1822,35 +1815,17 @@
<qandaentry>
<question id="need-complete-sources">
- <para>Do I need to install the complete sources?</para>
+ <para>Do I need to install the source?</para>
</question>
<answer>
- <para>In general, no. However, we would strongly recommend
- that you install, at a minimum, the <literal>base</literal>
- source kit, which includes several of the files mentioned
- here, and the <literal>sys</literal> (kernel) source kit,
- which includes sources for the kernel. There is nothing in
- the system which requires the presence of the sources to
- operate, however, except for the kernel-configuration
- program &man.config.8;. With the exception of the kernel
- sources, our build structure is set up so that you can
- read-only mount the sources from elsewhere via NFS and still
- be able to make new binaries (due to the kernel-source
- restriction, we recommend that you not mount this on
- <filename class="directory">/usr/src</filename> directly, but
- rather in some other location with appropriate symbolic
- links to duplicate the top-level structure of the source
- tree).</para>
-
- <para>Having the sources on-line and knowing how to build a
- system with them will make it much easier for you to upgrade
- to future releases of &os;.</para>
-
- <para>To actually select a subset of the sources, use the
- <guimenuitem>Custom</guimenuitem> menu item when you are in
- the <guimenuitem>Distributions</guimenuitem> menu of the
- system installation tool.</para>
+ <para>In general, no. There is nothing in the base
+ system which requires the presence of the source to
+ operate. Some ports, like <filename
+ role="package">sysutils/lsof</filename>, will not build
+ unless the source is installed. In particular, if the
+ port builds a kernel module or directly operates on kernel
+ structures, the source must be installed.</para>
</answer>
</qandaentry>
@@ -1860,18 +1835,15 @@
</question>
<answer>
- <para>Building a new kernel was originally pretty much a
- required step in a &os; installation, but more recent releases
- have benefited from the introduction of much friendlier
- kernel configuration methods. It is very easy to configure
- the kernel's configuration by much more flexible
- <quote>hints</quote> which can be set at the loader
- prompt.</para>
-
- <para>It may still be worthwhile building a new kernel
- containing just the drivers that you need, just to save a
- bit of RAM, but it is no longer necessary for most
- systems.</para>
+ <para>Usually not. The supplied <literal>GENERIC</literal>
+ kernel contains the drivers an ordinary computer will
+ need. &man.freebsd-update.8;, the &os; binary upgrade
+ tool, cannot upgrade custom kernels, another reason
+ to stick with the GENERIC kernel when possible.
+ For computers with very limited RAM, such as
+ embedded systems, it may be worthwhile to build a
+ smaller custom kernel containing just the required
+ drivers.</para>
</answer>
</qandaentry>
@@ -1882,8 +1854,10 @@
</question>
<answer>
- <para>The default password format on &os; is to use
- <emphasis>MD5</emphasis>-based passwords. These are
+ <para>&os;&nbsp;7 and 8 use MD5 password hashing by
+ default. Recent versions
+ of &os; use <emphasis>SHA512</emphasis> by default.
+ These are
believed to be more secure than the traditional &unix;
password format, which used a scheme based on the
<emphasis>DES</emphasis> algorithm. DES passwords are still
@@ -2293,19 +2267,9 @@
support on Intel CPUs that support this feature. A kernel
with the <literal>options SMP</literal> feature enabled
will automatically detect the additional logical
- processors. The default &os; scheduler treats the logical
- processors the same as additional physical processors; in
- other words, no attempt is made to optimize scheduling
- decisions given the shared resources between logical
- processors within the same CPU. Because this naive
- scheduling can result in suboptimal performance, under
- certain circumstances it may be useful to disable the
- logical processors with the
- <varname>machdep.hlt_logical_cpus</varname> sysctl
- variable. It is also possible to halt any CPU in the idle
- loop with the <varname>machdep.hlt_cpus</varname> sysctl
- variable. The &man.smp.4; manual page has more
- details.</para>
+ processors.</para>
+
+ <para>&man.smp.4; has more details.</para>
</answer>
</qandaentry>
</qandaset>
@@ -4090,7 +4054,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
<answer>
<para>The Open Group has released the source code to
- <application>&motif;&nbsp;2.2.2</application>. You can
+ <application>&motif;</application>. You can
install the <filename
role="package">x11-toolkits/open-motif</filename> package,
or compile it from ports. Refer to <ulink
@@ -5242,7 +5206,7 @@ use "disklabel -r" to install initial label</screen>
<term>ZFS</term>
<listitem>
- <para>As of this writing, &os; includes a port of
+ <para>&os; includes a port of
&sun;'s ZFS driver. The current recommendation is to
use it only on &arch.amd64; platforms with sufficient
memory. For more information, see &man.zfs.8;.</para>
@@ -7687,133 +7651,6 @@ Key F15 A A Menu Workplace Nop</programlisting>
</qandaentry>
<qandaentry>
- <question id="dec-pci-chipset">
- <para>Which network cards are based on the DEC PCI
- chipset?</para>
- </question>
-
- <answer>
- <para>Here is a list compiled by Glen Foster
- <email>gfoster@driver.nsta.org</email>, with some more
- modern additions:</para>
-
- <table>
- <title>Network Cards Based on the DEC PCI Chipset</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Vendor</entry>
-
- <entry>Model</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>ASUS</entry>
-
- <entry>PCI-L101-TB</entry>
- </row>
-
- <row>
- <entry>Accton</entry>
-
- <entry>ENI1203</entry>
- </row>
-
- <row>
- <entry>Cogent</entry>
-
- <entry>EM960PCI</entry>
- </row>
-
- <row>
- <entry>Compex</entry>
-
- <entry>ENET32-PCI</entry>
- </row>
-
- <row>
- <entry>D-Link</entry>
-
- <entry>DE-530</entry>
- </row>
-
- <row>
- <entry>Dayna</entry>
-
- <entry>DP1203, DP2100</entry>
- </row>
-
- <row>
- <entry>DEC</entry>
-
- <entry>DE435, DE450</entry>
- </row>
-
- <row>
- <entry>Danpex</entry>
-
- <entry>EN-9400P3</entry>
- </row>
-
- <row>
- <entry>JCIS</entry>
-
- <entry>Condor JC1260</entry>
- </row>
-
- <row>
- <entry>Linksys</entry>
-
- <entry>EtherPCI</entry>
- </row>
-
- <row>
- <entry>Mylex</entry>
-
- <entry>LNP101</entry>
- </row>
-
- <row>
- <entry>SMC</entry>
-
- <entry>EtherPower 10/100 (Model 9332)</entry>
- </row>
-
- <row>
- <entry>SMC</entry>
-
- <entry>EtherPower (Model 8432)</entry>
- </row>
-
- <row>
- <entry>TopWare</entry>
-
- <entry>TE-3500P</entry>
- </row>
-
- <row>
- <entry>Znyx (2.2.x)</entry>
-
- <entry>ZX312, ZX314, ZX342, ZX345, ZX346,
- ZX348</entry>
- </row>
-
- <row>
- <entry>Znyx (3.x)</entry>
-
- <entry>ZX345Q, ZX346Q, ZX348Q, ZX412Q, ZX414, ZX442,
- ZX444, ZX474, ZX478, ZX212, ZX214 (10mbps/hd)</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </answer>
- </qandaentry>
-
- <qandaentry>
<question id="fqdn-hosts">
<para>Why do I have to use the FQDN for hosts on my
site?</para>
@@ -9243,92 +9080,6 @@ ATDT1234567</programlisting>
</qandaentry>
<qandaentry>
- <question id="useful-port-numbers">
- <para>Has anybody made a list of useful port numbers?</para>
- </question>
-
- <answer>
- <para>Not yet, but this is intended to grow into such a list
- (if any interest is shown). In each example,
- <replaceable>internal</replaceable> should be replaced with
- the IP number of the machine playing the game.</para>
-
- <itemizedlist>
- <listitem>
- <para><application>Asheron's Call</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable> :65000
- 65000</literal></para>
-
- <para>Manually change the port number within the game to
- <literal>65000</literal>. If you have got a number of
- machines that you wish to play on assign a unique port
- number for each (i.e. <literal>65001</literal>,
- <literal>65002</literal>, etc) and add a <literal>nat
- port</literal> line for each one.</para>
- </listitem>
-
- <listitem>
- <para><application>Half Life</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:27005
- 27015</literal></para>
- </listitem>
-
- <listitem>
- <para><application>PCAnywhere 8.0</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:5632
- 5632</literal></para>
-
- <para><literal>nat port tcp
- <replaceable>internal</replaceable>:5631
- 5631</literal></para>
- </listitem>
-
- <listitem>
- <para><application>Quake</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:6112
- 6112</literal></para>
- </listitem>
-
- <listitem>
- <para><application>Quake 2</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:27901
- 27910</literal></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:60021
- 60021</literal></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:60040
- 60040</literal></para>
- </listitem>
-
- <listitem>
- <para><application>Red Alert</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:8675
- 8675</literal></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:5009
- 5009</literal></para>
- </listitem>
- </itemizedlist>
- </answer>
- </qandaentry>
-
- <qandaentry>
<question id="fcs-errors">
<para>What are FCS errors?</para>
</question>
@@ -9378,78 +9129,6 @@ ATDT1234567</programlisting>
</answer>
</qandaentry>
- <qandaentry id="PPPoEwithNAT">
- <question id="macos-win98-pppoe-freeze">
- <para>Why do &macos; and &windows;&nbsp;98 connections freeze
- when running PPPoE on the gateway?</para>
- </question>
-
- <answer>
- <para>Thanks to Michael Wozniak
- <email>mwozniak@netcom.ca</email> for figuring this out and
- Dan Flemming <email>danflemming@mac.com</email> for the Mac
- solution:</para>
-
- <para>This is due to what is called a <quote>Black
- Hole</quote> router. &macos; and &windows;&nbsp;98 (and maybe
- other &microsoft; OSs) send TCP packets with a requested
- segment size too big to fit into a PPPoE frame (MTU is
- <literal>1500</literal> by default for Ethernet)
- <emphasis>and</emphasis> have the <quote>do not
- fragment</quote> bit set (default of TCP) and the Telco
- router is not sending ICMP <quote>must fragment</quote> back
- to the WWW site you are trying to load. (Alternatively, the
- router is sending the ICMP packet correctly, but the
- firewall at the WWW site is dropping it.) When the www
- server is sending you frames that do not fit into the PPPoE
- pipe the Telco router drops them on the floor and your page
- does not load (some pages/graphics do as they are smaller
- than a MSS). This seems to be the default of most Telco
- PPPoE configurations.</para>
-
- <para>One fix is to use <application>regedit</application> on
- your 95/98 system to add the following registry entry:</para>
-
- <programlisting>HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Class\NetTrans\0000\MaxMTU</programlisting>
-
- <para>It should be a string with a value
- <literal>1436</literal>, as some ADSL routers are reported
- to be unable to deal with packets larger than this. This
- registry key has been changed to
- <literal>Tcpip\Parameters\Interfaces\<replaceable>ID for
- adapter</replaceable>\MTU</literal> in &windows;&nbsp;2000
- and becomes a <literal>DWORD</literal>.</para>
-
- <para>Refer to the Microsoft Knowledge Base documents <ulink
- url="http://support.microsoft.com/support/kb/articles/Q158/4/74.asp">Q158474 - Windows TCPIP Registry Entries</ulink>
- and <ulink
- url="http://support.microsoft.com/support/kb/articles/Q120/6/42.asp">Q120642 - TCPIP &amp; NBT Configuration Parameters for &windowsnt;</ulink>
- for more information on changing &windows; MTU to work with
- a NAT router.</para>
-
- <para>Another regedit possibility under &windows;&nbsp;2000 to
- set the <literal>Tcpip\Parameters\Interfaces\<replaceable>ID
- for adapter</replaceable>\EnablePMTUBHDetect</literal>
- <literal>DWORD</literal> to <literal>1</literal> as
- mentioned in the Microsoft document 120642 mentioned
- above.</para>
-
- <para>Unfortunately, &macos; does not provide an interface for
- changing TCP/IP settings. However, there are several commercial
- programs available that will allow users to customize TCP/IP
- settings. &macos; NAT users should search for their MTU
- settings and enter <literal>1450</literal> instead of
- <literal>1500</literal>.</para>
-
- <para>The &man.ppp.8; has an <command>enable
- tcpmssfixup</command> command that will automatically adjust
- the MSS to an appropriate value. This facility is enabled
- by default. If you are stuck with an older version of
- &man.ppp.8;, you may want to look at the <filename
- role="package">net/tcpmssd</filename> port.</para>
- </answer>
- </qandaentry>
-
<qandaentry>
<question id="desperation">
<para>None of this helps &mdash; I am desperate! What can I
@@ -10647,24 +10326,6 @@ hint.sio.7.irq="12"</programlisting>
</qandaentry>
<qandaentry>
- <question id="split-1392k">
- <para>How did you split the distribution into 1392&nbsp;KB
- files?</para>
- </question>
-
- <answer>
- <para>Newer BSD based systems have a <option>-b</option>
- option to &man.split.1; that allows them to split files on
- arbitrary byte boundaries.</para>
-
- <para>Here is an example from
- <filename>/usr/src/release/Makefile</filename>.</para>
-
- <programlisting>ZIPNSPLIT= gzip --no-name -9 -c | split -b 1392k -</programlisting>
- </answer>
- </qandaentry>
-
- <qandaentry>
<question id="submitting-kernel-extensions">
<para>I have written a kernel extension, who do I send it
to?</para>
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
index 9a454e53b2..a53a76c0a6 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
@@ -116,6 +116,15 @@
<screen>&prompt.root; <userinput><command>cd</command> en_US.ISO8859-1/htdocs</userinput>
&prompt.root; <userinput><command>make</command> <maketarget>all</maketarget></userinput></screen>
+
+ <tip>
+ <para>The build requires a few files from the Ports Collection
+ and may fail without a properly configured Ports CVS
+ mirror. Set the <makevar>NOPORTSCVS</makevar> environment
+ variable as described in <xref linkend="the-website-env"/>
+ to use your local Ports Collection (typically <filename
+ class="directory">/usr/ports</filename>) instead.</para>
+ </tip>
</step>
</procedure>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index b69ec5bc75..c43896a855 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -5968,14 +5968,34 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
<para>These settings will help you configure a machine that
will be on your LAN and act as a client, not a router. To
- have &man.rtsol.8; autoconfigure your interface on boot all
- you need to add is:</para>
+ have &man.rtsol.8; autoconfigure your interface on boot on
+ &os;&nbsp;9.<replaceable>x</replaceable> and later,
+ add:</para>
+
+ <programlisting>ipv6_prefer="YES"</programlisting>
+
+ <para>to <filename>rc.conf</filename>.</para>
+
+ <para>For &os;&nbsp;8.<replaceable>x</replaceable> and
+ earlier, add:</para>
<programlisting>ipv6_enable="YES"</programlisting>
<para>To statically assign an IP address such as <hostid
role="ip6addr">2001:471:1f11:251:290:27ff:fee0:2093</hostid>,
- to your <devicename>fxp0</devicename> interface, add:</para>
+ to your <devicename>fxp0</devicename> interface, add the
+ following for &os;&nbsp;9.<replaceable>x</replaceable>:</para>
+
+ <programlisting>ifconfig_fxp0_ipv6="inet6 2001:471:1f11:251:290:27ff:fee0:2093 prefixlen <replaceable>64</replaceable>"</programlisting>
+
+ <note>
+ <para>Be sure to change <replaceable>prefixlen
+ 64</replaceable> to the appropriate value for the subnet
+ within which the computer is networked.</para>
+ </note>
+
+ <para>For &os;&nbsp;8<replaceable>x</replaceable> and earlier,
+ add:</para>
<programlisting>ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093"</programlisting>
@@ -6008,10 +6028,15 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
<programlisting>gifconfig_gif0="<replaceable>MY_IPv4_ADDR REMOTE_IPv4_ADDR</replaceable>"</programlisting>
<para>To apply the IPv6 address you have been assigned for use
- as your IPv6 tunnel endpoint, add:</para>
+ as your IPv6 tunnel endpoint, add the following for
+ &os;&nbsp;9.<replaceable>x</replaceable> and later:</para>
- <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
+ <programlisting>ifconfig_gif0_ipv6="inet6 <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
+ <para>For &os;&nbsp;8.<replaceable>x</replaceable> and
+ earlier, add:</para>
+
+ <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
<para>Then all you have to do is set the default route for
IPv6. This is the other side of the IPv6 tunnel:</para>
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
index c673feab89..22726b5503 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
@@ -1401,6 +1401,11 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
</listitem>
<listitem>
+ <para><literal>freebsd-zfs</literal> - A &os; ZFS
+ filesystem. See <xref linkend="filesystems-zfs"/>.</para>
+ </listitem>
+
+ <listitem>
<para><literal>freebsd-swap</literal> - &os; swap
space.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
index c9f70de077..10ce0668c9 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -2694,7 +2694,7 @@ kern.maxvnodes: 100000</screen>
<para>Use &man.swapon.8; to add a swap partition to the system.
For example:</para>
- <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1p2</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1b</replaceable></userinput></screen>
<warning>
@@ -2710,9 +2710,9 @@ kern.maxvnodes: 100000</screen>
entry to <filename>/etc/fstab</filename> for the
partition:</para>
- <programlisting><replaceable>/dev/ada1s1p2</replaceable> none swap sw 0 0</programlisting>
+ <programlisting><replaceable>/dev/ada1s1b</replaceable> none swap sw 0 0</programlisting>
- <para>See &man.fstab.5; for an explaination of the entries in
+ <para>See &man.fstab.5; for an explanation of the entries in
<filename>/etc/fstab</filename>.</para>
</sect2>
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index dd153bdb1a..570755fd12 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -409,6 +409,18 @@
<application>Konqueror</application>,
available in <filename role="package">misc/konq-plugins</filename>.</para>
+ <para><application>Konqueror</application> supports WebKit as
+ well as its own KHTML. WebKit is used by many modern browsers
+ including Chromium. To use WebKit with
+ <application>Konqueror</application> on &os;:</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+ <para>Then in <application>Konqueror</application>, click
+ <quote>Settings</quote>, <quote>Configure Konqueror</quote>,
+ then <quote>Change KHTML to WebKit</quote>.</para>
+
<para><application>Konqueror</application> also supports <application>&flash;</application>; a <quote>How To</quote> guide
for getting <application>&flash;</application> support on
<application>Konqueror</application>
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
index 4b78c81663..20ca42d10b 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
@@ -395,6 +395,11 @@
</row>
<row>
+ <entry>&a.numerics.name;</entry>
+ <entry>Discussions of high quality implementation of libm functions</entry>
+ </row>
+
+ <row>
<entry>&a.office.name;</entry>
<entry>Office applications on &os;</entry>
</row>
@@ -616,7 +621,7 @@
you can change your digest options in your account options
section.</para>
- <para><emphasis>CVS &amp; SVN lists:</emphasis> The following lists
+ <para><emphasis>SVN lists:</emphasis> The following lists
are for people interested in seeing the log messages for changes to
various areas of the source tree. They are
<emphasis>Read-Only</emphasis> lists and should not have mail sent to
@@ -634,40 +639,61 @@
<tbody>
<row>
- <entry>&a.cvsall.name;</entry>
- <entry><filename>/usr/(CVSROOT|doc|ports)</filename></entry>
- <entry>All changes to any place in the tree (superset of other CVS commit lists)</entry>
+ <entry>&a.svn-doc-all.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the doc Subversion repository (except
+ for <filename>user</filename>,
+ <filename>projects</filename>
+ and <filename>translations</filename>)</entry>
+ </row>
+
+ <row>
+ <entry>&a.svn-doc-head.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the <quote>head</quote> branch of
+ the doc Subversion repository</entry>
+ </row>
+
+ <row>
+ <entry>&a.svn-doc-projects.name;</entry>
+ <entry><filename>/usr/doc/projects</filename></entry>
+ <entry>All changes to the <filename>projects</filename>
+ area of the doc Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-doc.name;</entry>
- <entry><filename>/usr/(doc|www)</filename></entry>
- <entry>All changes to the doc and www trees</entry>
+ <entry>&a.svn-doc-svnadmin.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the administrative scripts, hooks,
+ and other configuration data of the doc Subversion
+ repository</entry>
</row>
<row>
- <entry>&a.cvs-ports.name;</entry>
+ <entry>&a.svn-ports-all.name;</entry>
<entry><filename>/usr/ports</filename></entry>
- <entry>All changes to the ports tree</entry>
+ <entry>All changes to the ports Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-projects.name;</entry>
- <entry><filename>/usr/projects</filename></entry>
- <entry>All changes to the projects tree</entry>
+ <entry>&a.svn-ports-head.name;</entry>
+ <entry><filename>/usr/ports</filename></entry>
+ <entry>All changes to the <quote>head</quote> branch of
+ the ports Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-src.name;</entry>
- <entry><filename>/usr/src</filename></entry>
- <entry>All changes to the src tree (generated by the svn-to-cvs
- importer commits)</entry>
+ <entry>&a.svn-ports-svnadmin.name;</entry>
+ <entry><filename>/usr/ports</filename></entry>
+ <entry>All changes to the administrative scripts, hooks,
+ and other configuration data of the ports Subversion
+ repository</entry>
</row>
<row>
<entry>&a.svn-src-all.name;</entry>
<entry><filename>/usr/src</filename></entry>
- <entry>All changes to the Subversion repository (except
+ <entry>All changes to the src Subversion repository (except
for <filename>user</filename>
and <filename>projects</filename>)</entry>
</row>
@@ -676,7 +702,7 @@
<entry>&a.svn-src-head.name;</entry>
<entry><filename>/usr/src</filename></entry>
<entry>All changes to the <quote>head</quote> branch of
- the Subversion repository (the &os;-CURRENT
+ the src Subversion repository (the &os;-CURRENT
branch)</entry>
</row>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
index 3f6ab55101..12e186855f 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
@@ -769,12 +769,12 @@ errors: No known data errors</screen>
<para>First, load the kernel loadable module:</para>
- <screen>kldload ext2fs</screen>
+ <screen>&prompt.root; <userinput>kldload ext2fs</userinput></screen>
<para>Then, to mount an &man.ext2fs.5; volume located on
<filename>/dev/ad1s1</filename>:</para>
- <screen><userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
</sect2>
<sect2>
<title>XFS</title>
@@ -791,7 +791,7 @@ errors: No known data errors</screen>
<para>To load <acronym>XFS</acronym> as a kernel-loadable
module:</para>
- <screen>kldload xfs</screen>
+ <screen>&prompt.root; <userinput>kldload xfs</userinput></screen>
<para>The &man.xfs.5; driver lets the &os; kernel access
XFS filesystems. However, at present only read-only
@@ -801,7 +801,7 @@ errors: No known data errors</screen>
<para>To mount a &man.xfs.5; volume located on
<filename>/dev/ad1s1</filename>, do the following:</para>
- <screen><userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
<para>Also useful to note is that the
<filename role="package">sysutils/xfsprogs</filename> port
@@ -828,12 +828,12 @@ errors: No known data errors</screen>
<para>First, the kernel-loadable module needs to be loaded:</para>
- <screen>kldload reiserfs</screen>
+ <screen>&prompt.root; <userinput>kldload reiserfs</userinput></screen>
<para>Then, to mount a ReiserFS volume located on
<filename>/dev/ad1s1</filename>:</para>
- <screen><userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
index 68e90c31d3..5ba27303cc 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
@@ -2132,8 +2132,7 @@ pass in quick on rl0 proto tcp from any to any port = 20 flags S keep state</pro
run time loadable module. The system will dynamically load the
kernel module when the <filename>rc.conf</filename> statement
<literal>firewall_enable="YES"</literal> is used. There is no
- need to compile IPFW into the &os; kernel unless
- <acronym>NAT</acronym> functionality is desired.</para>
+ need to compile IPFW into the &os; kernel.</para>
<para>After rebooting your system with
<literal>firewall_enable="YES"</literal> in
@@ -2181,9 +2180,8 @@ net.inet.ip.fw.verbose_limit=5</programlisting>
</indexterm>
<para>It is not a mandatory requirement to enable IPFW by
- compiling the following options into the &os; kernel, unless
- <acronym>NAT</acronym> functionality is required. It is presented here
- as background information.</para>
+ compiling the following options into the &os; kernel. It is
+ presented here as background information only.</para>
<programlisting>options IPFIREWALL</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
index 9e1955cc04..c826d91bce 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
@@ -811,23 +811,27 @@
The switch was deemed necessary, as the technical limitations
imposed by <application>CVS</application> were becoming obvious
due to the rapid expansion of the source tree and the amount
- of history already stored. While the base repository now uses
+ of history already stored. The Documentation Project
+ and Ports Collection repositories also moved from
+ <application>CVS</application> to
+ <application>SVN</application> in May 2012 and July
+ 2012, respectively.</para>
+
+ <para>While the <literal>src/</literal> and
+ <literal>ports/</literal> repositories now use
<application>SVN</application>, client side tools like
<application>csup</application> that depend on the older
<application>CVS</application> infrastructure, continue to
work normally &mdash; changes in the
<application>SVN</application> repository are backported to
- <application>CVS</application> for this purpose.</para>
-
- <para>In May 2012, the Documentation Project repository
- also moved from <application>CVS</application> to
- <application>SVN</application>. Unlike the base system,
+ <application>CVS</application> for this purpose.
+ Unlike <literal>src/</literal> and
+ <literal>ports/</literal>,
the documentation <application>SVN</application>
repository is not backported to
<application>CVS</application>.</para>
- <para>The Ports repository is
- currently using <application>CVS</application>. The primary
+ <para>The primary <application>CVS</application>
<ulink
url="http://www.FreeBSD.org/cgi/cvsweb.cgi">repository</ulink>
resides on a machine in Santa Clara CA, USA
@@ -878,7 +882,7 @@
is one of the functions of the core team, as is the
recruitment of new core team members as others move on.
The current core team was elected from a pool of committer
- candidates in July 2010. Elections are held
+ candidates in July 2012. Elections are held
every 2 years.</para>
<para>Some core team members also have specific areas of
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 040d416838..59336ff9fc 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -724,8 +724,11 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<programlisting>options GEOM_PART_GPT # GUID Partition Tables.</programlisting>
- <para>This option brings the ability to have a large number of
- partitions on a single disk.</para>
+ <para>Adds support for <ulink
+ url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
+ Partition Tables</ulink>. GPT provides the ability to have a
+ large number of partitions per disk, 128 in the standard
+ configuration.</para>
<programlisting>options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 2fb48a8f5c..c458ffe084 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -21,13 +21,6 @@
<itemizedlist>
<listitem>
<address>
- <otheraddr>CompUSA</otheraddr>
- WWW: <otheraddr><ulink url="http://www.compusa.com/"></ulink></otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>
<otheraddr>Frys Electronics</otheraddr>
WWW: <otheraddr><ulink url="http://www.frys.com/"></ulink></otheraddr>
</address>
@@ -68,16 +61,6 @@
<listitem>
<address>
- <otheraddr>Ikarios</otheraddr>
- <street>22-24 rue Voltaire</street>
- <postcode>92000</postcode> <city>Nanterre</city>
- <country>France</country>
- WWW: <otheraddr><ulink url="http://ikarios.com/form/#freebsd"></ulink></otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>
<otheraddr>JMC Software</otheraddr>
<country>Ireland</country>
Phone: <phone>353 1 6291282</phone>
@@ -158,19 +141,6 @@
please contact a distributor:</para>
<itemizedlist>
- <listitem>
- <address>
- <otheraddr>Cylogistics</otheraddr>
- <street>809B Cuesta Dr., #2149</street>
- <city>Mountain View</city>, <state>CA</state> <postcode>94040</postcode>
- <country>USA</country>
- Phone: <phone>+1 650 694-4949</phone>
- Fax: <fax>+1 650 694-4953</fax>
- Email: <email>sales@cylogistics.com</email>
- WWW: <otheraddr><ulink url="http://www.cylogistics.com/"></ulink></otheraddr>
- </address>
- </listitem>
-
<listitem>
<address>
<otheraddr>Ingram Micro</otheraddr>
@@ -206,18 +176,6 @@
WWW: <otheraddr><ulink url="http://linuxcenter.ru/freebsd"></ulink></otheraddr>
</address>
</listitem>
-
- <listitem>
- <address>
- <otheraddr>Navarre Corp</otheraddr>
- <street>7400 49th Ave South</street>
- <city>New Hope</city>, <state>MN</state> <postcode>55428</postcode>
- <country>USA</country>
- Phone: <phone>+1 763 535-8333</phone>
- Fax: <fax>+1 763 535-0341</fax>
- WWW: <otheraddr><ulink url="http://www.navarre.com/"></ulink></otheraddr>
- </address>
- </listitem>
</itemizedlist>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index ba3c98b137..654a57b607 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -8,7 +8,7 @@
Do not edit this file except as instructed by the addkey.sh script.
- See the README file in doc/share/pgpkeys for instructions.
+ See the README file in head/share/pgpkeys for instructions.
-->
<appendix id="pgpkeys">
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index c1e7dbc677..1738a2d6af 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -274,11 +274,11 @@
</listitem>
<listitem>
- <indexterm><primary>FreshMeat</primary></indexterm>
+ <indexterm><primary>Freecode</primary></indexterm>
<para>If you do not know the name of the application you want,
- try using a site like FreshMeat (<ulink
- url="http://www.freshmeat.net/"></ulink>) to find an
+ try using a site like Freecode (<ulink
+ url="http://www.freecode.com/"></ulink>) to find an
application, then check back at the FreeBSD site to see if
the application has been ported yet.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.sgml b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
index ddc97babed..3b0f588d73 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
@@ -821,7 +821,7 @@ passwd: done</screen>
&man.mlock.2;). Some system-critical programs, such as
&man.amd.8;, lock into main memory such that in the event
of being swapped out, they do not contribute to
- a system's trashing in time of trouble.</para>
+ a system's thrashing in time of trouble.</para>
</listitem>
</varlistentry>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
index d5c85acbd5..6a904673cf 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
@@ -1115,8 +1115,7 @@ EndSection</programlisting>
<application>VMware</application> (like
<filename role="package">emulators/vmware3</filename>), which
utilized the &linux; binary compatibility layer. Shortly after
- the release of &os;&nbsp;7.2, the Open Source Edition
- (<acronym>OSE</acronym>) of Sun's
+ the release of &os;&nbsp;7.2, Sun's
<application>&virtualbox;</application> appeared in the
Ports&nbsp;Collection as a native &os; program.</para>
@@ -1124,14 +1123,13 @@ EndSection</programlisting>
developed, complete virtualization package, that is available
for most operating systems including &windows;, &macos;, &linux;
and &os;. It is equally capable at running &windows; or &unix;
- like guests. It comes in two flavors, an open source and a
- proprietary edition. From the user's point of view, perhaps the
- most important limitation of the <acronym>OSE</acronym> is the
- lack of USB support. Other differences may be found in the
- <quote>Editions</quote> page of the
- <application>&virtualbox;</application> wiki, at
- <ulink url="http://www.virtualbox.org/wiki/Editions"></ulink>.
- Currently, only the OSE is available for &os;.</para>
+ like guests. It is released as open source software, but with
+ closed-source components available in a separate extension pack.
+ These components include support for USB 2.0 devices, among others.
+ More information may be found on the <quote>Downloads</quote> page
+ of the <application>&virtualbox;</application> wiki, at
+ <ulink url="http://www.virtualbox.org/wiki/Downloads"></ulink>.
+ Currently, these extensions are not available for &os;.</para>
<sect2 id="virtualization-virtualbox-install">
<title>Installing &virtualbox;</title>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index ec397c1aaf..ba9cf67779 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -365,36 +365,47 @@
<sect2>
<title>Before Starting</title>
- <para>Before configuration of X11
- the following information about the target system is needed:</para>
+ <para>In most cases, X11 is self-configuring. Those with older
+ or unusual equipment may find it helpful to gather some
+ hardware information before beginning configuration.</para>
<itemizedlist>
- <listitem><para>Monitor specifications</para></listitem>
- <listitem><para>Video Adapter chipset</para></listitem>
- <listitem><para>Video Adapter memory</para></listitem>
+ <listitem><para>Monitor sync frequencies</para></listitem>
+ <listitem><para>Video card chipset</para></listitem>
+ <listitem><para>Video card memory</para></listitem>
</itemizedlist>
- <indexterm><primary>horizontal scan rate</primary></indexterm>
- <indexterm><primary>vertical scan rate</primary></indexterm>
-
- <para>The specifications for the monitor are used by
- X11 to determine the resolution and
- refresh rate to run at. These specifications can usually be
- obtained from the documentation that came with the monitor or from
- the manufacturer's website. There are two ranges of numbers that
- are needed, the horizontal scan rate and the vertical synchronization
- rate.</para>
-
- <para>The video adapter's chipset defines what driver module
- X11 uses to talk to the graphics
- hardware. With most chipsets, this can be automatically
- determined, but it is still useful to know in case the automatic
- detection does not work correctly.</para>
-
- <para>Video memory on the graphic adapter determines the
- resolution and color depth which the system can run at. This is
- important to know so the user knows the limitations of the
- system.</para>
+ <indexterm>
+ <primary>horizontal sync frequency</primary>
+ </indexterm>
+ <indexterm>
+ <primary>horizontal scan rate</primary>
+ <see>horizontal sync frequency</see>
+ </indexterm>
+ <indexterm><primary>refresh rate</primary></indexterm>
+ <indexterm>
+ <primary>vertical sync frequency</primary>
+ <see>refresh rate</see>
+ </indexterm>
+ <indexterm>
+ <primary>vertical scan rate</primary>
+ <see>refresh rate</see>
+ </indexterm>
+
+ <para>Screen resolution and refresh rate are determined by the
+ monitor's horizontal and vertical sync frequencies. Almost
+ all monitors support electronic autodetection of these values.
+ A few monitors do not provide these values, and the
+ specifications must be determined from the printed manual
+ or manufacturer web site.</para>
+
+ <para>The video card chipset is also autodetected, and used to
+ select the proper video driver. It is beneficial for the user
+ to be aware of which chipset is installed for when
+ autodetection does not provide the desired result.</para>
+
+ <para>Video card memory determines the maximum resolution and
+ color depth which can be displayed.</para>
</sect2>
<sect2>
@@ -585,12 +596,12 @@ dbus_enable="YES"</programlisting>
<indexterm><primary>X11 tuning</primary></indexterm>
- <para>Next, tune the <filename>xorg.conf.new</filename>
- configuration file to taste. Open the file in a text editor such
- as &man.emacs.1; or &man.ee.1;. First, add the
- frequencies for the target system's monitor. These are usually
- expressed as a horizontal and vertical synchronization rate. These
- values are added to the <filename>xorg.conf.new</filename> file
+ <para>The <filename>xorg.conf.new</filename>
+ configuration file may now be tuned to taste. Open the file in a text editor such
+ as &man.emacs.1; or &man.ee.1;. If the monitor is an older
+ or unusual model that does not support autodetection of
+ sync frequencies, those settings can
+ be added to <filename>xorg.conf.new</filename>
under the <literal>"Monitor"</literal> section:</para>
<programlisting>Section "Monitor"
@@ -601,14 +612,11 @@ dbus_enable="YES"</programlisting>
VertRefresh 48-120
EndSection</programlisting>
- <para>The <literal>HorizSync</literal> and
- <literal>VertRefresh</literal> keywords may be missing in the
- configuration file. If they are, they need to be added, with
- the correct horizontal synchronization rate placed after the
- <literal>HorizSync</literal> keyword and the vertical
- synchronization rate after the <literal>VertRefresh</literal>
- keyword. In the example above the target monitor's rates were
- entered.</para>
+ <para>Most monitors support sync frequency autodetection, making
+ manual entry of these values unnecessary. For the few
+ monitors that do not support autodetection, avoid potential
+ damage by only entering values provided by the
+ manufacturer.</para>
<para>X allows DPMS (Energy Star) features to be used with capable
monitors. The &man.xset.1; program controls the time-outs and can force
@@ -685,7 +693,7 @@ EndSection</programlisting>
<title>Advanced Configuration Topics</title>
<sect3>
- <title>Configuration with &intel; i810 Graphics Chipsets</title>
+ <title>Configuration with &intel; <literal>i810</literal> Graphics Chipsets</title>
<indexterm><primary>Intel i810 graphic chipset</primary></indexterm>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 1d8c7f8b6b..1d6a2cf3cf 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -137,7 +137,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
MAINTAINER= asami@FreeBSD.org
-COMMENT= A cat chasing a mouse all over the screen
+COMMENT= Cat chasing a mouse all over the screen
MAN1= oneko.1
MANCOMPRESSED= yes
@@ -147,7 +147,7 @@ USE_IMAKE= yes
<para>See if you can figure it out. Do not worry about the
contents of the <literal>&dollar;FreeBSD&dollar;</literal>
- line, it will be filled in automatically by CVS when the port
+ line, it will be filled in automatically by SVN when the port
is imported to our main ports tree. You can find a more
detailed example in the <link
linkend="porting-samplem">sample Makefile</link>
@@ -720,7 +720,7 @@ PLIST_DIRS= lib/X11/oneko</programlisting>
<filename>patch-ab</filename> etc, always mention the path and
file name in patch names.</para>
- <para>Do not put RCS strings in patches. CVS will mangle them
+ <para>Do not put RCS strings in patches. SVN will mangle them
when we put the files into the ports tree, and when we check
them out again, they will come out different and the patch
will fail. RCS strings are surrounded by dollar
@@ -751,7 +751,7 @@ PLIST_DIRS= lib/X11/oneko</programlisting>
take a working piece of functionality from one project to fix
similar areas in another, please be careful: the resulting
line patch may be full of non-functional changes. It not only
- increases the size of the CVS repository but makes it hard to
+ increases the size of the SVN repository but makes it hard to
find out what exactly caused the problem and what you changed
at all.</para>
@@ -2451,6 +2451,10 @@ MASTER_SITE_SUBDIR= make</programlisting>
<programlisting>MASTER_SITES= SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+ <para>This can be also written as</para>
+ <programlisting>MASTER_SITES= SF
+MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+
<table frame="none">
<title>Popular Magic <makevar>MASTER_SITES</makevar>
Macros</title>
@@ -3411,20 +3415,42 @@ ALWAYS_KEEP_DISTFILES= yes
<title><makevar>COMMENT</makevar></title>
<para>This is a one-line description of the port.
- <emphasis>Please</emphasis> do not include the package name
- (or version number of the software) in the comment. The
- comment should begin with a capital and end without a period.
- Here is an example:</para>
+ Please respect the following rules:</para>
+ <orderedlist>
+ <listitem>
+ <para>Try to keep the COMMENT value at no longer than 70
+ characters, as this line will be used by the &man.pkg.info.1;
+ utility to display a one-line summary of the port;</para>
+ </listitem>
+ <listitem>
+ <para>Do <emphasis>not</emphasis> include the package name
+ (or version number of the software);</para>
+ </listitem>
+ <listitem>
+ <para>The comment should begin with a capital and end without a
+ period;</para>
+ </listitem>
+ <listitem>
+ <para>Do not start with an indefinite article (i.e. A or An);</para>
+ </listitem>
+ <listitem>
+ <para>Names are capitalized (e.g. Apache, JavaScript, Perl);</para>
+ </listitem>
+ <listitem>
+ <para>For lists of words use the Oxford comma (e.g. green,
+ red<emphasis>,</emphasis> and blue);</para>
+ </listitem>
+ <listitem>
+ <para>Spell check the text.</para>
+ </listitem>
+ </orderedlist>
+ <para>Here is an example:</para>
- <programlisting>COMMENT= A cat chasing a mouse all over the screen</programlisting>
+ <programlisting>COMMENT= Cat chasing a mouse all over the screen</programlisting>
<para>The COMMENT variable should immediately follow the
MAINTAINER variable in the
<filename>Makefile</filename>.</para>
-
- <para>Please try to keep the COMMENT value at no longer than 70
- characters, as this line will be used by the &man.pkg.info.1;
- utility to display a one-line summary of the port.</para>
</sect1>
<sect1 id="makefile-depend">
@@ -3452,10 +3478,10 @@ ALWAYS_KEEP_DISTFILES= yes
and <replaceable>target</replaceable> is the target to call
in that directory. For example,</para>
- <programlisting>LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
+ <programlisting>LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
- <para>will check for a shared jpeg library with major
- version 9, and descend into the
+ <para>will check for a shared jpeg library with any version,
+ and descend into the
<filename>graphics/jpeg</filename> subdirectory of your
ports tree to build and install it if it is not found. The
<replaceable>target</replaceable> part can be omitted if it
@@ -3466,13 +3492,13 @@ ALWAYS_KEEP_DISTFILES= yes
<para>The <replaceable>lib</replaceable> part is a regular
expression which is being looked up in the
<command>ldconfig -r</command> output. Values such as
- <literal>intl.[5-7]</literal> and <literal>intl</literal>
+ <literal>intl.9</literal> and <literal>intl.[5-7]</literal>
are allowed. The first pattern,
+ <literal>intl.9</literal>, will match only version 9 of
+ intl, while
<literal>intl.[5-7]</literal>, will match any of:
<literal>intl.5</literal>, <literal>intl.6</literal> or
- <literal>intl.7</literal>. The second pattern,
- <literal>intl</literal>, will match any version of the
- <literal>intl</literal> library.</para>
+ <literal>intl.7</literal>.</para>
</note>
<para>The dependency is checked twice, once from within the
@@ -3503,11 +3529,11 @@ ALWAYS_KEEP_DISTFILES= yes
<para>For example,</para>
- <programlisting>RUN_DEPENDS= ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
+ <programlisting>RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
<para>will check if the file or directory
- <filename>/usr/local/etc/innd</filename> exists, and build
+ <filename>/usr/local/news/bin/innd</filename> exists, and build
and install it from the <filename>news/inn</filename>
subdirectory of the ports tree if it is not found. It will
also see if an executable called
@@ -3887,7 +3913,7 @@ BAR_DESC= Enable bar support
.include &lt;bsd.port.options.mk&gt;
-.if ${PORTOPTIONS:MBAR}
+.if ${PORT_OPTIONS:MBAR}
LIB_DEPENDS= bar:${PORTSDIR}/foo/bar
.endif</programlisting>
</example>
@@ -3899,6 +3925,42 @@ LIB_DEPENDS= bar:${PORTSDIR}/foo/bar
installation, and updating of these ports and their
packages.</para>
</sect2>
+
+ <sect2 id="use-want">
+ <title><makevar>USE_</makevar> and
+ <makevar>WANT_</makevar></title>
+
+ <para><makevar>USE_</makevar> variables are set by the port
+ maintainer to define software on which this port depends. A
+ port that needs Firefox would set</para>
+
+ <programlisting>USE_FIREFOX= yes</programlisting>
+
+ <para>Some <makevar>USE_</makevar> variables can accept
+ version numbers or other parameters. For example, a port
+ that requires Apache 2.2 would set</para>
+
+ <programlisting>USE_APACHE= 22</programlisting>
+
+ <para>For more control over dependencies in some cases,
+ <makevar>WANT_</makevar> variables are available to more
+ precisely specify what is needed. For example, consider the
+ <filename role="package">mail/squirrelmail</filename> port.
+ This port needs some PHP modules, which are listed in the
+ <makevar>USE_PHP</makevar> variable:</para>
+
+ <programlisting>USE_PHP= session mhash gettext mbstring pcre openssl xml</programlisting>
+
+ <para>Those modules may be available in CLI or web versions,
+ so the web version is selected with a
+ <makevar>WANT_</makevar> variable:</para>
+
+ <programlisting>WANT_PHP_WEB= yes</programlisting>
+
+ <para>Available <makevar>USE_</makevar> and
+ <makevar>WANT_</makevar> variables are defined in the files
+ in <filename>/usr/ports/Mk</filename>.</para>
+ </sect2>
</sect1>
<sect1 id="makefile-masterdir">
@@ -4112,7 +4174,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
<para>These variables are designed to be set by the system
administrator. There are many that are standardized in
the <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup"><filename>ports/KNOBS</filename></ulink>
+ url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>
file.</para>
<para>When creating a port, do not make knob names specific
@@ -4192,7 +4254,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
for the benefit of end-users and to help keep the number
of knob names down. A list of popular knob names can be
found in the <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup">KNOBS</ulink>
+ url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
file.</para>
<para>Knob names should reflect what the knob is and does.
@@ -4426,7 +4488,7 @@ CONFIGURE_ARGS+= --with-foo
<title>Wrong Handling of an Option</title>
<programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo
+LIB_DEPENDS+= foo:${PORTSDIR}/devel/foo
CONFIGURE_ARGS+= --enable-foo
.endif</programlisting>
</example>
@@ -4445,7 +4507,7 @@ CONFIGURE_ARGS+= --enable-foo
<title>Correct Handling of an Option</title>
<programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo
+LIB_DEPENDS+= foo:${PORTSDIR}/devel/foo
CONFIGURE_ARGS+= --enable-foo
.else
CONFIGURE_ARGS+= --disable-foo
@@ -5456,6 +5518,45 @@ IGNORE= may not be redistributed because of licensing reasons. Please visit <rep
</sect2>
</sect1>
+ <sect1 id="using-pkg-config">
+ <title>Using <literal>pkg-config</literal></title>
+
+ <para>If your ports requires <literal>pkg-config</literal>,
+ just set <makevar>USE_PKGCONFIG</makevar> to the following
+ possible values:</para>
+ <table frame="none">
+ <title>Values for <makevar>USE_PKGCONFIG</makevar></title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Definition</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= yes</makevar></entry>
+ <entry>The ports uses pkg-config only at build time</entry>
+ </row>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= build</makevar></entry>
+ <entry>The ports uses pkg-config only at build time</entry>
+ </row>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= run</makevar></entry>
+ <entry>The ports uses pkg-config only at run time</entry>
+ </row>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= both</makevar></entry>
+ <entry>The ports uses pkg-config both at build and run time</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </sect1>
+
<sect1 id="using-gettext">
<title>Using GNU <literal>gettext</literal></title>
@@ -6919,8 +7020,8 @@ QT_COMPONENTS= moc_build qmake_build rcc_build uic_build</programlisting>
section are implemented in <filename>bsd.java.mk</filename>.
If you ever think that your port needs more sophisticated
Java support, please first have a look at the <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.java.mk">
- bsd.java.mk CVS log</ulink> as it usually takes some time
+ url="http://svn.FreeBSD.org/ports/head/Mk/bsd.java.mk?view=markup">bsd.java.mk
+ SVN log</ulink> as it usually takes some time
to document the latest features. Then, if you think the
support you are lacking would be beneficial to many other
Java ports, feel free to discuss it on the &a.java;.</para>
@@ -6955,17 +7056,18 @@ QT_COMPONENTS= moc_build qmake_build rcc_build uic_build</programlisting>
<entry><makevar>USE_APACHE</makevar></entry>
<entry>The port requires Apache. Possible values:
<literal>yes</literal> (gets any version),
- <literal>2.0</literal>, <literal>2.2</literal>,
- <literal>2.0+</literal>, etc.
- Default dependency is on version
- <literal>2.2</literal>.</entry>
+ <literal>20</literal>, <literal>22</literal>,
+ <literal>20-22</literal>, <literal>20+</literal>,
+ etc. The default APACHE version is
+ <literal>22</literal>. More details are available in
+ <filename>ports/Mk/bsd.apache.mk</filename> and at
+ <ulink url="http://wiki.freebsd.org/Apache/">wiki.freebsd.org/Apache/</ulink>.</entry>
</row>
<row>
<entry><makevar>WITH_APACHE2</makevar></entry>
<entry>This variable is deprecated and should
- not be used
- any more.</entry>
+ not be used any more.</entry>
</row>
<row>
@@ -9011,7 +9113,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
role="package">databases/postgresql90-client</filename>
port. An associated variable,
<makevar>WANT_PGSQL_VER</makevar>, may be set to
- values such as 83, 84, 90, or 91. You can declare a
+ values such as 83, 84, 90, 91 or 92. You can declare a
minimum or maximum value;
<makevar>WANT_PGSQL_VER</makevar>=
<literal> 90+</literal> will cause the
@@ -9031,8 +9133,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
</table>
<para>More details are available in <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.database.mk">
- bsd.database.mk</ulink>.</para>
+ url="http://svn.FreeBSD.org/ports/head/Mk/bsd.database.mk?view=markup">bsd.database.mk</ulink>.</para>
</sect1>
<sect1 id="rc-scripts">
@@ -9143,13 +9244,13 @@ run_rc_command "$1"</programlisting>
<para>in their <filename>rc.conf.local</filename> file, and a
variable substitution using &quot;:=&quot; would
- inappropriately override the user's intention.</para>
+ inappropriately override the user's intention. The
+ <literal>_enable</literal> variable is not optional,
+ and should use the &quot;:&quot; for the default.</para>
<note>
<para>No new scripts should be added with the
- <filename>.sh</filename> suffix. At some point there will
- be a mass repocopy of all the scripts that still have that
- suffix.</para>
+ <filename>.sh</filename> suffix.</para>
</note>
<sect2>
@@ -9355,7 +9456,7 @@ GROUPS= pulse pulse-access pulse-rt</programlisting>
<filename>ports/GIDs</filename>.</para>
</sect1>
- <sect1>
+ <sect1 id="requiring-kernel-sources">
<title>Ports That Rely on Kernel Sources</title>
<para>Some ports (such as kernel loadable modules) need the
@@ -10169,8 +10270,8 @@ as .putsy.conf and edit it.</programlisting>
<screen>&prompt.user; <userinput>/usr/bin/diff something.orig something > something.diff</userinput></screen>
</informalexample>
- <para>Otherwise, you should either use the <command>cvs
- diff</command> method (<xref linkend="cvs-diff"/>) or copy the
+ <para>Otherwise, you should either use the <command>svn
+ diff</command> method (<xref linkend="svn-diff"/>) or copy the
contents of the port to an entire different directory and use
the result of the recursive &man.diff.1; output of the new and
old ports directories (e.g., if your modified port directory is
@@ -10209,7 +10310,7 @@ as .putsy.conf and edit it.</programlisting>
<quote>Class</quote> of your PR should be
<literal>change-request</literal>. Please mention any added or
deleted files in the message, as they have to be explicitly
- specified to &man.cvs.1; when doing a commit. If the diff is
+ specified to &man.svn.1; when doing a commit. If the diff is
more than about 20KB, please compress and uuencode it;
otherwise, just include it in the PR as is.</para>
@@ -10238,11 +10339,11 @@ as .putsy.conf and edit it.</programlisting>
<para>Now that you have done all that, you will want to read about
how to keep up-to-date in <xref linkend="keeping-up"/>.</para>
- <sect1 id="cvs-diff">
- <title>Using <literal>CVS</literal> to Make Patches</title>
+ <sect1 id="svn-diff">
+ <title>Using <literal>SVN</literal> to Make Patches</title>
- <para>If you can, please submit a &man.cvs.1; diff; they are
- easier to handle than diffs between <quote>new and old</quote>
+ <para>If you can, please submit a &man.svn.1 diff; they are easier to
+ handle than diffs between <quote>new and old</quote>
directories. Plus it is easier for you to see what you have
changed and to update your diff if something is modified in
the Ports Collection from when you started to work on it until
@@ -10250,7 +10351,7 @@ as .putsy.conf and edit it.</programlisting>
something.</para>
<screen>&prompt.user; <userinput>cd ~/my_wrkdir</userinput> <co id="my-wrkdir"/>
-&prompt.user; <userinput>cvs -d R_CVSROOT co pdnsd</userinput> <co id="R-CVSROOT"/> <co id="module-name"/>
+&prompt.user; <userinput>svn co svn://svn.FreeBSD.org/ports/head/dns/pdnsd</userinput> <co id="svn-FreeBSD-org"/>
&prompt.user; <userinput>cd ~/my_wrkdir/pdnsd</userinput></screen>
<calloutlist>
@@ -10261,53 +10362,38 @@ as .putsy.conf and edit it.</programlisting>
class="directory">/usr/ports/</filename>.</para>
</callout>
- <callout arearefs="R-CVSROOT">
- <para>R_CVSROOT is any public cvs server, see how to use cvs
- in the <ulink
- url="&url.books.handbook;/anoncvs.html">&os;
- Handbook</ulink>.</para>
- </callout>
-
- <callout arearefs="module-name">
- <para>pdnsd is the module name for the port; it is generally
- the name of the port, although there are some exceptions,
- notably for language-specific categories (<filename
- role="package">german/selfhtml</filename> has the module
- name de-selfhtml); you can either look up the module name
- via the <ulink
- url="&url.base;/cgi/cvsweb.cgi/ports">cvsweb
- interface</ulink> or use the whole path, in our example
- <filename
- class="directory">ports/dns/pdnsd</filename>.</para>
+ <callout arearefs="svn-FreeBSD-org">
+ <para><ulink url="http://svn.FreeBSD.org/">svn.FreeBSD.org</ulink>
+ is a public <literal>SVN</literal> server.</para>
</callout>
</calloutlist>
<para>While in the working directory, make any changes that you
would usually make to the port. If you add or remove a file,
- use <command>cvs</command> to track these changes:</para>
+ use <command>svn</command> to track these changes:</para>
- <screen>&prompt.user; <userinput>cvs add new_file</userinput>
-&prompt.user; <userinput>cvs remove deleted_file</userinput></screen>
+ <screen>&prompt.user; <userinput>svn add new_file</userinput>
+&prompt.user; <userinput>svn remove deleted_file</userinput></screen>
<para>Make sure that you check the port using the checklist in
<xref linkend="porting-testing"/> and
<xref linkend="porting-portlint"/>.</para>
- <screen>&prompt.user; <userinput>cvs status</userinput>
-&prompt.user; <userinput>cvs update</userinput> <co id="cvs-update"/></screen>
+ <screen>&prompt.user; <userinput>svn status</userinput>
+&prompt.user; <userinput>svn update</userinput> <co id="svn-update"/></screen>
<calloutlist>
- <callout arearefs="cvs-update">
+ <callout arearefs="svn-update">
<para>This will try to merge the differences between your
- patch and current CVS; watch the output carefully. The
+ patch and current SVN; watch the output carefully. The
letter in front of each file name indicates what was done
- with it. See <xref linkend="table-cvs-up"/> for a complete
+ with it. See <xref linkend="table-svn-up"/> for a complete
list.</para>
</callout>
</calloutlist>
- <table pgwide="1" frame="none" id="table-cvs-up">
- <title><literal>CVS</literal> Update File Prefixes</title>
+ <table pgwide="1" frame="none" id="table-svn-up">
+ <title><literal>SVN</literal> Update File Prefixes</title>
<tgroup cols="2">
<tbody>
@@ -10317,7 +10403,7 @@ as .putsy.conf and edit it.</programlisting>
</row>
<row>
- <entry>P</entry>
+ <entry>G</entry>
<entry>The file was updated without problems (you will
only see this when working against a remote
repository).</entry>
@@ -10339,25 +10425,22 @@ as .putsy.conf and edit it.</programlisting>
</table>
<para>If you get <literal>C</literal> as a result of
- <literal>cvs update</literal> it means something changed in
- the CVS and &man.cvs.1; was not able to merge your local
- changes and those from CVS. It is always a good idea to
- inspect the changes anyway, since <command>cvs</command> does
- not know anything about how a port should be, so it might (and
- probably will) merge things that do not make sense.</para>
+ <command>svn update</command> it means something changed in
+ the SVN repository and &man.svn.1; was not able to merge your
+ local changes and those from the repository. It is always a good idea
+ to inspect the changes anyway, since &man.svn.1;
+ does not know anything about how a port should be, so it might
+ (and probably will) merge things that do not make sense.</para>
<para>The last step is to make a unified &man.diff.1;
- of the files against CVS:</para>
+ of the files against SVN:</para>
- <screen>&prompt.user; <userinput>cvs diff -uN &gt; ../`basename ${PWD}`.diff</userinput></screen>
+ <screen>&prompt.user; <userinput>svn diff &gt; ../`basename ${PWD}`.diff</userinput></screen>
<note>
- <para>It is important to use <option>-N</option> to ensure
- that files you have added or removed are accounted for in
- the patch. The patch will include any removed files when
- applied, though the file contents will be empty, so remember
- to include these in the PR so the committer knows to remove
- them.</para>
+ <para>Any files that have been removed should be explicitly
+ mentioned in the PR, because file removal may not be obvious
+ to the committer.</para>
</note>
<para>Send your patch following the guidelines in
@@ -10384,12 +10467,24 @@ as .putsy.conf and edit it.</programlisting>
instructions, please make sure to get the shell escaping
right.</para>
- <para>If your port is deleted or renamed, you should add an
- entry to <filename>/usr/ports/MOVED</filename>. Entries in
- this file use the following format:</para>
+ <para>The <filename>/usr/ports/MOVED</filename> file is used to
+ list moved or removed ports. Each line in the file is made
+ up of the name of the port, where the port was moved to, when,
+ and why. If the port was removed, the section detailing where
+ it was moved to can be left blank. Each section must be
+ separated by the <literal>|</literal> (pipe) character, like
+ so:</para>
<programlisting>old name|new name (blank for deleted)|date of move|reason</programlisting>
+ <para>The date should be entered in the form <literal>YYYY-
+ MM-DD</literal>. New entries should be added to the end
+ of the file to keep it in chronological order.</para>
+
+ <para>If a port was removed but has since been restored,
+ delete the line in this file that states that it was
+ removed.</para>
+
<para>The changes can be validated with
<command>Tools/scripts/MOVEDlint.awk</command>.</para>
</sect1>
@@ -10981,7 +11076,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<para>The preferred way to tell 4.3BSD/Reno (1990) and newer
versions of the BSD code apart is by using the
<literal>BSD</literal> macro defined in <ulink
- url="http://cvsweb.freebsd.org/src/sys/sys/param.h">sys/param.h</ulink>.
+ url="http://svnweb.freebsd.org/base/head/sys/sys/param.h?view=markup">sys/param.h</ulink>.
Hopefully that file is already included; if not, add the
code:</para>
@@ -11085,7 +11180,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<para>Here is a convenient list of
<literal>__FreeBSD_version</literal> values as defined in
<ulink
- url="http://cvsweb.freebsd.org/src/sys/sys/param.h">sys/param.h</ulink>:</para>
+ url="http://svnweb.FreeBSD.org/base/head/sys/sys/param.h?view=markup">sys/param.h</ulink>:</para>
<table frame="none">
<title><literal>__FreeBSD_version</literal> Values</title>
@@ -14898,7 +14993,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>802517</entry>
<entry>February 15, 2012</entry>
<entry>8.2-STABLE after introduction of the new
- extentensible sysctl(3) interface NET_RT_IFLISTL
+ extensible sysctl(3) interface NET_RT_IFLISTL
to query address lists (rev
<svnref>231769</svnref>.</entry>
</row>
@@ -15287,9 +15382,9 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>900503</entry>
<entry>February 15, 2012</entry>
<entry>9.0-STABLE after introduction of the new
- extentensible sysctl(3) interface NET_RT_IFLISTL
+ extensible sysctl(3) interface NET_RT_IFLISTL
to query address lists (rev
- <svnref>231768</svnref>.</entry>
+ <svnref>231768</svnref>).</entry>
</row>
<row>
@@ -15297,7 +15392,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>March 3, 2012</entry>
<entry>9.0-STABLE after changes related to mounting
of filesystem inside a jail (rev
- <svnref>232728</svnref>.</entry>
+ <svnref>232728</svnref>).</entry>
</row>
<row>
@@ -15380,12 +15475,19 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>1000008</entry>
<entry>February 11, 2012</entry>
<entry>10-CURRENT after introduction of the new
- extentensible sysctl(3) interface NET_RT_IFLISTL
+ extensible sysctl(3) interface NET_RT_IFLISTL
to query address lists (rev
<svnref>231505</svnref>).</entry>
</row>
<row>
+ <entry>1000009</entry>
+ <entry>February 25, 2012</entry>
+ <entry>10-CURRENT after import of libarchive 3.0.3
+ (rev <svnref>232153</svnref>).</entry>
+ </row>
+
+ <row>
<entry>1000010</entry>
<entry>March 31, 2012</entry>
<entry>10-CURRENT after xlocale cleanup (rev
@@ -15412,6 +15514,27 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>10-CURRENT after byacc import
(rev <svnref>235788</svnref>).</entry>
</row>
+
+ <row>
+ <entry>1000014</entry>
+ <entry>June 27, 2012</entry>
+ <entry>10-CURRENT after BSD sort becoming the default
+ sort (rev <svnref>237629</svnref>).</entry>
+ </row>
+
+ <row>
+ <entry>1000015</entry>
+ <entry>July 12, 2012</entry>
+ <entry>10-CURRENT after import of OpenSSL 1.0.1c
+ (rev <svnref>238405</svnref>).</entry>
+ </row>
+
+ <row>
+ <entry>(not changed)</entry>
+ <entry>July 13, 2012</entry>
+ <entry>10-CURRENT after the fix for LLVM/Clang 3.1
+ regression (rev <svnref>238429</svnref>).</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -15714,7 +15837,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
<title><filename>README.html</filename></title>
<para>Do not include the <filename>README.html</filename> file.
- This file is not part of the cvs collection but is generated
+ This file is not part of the SVN collection but is generated
using the <command>make readme</command> command.</para>
<note>
@@ -15787,9 +15910,9 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
<listitem>
<para><makevar>FORBIDDEN</makevar> is used for ports that
- do contain a security vulnerability or induce grave
+ contain a security vulnerability or induce grave
concern regarding the security of a FreeBSD system with
- a given port installed (ex: a reputably insecure program
+ a given port installed (e.g., a reputably insecure program
or a program that provides easily exploitable services).
Ports should be marked as <makevar>FORBIDDEN</makevar>
as soon as a particular piece of software has a
@@ -16017,6 +16140,77 @@ IGNORE= POINTYHAT is not supported
and confirm the changes with them.</para>
</sect1>
+ <sect1 id="dads-avoiding-linuxisms">
+ <title>Avoiding Linuxisms</title>
+
+ <para>Do not use <filename>/proc</filename> if there are any
+ other ways of getting the information, e.g.
+ <function>setprogname(argv[0])</function> in
+ <function>main()</function> and then &man.getprogname.3; if
+ you want to <quote>know your name</quote>.</para>
+
+ <para>Do not rely on behaviour that is undocumented by
+ <acronym>POSIX</acronym>.</para>
+
+ <para>Do not record timestamps in the critical path of the
+ application if it also works without. Getting timestamps may
+ be slow, depending on the accuracy of timestamps in the
+ <acronym>OS</acronym>. If timestamps are really needed,
+ determine how precise they have to be and use an
+ <acronym>API</acronym> which is documented to just deliver the
+ needed precision.</para>
+
+ <para>A number of simple syscalls (for example
+ &man.gettimeofday.2;, &man.getpid.2;) are much faster on
+ &linux; than on any other operating system due to caching and
+ the vsyscall performance optimizations. Do not rely on them
+ being cheap in performance-critical applications. In general,
+ try hard to avoid syscalls if possible.</para>
+
+ <para>Do not rely on &linux;-specific socket behaviour. In
+ particular, default socket buffer sizes are different (call
+ &man.setsockopt.2; with <literal>SO_SNDBUF</literal> and
+ <literal>SO_RCVBUF</literal>, and while &linux;'s &man.send.2;
+ blocks when the socket buffer is full, &os;'s will fail and
+ set <literal>ENOBUFS</literal> in errno.</para>
+
+ <para>If relying on non-standard behaviour is required,
+ encapsulate it properly into a generic <acronym>API</acronym>,
+ do a check for the behaviour in the configure stage, and stop
+ if it is missing.</para>
+
+ <para>Check the <ulink
+ url="http://www.freebsd.org/cgi/man.cgi">man pages</ulink> to
+ see if the function used is a <acronym>POSIX</acronym>
+ interface (in the <quote>STANDARDS</quote> section of the man
+ page).</para>
+
+ <para>Do not assume that <filename>/bin/sh</filename> is
+ <application>bash</application>. Ensure that a command line
+ passed to &man.system.3; will work with a
+ <acronym>POSIX</acronym> compliant shell.</para>
+
+ <para>A list of common <application>bash</application>isms is
+ available <ulink
+ url="https://wiki.ubuntu.com/DashAsBinSh">here</ulink>.</para>
+
+ <para>Do not <literal>#include
+ <filename>&lt;stdint.h&gt;</filename></literal> if
+ <filename>inttypes.h</filename> is sufficient. This will
+ ensure that the software builds on older versions of
+ &os;.</para>
+
+ <para>Check that headers are included in the
+ <acronym>POSIX</acronym> or man page recommended way, e.g.
+ <filename>sys/types.h</filename> is often forgotten, which is
+ not as much of a problem for &linux; as it is for &os;.</para>
+
+ <para>Compile threaded applications with
+ <quote>-pthread</quote>, not <quote>-lpthread</quote> or
+ variations thereof.</para>
+
+ </sect1>
+
<sect1 id="dads-misc">
<title>Miscellanea</title>
@@ -16059,9 +16253,9 @@ not be changed when upgrading the port later.]
# Whom: Satoshi Asami &lt;asami@FreeBSD.org&gt;
#
# &dollar;FreeBSD&dollar;
-[ ^^^^^^^^^ This will be automatically replaced with RCS ID string by CVS
+[ ^^^^^^^^^ This will be automatically replaced with RCS ID string by SVN
when it is committed to our repository. If upgrading a port, do not alter
-this line back to "&dollar;FreeBSD&dollar;". CVS deals with it automatically.]
+this line back to "&dollar;FreeBSD&dollar;". SVN deals with it automatically.]
#
[section to describe the port itself and the master site - PORTNAME
@@ -16096,7 +16290,7 @@ COMMENT= A DVI Previewer for the X Window System
[dependencies -- can be empty]
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript
-LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm:${PORTSDIR}/graphics/xpm
[this section is for other standard bsd.port.mk variables that do not
belong to any of the above]
@@ -16172,20 +16366,20 @@ pre-install:
commits.</para>
</sect1>
- <sect1 id="cvsweb">
+ <sect1 id="svnweb">
<title>The Web Interface to the Source Repository</title>
<para>It is possible to browse the files in the source
repository by using a web interface. Changes that affect the
entire port system are now documented in the <ulink
- url="http://cvsweb.FreeBSD.org/ports/CHANGES">
- CHANGES</ulink> file. Changes that affect individual ports
+ url="http://svnweb.FreeBSD.org/ports/head/CHANGES">CHANGES</ulink>
+ file. Changes that affect individual ports
are now documented in the <ulink
- url="http://cvsweb.FreeBSD.org/ports/UPDATING">
- UPDATING</ulink> file. However, the definitive answer to
+ url="http://svnweb.FreeBSD.org/ports/head/UPDATING">UPDATING</ulink>
+ file. However, the definitive answer to
any question is undoubtedly to read the source code of <ulink
- url="http://cvsweb.FreeBSD.org/ports/Mk/bsd.port.mk">
- bsd.port.mk</ulink>, and associated files.</para>
+ url="http://svnweb.FreeBSD.org/ports/head/Mk/bsd.port.mk">bsd.port.mk</ulink>,
+ and associated files.</para>
</sect1>
<sect1 id="ports-mailling-list">
@@ -16218,19 +16412,40 @@ pre-install:
</sect1>
<sect1 id="distfile-survey">
- <title>The &os; Ports Distfile Scanner</title>
+ <title>Portscout: the &os; Ports Distfile Scanner</title>
<para>The build cluster is dedicated to building the latest
release of each port with distfiles that have already been
fetched. However, as the Internet continually changes,
- distfiles can quickly go missing. The <ulink
- url="http://www.portscout.org">FreeBSD Ports distfile
- scanner</ulink> attempts to query every download site for
- every port to find out if each distfile is still currently
- available. Maintainers are asked to check this report
- periodically, not only to speed up the building process for
- users, but to help avoid wasting bandwidth of the sites that
- volunteer to host all these distfiles.</para>
+ distfiles can quickly go missing. <ulink
+ url="http://portscout.org">Portscout</ulink>, the &os;
+ Ports distfile scanner, attempts to query every download site
+ for every port to find out if each distfile is still
+ available. <application>Portscout</application> can generate
+ <acronym>HTML</acronym> reports and send emails about newly
+ available ports to those who request them. Unless not
+ otherwise subscribed, maintainers are asked to check
+ periodically for changes, either by hand or using the
+ <acronym>RSS</acronym> feed.</para>
+
+ <para><application>Portscout</application>'s first page gives
+ the email address of the port maintainer, the number of ports
+ the maintainer is responsible for, the number of those ports
+ with new distfiles, and the percentage of those ports that are
+ out-of-date. The search function allows for searching by
+ email address for a specific maintainer, and for selecting
+ whether or not only out-of-date ports should be shown.</para>
+
+ <para>Upon clicking on a maintainer's email address,
+ a list of all of their ports is displayed, along with port
+ category, current version number, whether or not there is a
+ new version, when the port was last updated, and finally when
+ it was last checked. A search function on this page allows
+ the user to search for a specific port.</para>
+
+ <para>Clicking on a port name in the list displays the
+ <ulink url="http://freshports.org">FreshPorts</ulink> port
+ information.</para>
</sect1>
<sect1 id="portsmon">
diff --git a/en_US.ISO8859-1/htdocs/administration.sgml b/en_US.ISO8859-1/htdocs/administration.sgml
index af28ce53d2..28e7cdd4d5 100644
--- a/en_US.ISO8859-1/htdocs/administration.sgml
+++ b/en_US.ISO8859-1/htdocs/administration.sgml
@@ -84,15 +84,15 @@
Core Team is elected by the active developers in the project.</p>
<ul>
+ <li>&a.tabthorpe; &lt;<a href="mailto:tabthorpe@FreeBSD.org">tabthorpe@FreeBSD.org</a>&gt;</li>
+ <li>&a.gavin; &lt;<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>&gt;</li>
<li>&a.jhb; &lt;<a href="mailto:jhb@FreeBSD.org">jhb@FreeBSD.org</a>&gt;</li>
<li>&a.kib; &lt;<a href="mailto:kib@FreeBSD.org">kib@FreeBSD.org</a>&gt;</li>
- <li>&a.brooks; &lt;<a href="mailto:brooks@FreeBSD.org">brooks@FreeBSD.org</a>&gt;</li>
- <li>&a.wilko; &lt;<a href="mailto:wilko@FreeBSD.org">wilko@FreeBSD.org</a>&gt;</li>
- <li>&a.imp; &lt;<a href="mailto:imp@FreeBSD.org">imp@FreeBSD.org</a>&gt;</li>
- <li>&a.pav; &lt;<a href="mailto:pav@FreeBSD.org">pav@FreeBSD.org</a>&gt;</li>
- <li>&a.cperciva; &lt;<a href="mailto:cperciva@FreeBSD.org">cperciva@FreeBSD.org</a>&gt;</li>
+ <li>&a.theraven; &lt;<a href="mailto:theraven@FreeBSD.org">theraven@FreeBSD.org</a>&gt;</li>
+ <li>&a.attilio; &lt;<a href="mailto:attilio@FreeBSD.org">attilio@FreeBSD.org</a>&gt;</li>
<li>&a.hrs; &lt;<a href="mailto:hrs@FreeBSD.org">hrs@FreeBSD.org</a>&gt;</li>
- <li>&a.rwatson; &lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</li>
+ <li>&a.peter; &lt;<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>&gt;</li>
+ <li>&a.miwi; &lt;<a href="mailto:miwi@FreeBSD.org">miwi@FreeBSD.org</a>&gt;</li>
</ul>
<h3><a name="t-doceng">FreeBSD Documentation Engineering Team</a>
@@ -281,7 +281,7 @@
actions.</p>
<ul>
- <li>&a.gavin; &lt;<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>&gt;</li>
+ <li>&a.pgj; &lt;<a href="mailto:pgj@FreeBSD.org">pgj@FreeBSD.org</a>&gt;</li>
</ul>
<h3><a name="t-portmgr-secretary">Port Management Team Secretary</a>
@@ -351,10 +351,10 @@
also responsible for the problem report group.</p>
<ul>
+ <li>&a.eadler; &lt; <a href="mailto:eadler@FreeBSD.org">eadler@FreeBSD.org</a>&gt;</li>
<li>&a.gavin; &lt;<a href="mailto:gavin@FreeBSD.org">gavin@FreeBSD.org</a>&gt;</li>
+ <li>&a.gonzo; &lt;<a href="mailto:gonzo@FreeBSD.org">gonzo@FreeBSD.org</a>&gt;</li>
<li>&a.linimon; &lt;<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>&gt;</li>
- <li>&a.remko; &lt;<a href="mailto:remko@FreeBSD.org">remko@FreeBSD.org</a>&gt;</li>
- <li>&a.vwe; &lt;<a href="mailto:vwe@FreeBSD.org">vwe@FreeBSD.org</a>&gt;</li>
</ul>
<h3><a name="t-clusteradm">Cluster Administrators</a>
diff --git a/en_US.ISO8859-1/htdocs/advocacy/index.sgml b/en_US.ISO8859-1/htdocs/advocacy/index.sgml
index 4b1ae86c4c..bff706bb2c 100644
--- a/en_US.ISO8859-1/htdocs/advocacy/index.sgml
+++ b/en_US.ISO8859-1/htdocs/advocacy/index.sgml
@@ -61,7 +61,7 @@
<li>A brief list of sites using &os; is maintained
<a href="&base;/handbook/nutshell.html#INTRODUCTION-NUTSHELL-USERS">
- in the handbook</a></li>
+ in the handbook</a>.</li>
</ul>
diff --git a/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl b/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl
index 6be9812564..15eae31277 100644
--- a/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl
+++ b/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl
@@ -151,8 +151,7 @@ $i_topbar = qq`
<li><a href="$hsty_base/projects/index.html">Developers</a>
<ul>
<li><a href="$hsty_base/projects/ideas/ideas.html">Project Ideas</a></li>
- <li><a href="http://svnweb.FreeBSD.org/base/">Source SVN Repository</a></li>
- <li><a href="http://svnweb.FreeBSD.org/doc/">Documentation SVN Repository</a></li>
+ <li><a href="http://svnweb.FreeBSD.org">SVN Repository</a></li>
<li><a href="http://cvsweb.FreeBSD.org">CVS Repository</a></li>
<li><a href="http://p4web.FreeBSD.org">Perforce Repository</a></li>
</ul>
diff --git a/en_US.ISO8859-1/htdocs/cgi/man.cgi b/en_US.ISO8859-1/htdocs/cgi/man.cgi
index b202d2d625..6ae68a97dd 100755
--- a/en_US.ISO8859-1/htdocs/cgi/man.cgi
+++ b/en_US.ISO8859-1/htdocs/cgi/man.cgi
@@ -148,12 +148,16 @@ $sectionpath = {
'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', },
'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', },
- 'CentOS Linux/i386 5.4' => {
- 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n',
- },
- 'CentOS Linux/i386 5.5' => {
- 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n',
- },
+ 'CentOS Linux/i386 5.3' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/i386 5.4' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/i386 5.5' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 5.6' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 5.7' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 5.8' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 6.0' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 6.1' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 6.2' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
+ 'CentOS Linux/amd64 6.3' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n' },
'SuSE Linux/i386 4.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', },
'SuSE Linux/i386 5.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', },
@@ -429,6 +433,13 @@ $manPathDefault = 'FreeBSD 9.0-RELEASE';
'CentOS Linux/i386 4.8', "$manLocalDir/CentOS-4.8",
'CentOS Linux/i386 5.4', "$manLocalDir/CentOS-5.4",
'CentOS Linux/i386 5.5', "$manLocalDir/CentOS-5.5",
+ 'CentOS Linux/amd64 5.6', "$manLocalDir/CentOS-5.6",
+ 'CentOS Linux/amd64 5.7', "$manLocalDir/CentOS-5.7",
+ 'CentOS Linux/amd64 5.8', "$manLocalDir/CentOS-5.8",
+ 'CentOS Linux/amd64 6.0', "$manLocalDir/CentOS-6.0",
+ 'CentOS Linux/amd64 6.1', "$manLocalDir/CentOS-6.1",
+ 'CentOS Linux/amd64 6.2', "$manLocalDir/CentOS-6.2",
+ 'CentOS Linux/amd64 6.3', "$manLocalDir/CentOS-6.3",
'SuSE Linux/i386 4.3', "$manLocalDir/SuSE-4.3-i386",
'SuSE Linux/i386 5.0', "$manLocalDir/SuSE-5.0-i386",
@@ -605,7 +616,7 @@ while ( ( $key, $val ) = each %manPath ) {
'slackware', 'Linux Slackware 3.1',
'redhat', 'Red Hat Linux/i386 9',
- 'centos', 'CentOS Linux/i386 5.5',
+ 'centos', 'CentOS Linux/amd64 6.3',
'suse', 'SuSE Linux/i386 11.3',
'linux', 'SuSE Linux/i386 11.3',
'darwin', 'Darwin 8.0.1/ppc',
diff --git a/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi b/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi
index 906a28cf72..85ab740928 100755
--- a/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi
+++ b/en_US.ISO8859-1/htdocs/cgi/query-pr-summary.cgi
@@ -211,7 +211,7 @@ print "<p>You may view summaries by <a href='$self_ref1'>Severity</a>, ";
$self_ref1 .= '&amp;' if ($self_ref1 !~/\?$/);
print "<a href='${self_ref1}state=summary'>State</a>, ";
print "<a href='${self_ref1}category=summary'>Category</a>, or ";
-print "<a href='${self_ref1}responsible=summary'>Responsible Party</a>.";
+print "<a href='${self_ref1}responsible=summary'>Responsible Party</a>.\n";
$self_ref2 = $self_ref . '?';
foreach ('category', 'originator', 'priority', 'class', 'responsible',
diff --git a/en_US.ISO8859-1/htdocs/developers/cvs.sgml b/en_US.ISO8859-1/htdocs/developers/cvs.sgml
index 3ae946d983..627e209852 100644
--- a/en_US.ISO8859-1/htdocs/developers/cvs.sgml
+++ b/en_US.ISO8859-1/htdocs/developers/cvs.sgml
@@ -47,8 +47,8 @@
<a href="http://www.cz.FreeBSD.org/cgi/cvsweb.cgi/">Czech republic</a>,
<a href="http://www.dk.FreeBSD.org/cgi/cvsweb.cgi/">Denmark</a>,
<a href="http://www.jp.FreeBSD.org/cgi/cvsweb.cgi/">Japan</a>,
- <a href="http://cvsweb.FreeBSD.org/">USA/California</a> and
- <a href="http://www.FreeBSD.org.ua/cgi/cvsweb.cgi?cvsroot=freebsd">Ukraine</a>.</p>
+ <a href="http://cvsweb.FreeBSD.org/">USA/California</a>.
+ </p>
<h2>Subversion</h2>
diff --git a/en_US.ISO8859-1/htdocs/internal/Makefile b/en_US.ISO8859-1/htdocs/internal/Makefile
index c5f8ae6536..8a78b19615 100644
--- a/en_US.ISO8859-1/htdocs/internal/Makefile
+++ b/en_US.ISO8859-1/htdocs/internal/Makefile
@@ -15,6 +15,7 @@ DOCS+= developer.sgml
DOCS+= doceng.sgml
DOCS+= expire-bits.sgml
DOCS+= fortunes.sgml
+DOCS+= hats.sgml
DOCS+= i18n.sgml
DOCS+= internal.sgml
DOCS+= machines.sgml
diff --git a/en_US.ISO8859-1/htdocs/internal/hats.sgml b/en_US.ISO8859-1/htdocs/internal/hats.sgml
new file mode 100644
index 0000000000..6756399b3f
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/internal/hats.sgml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY title "Hats Term Limits Policy">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>&title;</title>
+
+ <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+ </head>
+
+ <body class="navinclude.docs">
+
+ <h2>Rationale</h2>
+
+ <p>The FreeBSD Core team appoints several individuals
+ (&quot;hats&quot;) that perform critical roles within the
+ project. It is important to reduce single points of failure in
+ these roles. Additionally, turnover in hats can provide fresh
+ insight and help avoid burnout.</p>
+
+ <p>The current set of core-appointed hats is core secretary, head
+ release engineer, the security officer, and postmaster.</p>
+
+ <p>It is suggested that shortened terms longer than half of a core
+ term be considered a full term for purposes of eligibility.</p>
+
+ <p>This policy will begin with the start of the next core term, and
+ all hats will start off with zero terms at that time.</p>
+
+ <p>The FreeBSD Core team approved the following hats term limits
+ policy which was posted to the Developers mailing list on June 22,
+ 2012.</p>
+
+ <h2>Policy</h2>
+
+ <p>An individual may serve as a core-appointed hat for at most two
+ consecutive terms. Each hat's term begins three months after the
+ start of a core team's term and ends three months after the end of
+ a core team's term. Hats are explicitly approved by the new core
+ team at the start of a hat's term. An individual who serves as a
+ hat for two consecutive terms may serve again after a break of at
+ least one full term.</p>
+
+ <p>Core shall review all hats annually.</p>
+
+ <p>If a hat becomes vacant during a term, core shall appoint a
+ replacement for the remainder of the term. It is at core's
+ discretion whether the shortened term will count for purposes of
+ limiting the terms of the replacement.</p>
+
+ <p>If a core team is dissolved prematurely, then the next term for
+ each hat will begin three months after the new core team's term
+ begins. It is at the new core's discretion whether the shortened
+ term will count for purposes of limiting the terms of current
+ hats.</p>
+
+ <p>These limits apply to individual hats and not to teams. For
+ teams with a single lead role, the limits shall apply to the lead
+ role. An individual that is not eligible to serve as the lead of
+ a team may continue to serve as a member of the team.</p>
+
+ </body>
+</html>
diff --git a/en_US.ISO8859-1/htdocs/internal/policies.sgml b/en_US.ISO8859-1/htdocs/internal/policies.sgml
index 99654198f4..f7ecd975cf 100644
--- a/en_US.ISO8859-1/htdocs/internal/policies.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/policies.sgml
@@ -49,6 +49,8 @@ the
<a href="i18n.html">Internationalization Policy</a>,
the
<a href="data.html">User Data Policy</a>,
+the
+<a href="hats.html">Hats Term Limits Policy</a>,
and the
<a href="../doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem Report Handling Guidelines</a>.</p>
diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml b/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
index 62e7f25595..5a450cde99 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
@@ -67,7 +67,7 @@
it introduces plurality and demonstrate the usage
of the utilities relating to each solution.
</desc>
- <overview>http://www.bsdcan.org/2012/schedule/events/291en.html</overview>
+ <overview>http://www.bsdcan.org/2012/schedule/events/291.en.html</overview>
<tags>2012,bsdcan,bsdcan2012,papers,michael dexter</tags>
<files>
<file>
@@ -95,7 +95,7 @@
that might occur because of improper acquisition ordering
of locks.
</desc>
- <overview>http://www.bsdcan.org/2012/schedule/events/306en.html</overview>
+ <overview>http://www.bsdcan.org/2012/schedule/events/306.en.html</overview>
<tags>2012,bsdcan,bsdcan2012,papers,kirk mckusick</tags>
<files>
<file>
@@ -118,7 +118,7 @@
The auditdistd daemon's role is to distribute audit
trail files to a remote system in a secure and reliable way.
</desc>
- <overview>http://www.bsdcan.org/2012/schedule/events/335en.html</overview>
+ <overview>http://www.bsdcan.org/2012/schedule/events/335.en.html</overview>
<tags>2012,bsdcan,bsdcan2012,papers,pawel jakub dawidek</tags>
<files>
<file>
@@ -144,7 +144,7 @@
scenarios with the focus on how it can help real-world
applications (not limited to Web applications).
</desc>
- <overview>http://www.bsdcan.org/2012/schedule/events/339en.html</overview>
+ <overview>http://www.bsdcan.org/2012/schedule/events/339.en.html</overview>
<tags>2012,bsdcan,bsdcan2012,papers,ivan voras</tags>
<files>
<file>
@@ -162,7 +162,7 @@
<desc>
A summary of FreeBSD's participation in the 2011 contest.
</desc>
- <overview>http://www.bsdcan.org/2012/schedule/events/354en.html</overview>
+ <overview>http://www.bsdcan.org/2012/schedule/events/354.en.html</overview>
<tags>2012,bsdcan,bsdcan2012,papers,benedict reuschling</tags>
<files>
<file>
@@ -202,7 +202,7 @@
features in a number of different ways. This talk
presents some of the more interesting ones.
</desc>
- <overview>http://www.bsdcan.org/2011/schedule/events/233en.html</overview>
+ <overview>http://www.bsdcan.org/2011/schedule/events/233.en.html</overview>
<tags>2011,bsdcan,bsdcan2011,papers,brooks davis</tags>
<files>
<file>
@@ -269,11 +269,11 @@
the heavy requirements from being implemented in QT/KDE,
and lack of a digital verification mechanism.
</desc>
- <overview>http://www.bsdcan.org/2011/schedule/events/215en.html</overview>
+ <overview>http://www.bsdcan.org/2011/schedule/events/215.en.html</overview>
<tags>2010,bsdcan,bsdcan2010,papers,kris moore</tags>
<files>
<file>
- <url>http://www.bsdcan.org/2011/schedule/events/215en.html</url>
+ <url>http://www.bsdcan.org/2011/schedule/events/215.en.html</url>
<desc>html</desc>
<tags>html</tags>
</file>
@@ -1376,7 +1376,7 @@
<desc>
A quick update on AsiaBSDCon 2008 with Hiroki Sato
and George Neville-Neil. More information at
- http://www.asiabsdcon.org/.
+ http://2008.asiabsdcon.org/.
</desc>
<overview>http://bsdtalk.blogspot.com/2007/10/bsdtalk134-asiabsdcon-update-with.html</overview>
<tags>bsdtalk,interview,asiabsdcon,hiroki sato,george neville-neil</tags>
@@ -2938,7 +2938,7 @@
<title>Interview with Hiroki Sato and George Neville-Neil from AsiaBSDCon</title>
<desc>
Interview with Hiroki Sato and George Neville-Neil
- from AsiaBSDCon. More info at http://www.asiabsdcon.org/.
+ from AsiaBSDCon. More info at http://2006.asiabsdcon.org/.
</desc>
<overview>http://bsdtalk.blogspot.com/2006/10/bsdtalk074-interview-with-hiroki-sato.html</overview>
<tags>bsdtalk,interview,asiabsdcon,asiabsdcon2006,hiroki sao,george neville-neil</tags>
@@ -4338,293 +4338,6 @@
<tags>dcbsdcon,dcbsdcon2009,photos</tags>
</item>
- <item source="dcbsdcon" added="20090524">
- <title>Chris Buechler - Network perimeter redundancy with pfsense</title>
- <desc>
- This session will first provide an introduction and
- overview of pfSense and its common uses. It will
- then go on to cover means of providing redundancy
- for the critical portions of your network perimeter
- using pfSense, including redundancy for your Internet
- connections, firewalls and DNS. Live configuration
- examples will be shown for as many of these topics
- as the session's length permits. This session will
- cover pfSense 1.2.1, but will also offer an overview
- of some of the enhanced capabilities in this area
- that pfSense 2.0 will provide in the future.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/buechler.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,pfsense,chris buechler</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/buechler_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>6.2 Kb</size>
- <length>30 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Richard Bejtlich - Network security monitoring using FreeBSD</title>
- <desc>
- I've been using FreeBSD as my preferred platform
- for Network Security Monitoring (NSM) since 2000.
- In this presentation I'll discuss my latest thinking
- on using FreeBSD to identify normal, suspicious,
- and malicious traffic in enterprise networks. FreeBSD
- is a powerful platform for network traffic inspection
- and log analysis, and I'll share a few ways I use
- it in production environments.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/bejtlich.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,freebsd,network security,monitoring,richard bejtlich</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/bejtlich_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>972 Kb</size>
- <length>23 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Henning Brauer - Faster packets: Performance tuning in the OpenBSD network stack and PF</title>
- <desc>
- n/a
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/brauer.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,openbsd,performance,henning brauer</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/brauer_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>27 Mb</size>
- <length>69 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Kristaps Dzonsons - Process isolation for NetBSD and OpenBSD</title>
- <desc>
- In NetBSD and OpenBSD, user-land process and
- process-context isolation is limited to credential
- cross-checks, file-system chroot and explicit
- systrace/kauth applications. I'll demonstrate a
- working mechanism of isolated process trees in
- branched OpenBSD-4.4 and NetBSD-5.0-beta kernels
- where an isolated process is started by a system
- call similar to fork; following that, the child
- process and its descendants execute in a context
- isolated from the caller. This system is the continued
- work of "mult" -- first prototyped in a branched
- NetBSD-3.1 kernel and isolating all system resources
- -- pared down to a lightweight, auditable patch of
- process-only separation for both OpenBSD and NetBSD.
- I specifically address solutions to performance
- issues and mechanism design with an eye toward more
- resources being isolated in the future.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/dzonsons.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,openbsd,netbsd,process isolation,kristaps dzonsons</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/dzonsons_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>687 Kb</size>
- <length>27 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Robert Luciani - M:N threading in DragonflyBSD</title>
- <desc>
- Ineffective concurrency mechanisms in an operating
- system can lead to low performance in both single
- and multiprocessor environments. Practical setbacks
- involved with attempting overly invasive kernel
- changes have made it difficult in the past to
- implement new and innovative concurrency systems.
- This paper describes the rationale behind interfaces
- in the DragonFly BSD operating system intended to
- provide high performance and scalability on
- multiprocessor architectures. Using a lock-free
- processor centric approach, DragonFly BSD has
- developed a unique thread system with the potential
- for excellent scalability.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/luciani.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,dragonflybsd,concurrency,robert luciani</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/luciani_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>1.5 Mb</size>
- <length>23 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Ken Caruso - Using BSD in Shmoocon labs</title>
- <desc>
- n/a
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/caruso.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,freebsd,scmoocon,ken caruso</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/caruso_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>447 Kb</size>
- <length>13 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Brooks Davis - Isolating cluster jobs for performance and predictability</title>
- <desc>
- At The Aerospace Corporation, we run a large FreeBSD
- based computing cluster to support engineering
- applications. These applications come in all shapes,
- sizes, and qualities of implementation. To support
- them and our diverse userbase we have been searching
- for ways to isolate jobs from one another in ways
- that are more effective than Unix time sharing and
- more fine grained than allocating whole nodes to
- jobs. In this paper we discuss the problem space
- and our efforts so far. These efforts include
- implementation of partial file systems vitalization
- and CPU isolation using CPU sets.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/davis.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,freebsd,clusters,brooks davis</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/davis_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>952 Kb</size>
- <length>24 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Marco Peereboom - Epitome</title>
- <desc>
- <p>
- Tired of tape and their weaknesses? So am I!
- </p><p>
- Epitome is the next generation backup mechanism.
- It is based on the idea of providing instant available
- backup data while removing duplicate files &amp; blocks
- from backups (yes really!). It is a disk based WORM
- backup system.
- </p><p>
- This talk will go into the Epitome protocol and its
- application. The code is generic enough that it can
- address all 3 major (buzzword compliant) technologies
- known as: CAS, DEDUP &amp; SIS.
- </p>
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/peereboom.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,epitome,backup,marco peereboom</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/peereboom_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>197 Kb</size>
- <length>34 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Kurt Miller - Implementing PIE on OpenBSD</title>
- <desc>
- In this session, Kurt will discuss OpenBSD's PIE
- implementation, its impact on existing security
- mechanisms such as W^X on i386, and the various
- enhancements needed to the runtime linker, kernel
- and other system libs.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/miller.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,openbsd,pie,kurt miller</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/miller_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>4.1 Mb</size>
- <length>24 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>Ted Unangst - OpenBSD vs SMP, threading, and concurrency</title>
- <desc>
- I will discuss the current status of kernel SMP
- support, the rthreads thread library, and relevant
- future developments. Over the years, we have
- accumulated several concurrency primitives in the
- kernel, causing some confusion amongst developers,
- so I will lay out the origin and correct usage for
- each. The talk is primarily targeted at the budding
- OpenBSD kernel developer, but I will also describe
- the end-user effects of each topic.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/unangst.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,openbsd,smp,threading,concurrency,ted unangst</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/unangst_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>675 Kb</size>
- <length>32 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
- <item source="dcbsdcon" added="20090524">
- <title>George Neville-Neil - Performance analysis with (hwpmc)</title>
- <desc>
- FreeBSD has included support for Hardware Performance
- Monitoring Counters (hwpmc) for several years now.
- The hwpmc system provides access to counters that
- are present in all modern Intel and AMD CPUs, as
- well as other chipsets, and which give the programmer
- the ability to understand the low level performance
- issues that may effect their code. This talk will
- cover the motivation behind and basic usage of
- HWPMC.
- </desc>
- <overview>http://www.dcbsdcon.org/speakers/neville-neil.html</overview>
- <tags>dcbsdcon,dcbsdcon2009,slides,freebsd,hwpmc,george neville-neil</tags>
- <files>
- <file>
- <url>http://www.dcbsdcon.org/speakers/slides/neville-neil_dcbsdcon2009.pdf</url>
- <desc>PDF</desc>
- <size>469 Kb</size>
- <length>71 pages</length>
- <tags>pdf</tags>
- </file>
- </files>
- </item>
-
<!-- EuroBSDCon
-->
<item source="eurobsdcon" added="20081022">
@@ -5918,12 +5631,6 @@
<tags>avi,network testing,freebsd,george neville-neil</tags>
</file>
<file>
- <url>IsaacLevy.EuroBSDCon.2007.avi</url>
- <desc>Isaac Levy - FreeBSD jail(8) Overview, the Secure Virtual Server</desc>
- <size>350 Mb</size>
- <tags>avi,freebsd,isaac levy</tags>
- </file>
- <file>
<url>JohnHartmann.EuroBSDCon.2007.avi</url>
<desc>John P Hartmann - Real Men's Pipes - When UNIX meets the mainframe mindset</desc>
<size>315 Mb</size>
@@ -5948,12 +5655,6 @@
<tags>avi,load balancing,pierre yves ritschard</tags>
</file>
<file>
- <url>RobertWatson.EuroBSDCon.2007.avi</url>
- <desc>Robert Watson - FreeBSD Advanced Security Features</desc>
- <size>200 Mb</size>
- <tags>avi,security,freebsd,robert watson</tags>
- </file>
- <file>
<url>RyanBickhart.EuroBSDCon.2007.avi</url>
<desc>Ryan Bickhart - Transparent TCP-to-SCTP Translation Shim Layer</desc>
<size>376 Mb</size>
@@ -6449,10 +6150,10 @@
<desc>
Slides and papers of the AsiaBSDCon 2007
</desc>
- <overview>http://asiabsdcon.org/papers/</overview>
+ <overview>http://2007.asiabsdcon.org/papers/</overview>
<tags>asiabsdcon,asiabsdcon2007</tags>
<files>
- <prefix>http://asiabsdcon.org/papers/</prefix>
+ <prefix>http://2007.asiabsdcon.org/papers/</prefix>
<file>
<url>abc2007-proc-cover.pdf</url>
<size>588 Kb</size>
@@ -6898,21 +6599,29 @@
</files>
</item>
- <!-- Source: daemonnews
- -->
+ <item source="bsdcan" added="20060524">
+ <title>BSDCan-2006 Photos - Friday</title>
+ <overview>http://www.db.net/gallery/BSDCan/BSDCan_2006_Friday/</overview>
+ <desc>
+ Photos taken during the Conference on Friday at BSDCan 2006 in Ottawa
+ by Diane Bruce.
+ </desc>
- <item source="daemonnews" added="20060524">
- <title>BSDCan 2006 Photos</title>
- <desc>BSDCan 2006 Photos by Diane Bruce</desc>
- <tags>daily deamon news,photos,bsdcan,bsdcan2006,diane bruce</tags>
- <files>
- <file>
- <url>http://ezine.daemonnews.org/200605/bsdcan_photos.html</url>
- <tags>jpg</tags>
- </file>
- </files>
+ <tags>2006,bsdcan,bsdcan2006,photos,diane bruce</tags>
+ </item>
+
+ <item source="bsdcan" added="20060524">
+ <title>BSDCan-2006 Photos - Saturday</title>
+ <overview>http://www.db.net/gallery/BSDCan/BSDCan_2006_Saturday/</overview>
+ <desc>
+ Photos taken during the Conference on Saturday at BSDCan 2006 in Ottawa
+ by Diane Bruce.
+ </desc>
+
+ <tags>2006,bsdcan,bsdcan2006,photos,diane bruce</tags>
</item>
+
<!-- Source: New York City *BSD User Group
-->
@@ -8208,24 +7917,6 @@
<!-- Source: FreeBSD for All
-->
- <item source="f4all" added="20061127">
- <title>Episode 08 of "FreeBSD for all" uploaded</title>
- <desc>
- This week we talk about some tips, latest news, Press Coverage and yes, some jazz.
- </desc>
- <overview>http://freebsdforall.blogspot.com/2006/11/episode-08.html</overview>
- <tags>freebsd for all,talk</tags>
- <files>
- <prefix>http://dl01.blastpodcast.com/freebsdforall/</prefix>
- <file>
- <url>15403_1164691046.mp3</url>
- <size>18 Mb</size>
- <desc>128 kbps MP3 version</desc>
- <tags>mp3</tags>
- </file>
- </files>
- </item>
-
<item source="f4all" added="20060727">
<title>Episode 07 of "FreeBSD for all" uploaded</title>
<desc>
@@ -8464,12 +8155,6 @@
<tags>slides</tags>
</file>
<file>
- <url>http://vp.video.google.com/videodownload?version=0&amp;secureurl=uAAAANDveMbSROZ54T6ovHpX7U46rpfxARh9qN1NEemo6WM7qeDBk-8GxxtGIXTqDRuaHnUUJVcUs0bf539CXM4fqBp6xeb9INr7CRp9JPcKZeT9UsSqDsvdYZhiN7xnPzju7rN379RkfS47rjI8TnCJ1iQdrEqhd8Okw_KJcO7O3Iq00GUYYZaedmq5jrmy1ezFXGAG6KURgb8RV19cCaui1U0zVEKd2ApjzlxRHSi89QBih_VSyFE64p3haNyy76qCVQ&amp;sigh=GK-OoKkmqQWNalgoUzB4HmzA3EI&amp;begin=0&amp;len=3967520&amp;amp;docid=-2979502732836620391</url>
- <length>1:06:07</length>
- <desc>Google Video</desc>
- <tags>mp4</tags>
- </file>
- <file>
<url>http://events.ccc.de/congress/2005/fahrplan/attachments/905-22C3-1139-en-complete_harddisk_encryption_with_freebsd.mp4.torrent</url>
<size>37Kb</size>
<desc>Bittorrent link</desc>
@@ -8488,7 +8173,7 @@
AAUUG, 22 August 2006 by Simon L. Nielsen (FreeBSD
Deputy Security Officer)
</desc>
- <overview>http://www.aauug.dk/foredrag.html</overview>
+ <overview>http://www.aauug.dk/</overview>
<tags>aauug,presentation,danish,freebsd,security officer,simon l nielsen</tags>
<files>
<file>
@@ -8524,67 +8209,6 @@
<!-- Source: Google Tech Talk
-->
- <item source="googletechtalks" added="20070704">
- <title>Google Tech Talks June 20, 2007: How the FreeBSD Project Works</title>
- <desc>
- <p>
- The FreeBSD Project is one of the oldest and most
- successful open source operating system ... all
- projects, seeing wide deployment across the IT
- industry. From the root name servers, to top tier
- ISPs, to core router operating systems, to firewalls,
- to embedded appliances, you can't use a networked
- computer for ten minutes without using FreeBSD
- dozens of times. Part of FreeBSD's reputation for
- quality and reliability comes from the nature of
- its development organization--driven by a hundreds
- of highly skilled volunteers, from high school
- students to university professors. And unlike most
- open source projects, the FreeBSD Project has
- developers who have been working on the same source
- base for over twenty years. But how does this
- organization work? Who pays the bandwidth bills,
- runs the web servers, writes the documentation,
- writes the code, and calls the shots? And how can
- developers in a dozen time zones reach agreement
- on the time of day, let alone a kernel architecture?
- This presentation will attempt to provide, in 45
- minutes, a brief if entertaining snapshot into
- what makes FreeBSD run.
- </p><p>
- Speaker: Robert Watson Robert Watson is a researcher
- at the University of Cambridge Computer Laboratory
- investinging operating system and network security.
- Prior to joining the Computer Laboratory to work
- on a PhD, he was a Senior Principal Scientist at
- McAfee Research, now SPARTA ISSO, a leading security
- research and development organization, where he
- directed government and commercial research contracts
- for customers that include DARPA, the US Navy, and
- Apple Computer. His research interests include
- operating system security, network stack structure
- and performance, and windowing system structure.
- He is also a member of the FreeBSD Core Team and
- president of the FreeBSD Foundation.
- </p>
- </desc>
- <overview>
- http://video.google.com/videoplay?docid=-4400856579609253323&amp;total=1&amp;start=0&amp;num=10&amp;so=1&amp;type=search&amp;plindex=0
- </overview>
- <tags>google,presentation,freebsd,freebsd project,robert watson</tags>
- <files>
- <file>
- <url>
- http://vp.video.google.com/videodownload?version=0&amp;secureurl=uAAAAMnsi51RXPgEl7zGKAWEdrKWWWjUJ5q602Nvd2V5YwaDTyCIRM5k8Rq4nUZipL4tHODLiuiSxq34qoHi8TiEyXrdjKI8_WN0fXSKQYyrrlrWKMWd5Vw7AuXiu_B0uHEadc-fR6np2MP0ItJbT-Zx-J0-GCx0Mya2fQLoLG2pb55veUzTepcJz2RsKjNaGM-XUHpxqTZoIh0rggQIkNp-vZzghRb_8JQanc00ChX2CYB3LogDCHj1hpnFFmFd-2sEEg&amp;sigh=ZrfuqGS7FqWRpFYVklZH1V4LRj4&amp;begin=0&amp;len=3053322&amp;docid=-4400856579609253323
- </url>
- <size>321 Mb</size>
- <length>51 minutes</length>
- <desc>AVI</desc>
- <tags>avi</tags>
- </file>
- </files>
- </item>
-
<!-- Source: nuug
-->
@@ -9173,7 +8797,7 @@
<item source="openfest" added="20080327">
<title>Dimitri Vasileva - Visualizing Security Threats with Social Networking Software</title>
<desc>Dimitri Vasileva - Visualizing Security Threats with Social Networking Software (Bulgarian)</desc>
- <overview>http://openfest.org/program2007/</overview>
+ <overview>http://openfest.org/archive/openfest-2007/</overview>
<tags>openfest,openfest2007,presentation,freebsd,security,social networking,dimitri vasileva</tags>
<files>
<file>
@@ -9187,7 +8811,7 @@
<item source="openfest" added="20080327">
<title>Shcheryana Shopova - SNMP monitoring</title>
<desc>Shcheryana Shopova - SNMP monitoring (Bulgarian)</desc>
- <overview>http://openfest.org/program2007/</overview>
+ <overview>http://openfest.org/archive/openfest-2007/</overview>
<tags>openfest,openfest2007,presentation,freebsd,snmp,monitoring,shcheryana shopova</tags>
<files>
<file>
@@ -9215,7 +8839,7 @@
<item source="openfest" added="20080327">
<title>Atanas Bchvarov - Packet Filtering in FreeBSD</title>
<desc>Atanas Bchvarov - Packet Filtering in FreeBSD (Bulgarian)</desc>
- <overview>http://openfest.org/program2007/</overview>
+ <overview>http://openfest.org/archive/openfest-2007/</overview>
<tags>openfest,openfest2007,presentation,freebsd,atanas bchvarov</tags>
<files>
<file>
@@ -11802,15 +11426,6 @@
</item>
<item source="bsdcan" added="20070524">
- <title>BSDCan-2007 Photos - Julian C. Dunn</title>
- <overview>http://www.aquezada.com/gallery/v/trips/bsdcan2007/</overview>
- <desc>
- Photos taken at BSDCan 2007 by Julian C. Dunn
- </desc>
- <tags>bsdcan,bsdcan2007,photos,julian c dunn</tags>
- </item>
-
- <item source="bsdcan" added="20070524">
<title>BSDCan-2007 Photos - Bjoern A. Zeeb</title>
<overview>http://www.zabbadoz.net/users/bz/BSDCan2007/BSDCan2007-public/</overview>
<desc>
diff --git a/en_US.ISO8859-1/htdocs/news/1993/Makefile b/en_US.ISO8859-1/htdocs/news/1993/Makefile
index f78fc03c3a..95982b4630 100644
--- a/en_US.ISO8859-1/htdocs/news/1993/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/1993/Makefile
@@ -9,4 +9,7 @@
DOCS= freebsd-coined.sgml
+XMLDOCS+= index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
+DEPENDSET.index=transtable news
+
.include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/news/1993/news.xml b/en_US.ISO8859-1/htdocs/news/1993/news.xml
new file mode 100644
index 0000000000..c8f2ceac65
--- /dev/null
+++ b/en_US.ISO8859-1/htdocs/news/1993/news.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
+ "http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
+
+<!-- Simple schema for FreeBSD Project news.
+
+ Divide time in to <year>, <month>, and <day> elements, each of which
+ has a <name>.
+
+ each <day> element contains one or more <event> elements.
+
+ Each <event> contains an optional <title>, and then a <p>. <p> elements
+ can contain <a> anchors.
+
+ Use the <title> element if the <p> content is lengthy. When generating
+ synopses of this information (e.g., for syndication using RDF files),
+ the contents of <title> will be preferred over <p>.
+-->
+
+<news>
+ <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
+ <cvs:keyword name="freebsd">
+ $FreeBSD$
+ </cvs:keyword>
+ </cvs:keywords>
+
+ <year>
+ <name>1993</name>
+ <month>
+ <name>12</name>
+ <day>
+ <name>11</name>
+
+ <event>
+ <p><a
+ href="http://www.FreeBSD.org/news/1993/freebsd-coined.html">FreeBSD</a>
+ gets its name.</p>
+ </event>
+ </day>
+ </month>
+ </year>
+</news>
diff --git a/en_US.ISO8859-1/htdocs/platforms/xbox.sgml b/en_US.ISO8859-1/htdocs/platforms/xbox.sgml
index dd2ee444f5..0d8295d8ca 100644
--- a/en_US.ISO8859-1/htdocs/platforms/xbox.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/xbox.sgml
@@ -24,7 +24,7 @@
<h3>Status</h3>
- <p>FreeBSD/xbox is supported in FreeBSD 6-STABLE and FreeBSD 7-CURRENT.
+ <p>&os;/xbox has been supported since FreeBSD 6-STABLE.
The framebuffer, Ethernet, sound and USB devices
(such as an USB keyboard for the console) are all supported.</p>
@@ -34,9 +34,9 @@
It is available <a
href="ftp://ftp.stack.nl/pub/freebsd-xbox/">here</a>.</p>
- <h3>Booting FreeBSD-CURRENT kernels</h3>
+ <h3>Booting &os; kernels</h3>
- <p>In order to boot FreeBSD 7-CURRENT from CVS, you must have an up-to-date
+ <p>In order to boot &os; you must have an up-to-date
version of the Linux/xbox BIOS, called Cromwell (failure will result in your
kernel crashing immediately after loading). A Cromwell with FreeBSD UFS
patches (this will make it able to load a kernel directly from an UFS file
@@ -55,12 +55,5 @@
installation and set up the /boot/xboxlinux.cfg configuration
file yourself, so Cromwell can determine which kernel to load.</p>
- <h3>Links</h3>
-
- <ul>
- <li><a href="http://www.xbox-linux.org/">The Linux Xbox project</a></li>
- <li><a href="http://www.xbox-bsd.nl/">The FreeBSD/xbox project</a></li>
- </ul>
-
</body>
</html>
diff --git a/en_US.ISO8859-1/htdocs/portmgr/charter.sgml b/en_US.ISO8859-1/htdocs/portmgr/charter.sgml
index 4cd62cc72c..d3f16ea8ea 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/charter.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/charter.sgml
@@ -30,7 +30,7 @@
<ul>
<li>
<p>Assure the integrity of the Ports Collection by managing
- commits to the <tt>ports</tt> portion of the FreeBSD CVS repository.
+ commits to the <tt>ports</tt> portion of the FreeBSD repository.
This includes maintaining certain key files directly;
running test builds of proposed large changes; and acting as
arbiter over other commits.</p>
@@ -65,7 +65,7 @@
</li>
<li>
- <p>Manage CVS commit access to the ports tree. All new
+ <p>Manage commit access to the ports tree. All new
committer approvals must be sent to admins@, and CC'd to
core@; they must be PGP-signed.</p>
</li>
diff --git a/en_US.ISO8859-1/htdocs/portmgr/policies.sgml b/en_US.ISO8859-1/htdocs/portmgr/policies.sgml
index e6411eb32a..c25d5a63d3 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/policies.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/policies.sgml
@@ -47,7 +47,7 @@
is divided up)</p></li>
</ul>
-<p>Again, since the ports CVS tree is not branched, any large-scale
+<p>Again, since the ports tree is not branched, any large-scale
failures that might be caused by any of the above need to be caught
first before a large number of user installations are affected.</p>
@@ -57,8 +57,8 @@
<p>portmgr reserves the right to act as final arbiter of other
commits in certain unusual cases, such as: commits that in their
- opinion destabilize the Ports Collection; violate POLA (the
- Principle Of Least Astonishment) for FreeBSD's users; or in cases
+ opinion destabilize the Ports Collection; violate the
+ Principle Of Least Astonishment for FreeBSD's users; or in cases
of inter-committer disputes that can not be solved among the
committers themselves.</p>
@@ -143,12 +143,12 @@
Committer's Guide. In case of disputes, it reserves the right
to abitrate, subject to review by the Core Team.</p>
-<h3>Manage CVS Commit Access To The Ports Tree</h3>
+<h3>Manage Commit Access To The Ports Tree</h3>
<p>The FreeBSD Core Team has delegated the responsibility to manage
- CVS commit access to the <tt>ports/</tt> tree to portmgr. Core
+ commit access to the <tt>ports/</tt> tree to portmgr. Core
reviews granting and revocation of commit bits and has final
- authority over the entire FreeBSD CVS repository.</p>
+ authority over all the entire FreeBSD repositories.</p>
<p>New Ports Committers are proposed by an existing Ports Committer
who wishes to act as a mentor. The proposals should include a brief
diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode.sgml b/en_US.ISO8859-1/htdocs/projects/summerofcode.sgml
index 98c044d879..9028941757 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode.sgml
@@ -16,8 +16,8 @@
<p>The FreeBSD Project is looking forward to participating as a mentoring
organization in <a
- href="http://www.google-melange.com/gsoc/homepage/google/gsoc2011">Google
- Summer of Code</a> 2011.
+ href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012">Google
+ Summer of Code</a> 2012.
This program funds students to contribute to an open source project over
the summer break.
We have had over 100 successful
@@ -27,10 +27,11 @@
href="&base;/projects/summerofcode-2007.html">2007</a>, <a
href="&base;/projects/summerofcode-2008.html">2008</a>,
<a href="http://wiki.freebsd.org/SummerOfCode2009Projects">2009</a>,
+ <a href="http://wiki.freebsd.org/SummerOfCode2010Projects">2010</a>
and
- <a href="http://wiki.freebsd.org/SummerOfCode2010Projects">2010</a>.</p>
+ <a href="http://wiki.freebsd.org/SummerOfCode2011Projects">2011</a>.</p>
- <p>This page will be updated throughout the GSoC 2011 application period
+ <p>This page will be updated throughout the application period
to include new information, such as project ideas, proposal information,
and potential mentor contact information. If you don't see an idea that
interests you, visit again in a couple of days!</p>
@@ -75,6 +76,8 @@
<p>For a complete list of student projects from previous years,
visit:</p>
<ul>
+ <li><a href="http://wiki.freebsd.org/SummerOfCode2011Projects">Summer of
+ Code 2011 FreeBSD Projects Wiki</a></li>
<li><a href="http://wiki.freebsd.org/SummerOfCode2010Projects">Summer of
Code 2010 FreeBSD Projects Wiki</a></li>
<li><a href="http://wiki.freebsd.org/SummerOfCode2009Projects">Summer of
@@ -248,31 +251,31 @@ href="http://wiki.freebsd.org/moin.cgi/SummerOfCode2005">2005</a>].</p>
interest relating to the application process:</p>
<ul>
- <li><p><strong>18 March</strong> - Google to announce what open source
- organizations will participate in Google Summer of Code 2011.</p></li>
+ <li><p><strong>16 March</strong> - Google to announce what open source
+ organizations will participate in Google Summer of Code 2012.</p></li>
- <li><p><strong>28 March</strong> - Student application period opens.
+ <li><p><strong>26 March</strong> - Student application period opens.
</p></li>
- <li><p><strong>8 April</strong> - Student application period closes.
+ <li><p><strong>6 April</strong> - Student application period closes.
</p></li>
- <li><p><strong>22 April</strong> - Organizations finish reviewing
+ <li><p><strong>20 April</strong> - Organizations finish reviewing
applications an mentors registered.</p></li>
- <li><p><strong>25 April</strong> - Accepted students announced.</p>
+ <li><p><strong>23 April</strong> - Accepted students announced.</p>
</li>
</ul>
<p>Note that these dates may change, and the Google FAQ timeline is the
authoritative source of detailed schedule information:</p>
- <ul><li><a href="http://www.google-melange.com/gsoc/events/google/gsoc2011">GSoC 2011 Timeline</a></li></ul>
+ <ul><li><a href="http://www.google-melange.com/gsoc/events/google/gsoc2012">GSoC 2012 Timeline</a></li></ul>
<p>All students must register with, and submit applications via, the
Google Summer of Code home page:</p>
- <ul><li><a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2011">Google Summer of Code Home Page</a></li></ul></li>
+ <ul><li><a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012">Google Summer of Code Home Page</a></li></ul></li>
<li><p><strong>What advice do you have for a student who might want to
submit a proposal?</strong></p>
@@ -321,8 +324,9 @@ href="http://wiki.freebsd.org/moin.cgi/SummerOfCode2005">2005</a>].</p>
in previous summers?</strong></p>
<p>Please see the <a
- href="http://wiki.freebsd.org/SummerOfCode2010Projects">2010 FreeBSD
+ href="http://wiki.freebsd.org/SummerOfCode2011Projects">2011 FreeBSD
Summer of Code page</a>, as well as older project pages from
+ <a href="http://wiki.freebsd.org/SummerOfCode2010Projects">2010</a>,
<a href="http://wiki.freebsd.org/SummerOfCode2009Projects">2009</a>, <a
href="summerofcode-2008.html">2008</a>, <a
href="summerofcode-2007.html">2007</a>, <a
diff --git a/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml
index cd95a777b3..bacf1b0428 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml
@@ -87,14 +87,14 @@
<tr>
<td>RELEASE build</td>
<td>9&nbsp;April&nbsp;2012</td>
- <td>-</td>
+ <td>9&nbsp;April&nbsp;2012</td>
<td>&local.rel;-RELEASE build.</td>
</tr>
<tr>
<td>RELEASE announcement</td>
<td>-</td>
- <td>-</td>
+ <td>18&nbsp;April&nbsp;2012</td>
<td>&local.rel;-RELEASE press release.</td>
</tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
index 7dbaa0650b..4fe3d404b5 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
@@ -3,7 +3,8 @@
"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
<!ENTITY email 'freebsd-qa'>
<!ENTITY local.rel "9.1">
-<!ENTITY local.rel.tag "9_1">
+<!ENTITY local.branch.stable "stable/9">
+<!ENTITY local.branch.releng "releng/9.1">
<!ENTITY title "FreeBSD &local.rel; Release Process">
]>
@@ -51,7 +52,7 @@
<tr>
<td>Release schedule reminder</td>
<td>17&nbsp;June&nbsp;2012</td>
- <td>-</td>
+ <td>26&nbsp;June&nbsp;2012</td>
<td>Release Engineers send reminder announcement e-mail to developers
with updated schedule.</td>
</tr>
@@ -59,9 +60,9 @@
<tr>
<td>Code freeze begins</td>
<td>2&nbsp;July&nbsp;2012</td>
- <td>-</td>
+ <td>3&nbsp;July&nbsp;2012</td>
<td>Release Engineers announce that all further commits to the
- head branch will require explicit approval.
+ &local.branch.stable; branch will require explicit approval.
Certain blanket approvals will be granted for narrow areas of
development, documentation improvements, etc.</td>
</tr>
@@ -69,14 +70,14 @@
<tr>
<td>BETA1</td>
<td>6&nbsp;July&nbsp;2012</td>
- <td>-</td>
+ <td>15&nbsp;July&nbsp;2012</td>
<td>First beta test snapshot.</td>
</tr>
<tr>
- <td>releng/9.1 branch</td>
+ <td>&local.branch.releng; branch</td>
<td>3&nbsp;August&nbsp;2012</td>
- <td>-</td>
+ <td>5&nbsp;August&nbsp;2012</td>
<td>Subversion branch created, propagated to CVS; future
release engineering proceeds on this branch.</td>
</tr>
@@ -113,7 +114,7 @@
<td>Turn over to the secteam</td>
<td>-</td>
<td>-</td>
- <td>RELENG_&local.rel.tag; branch is handed over to
+ <td>&local.branch.releng; branch is handed over to
the FreeBSD Security Officer Team in one or two weeks after the
announcement.</td>
</tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/index.sgml b/en_US.ISO8859-1/htdocs/releases/index.sgml
index e04c786e8b..42d3785e91 100644
--- a/en_US.ISO8859-1/htdocs/releases/index.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/index.sgml
@@ -13,81 +13,95 @@
</head>
<body class="navinclude.download">
-<img alt="FreeBSD Releases" src="../gifs/releases.jpg" height="200" width="300" align="right" border="0"/>
-
-<p><em>For late-breaking news about FreeBSD, please visit
-the <a href="&base;/news/newsflash.html">Newsflash</a> page.</em></p>
-
-<a name="current"></a>
-<h2>Current Release(s)</h2>
-
-<p><b>Release &rel.current;</b> (&rel.current.date;)
-<em>
-<a href="&u.rel.announce;">Announcement</a> :
-<a href="&u.rel.notes;">Release Notes</a> :
-<a href="&u.rel.installation;">Installation Instructions</a> :
-<a href="&u.rel.hardware;">Hardware Notes</a> :
-<a href="&u.rel.readme;">Readme</a> :
-<a href="&u.rel.errata;">Errata</a>
-</em></p>
-
-<p><b>Release &rel2.current;</b> (&rel2.current.date;)
-<em>
-<a href="&u.rel2.announce;">Announcement</a> :
-<a href="&u.rel2.notes;">Release Notes</a> :
-<a href="&u.rel2.installation;">Installation Instructions</a> :
-<a href="&u.rel2.hardware;">Hardware Notes</a> :
-<a href="&u.rel2.readme;">Readme</a> :
-<a href="&u.rel2.errata;">Errata</a>
-</em></p>
-
-<p><b>Release &rel3.current;</b> (&rel3.current.date;)
-<em>
-<a href="&u.rel3.announce;">Announcement</a> :
-<a href="&u.rel3.notes;">Release Notes</a> :
-<a href="&u.rel3.hardware;">Hardware Notes</a> :
-<a href="&u.rel3.readme;">Readme</a> :
-<a href="&u.rel3.errata;">Errata</a>
-</em></p>
-
-<p>The latest snapshots from our <a
-href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a>
-and <a
-href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
-branches are
-also available. Please see <a href="../where.html">Getting
-FreeBSD</a> for details.</p>
-
-<a name="supported-branches"></a>
-<h2>Supported Releases</h2>
-
-<p>The current designation and estimated lifetimes of currently
-supported releases can be found on the
-<a href="&base;/security/security.html#sup">FreeBSD
-Security Information</a> page.</p>
-
-<a name="future"></a>
-<h2>Future Releases</h2>
-
- <p>We will continue to bring you new releases from both
- our <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a> and
- <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
- branches, both as developer's snapshots and as regular full releases.</p>
-
- <p>For more information about the release engineering process,
- or to see a comprehensive schedule of upcoming releases, please
- visit the <a href="&base;/releng/index.html">Release
- Engineering</a> section of this web site.</p>
-
- <p>The release documentation files for FreeBSD-STABLE and
- FreeBSD-CURRENT are available for viewing in HTML format on the
- <a href="&base;/relnotes.html">Release Documentation</a> page.
- These files are rebuilt periodically, and reflect the changing
- state of FreeBSD's development.</p>
-
-<a name="past"></a>
-<h2>Past Releases</h2>
-<ul>
+ <img alt="FreeBSD Releases" src="../gifs/releases.jpg" height="200" width="300" align="right" border="0"/>
+
+ <p>FreeBSD releases are classified into "Production Releases" and
+ "Legacy Releases". The former are best suited to users looking
+ for the latest new features; the latter are for users wishing to
+ stay with a more conservative upgrade strategy.</p>
+
+ <p>Releases are further classified by the length of time they will
+ be supported by the Security Officer into "Normal" and "Extended"
+ releases.</p>
+
+ <p>Documentation files for each release are available for viewing in
+ HTML format on the <a href="&base;/relnotes.html">Release
+ Documentation</a> page.</p>
+
+ <a name="supported-releases"></a>
+ <h2>Currently Supported Releases</h2>
+
+ <p>Complete information about the release date, the classifcation
+ type, and the estimated End-Of-Life (EOL) for currently supported
+ releases can be found on the <a
+ href="&base;/security/security.html#sup"> Supported Releases</a>
+ section of the <a href="&base;/security/security.html">FreeBSD
+ Security Information</a> page.</p>
+
+ <a name="current"></a>
+ <h2>Most Recent Release(s)</h2>
+
+ <h3>Production Releases</h3>
+ <p><b>Release &rel.current;</b> (&rel.current.date;)
+ <em>
+ <a href="&u.rel.announce;">Announcement</a> :
+ <a href="&u.rel.notes;">Release Notes</a> :
+ <a href="&u.rel.installation;">Installation Instructions</a> :
+ <a href="&u.rel.hardware;">Hardware Notes</a> :
+ <a href="&u.rel.readme;">Readme</a> :
+ <a href="&u.rel.errata;">Errata</a>
+ </em></p>
+
+ <p><b>Release &rel2.current;</b> (&rel2.current.date;)
+ <em>
+ <a href="&u.rel2.announce;">Announcement</a> :
+ <a href="&u.rel2.notes;">Release Notes</a> :
+ <a href="&u.rel2.installation;">Installation Instructions</a> :
+ <a href="&u.rel2.hardware;">Hardware Notes</a> :
+ <a href="&u.rel2.readme;">Readme</a> :
+ <a href="&u.rel2.errata;">Errata</a>
+ </em></p>
+
+ <h3>Legacy Releases</h3>
+ <p><b>Release &rel3.current;</b> (&rel3.current.date;)
+ <em>
+ <a href="&u.rel3.announce;">Announcement</a> :
+ <a href="&u.rel3.notes;">Release Notes</a> :
+ <a href="&u.rel3.hardware;">Hardware Notes</a> :
+ <a href="&u.rel3.readme;">Readme</a> :
+ <a href="&u.rel3.errata;">Errata</a>
+ </em></p>
+
+ <a name="future"></a>
+ <h2>Future Releases</h2>
+
+ <p>For the schedule of upcoming releases, or for more information
+ about the release engineering process, please visit the <a
+ href="&base;/releng/index.html">Release Engineering</a>
+ page.</p>
+
+ <p>The latest snapshots from our <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">FreeBSD-STABLE</a>
+ and <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">FreeBSD-CURRENT</a>
+ branches are also available. Please see <a
+ href="../where.html">Getting FreeBSD</a> for details.</p>
+
+<!-- <a name="prior-supported"></a>
+ <h2>Prior Releases Still Being Supported</h2> -->
+
+ <a name="prior-unsupported"></a>
+ <h2>Prior Releases Which Have Reached End-Of-Life</h2>
+
+ <p>Complete historical information about the release date, the
+ classification type, and the effective End-Of-Life (EOL) for
+ these releases may be found on the <a
+ href="&base;/security/security.html#unsup">Unsupported
+ Releases</a> section of the <a
+ href="&base;/security/security.html">FreeBSD Security
+ Information</a> page.</p>
+
+ <ul>
<li><b>8.2</b> (February 2011)
<em>
<a href="8.2R/announce.html">Announcement</a>:
@@ -444,7 +458,7 @@ Security Information</a> page.</p>
<a href="./3.4R/errata.html">Errata</a>
</em>
</li>
-
+
<li><b>3.3</b> (September, 1999)
<em>
<a href="./3.3R/announce.html">Announcement</a> :
@@ -452,7 +466,7 @@ Security Information</a> page.</p>
<a href="./3.3R/errata.html">Errata</a>
</em>
</li>
-
+
<li><b>3.2</b> (May, 1999)
<em>
<a href="./3.2R/announce.html">Announcement</a> :
@@ -571,32 +585,22 @@ Security Information</a> page.</p>
</em>
</li>
- <li><b>1.1.5.1</b> (July, 1994)</li>
+ <li><b>1.1.5.1</b> (July, 1994)</li>
<li><b>1.1.5</b>
<em>
<a href="./1.1.5/RELNOTES.FreeBSD">Release Notes</a>
</em>
- </li>
+ </li>
<li><b>1.1</b> (May, 1994)
<em>
<a href="./1.1/RELNOTES.FreeBSD">Release Notes</a>
</em>
</li>
-
- <li><b>1.0</b> (November, 1993)</li>
- </ul>
-
-<a name="releasestatistic"></a>
-<h2>Release Usage Statistics</h2>
-<p>
-A snapshot of the current and past FreeBSD release usage
-is available at
-<a href="http://www.FreeBSD.org/statistic/release_usage/">
-http://www.FreeBSD.org/statistic/release_usage/</a>.
-</p>
+ <li><b>1.0</b> (November, 1993)</li>
+ </ul>
-</body>
+ </body>
</html>
diff --git a/en_US.ISO8859-1/htdocs/releng/index.sgml b/en_US.ISO8859-1/htdocs/releng/index.sgml
index e72fa03e4e..c6376e1394 100644
--- a/en_US.ISO8859-1/htdocs/releng/index.sgml
+++ b/en_US.ISO8859-1/htdocs/releng/index.sgml
@@ -50,9 +50,9 @@
</tr>
<tr>
- <td>2012</td>
+ <td>August 2012</td>
<td>&os; 9.1</td>
- <td>Schedule under discussion.</td>
+ <td><a href="&base;/releases/9.1R/schedule.html">Target Schedule</a></td>
</tr>
</table>
@@ -112,14 +112,14 @@
<td><tt>RELENG_8_2</tt></td>
<td>Frozen</td>
<td>&contact.so;</td>
- <td>FreeBSD 8.2 supported errata fix branch.</td>
+ <td>FreeBSD 8.2 errata fix branch (not officially supported).</td>
</tr>
<tr>
<td><tt>RELENG_8_1</tt></td>
<td>Frozen</td>
<td>&contact.so;</td>
- <td>FreeBSD 8.1 supported errata fix branch.</td>
+ <td>FreeBSD 8.1 errata fix branch (not officially supported).</td>
</tr>
<tr>
diff --git a/en_US.ISO8859-1/htdocs/security/security.sgml b/en_US.ISO8859-1/htdocs/security/security.sgml
index 4b51e790b6..aa3402c83c 100644
--- a/en_US.ISO8859-1/htdocs/security/security.sgml
+++ b/en_US.ISO8859-1/htdocs/security/security.sgml
@@ -98,7 +98,7 @@
<tr valign="top">
<td>&a.rwatson; <a
href="mailto:rwatson@FreeBSD.org">&lt;rwatson@FreeBSD.org&gt;</a></td>
- <td>FreeBSD Core Team liaison, Release Engineering liaison,<br/>
+ <td>Release Engineering liaison,<br/>
TrustedBSD Project liaison, system security architecture expert</td>
</tr>
</table>
@@ -271,20 +271,6 @@
<td>last release + 2 years</td>
</tr>
<tr>
- <td>RELENG_8_1</td>
- <td>8.1-RELEASE</td>
- <td>Extended</td>
- <td>July 23, 2010</td>
- <td>July 31, 2012</td>
- </tr>
- <tr>
- <td>RELENG_8_2</td>
- <td>8.2-RELEASE</td>
- <td>Normal</td>
- <td>February 24, 2011</td>
- <td>July 31, 2012</td>
- </tr>
- <tr>
<td>RELENG_8_3</td>
<td>8.3-RELEASE</td>
<td>Extended</td>
@@ -462,6 +448,20 @@
<td>November 25, 2009</td>
<td>November 30, 2010</td>
</tr>
+ <tr>
+ <td>RELENG_8_1</td>
+ <td>8.1-RELEASE</td>
+ <td>Extended</td>
+ <td>July 23, 2010</td>
+ <td>July 31, 2012</td>
+ </tr>
+ <tr>
+ <td>RELENG_8_2</td>
+ <td>8.2-RELEASE</td>
+ <td>Normal</td>
+ <td>February 24, 2011</td>
+ <td>July 31, 2012</td>
+ </tr>
</table>
</body>
diff --git a/en_US.ISO8859-1/htdocs/send-pr.sgml b/en_US.ISO8859-1/htdocs/send-pr.sgml
index 006706f216..0cdf37c126 100644
--- a/en_US.ISO8859-1/htdocs/send-pr.sgml
+++ b/en_US.ISO8859-1/htdocs/send-pr.sgml
@@ -78,6 +78,8 @@
enctype="multipart/form-data">
<input type="hidden" name="submitterid" value="current-users"/>
<input type="hidden" name="confidential" value="no"/>
+ <input type="hidden" name="severity" value="non-critical"/>
+ <input type="hidden" name="priority" value="low"/>
<label for="email">Your Electronic Mail Address</label>: <br/>
<input type="text" name="email" id="email" size="40"/>
@@ -114,18 +116,6 @@
<option> www</option>
</select>
- <br/><br/><label for="severity">Severity</label>: <select name="severity" id="severity">
- <option> non-critical</option>
- <option> serious</option>
- <option> critical</option>
- </select>
-
- <br/><br/><label for="priority">Priority</label>: <select name="priority" id="priority">
- <option> low</option>
- <option> medium</option>
- <option> high</option>
- </select>
-
<br/><br/><label for="class">Class:</label> <select name="class" id="class">
<option> sw-bug</option>
<option> doc-bug</option>
@@ -163,7 +153,6 @@
<input type="text" name="code-confirm" id="code-confirm" size="8"/><br/><br/>
<input type="submit" value="Submit Problem Report"/>
- <input type="reset" value="Reset"/>
</form>
</body>
diff --git a/en_US.ISO8859-1/htdocs/support/webresources.sgml b/en_US.ISO8859-1/htdocs/support/webresources.sgml
index dc299791d4..185a2450a9 100644
--- a/en_US.ISO8859-1/htdocs/support/webresources.sgml
+++ b/en_US.ISO8859-1/htdocs/support/webresources.sgml
@@ -25,9 +25,6 @@
<h2>General &unix; Information</h2>
<ul>
- <li><a href="http://www.technion.ac.il/guides/unix.html">The Unix Reference
- Desk</a> by Jennifer Myers</li>
-
<li><a href="http://www.ugu.com/">Unix Guru Universe</a></li>
<li><a href="http://www.ora.com/">O'Reilly &amp; Associates, Inc.</a></li>
@@ -88,8 +85,8 @@
&unix; like operating system.</li>
<li><a href="http://www.dragonflybsd.org/"><strong>DragonFly
- BSD</strong></a> is based on FreeBSD 4.X but has a different
- set of development goals than FreeBSD 5.X.</li>
+ BSD</strong></a> is based on &os; 4.X but has a different
+ set of development goals than &os;.</li>
<li><a href="http://opensolaris.org/os/"><strong>OpenSolaris</strong></a>
is the open source variation of Sun Microsystems' Solaris operating
diff --git a/en_US.ISO8859-1/htdocs/where.sgml b/en_US.ISO8859-1/htdocs/where.sgml
index 9f01c1735b..8563926f5a 100644
--- a/en_US.ISO8859-1/htdocs/where.sgml
+++ b/en_US.ISO8859-1/htdocs/where.sgml
@@ -48,6 +48,15 @@
<h2>Download FreeBSD</h2>
+ <p>If you plan on getting FreeBSD via FTP or HTTP, please check
+ the listing of <a
+ href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>mirror
+ sites</strong></a> in the handbook to see if there is a site
+ closer to you. Alternatively, you may want to download &os; using
+ the BitTorrent protocol. The <q>.torrent</q> files can be
+ downloaded from the <a
+ href="http://torrents.FreeBSD.org:8080/">&os; BitTorrent Tracker</a>.</p>
+
<table class="tblbasic">
<thead>
<tr style="text-align: center;">
@@ -173,16 +182,9 @@
</table>
<p><em>Note:</em> If you are in doubt of which platform /
- architecture to get, you probably need <em>i386</em>.</p>
-
- <p>If you plan on getting FreeBSD via FTP, please check the
- listing of <a
- href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>mirror
- sites</strong></a> in the handbook to see if there is a site
- closer to you. Alternatively, you may want to download &os; using
- the BitTorrent protocol. The <q>.torrent</q> files can be
- downloaded from the <a
- href="http://torrents.FreeBSD.org:8080/">&os; BitTorrent Tracker</a>.</p>
+ architecture to get, you probably need <em>i386</em> if you have
+ an older computer, and <em>amd64</em> if you have a newer
+ computer.</p>
<!--
<![%beta.testing;[
@@ -214,20 +216,26 @@
<tr>
<td></td>
<td>amd64</td>
- <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>i386</td>
- <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
- <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <td>powerpc64</td>
+ <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>sparc64</td>
+ <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
</tbody>
</table>
diff --git a/en_US.ISO8859-1/share/sgml/mailing-lists.ent b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
index 43cdde326d..822a7ab29c 100644
--- a/en_US.ISO8859-1/share/sgml/mailing-lists.ent
+++ b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
@@ -307,6 +307,10 @@
<!ENTITY a.newbus "<ulink url='&a.newbus.url;'>FreeBSD new-bus mailing list</ulink>">
<!ENTITY a.newbus.name "<ulink url='&a.newbus.url;'>freebsd-new-bus</ulink>">
+<!ENTITY a.numerics.url "&a.mailman.listinfo;/freebsd-numerics">
+<!ENTITY a.numerics "<ulink url='&a.numerics.url;'>Discussions of high quality implementation of libm functions</ulink>">
+<!ENTITY a.numerics.name "<ulink url='&a.numerics.url;'>freebsd-numerics</ulink>">
+
<!ENTITY a.office.url "&a.mailman.listinfo;/freebsd-office">
<!ENTITY a.office "<ulink url='&a.office.url;'>Office applications on FreeBSD</ulink>">
<!ENTITY a.office.name "<ulink url='&a.office.url;'>freebsd-office</ulink>">
@@ -411,6 +415,34 @@
<!ENTITY a.sun4v "<ulink url='&a.sun4v.url;'>FreeBSD sun4v porting mailing list</ulink>">
<!ENTITY a.sun4v.name "<ulink url='&a.sun4v.url;'>freebsd-sun4v</ulink>">
+<!ENTITY a.svn-doc-all.url "&a.mailman.listinfo;/svn-doc-all">
+<!ENTITY a.svn-doc-all "<ulink url='&a.svn-doc-all.url;'>SVN commit messages for the entire doc tree (except for <quote>user</quote>, <quote>projects</quote> and <quote>translations</quote>)</ulink>">
+<!ENTITY a.svn-doc-all.name "<ulink url='&a.svn-doc-all.url;'>svn-doc-all</ulink>">
+
+<!ENTITY a.svn-doc-head.url "&a.mailman.listinfo;/svn-doc-head">
+<!ENTITY a.svn-doc-head "<ulink url='&a.svn-doc-head.url;'>SVN commit messages for the doc tree for head/</ulink>">
+<!ENTITY a.svn-doc-head.name "<ulink url='&a.svn-doc-head.url;'>svn-doc-head</ulink>">
+
+<!ENTITY a.svn-doc-projects.url "&a.mailman.listinfo;/svn-doc-projects">
+<!ENTITY a.svn-doc-projects "<ulink url='&a.svn-doc-projects.url;'>SVN commit messages for the doc <quote>projects</quote> tree</ulink>">
+<!ENTITY a.svn-doc-projects.name "<ulink url='&a.svn-doc-projects.url;'>svn-doc-projects</ulink>">
+
+<!ENTITY a.svn-doc-svnadmin.url "&a.mailman.listinfo;/svn-doc-svnadmin">
+<!ENTITY a.svn-doc-svnadmin "<ulink url='&a.svn-doc-svnadmin.url;'>SVN commit messages for the doc admin&nbsp;/ configuration tree</ulink>">
+<!ENTITY a.svn-doc-svnadmin.name "<ulink url='&a.svn-doc-svnadmin.url;'>svn-doc-svnadmin</ulink>">
+
+<!ENTITY a.svn-ports-all.url "&a.mailman.listinfo;/svn-ports-all">
+<!ENTITY a.svn-ports-all "<ulink url='&a.svn-ports-all.url;'>SVN commit messages for the entire ports tree</ulink>">
+<!ENTITY a.svn-ports-all.name "<ulink url='&a.svn-ports-all.url;'>svn-ports-all</ulink>">
+
+<!ENTITY a.svn-ports-head.url "&a.mailman.listinfo;/svn-ports-head">
+<!ENTITY a.svn-ports-head "<ulink url='&a.svn-ports-head.url;'>SVN commit messages for the ports tree for head/</ulink>">
+<!ENTITY a.svn-ports-head.name "<ulink url='&a.svn-ports-head.url;'>svn-ports-head</ulink>">
+
+<!ENTITY a.svn-ports-svnadmin.url "&a.mailman.listinfo;/svn-ports-svnadmin">
+<!ENTITY a.svn-ports-svnadmin "<ulink url='&a.svn-ports-svnadmin.url;'>SVN commit messages for the ports admin&nbsp;/ configuration tree</ulink>">
+<!ENTITY a.svn-ports-svnadmin.name "<ulink url='&a.svn-ports-svnadmin.url;'>svn-ports-svnadmin</ulink>">
+
<!ENTITY a.svn-src-all.url "&a.mailman.listinfo;/svn-src-all">
<!ENTITY a.svn-src-all "<ulink url='&a.svn-src-all.url;'>SVN commit messages for the entire src tree (except for <quote>user</quote> and <quote>projects</quote>)</ulink>">
<!ENTITY a.svn-src-all.name "<ulink url='&a.svn-src-all.url;'>svn-src-all</ulink>">