aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1
diff options
context:
space:
mode:
Diffstat (limited to 'en_US.ISO8859-1')
-rw-r--r--en_US.ISO8859-1/articles/5-roadmap/article.sgml2
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.sgml26
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.additional.sgml65
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.committers.sgml22
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.staff.sgml57
-rw-r--r--en_US.ISO8859-1/articles/dialup-firewall/article.sgml6
-rw-r--r--en_US.ISO8859-1/articles/hubs/article.sgml4
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml14
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml16
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml61
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml14
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml13
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml7
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml10
-rw-r--r--en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/config/chapter.sgml58
-rw-r--r--en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/disks/chapter.sgml71
-rw-r--r--en_US.ISO8859-1/books/handbook/install/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml16
-rw-r--r--en_US.ISO8859-1/books/handbook/mail/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml5
-rw-r--r--en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml49
-rw-r--r--en_US.ISO8859-1/books/handbook/security/chapter.sgml32
-rw-r--r--en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml39
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/book.sgml239
-rw-r--r--en_US.ISO8859-1/share/sgml/authors.ent2
-rw-r--r--en_US.ISO8859-1/share/sgml/mailing-lists.ent9
29 files changed, 145 insertions, 710 deletions
diff --git a/en_US.ISO8859-1/articles/5-roadmap/article.sgml b/en_US.ISO8859-1/articles/5-roadmap/article.sgml
index 2162705c34..0c32bd2981 100644
--- a/en_US.ISO8859-1/articles/5-roadmap/article.sgml
+++ b/en_US.ISO8859-1/articles/5-roadmap/article.sgml
@@ -83,7 +83,7 @@
<para>Our intent is to avoid repeating that scenario with &os; 5.x.
Delaying the &t.releng.5; branch until it is stable and production quality
will ensure that it stays maintainable and provides a compelling reason
- to upgrade from 4.<replaceable>X</replaceable>. To do this, we must
+ to upgrade from 4.<replaceable>X</replaceable>, To do this, we must
identify the current areas of weakness and set clear goals for
resolving them. This document contains what we as the release
engineering team feel are the milestones and issues that must be
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 762cfd8a80..185ea29d92 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -91,16 +91,12 @@
<row>
<entry><emphasis>Mailing Lists</emphasis></entry>
- <entry>&a.doc-developers;, &a.doc-committers;;
- &a.ports-developers;, &a.ports-committers;;
- &a.src-developers;, &a.src-committers;. (Each project
- repository has its own -developers and -committers mailing
- lists. Archives for these lists may be found in files
- <filename>/home/mail/<replaceable>repository-name</replaceable>-developers-archive</filename>
- and
- <filename>/home/mail/<replaceable>repository-name</replaceable>-committers-archive</filename>
- on the <hostid role="domainname">FreeBSD.org</hostid>
- cluster.)
+ <entry>&a.developers;, &a.committers;
+ (Both of these are private lists; archives can be found
+ in <filename>/home/mail/developers-archive</filename>
+ and <filename>/home/mail/committers-archive</filename>
+ on the <hostid role="domainname">FreeBSD.org</hostid>
+ cluster.)
</entry>
</row>
@@ -685,11 +681,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
- of the <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> (or in FreeBSD's case,
+ of the <literal>$Id: article.sgml,v 1.191 2004-05-11 13:29:46 den Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
- (remove the marker lines and the second <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> line,
- leaving the original <literal>$Id: article.sgml,v 1.193 2004-05-22 12:57:44 simon Exp $</literal> line intact).</para>
+ (remove the marker lines and the second <literal>$Id: article.sgml,v 1.191 2004-05-11 13:29:46 den Exp $</literal> line,
+ leaving the original <literal>$Id: article.sgml,v 1.191 2004-05-11 13:29:46 den Exp $</literal> line intact).</para>
</listitem>
<listitem>
@@ -2805,8 +2801,8 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<answer>
<para>No. The ports manager will regenerate the
- <filename>INDEX</filename> and commit it for each
- &os; release.</para>
+ <filename>INDEX</filename> and commit it every few
+ days.</para>
</answer>
</qandaentry>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index 529dfbdd54..c967fcbf4d 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -256,11 +256,6 @@
</listitem>
<listitem>
- <para>Alexey Y. Mikhailov
- <email>karma@ez.pereslavl.ru</email></para>
- </listitem>
-
- <listitem>
<para>Alexey V. Neyman
<email>alex.neyman@auriga.ru</email></para>
</listitem>
@@ -506,11 +501,6 @@
</listitem>
<listitem>
- <para>Andrey Slusar
- <email>vasallia@ukr.net</email></para>
- </listitem>
-
- <listitem>
<para>Andrey Sverdlichenko
<email>rblaze@users.sourceforge.net</email></para>
</listitem>
@@ -531,11 +521,6 @@
</listitem>
<listitem>
- <para>Andy Miller
- <email>andy@trit.org</email></para>
- </listitem>
-
- <listitem>
<para>Andy Pavlo
<email>amp0928@rit.edu</email></para>
</listitem>
@@ -1326,11 +1311,6 @@
</listitem>
<listitem>
- <para>Daniel Roethlisberger
- <email>daniel@roe.ch</email></para>
- </listitem>
-
- <listitem>
<para>Daniel W. McRobb
<email>dwm@caimis.com</email></para>
</listitem>
@@ -1571,11 +1551,6 @@
</listitem>
<listitem>
- <para>Dermot Tynan
- <email>dtynan@kalopa.com</email></para>
- </listitem>
-
- <listitem>
<para>Diane Bruce
<email>db@db.net</email></para>
</listitem>
@@ -1606,11 +1581,6 @@
</listitem>
<listitem>
- <para>Dmitri Nikulin
- <email>setagllib@optusnet.com.au</email></para>
- </listitem>
-
- <listitem>
<para>Dmitry A. Yanko
<email>fm@astral.ntu-kpi.kiev.ua</email></para>
</listitem>
@@ -5771,11 +5741,6 @@
</listitem>
<listitem>
- <para>Robin Schoonover
- <email>end@endif.cjb.net</email></para>
- </listitem>
-
- <listitem>
<para>Rod Taylor
<email>rod@idiotswitch.org</email></para>
</listitem>
@@ -5796,11 +5761,6 @@
</listitem>
<listitem>
- <para>Roman Neuhauser
- <email>neuhauser@chello.cz</email></para>
- </listitem>
-
- <listitem>
<para>Roman V. Palagin
<email>romanp@unshadow.net</email></para>
</listitem>
@@ -6261,6 +6221,11 @@
</listitem>
<listitem>
+ <para>Stefan Farfeleder
+ <email>e0026813@stud3.tuwien.ac.at</email></para>
+ </listitem>
+
+ <listitem>
<para>Stefan Jahn
<email>stefan.jahn@nemesis-sektor.de</email></para>
</listitem>
@@ -6651,11 +6616,6 @@
</listitem>
<listitem>
- <para>Thomas Spreng
- <email>spreng@socket.ch</email></para>
- </listitem>
-
- <listitem>
<para>Thomas Stromberg
<email>tstrombe@rtci.com</email></para>
</listitem>
@@ -6691,11 +6651,6 @@
</listitem>
<listitem>
- <para>Tijl Coosemans
- <email>tijl@ulyssis.org</email></para>
- </listitem>
-
- <listitem>
<para>Tillman Hodgson
<email>tillman@seekingfire.com</email></para>
</listitem>
@@ -6736,21 +6691,11 @@
</listitem>
<listitem>
- <para>Timur I. Bakeyev
- <email>timur@gnu.org</email></para>
- </listitem>
-
- <listitem>
<para>Tobias Reifenberger
<email>treif@mayn.de</email></para>
</listitem>
<listitem>
- <para>Tobias Roth
- <email>ports@fsck.ch</email></para>
- </listitem>
-
- <listitem>
<para>Toby Allsopp
<email>toby@mi6.gen.nz</email></para>
</listitem>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index e2a35c1b06..ed51b994b7 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -659,10 +659,6 @@
</listitem>
<listitem>
- <para>&a.stefanf;</para>
- </listitem>
-
- <listitem>
<para>&a.stephane;</para>
</listitem>
@@ -771,10 +767,6 @@
</listitem>
<listitem>
- <para>&a.mezz;</para>
- </listitem>
-
- <listitem>
<para>&a.dinoex;</para>
</listitem>
@@ -933,11 +925,7 @@
<listitem>
<para>&a.alfred;</para>
</listitem>
-
- <listitem>
- <para>&a.csjp;</para>
- </listitem>
-
+
<listitem>
<para>&a.wes;</para>
</listitem>
@@ -951,11 +939,11 @@
</listitem>
<listitem>
- <para>&a.krion;</para>
+ <para>&a.bp;</para>
</listitem>
<listitem>
- <para>&a.bp;</para>
+ <para>&a.krion;</para>
</listitem>
<listitem>
@@ -1207,10 +1195,6 @@
</listitem>
<listitem>
- <para>&a.metal;</para>
- </listitem>
-
- <listitem>
<para>&a.suz;</para>
</listitem>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
index 076df9c55a..1603054c4b 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml
@@ -149,55 +149,6 @@
</itemizedlist>
</sect2>
- <sect2 id="staff-secteam">
- <title>The &os; Security Team:</title>
-
- <para>The current security team in &os; consists of:</para>
-
- <itemizedlist>
- <listitem>
- <para>&a.rwatson</para>
- </listitem>
-
- <listitem>
- <para>&a.bms;</para>
- </listitem>
-
- <listitem>
- <para>&a.cperciva;</para>
- </listitem>
-
- <listitem>
- <para>&a.des;</para>
- </listitem>
-
- <listitem>
- <para>&a.gshapiro;</para>
- </listitem>
-
- <listitem>
- <para>&a.guido;</para>
- </listitem>
-
- <listitem>
- <para>&a.imp;</para>
- </listitem>
-
- <listitem>
- <para>&a.julian;</para>
- </listitem>
-
- <listitem>
- <para>&a.nectar;</para>
- </listitem>
-
- <listitem>
- <para>&a.trhodes;</para>
- </listitem>
- </itemizedlist>
- </sect2>
-
-
<sect2>
<title>Misc Hats</title>
@@ -221,14 +172,6 @@
</listitem>
</itemizedlist>
- <para>Current &os; security officer deputy</para>
-
- <itemizedlist>
- <listitem>
- <para>&a.des;</para>
- </listitem>
- </itemizedlist>
-
<para>Current &os; core team secretary:</para>
<itemizedlist>
<listitem>
diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
index 6ea1502af6..3e1e488ef2 100644
--- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
+++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml
@@ -166,7 +166,7 @@ ppp_profile="<replaceable>your_profile</replaceable>"</programlisting>
is that you add the rules for everything you would like to allow,
and then everything else is automatically denied.</para>
- <para>Following that, let's create the directory where we will store our
+ <para>First off, let's create the directory where we will store our
firewall rules. In this example, we'll use <filename
class="directory">/etc/firewall</filename>. Change into the
directory and edit the file <filename>fwrules</filename> as we
@@ -226,9 +226,9 @@ $fwcmd add deny log ip from any to any</programlisting>
<para>You now have a fully functional firewall that only allows
connections to ports 22 and 80 and will log any other connection
- attempts. You may now safely reboot and the firewall should
+ attempts. You may now safely safely reboot and the firewall should
be automatically started and the ruleset loaded. If you find this
- incorrect in any way or experience any problems, or have any
+ incorrect in anyway or experience any problems, or have any
suggestions to improve this page, please email me.</para>
</sect1>
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.sgml
index fcfd492cff..ec3f90fa13 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.sgml
@@ -1106,6 +1106,10 @@ cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --all
<title>CVSup site stats</title>
<itemizedlist>
<listitem>
+ <para>cvsup5.FreeBSD.org - <email>staff@blackened.com</email> - <ulink
+ url="http://cvsup.freebsd.blackened.com/cvsup.freebsd.html">(CVSup processes)</ulink></para>
+ </listitem>
+ <listitem>
<para>cvsup[23456].jp.FreeBSD.org - <email>kuriyama@FreeBSD.org</email> - <ulink
url="http://home.jp.FreeBSD.org/stats/mrtg/cvsup/">(CVSup processes)</ulink></para>
</listitem>
diff --git a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
index 7cc9e29cdb..0c40c2225a 100644
--- a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
@@ -10,7 +10,7 @@
<author>
<firstname>Murray</firstname>
<surname>Stokely</surname>
- <contrib>Contributed by </contrib>
+ <contrib>This chapter was written by </contrib>
</author>
<author>
<firstname>Jeroen</firstname>
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
index 58637dc6a6..e773dcf3f1 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
@@ -8,19 +8,11 @@
<title>IPv6 Internals</title>
<sect1 id="ipv6-implementation">
- <sect1info>
- <authorgroup>
- <author>
- <firstname>Yoshinobu</firstname>
- <surname>Inoue</surname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- <!-- March 2000 -->
- </sect1info>
-
<title>IPv6/IPsec Implementation</title>
+ <para><emphasis>Contributed by &a.shin;, 5 March
+ 2000.</emphasis></para>
+
<para>This section should explain IPv6 and IPsec related implementation
internals. These functionalities are derived from <ulink
url="http://www.kame.net/">KAME project</ulink></para>
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 c5c841569f..ce9ed8d2de 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
@@ -5,22 +5,10 @@
-->
<chapter id="kerneldebug">
- <chapterinfo>
- <authorgroup>
- <author>
- <firstname>Paul</firstname>
- <surname>Richards</surname>
- <contrib>Contributed by </contrib>
- </author>
- <author>
- <firstname>J&ouml;rg</firstname>
- <surname>Wunsch</surname>
- </author>
- </authorgroup>
- </chapterinfo>
-
<title>Kernel Debugging</title>
+ <para><emphasis>Contributed by &a.paul; and &a.joerg;</emphasis></para>
+
<sect1 id="kerneldebug-obtain">
<title>Obtaining a Kernel Crash Dump</title>
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml
index 336ac5ec2b..bde00866fa 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml
@@ -5,19 +5,10 @@
-->
<chapter id="policies">
- <chapterinfo>
- <authorgroup>
- <author>
- <firstname>Poul-Henning</firstname>
- <surname>Kamp</surname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- <!-- June 1996 -->
- </chapterinfo>
-
<title>Source Tree Guidelines and Policies</title>
+ <para><emphasis>Contributed by &a.phk;.</emphasis></para>
+
<para>This chapter documents various guidelines and policies in force for
the FreeBSD source tree.</para>
@@ -25,6 +16,8 @@
<title><makevar>MAINTAINER</makevar> on Makefiles</title>
<indexterm><primary>ports maintainer</primary></indexterm>
+ <para>June 1996.</para>
+
<para>If a particular portion of the FreeBSD distribution is being
maintained by a person or group of persons, they can communicate this
fact to the world by adding a
@@ -55,29 +48,17 @@
</sect1>
<sect1 id="policies-contributed">
- <sect1info>
- <authorgroup>
- <author>
- <firstname>Poul-Henning</firstname>
- <surname>Kamp</surname>
- <contrib>Contributed by </contrib>
- </author>
- <author>
- <firstname>David</firstname>
- <surname>O'Brien</surname>
- </author>
- </authorgroup>
- <!-- June 1996 -->
- </sect1info>
-
<title>Contributed Software</title>
<indexterm><primary>contributed software</primary></indexterm>
+ <para><emphasis>Contributed by &a.phk; and &a.obrien;. </emphasis></para>
+
+ <para>June 1996.</para>
<para>Some parts of the FreeBSD distribution consist of software that is
actively being maintained outside the FreeBSD project. For historical
reasons, we call this <emphasis>contributed</emphasis> software. Some
- examples are <application>sendmail</application>, <application>gcc</application> and <application>patch</application>.</para>
+ examples are sendmail, gcc and patch.</para>
<para>Over the last couple of years, various methods have been used in
dealing with this type of software and all have some number of
@@ -121,7 +102,7 @@
<filename>compat</filename> subdirectories were eliminated before the
import.</para>
- <para><filename>src/lib/libtcl</filename> contains only a <application>bmake</application> style
+ <para><filename>src/lib/libtcl</filename> contains only a "bmake style"
<filename>Makefile</filename> that uses the standard
<filename>bsd.lib.mk</filename> makefile rules to produce the library
and install the documentation.</para>
@@ -140,7 +121,7 @@
the rules: it is supposed to contain the sources as distributed (on a
proper CVS vendor-branch and without RCS keyword expansion) with as few
FreeBSD-specific changes as possible. The 'easy-import' tool on
- <hostid>freefall</hostid> will assist in doing the import, but if there are any doubts on
+ freefall will assist in doing the import, but if there are any doubts on
how to go about it, it is imperative that you ask first and not blunder
ahead and hope it <quote>works out</quote>. CVS is not forgiving of
import accidents and a fair amount of effort is required to back out
@@ -333,26 +314,10 @@ obrien@FreeBSD.org - 30 March 1997</programlisting>
</sect1>
<sect1 id="policies-shlib">
- <sect1info>
- <authorgroup>
- <author>
- <firstname>Satoshi</firstname>
- <surname>Asami</surname>
- <contrib>Contributed by </contrib>
- </author>
- <author>
- <firstname>Peter</firstname>
- <surname>Wemm</surname>
- </author>
- <author>
- <firstname>David</firstname>
- <surname>O'Brien</surname>
- </author>
- </authorgroup>
- <!-- 9 Dec 1996 -->
- </sect1info>
-
<title>Shared Libraries</title>
+
+ <para><emphasis>Contributed by &a.asami;, &a.peter;, and &a.obrien; 9
+ December 1996.</emphasis></para>
<para>If you are adding shared library support to a port or other piece of
software that does not have one, the version numbers should follow these
diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml
index 05022487d6..1f27d9d020 100644
--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml
@@ -5,18 +5,10 @@
-->
<chapter id="secure">
- <chapterinfo>
- <authorgroup>
- <author>
- <firstname>Murray</firstname>
- <surname>Stockely</surname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- </chapterinfo>
-
<title>Secure Programming</title>
-
+
+ <para>This chapter was written by &a.murray;.</para>
+
<sect1 id="secure-synopsis"><title>Synopsis</title>
<para>This chapter describes some of the security issues that
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
index 50fa3d78da..3a8e7ad4ce 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
@@ -5,18 +5,11 @@
-->
<chapter id="sockets">
- <chapterinfo>
- <authorgroup>
- <author>
- <firstname>G. Adam</firstname>
- <surname>Stanislav</surname>
- <contrib>Contributed by </contrib>
- </author>
- </authorgroup>
- </chapterinfo>
-
<title>Sockets</title>
+ <para><emphasis>This chapter was written by
+ &a.stanislav;</emphasis></para>
+
<sect1 id="sockets-synopsis">
<title>Synopsis</title>
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 177b914a6e..223d58c6a9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
@@ -10,16 +10,19 @@
<author>
<firstname>James</firstname>
<surname>Raynard</surname>
- <contrib>Contributed by </contrib>
+ <contrib>Written by </contrib>
</author>
+ </authorgroup>
+ <authorgroup>
<author>
<firstname>Murray</firstname>
<surname>Stokely</surname>
+ <contrib>Modifications for the Developer's Handbook by </contrib>
</author>
</authorgroup>
</chapterinfo>
-
<title>Programming Tools</title>
+
<sect1 id="tools-synopsis"><title>Synopsis</title>
<para>This chapter is an introduction to using some of the
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 571753cf90..f17237b2ff 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -2306,7 +2306,7 @@ Exports list on foobar:
NFS filesystem with the option <option>-r=1024</option>. These
options may be specified using the fourth field of the
<filename>fstab</filename> entry on the client for automatic
- mounts, or by using the <option>-o</option> parameter of the &man.mount.8;
+ mounts, or by using the <option>-o</option> parameter of the mount
command for manual mounts.</para>
<para>It should be noted that there is a different problem,
@@ -2329,7 +2329,7 @@ Exports list on foobar:
your application.</para>
<para>Examples for the FreeBSD system (<hostid>freebox</hostid>) as
- the client in <filename>/etc/fstab</filename> on <hostid>freebox</hostid>:</para>
+ the client in <filename>/etc/fstab</filename> on freebox:</para>
<programlisting>fastws:/sharedfs /project nfs rw,-r=1024 0 0</programlisting>
@@ -4947,7 +4947,7 @@ dhcp_flags=""</programlisting>
<primary>DHCP</primary>
<secondary>server</secondary>
</indexterm>
- <para>The DHCP server, <application>dhcpd</application>, is included
+ <para>The DHCP server, <command>dhcpd</command>, is included
as part of the <filename
role="package">net/isc-dhcp3-server</filename> port in the ports
collection. This port contains the ISC DHCP server and
@@ -5027,7 +5027,7 @@ dhcp_flags=""</programlisting>
<para>In order to configure your FreeBSD system as a DHCP server,
you will need to ensure that the &man.bpf.4;
device is compiled into your kernel. To do this, add
- <literal>device bpf</literal> (<literal>pseudo-device bpf</literal> under &os;&nbsp;4.X) to your kernel
+ <literal>pseudo-device bpf</literal> to your kernel
configuration file, and rebuild the kernel. For more
information about building kernels, see <xref
linkend="kernelconfig">.</para>
@@ -5144,7 +5144,7 @@ host mailhost {
<callout arearefs="fixed-address">
<para>Specifies that the host should always be given the same
- IP address. Note that using a hostname is correct here, since the DHCP
+ IP address. Note that a hostname is OK here, since the DHCP
server will resolve the hostname itself before returning the
lease information.</para>
</callout>
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
index 5ae79401a5..7855608f5a 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
@@ -509,7 +509,7 @@
<para>Raymond, Eric S. <emphasis>The New Hacker's Dictionary, 3rd
edition</emphasis>. MIT Press, 1996. ISBN
0-262-68092-0. Also known as the <ulink
- url="http://www.catb.org/~esr/jargon/html/index.html">Jargon
+ url="http://www.catb.org/~esr/jargon/jargon.html">Jargon
File</ulink></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 e9953889fd..efa28ae87d 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -441,29 +441,8 @@ exit 0
<filename>crontab</filename> files store information about specific
functions which <command>cron</command> is supposed to perform at
certain times.</para>
-
- <para>The <command>cron</command> utility uses two different
- types of configuration files, the system crontab and user crontabs. The
- only difference between these two formats is the sixth field. In the
- system crontab, the sixth field is the name of a user for the command
- to run as. This gives the system crontab the ability to run commands
- as any user. In a user crontab, the sixth field is the command to run,
- and all commands run as the user who created the crontab; this is an
- important security feature.</para>
-
- <note>
- <para>User crontabs allow individual users to schedule tasks without the
- need for root privileges. Commands in a user's crontab run with the
- permissions of the user who owns the crontab.</para>
- <para>The root user can have a user crontab just like
- any other user. This one is different from
- <filename>/etc/crontab</filename> (the system crontab). Because of the
- system crontab, there's usually no need to create a user crontab
- for root.</para>
- </note>
- <para>Let us take a look at the <filename>/etc/crontab</filename> file
- (the system crontab):</para>
+ <para>Let us take a look at the <filename>/etc/crontab</filename> file:</para>
<programlisting># /etc/crontab - root's crontab for &os;
@@ -552,30 +531,16 @@ HOME=/var/log
<sect2 id="configtuning-installcrontab">
<title>Installing a Crontab</title>
- <important>
- <para>You must not use the procedure described here to
- edit/install the system crontab. Simply use your favorite
- editor: the <command>cron</command> utility will notice that the file
- has changed and immediately begin using the updated version.
- See
- <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq/admin.html#ROOT-NOT-FOUND-CRON-ERRORS">
- this FAQ entry </ulink> for more information.</para>
- </important>
-
- <para>To install a freshly written user
- <filename>crontab</filename>, first use your favorite editor to create
- a file in the proper format, and then use the
+ <para>To install your freshly written
+ <filename>crontab</filename>, just use the
<command>crontab</command> utility. The most common usage
is:</para>
- <screen>&prompt.user; <userinput>crontab crontab-file</userinput></screen>
-
- <para>In this example, <filename>crontab-file</filename> is the filename
- of a <filename>crontab</filename> that was previously created.</para>
+ <screen>&prompt.root; <userinput>crontab crontab</userinput></screen>
<para>There is also an option to list installed
- <filename>crontab</filename> files: just pass the
- <option>-l</option> option to <command>crontab</command> and look
+ <filename>crontab</filename> files, just pass the
+ <option>-l</option> to <command>crontab</command> and look
over the output.</para>
<para>For users who wish to begin their own crontab file from scratch,
@@ -584,11 +549,6 @@ HOME=/var/log
with an empty file. When the file is saved, it will be
automatically installed by the <command>crontab</command> command.
</para>
-
- <para>If you later want to remove your user <filename>crontab</filename>
- completely, use <command>crontab</command> with the <option>-r</option>
- option.
- </para>
</sect2>
</sect1>
@@ -2380,12 +2340,6 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
<sect2 id="ACPI-submitdebug">
<title>Submitting Debugging Information</title>
- <note>
- <para>Before submitting a problem, be sure you are running the latest
- <acronym>BIOS</acronym> version and, if available, embedded
- controller firmware version.</para>
- </note>
-
<para>For those of you that want to submit a problem right away,
please send the following information to
<ulink url="mailto:freebsd-acpi@FreeBSD.org">
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index 07c878bd23..c55f0c832d 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -643,8 +643,7 @@
</indexterm>
<para>Examine the files
- <filename>/usr/share/examples/etc/make.conf</filename>
- (called <filename>/etc/defaults/make.conf</filename> in &os;&nbsp;4.X) and
+ <filename>/etc/defaults/make.conf</filename> and
<filename>/etc/make.conf</filename>. The first contains some
default defines &ndash; most of which are commented out. To
make use of them when you rebuild your system from source, add
@@ -656,8 +655,7 @@
<para>A typical user will probably want to copy the
<makevar>CFLAGS</makevar> and
<makevar>NOPROFILE</makevar> lines found in
- <filename>/usr/share/examples/etc/make.conf</filename>
- (or in <filename>/etc/defaults/make.conf</filename> on &os;&nbsp;4.X) to
+ <filename>/etc/defaults/make.conf</filename> to
<filename>/etc/make.conf</filename> and uncomment them.</para>
<para>Examine the other definitions (<makevar>COPTFLAGS</makevar>,
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
index d9e748e460..c74c30f5b8 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
@@ -1182,12 +1182,13 @@ device scbus
device cd
device pass</programlisting>
- <para>You also need the following line in your kernel
+ <para>You also need the following lines in your kernel
configuration file:</para>
- <programlisting>device ata</programlisting>
+ <programlisting>device ata
+device atapicd</programlisting>
- <para>which should already be present.</para>
+ <para>Both of which should already be present.</para>
<para>Then rebuild, install your new kernel, and reboot your
machine. During the boot process, your burner should show up,
@@ -1230,13 +1231,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<contrib>Contributed by </contrib>
</author>
</authorgroup>
- <authorgroup>
- <author>
- <firstname>Andy</firstname>
- <surname>Polyakov</surname>
- <contrib>With inputs from </contrib>
- </author>
- </authorgroup>
<!-- Feb 2004 -->
</sect1info>
@@ -1299,7 +1293,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<note>
<para>A difference must be done between the physical media and
the application. For example a DVD-Video is a specific
- file layout that can be written on any recordable DVD
+ file system that can be written on any recordable DVD
physical media: DVD-R, DVD+R, DVD-RW etc. Before choosing
the type of media, you just must be sure the burner and the
DVD-Video player (a standalone player or a DVD-ROM drive on
@@ -1320,12 +1314,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
devices, therefore the <link linkend="atapicam">ATAPI/CAM
support</link> must be added to your kernel.</para>
- <para>You also have to enable DMA access for ATAPI devices, this
- can be done in adding the following line to the
- <filename>/boot/loader.conf</filename> file:</para>
-
- <programlisting>hw.ata.atapi_dma="1"</programlisting>
-
<para>Before attempting to use the
<application>dvd+rw-tools</application> you should consult the
<ulink
@@ -1360,7 +1348,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
DVD device, <replaceable>/dev/cd0</replaceable>, must be
changed according to your configuration. The
<option>-dvd-compat</option> parameter will close the disk,
- the recording will be unappendable. In return this should provide better
+ the recording will be unappendable. This should provide more
media compatibility with DVD-ROM drives.</para>
<para>It is also possible to burn a pre-mastered image, for
@@ -1384,9 +1372,9 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<sect2>
<title>Burning a DVD-Video</title>
- <para>A DVD-Video is a specific file layout based on ISO 9660
+ <para>A DVD-Video is a specific file system based on ISO 9660
and the micro-UDF (M-UDF) specifications. The DVD-Video also
- presents a specific data structure hierarchy, it is the reason
+ presents a specific file structure hierarchy, it is the reason
why you need a particular program such as <filename
role="package">sysutils/dvdauthor</filename> to author the
DVD.</para>
@@ -1400,11 +1388,9 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<screen>&prompt.root; <userinput>growisofs -Z <replaceable>/dev/cd0</replaceable> -dvd-video <replaceable>/path/to/video</replaceable></userinput></screen>
- <para>The <option>-dvd-video</option> option will be passed down to
- &man.mkisofs.8; and will instruct it to create a DVD-Video file system
- layout. Beside this, the <option>-dvd-video</option> option
- implies <option>-dvd-compat</option> &man.growisofs.1;
- option.</para>
+ <para>The <option>-dvd-video</option> option will tell
+ &man.mkisofs.8; to create a DVD-Video file system
+ layout.</para>
</sect2>
<indexterm>
@@ -1416,11 +1402,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<title>Using a DVD+RW</title>
<para>Unlike CD-RW, a virgin DVD+RW needs to be formatted before
- first use. The &man.growisofs.1; program will take care of it
- automatically whenever appropriate, which is the
- <emphasis>recommended</emphasis> way. However you can use the
- <command>dvd+rw-format</command> command to format the
- DVD+RW:</para>
+ first use. To format the DVD+RW, use the following:</para>
<screen>&prompt.root; <userinput>dvd+rw-format <replaceable>/dev/cd0</replaceable></userinput></screen>
@@ -1451,10 +1433,10 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
initial session should be used during next writes.</para>
<note>
- <para>You may want to use the <option>-dvd-compat</option>
- option if you want better media compatibility with DVD-ROM
- drives. In the DVD+RW case, this will not prevent you from
- adding data.</para>
+ <para>You must not use the <option>-dvd-compat</option> option
+ during the initial session if you want to be able to append
+ any data, or you will have to rewrite a new initial
+ session.</para>
</note>
<para>If for any reason you really want to blank the media, do
@@ -1548,20 +1530,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
will add a new session to the disc:</para>
<screen>&prompt.root; <userinput>growisofs -M <replaceable>/dev/cd0</replaceable> -J -R <replaceable>/path/to/nextdata</replaceable></userinput></screen>
-
- <para>Using this command line with a DVD+RW or a DVD-RW in restricted
- overwrite mode, will append data in merging the new session to
- the existing one. The result will be a single-session disc.
- This is the way used to add data after an initial write on these
- medias.</para>
-
- <note>
- <para>Some space on the media is used between each session for
- end and start of sessions. Therefore, one should add
- sessions with large amount of data to optimize media space.
- The number of sessions is limited to 154 for a DVD+R and
- about 2000 for a DVD-R.</para>
- </note>
</sect2>
<sect2>
@@ -1579,13 +1547,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
web site</ulink> and in the <ulink
url="http://lists.debian.org/cdwrite/">cdwrite mailing
list</ulink> archives.</para>
-
- <note>
- <para>The <command>dvd+rw-mediainfo</command> output of the
- resulting recording or the media with issues is mandatory
- for any problem report. Without this output, it will be
- quite impossible to help you.</para>
- </note>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
index a46524aea7..bbedf49885 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
@@ -5020,12 +5020,12 @@ Please press any key to reboot.</screen>
<filename>kern.flp</filename> floppy onto your FreeBSD
system using the &man.mount.8; command.</para>
- <screen>&prompt.root; <userinput>mount /dev/fd0 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount /dev/fd0 /floppy</userinput></screen>
<para>Now that you have the floppy mounted, you must
- change into the <filename role="directory">/mnt</filename> directory:</para>
+ change into the floppy directory:</para>
- <screen>&prompt.root; <userinput>cd /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /floppy</userinput></screen>
<para>Here is where you must set the floppy to boot into a
serial console. You have to make a file called
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index e700d04751..1fdf550fce 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -358,11 +358,9 @@
</indexterm>
<para>If you have <emphasis>not</emphasis> upgraded your source
- tree in any way since the last time you successfully completed
- a <maketarget>buildworld</maketarget>-<maketarget>installworld</maketarget> cycle
- (you have not run <application>CVSup</application>,
+ tree in any way (you have not run <application>CVSup</application>,
<application>CTM</application>, or used
- <application>anoncvs</application>), then it is safe to use the
+ <application>anoncvs</application>), then you should use the
<command>config</command>, <maketarget>make depend</maketarget>,
<command>make</command>, <maketarget>make install</maketarget> sequence.
</para>
@@ -925,8 +923,7 @@ options _KPOSIX_PRIORITY_SCHEDULING</programlisting>
<programlisting>device isa</programlisting>
- <para>All PCs supported by &os; have one of these. Do not remove,
- even if you have no ISA slots. If you have an
+ <para>All PCs supported by &os; have one of these. If you have an
IBM PS/2 (Micro Channel Architecture), &os; provides some
limited support at this time. For more information about the
MCA support, see
@@ -1028,13 +1025,6 @@ access)</programlisting>
<para>SCSI peripherals. Again, comment out any you do not have, or if
you have only IDE hardware, you can remove them completely.</para>
- <note>
- <para>The USB &man.umass.4; driver (and a few other drivers) use
- the SCSI subsystem even though they are not real SCSI devices.
- Therefore make sure not to remove SCSI support, if any such
- drivers are included in the kernel configuration.</para>
- </note>
-
<programlisting># RAID controllers
device ida # Compaq Smart RAID
device amr # AMI MegaRAID
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index da8964413e..ffb9ec6330 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -355,7 +355,7 @@ FreeBSD.org mail is handled (pri=10) by mx1.FreeBSD.org</screen>
<title>Accessing local mailboxes</title>
<para>Mailboxes may be accessed locally by directly utilizing
- <acronym>MUA</acronym>s on the server on which the mailbox
+ <acronym>MUA</acronym>'s on the server on which the mailbox
resides. This can be done using applications such as
<application>mutt</application> or &man.mail.1;.
</para>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index 22303548a3..70ba315608 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -731,11 +731,6 @@
&pgpkey.gsutter;
</sect2>
- <sect2 id="pgpkey-metal">
- <title>&a.metal;</title>
- &pgpkey.metal;
- </sect2>
-
<sect2 id="pgpkey-nyan">
<title>&a.nyan;</title>
&pgpkey.nyan;
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
index 9ab1b1a4db..74d9987431 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
@@ -553,8 +553,8 @@ protocol: ppp</screen>
<listitem>
<para>Adds a default route to your ISP's gateway. The
special word <literal>HISADDR</literal> is replaced with
- the gateway address specified on line 17. It is
- important that this line appears after line 17,
+ the gateway address specified on line 9. It is
+ important that this line appears after line 9,
otherwise <literal>HISADDR</literal> will not yet be
initialized.</para>
@@ -989,13 +989,25 @@ set nbns 203.14.100.5</programlisting>
linkend="userppp-dynamicIP">PPP and Dynamic IP addresses</link>
sections, the following alterations must be made:</para>
- <programlisting>13 set authname <replaceable>MyUserName</replaceable>
-14 set authkey <replaceable>MyPassword</replaceable>
-15 set login</programlisting>
+ <programlisting>7 set login
+&hellip;
+12 set authname <replaceable>MyUserName</replaceable>
+13 set authkey <replaceable>MyPassword</replaceable></programlisting>
<variablelist>
<varlistentry>
- <term>Line 13:</term>
+ <term>Line 7:</term>
+
+ <listitem>
+ <para>Your ISP will not normally require that you log into
+ the server if you are using PAP or CHAP. You must
+ therefore disable your <quote>set login</quote>
+ string.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Line 12:</term>
<listitem>
<para>This line specifies your PAP/CHAP user name. You
@@ -1005,7 +1017,7 @@ set nbns 203.14.100.5</programlisting>
</varlistentry>
<varlistentry>
- <term>Line 14:</term>
+ <term>Line 13:</term>
<indexterm><primary>password</primary></indexterm>
<listitem>
<para>This line specifies your PAP/CHAP password. You
@@ -1013,27 +1025,16 @@ set nbns 203.14.100.5</programlisting>
<replaceable>MyPassword</replaceable>. You may want to
add an additional line, such as:</para>
- <programlisting>16 accept PAP</programlisting>
+ <programlisting>15 accept PAP</programlisting>
<para>or</para>
- <programlisting>16 accept CHAP</programlisting>
+ <programlisting>15 accept CHAP</programlisting>
<para>to make it obvious that this is the intention, but
PAP and CHAP are both accepted by default.</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term>Line 15:</term>
-
- <listitem>
- <para>Your ISP will not normally require that you log into
- the server if you are using PAP or CHAP. You must
- therefore disable your <quote>set login</quote>
- string.</para>
- </listitem>
- </varlistentry>
</variablelist>
</sect4>
@@ -1129,7 +1130,7 @@ ifconfig_tun0=</programlisting>
for further details.</para>
</note>
- <para>Make sure the router program set to <literal>NO</literal> with
+ <para>Set the router program to <literal>NO</literal> with
following line in your
<filename>/etc/rc.conf</filename>:</para>
@@ -1139,7 +1140,7 @@ ifconfig_tun0=</programlisting>
<primary><application>routed</application></primary>
</indexterm>
<para>It is important that the <command>routed</command> daemon is
- not started (it is by default), as
+ not started (it is started by default), as
<command>routed</command> tends to delete the default routing
table entries created by <command>ppp</command>.</para>
@@ -1174,6 +1175,8 @@ ifconfig_tun0=</programlisting>
<quote>dfilter</quote> to block SMTP traffic. Refer to the
sample files for further details.</para>
+ <para>Now the only thing left to do is reboot the machine.</para>
+
<para>All that is left is to reboot the machine. After rebooting,
you can now either type:</para>
@@ -2755,7 +2758,7 @@ water.CS.Example localhost.Example. UGH 34 47641234 lo0 - 0.438
system for this yet, please see the tutorial for configuring
dialup services; if you have a World-Wide Web browser available,
browse the list of tutorials at <ulink
- url="&url.main;/index.html">http://www.FreeBSD.org/</ulink>.
+ url="../../../../index.html">http://www.FreeBSD.org/</ulink>.
You may also want to check the manual pages for &man.sio.4; for
information on the serial port device driver and &man.ttys.5;,
&man.gettytab.5;, &man.getty.8;, &amp; &man.init.8; for
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
index 4cf132a822..4803a57d1c 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
@@ -113,7 +113,7 @@
are ever competing with the human necessity for convenience. &unix;
systems, in general, are capable of running a huge number of
simultaneous processes and many of these processes operate as
- servers &mdash; meaning that external entities can connect and talk
+ servers &ndash; meaning that external entities can connect and talk
to them. As yesterday's mini-computers and mainframes become
today's desktops, and as computers become networked and
internetworked, security becomes an even bigger issue.</para>
@@ -255,7 +255,7 @@
</listitem>
<listitem>
- <para>Securing <username>root</username> &mdash; root-run servers
+ <para>Securing <username>root</username> &ndash; root-run servers
and suid/sgid binaries.</para>
</listitem>
@@ -332,7 +332,7 @@
You can do this by editing
your <filename>/etc/ssh/sshd_config</filename> file, and making
sure that <literal>PermitRootLogin</literal> is set to
- <literal>NO</literal>. Consider every access method &mdash;
+ <literal>NO</literal>. Consider every access method &ndash;
services such as FTP often fall through the cracks.
Direct <username>root</username> logins should only be allowed
via the system console.</para>
@@ -428,7 +428,7 @@
<para>Using something like Kerberos also gives you the ability to
disable or change the password for a staff account in one place,
- and have it immediately affect all the machines on which the staff
+ and have it immediately effect all the machines on which the staff
member may have an account. If a staff member's account gets
compromised, the ability to instantly change his password on all
machines should not be underrated. With discrete passwords,
@@ -619,7 +619,7 @@
such as <literal>schg</literal>,
will be enforced. You must also ensure that the
<literal>schg</literal> flag is set on critical startup binaries,
- directories, and script files &mdash; everything that gets run up
+ directories, and script files &ndash; everything that gets run up
to the point where the securelevel is set. This might be overdoing
it, and upgrading the system is much more difficult when you
operate at a higher secure level. You may compromise and run the
@@ -644,7 +644,7 @@
<filename>/usr</filename> is probably counterproductive, because
while it may protect the files, it also closes a detection window.
The last layer of your security onion is perhaps the most
- important &mdash; detection. The rest of your security is pretty
+ important &ndash; detection. The rest of your security is pretty
much useless (or, worse, presents you with a false sense of
safety) if you cannot detect potential incursions. Half the job
of the onion is to slow down the attacker, rather than stop him, in
@@ -663,7 +663,7 @@
box, or by setting up ssh key-pairs to
allow the limited-access box to ssh to
the other machines. Except for its network traffic, NFS is the
- least visible method &mdash; allowing you to monitor the
+ least visible method &ndash; allowing you to monitor the
filesystems on each client box virtually undetected. If your
limited-access server is connected to the client boxes through a
switch, the NFS method is often the better choice. If your
@@ -725,7 +725,7 @@
<para>Finally, security scripts should process the log files, and the
logs themselves should be generated in as secure a manner as
- possible &mdash; remote syslog can be very useful. An intruder
+ possible &ndash; remote syslog can be very useful. An intruder
tries to cover his tracks, and log files are critical to the
sysadmin trying to track down the time and method of the initial
break-in. One way to keep a permanent record of the log files is
@@ -738,11 +738,11 @@
<title>Paranoia</title>
<para>A little paranoia never hurts. As a rule, a sysadmin can add
- any number of security features, as long as they do not affect
+ any number of security features, as long as they do not effect
convenience, and can add security features that
- <emphasis>do</emphasis> affect convenience with some added thought.
+ <emphasis>do</emphasis> effect convenience with some added thought.
Even more importantly, a security administrator should mix it up a
- bit &mdash; if you use recommendations such as those given by this
+ bit &ndash; if you use recommendations such as those given by this
document verbatim, you give away your methodologies to the
prospective attacker who also has access to this document.</para>
</sect2>
@@ -829,7 +829,7 @@
<application>ntalkd</application>,
<application>sendmail</application>, and other Internet-accessible
services. If you try to configure the firewall the other way
- &mdash; as an inclusive or permissive firewall, there is a good
+ &ndash; as an inclusive or permissive firewall, there is a good
chance that you will forget to <quote>close</quote> a couple of
services, or that you will add a new internal service and forget
to update the firewall. You can still open up the high-numbered
@@ -848,7 +848,7 @@
<indexterm><primary>ICMP_BANDLIM</primary></indexterm>
<para>Another common DoS attack is called a springboard attack
- &mdash; to attack a server in a manner that causes the server to
+ &ndash; to attack a server in a manner that causes the server to
generate responses which overloads the server, the local
network, or some other machine. The most common attack of this
nature is the <emphasis>ICMP ping broadcast attack</emphasis>.
@@ -2396,8 +2396,8 @@ jdoe@example.org</screen>
would have access to that account without requiring a shared
password.</para>
- <para>Reading the manual pages for these commands is recommended.
- Note that the <command>ksu</command> manual page covers
+ <para>Reading the man pages for these commands is recommended.
+ Note that the <command>ksu</command> man page covers
<filename>.k5users</filename>.</para>
</sect2>
@@ -5030,7 +5030,7 @@ user@unfirewalled-system.example.org's password: <userinput>*******</userinput><
file system or other labels may require a configuration step
that involves assigning initial labels to system objects or
creating a policy configuration file. For information on how to
- configure and use each policy module, see its manual page.</para>
+ configure and use each policy module, see its man page.</para>
<para>A variety of tools are available to configure the MAC Framework
and labels maintained by various policies. Extensions have been
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
index e295332c9c..418588109e 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
@@ -1931,45 +1931,6 @@ raisechar=^^</programlisting>
</sect2>
- <sect2 id="serialconsole-howto-fast">
- <title>Serial Console Configuration, Terse Version</title>
-
- <para>This section assumes that you are using the default setup,
- know how to connect serial ports and just want a fast overview
- of a serial console. If you encounter difficulty with these
- steps, please see the more extensive explaination of all the
- options and advanced settings in
- <xref linkend="serialconsole-howto">.</para>
-
- <procedure>
-
- <step>
- <para>Connect the serial port. The serial console will be
- on COM1.</para>
- </step>
-
- <step>
- <para><command>echo -h > /boot.config</command> to enable
- the serial console for the boot loader and kernel.</para>
- </step>
-
- <step>
- <para>Edit <filename>/etc/ttys</filename> and change
- <literal>off</literal> to <literal>on</literal> for the
- <literal>ttyd0</literal> entry. This enables a login
- prompt on the serial console, which mirrors how video
- consoles are typically setup.</para>
- </step>
-
- <step>
- <para><command>shutdown -r now</command> will reboot the
- system with the serial console.</para>
- </step>
-
- </procedure>
-
- </sect2>
-
<sect2 id="serialconsole-howto">
<title>Serial Console Configuration</title>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index ecbd00f708..8d1103dca1 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -51,13 +51,13 @@
<para>The FreeBSD ports collection is the way almost everyone
installs applications ("ports") on FreeBSD. Like everything
- else about FreeBSD, it is primarily a volunteer effort.
- It is important to keep this in mind when reading this
- document.</para>
-
+ else about FreeBSD, it is primarily a volunteer effort.
+ It is important to keep this in mind when reading this
+ document.</para>
+
<para>In FreeBSD, anyone may submit a new port, or volunteer
- to maintain an existing port if it is unmaintained&mdash;you
- do not need any special commit privileges to do so.</para>
+ to maintain an existing port if it is unmaintained&mdash;you
+ do not need any special commit privileges to do so.</para>
</chapter>
@@ -3936,221 +3936,7 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/foo %%PREFIX%%/lib/bar</programlisting>
<sect1 id="using-java">
<title>Using Java</title>
- <para>If your port needs a Java&trade; Development Kit (JDK) to
- either build, run or even extract the distfile, then it should
- define <makevar>USE_JAVA</makevar>.</para>
-
- <para>There are several JDKs in the ports collection, from various
- vendors, and in several versions. If your port must use one of
- these versions, you can define which one. The most current
- version is <filename role="package">java/jdk14</filename>.</para>
-
- <table frame="none">
- <title>Variables to be defined by ports that use Java</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Variable</entry>
- <entry>Means</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><makevar>USE_JAVA</makevar></entry>
- <entry>Should be defined for the remaining variables to have any
- effect.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_VERSION</makevar></entry>
- <entry>List of space-separated suitable Java versions for
- the port. An optional <literal>"+"</literal> allows you to
- specify a range of versions (allowed values:
- <literal>1.1[+] 1.2[+] 1.3[+] 1.4[+]</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_OS</makevar></entry>
- <entry>List of space-separated suitable JDK port operating
- systems for the port (allowed values: <literal>native
- linux</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_VENDOR</makevar></entry>
- <entry>List of space-separated suitable JDK port vendors for
- the port (allowed values: <literal>freebsd bsdjava sun ibm
- blackdown</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_BUILD</makevar></entry>
- <entry>When set, it means that the selected JDK port should
- be added to the build dependencies of the port.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_RUN</makevar></entry>
- <entry>When set, it means that the selected JDK port should
- be added to the run dependencies of the port.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_EXTRACT</makevar></entry>
- <entry>When set, it means that the selected JDK port should
- be added to the extract dependencies of the port.</entry>
- </row>
- <row>
- <entry><makevar>USE_JIKES</makevar></entry>
- <entry>Whether the port should or should not use the
- <command>jikes</command> bytecode compiler to build. When
- no value is set for this variable, the port will use
- <command>jikes</command> to build if available. You may
- also explicitely forbid or enforce the use of
- <command>jikes</command> (by setting <literal>'no'</literal>
- or <literal>'yes'</literal>). In the later case, <filename
- role="package">devel/jikes</filename> will be added to build
- dependencies of the port.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>Below is the list of all settings a port will receive after
- setting <makevar>USE_JAVA</makevar>:</para>
-
- <table frame="none">
- <title>Variables defined for ports that use Java</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Variable</entry>
- <entry>Value</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><makevar>JAVA_PORT</makevar></entry>
- <entry>The name of the JDK port (e.g.
- <literal>'java/jdk14'</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_PORT_VERSION</makevar></entry>
- <entry>The full version of the JDK port (e.g.
- <literal>'1.4.2'</literal>). If you only need the first
- two digits of this version number, use
- <makevar>${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}</makevar>.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_PORT_OS</makevar></entry>
- <entry>The operating system used by the JDK port (e.g.
- <literal>'linux'</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_PORT_VENDOR</makevar></entry>
- <entry>The vendor of the JDK port (e.g.
- <literal>'sun'</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_PORT_OS_DESCRIPTION</makevar></entry>
- <entry>Description of the operating system used by the JDK port
- (e.g. <literal>'Linux'</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_PORT_VENDOR_DESCRIPTION</makevar></entry>
- <entry>Description of the vendor of the JDK port (e.g.
- <literal>'FreeBSD Foundation'</literal>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA_HOME</makevar></entry>
- <entry>Path to the installation directory of the JDK (e.g.
- <filename>'/usr/local/jdk1.3.1'</filename>).</entry>
- </row>
- <row>
- <entry><makevar>JAVAC</makevar></entry>
- <entry>Path to the Java compiler to use (e.g.
- <filename>'/usr/local/jdk1.1.8/bin/javac'</filename> or
- <filename>'/usr/local/bin/jikes'</filename>).</entry>
- </row>
- <row>
- <entry><makevar>JAR</makevar></entry>
- <entry>Path to the <command>jar</command> tool to use (e.g.
- <filename>'/usr/local/jdk1.2.2/bin/jar'</filename> or
- <filename>'/usr/local/bin/fastjar'</filename>).</entry>
- </row>
- <row>
- <entry><makevar>APPLETVIEWER</makevar></entry>
- <entry>Path to the <command>appletviewer</command> utility (e.g.
- <filename>'/usr/local/linux-jdk1.2.2/bin/appletviewer'</filename>).</entry>
- </row>
- <row>
- <entry><makevar>JAVA</makevar></entry>
- <entry>Path to the <command>java</command> executable. Use
- this for executing Java programs (e.g.
- <filename>'/usr/local/jdk1.3.1/bin/java'</filename>).</entry>
- </row>
- <row>
- <entry><makevar>JAVADOC</makevar></entry>
- <entry>Path to the <command>javadoc</command> utility
- program.</entry>
- </row>
- <row>
- <entry><makevar>JAVAH</makevar></entry>
- <entry>Path to the <command>javah</command> program.</entry>
- </row>
- <row>
- <entry><makevar>JAVAP</makevar></entry>
- <entry>Path to the <command>javap</command> program.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_KEYTOOL</makevar></entry>
- <entry>Path to the <command>keytool</command> utility program.
- This variable is availble only if the JDK is Java 1.2 or
- higher.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_N2A</makevar></entry>
- <entry>Path to the <command>native2ascii</command> tool.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_POLICYTOOL</makevar></entry>
- <entry>Path to the <command>policytool</command> program.
- This variable is available only if the JDK is Java 1.2 or
- higher.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_SERIALVER</makevar></entry>
- <entry>Path to the <command>serialver</command> utility
- program.</entry>
- </row>
- <row>
- <entry><makevar>RMIC</makevar></entry>
- <entry>Path to the RMI stub/skeleton generator,
- <command>rmic</command>.</entry>
- </row>
- <row>
- <entry><makevar>RMIREGISTRY</makevar></entry>
- <entry>Path to the RMI registry program,
- <command>rmiregistry</command>.</entry>
- </row>
- <row>
- <entry><makevar>RMID</makevar></entry>
- <entry>Path to the RMI daemon program <command>rmid</command>.
- This variable is only available if the JDK is Java 1.2
- or higher.</entry>
- </row>
- <row>
- <entry><makevar>JAVA_CLASSES</makevar></entry>
- <entry>Path to the archive that contains the JDK class
- files. On JDK 1.2 or later, this is
- <filename>${JAVA_HOME}/jre/lib/rt.jar</filename>. Earlier
- JDKs used
- <filename>${JAVA_HOME}/lib/classes.zip</filename>.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <para>You may use the <literal>java-debug</literal> make target
- to get information for debugging your port. It will display the
- value of many of the forecited variables.</para>
-
+ <para>This section is yet to be written.</para>
</sect1>
<sect1 id="using-python">
@@ -5267,10 +5053,6 @@ PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION}</programlisting>
<sect1 id="freebsd-versions">
<title>__FreeBSD_version values</title>
- <para>Here is a convenient list of
- <literal>__FreeBSD_version</literal> values as defined in
- <filename>sys/param.h</filename>:</para>
-
<table frame="none">
<title>__FreeBSD_version values</title>
<tgroup cols="2">
@@ -6675,12 +6457,10 @@ slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/sbin/nologi
fido:*:111:111:Fido System:/usr/local/fido:/bin/sh
postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin
rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/sbin/nologin
-sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin
agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent
ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin
drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin
-qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin
-ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh
+qtss:*:554:554:Darwin Streaming Server:/nonexistant:/sbin/nologin
bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin</programlisting>
<para>This is the current list of reserved GIDs.</para>
@@ -6702,8 +6482,7 @@ mailman:*:91:
postfix:*:125:
maildrop:*:126:
rbldns:*:153:
-qtss:*:554:
-ircdru:*:555:</programlisting>
+qtss:*:554:</programlisting>
<para>Please include a notice when you submit a port (or an upgrade)
that reserves a new UID or GID in this range. This allows us to
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index c450e784ed..f0f4e73e19 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -512,8 +512,6 @@
<!ENTITY a.mdodd "Matthew N. Dodd <email>mdodd@FreeBSD.org</email>">
-<!ENTITY a.metal "Koichi Suzuki <email>metal@FreeBSD.org</email>">
-
<!ENTITY a.mezz "Jeremy Messenger <email>mezz@FreeBSD.org</email>">
<!ENTITY a.mharo "Michael Haro <email>mharo@FreeBSD.org</email>">
diff --git a/en_US.ISO8859-1/share/sgml/mailing-lists.ent b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
index acff95698f..f105abca39 100644
--- a/en_US.ISO8859-1/share/sgml/mailing-lists.ent
+++ b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
@@ -144,9 +144,6 @@
<!ENTITY a.doc-committers "FreeBSD doc/ committer's mailing list">
<!ENTITY a.doc-committers.name "doc-committers">
-<!ENTITY a.doc-developers "FreeBSD doc/ developers mailing list">
-<!ENTITY a.doc-developers.name "doc-developers">
-
<!ENTITY a.emulation.url "&a.mailman.listinfo;/freebsd-emulation">
<!ENTITY a.emulation "<ulink url='&a.emulation.url;'>FreeBSD-emulation mailing list</ulink>">
<!ENTITY a.emulation.name "<ulink url='&a.emulation.url;'>freebsd-emulation</ulink>">
@@ -290,9 +287,6 @@
<!ENTITY a.ports-committers "FreeBSD ports/ committer's mailing list">
<!ENTITY a.ports-committers.name "ports-committers">
-<!ENTITY a.ports-developers "FreeBSD ports/ developers mailing list">
-<!ENTITY a.ports-developers.name "ports-developers">
-
<!ENTITY a.ppc.url "&a.mailman.listinfo;/freebsd-ppc">
<!ENTITY a.ppc "<ulink url='&a.ppc.url;'>FreeBSD PowerPC porting mailing list</ulink>">
<!ENTITY a.ppc.name "<ulink url='&a.ppc.url;'>freebsd-ppc</ulink>">
@@ -336,9 +330,6 @@
<!ENTITY a.src-committers "FreeBSD src/ committer's mailing list">
<!ENTITY a.src-committers.name "freebsd-src-committers">
-<!ENTITY a.src-developers "FreeBSD src/ developers mailing list">
-<!ENTITY a.src-developers.name "freebsd-src-developers">
-
<!ENTITY a.stable.url "&a.mailman.listinfo;/freebsd-stable">
<!ENTITY a.stable "<ulink url='&a.stable.url;'>&os.stable; mailing list</ulink>">
<!ENTITY a.stable.name "<ulink url='&a.stable.url;'>freebsd-stable</ulink>">