This commit is contained in:
Gabor Kovesdan 2013-07-24 19:11:16 +00:00
commit 988c5ce88c
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/projects/db5/; revision=42422
146 changed files with 6232 additions and 7422 deletions

View file

@ -547,9 +547,8 @@ boot:</screen>
des Loaders.</para>
<itemizedlist>
<indexterm><primary>Single-User Modus</primary></indexterm>
<listitem>
<para>Um den gewöhnlichen Kernel im Single-User Modus zu
<para>Um den gewöhnlichen Kernel im Single-User Modus<indexterm><primary>Single-User Modus</primary></indexterm> zu
starten:</para>
<screen><userinput>boot -s</userinput></screen>
@ -559,16 +558,13 @@ boot:</screen>
<para>Um alle gewöhnlichen Kernelmodule zu entladen und dann
nur den alten (oder jeden beliebigen anderen) Kernel zu
laden:</para>
<indexterm>
<primary><filename>kernel.old</filename></primary>
</indexterm>
<screen><userinput>unload</userinput>
<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
<para>Es kann <filename>kernel.GENERIC</filename> verwendet
werden, um den allgemeinen Kernel zu bezeichnen, der
vorinstalliert wird. <filename>kernel.old</filename>
vorinstalliert wird. <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm>
bezeichnet den Kernel, der vor dem aktuellen installiert
war (falls man einen neuen Kernel kompiliert und
installiert hat zum Beispiel).</para>

View file

@ -1487,14 +1487,10 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<sect3>
<title>Benutzen von &os.current;</title>
<indexterm>
<primary>-CURRENT</primary>
<secondary>benutzen</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>Es ist <emphasis>essentiell</emphasis>, die Mailinglisten
&a.current.name; und &a.svn-src-head.name; zu lesen. Wenn Sie
&a.current.name; und &a.svn-src-head.name;<indexterm><primary>-CURRENT</primary><secondary>benutzen</secondary></indexterm> zu lesen. Wenn Sie
<emphasis>&a.current.name;</emphasis> nicht lesen, verpassen Sie
die Kommentare anderer über den momentanen Zustand des
Systems und rennen demzufolge in viele bekannte Probleme, die
@ -1521,21 +1517,9 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
dazu zwei Möglichkeiten:</para>
<orderedlist>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>mit <application>CVSup</application>
synchronisieren</secondary>
</indexterm>
<listitem>
<para>Benutzen Sie das Programm
<link linkend="cvsup">cvsup</link>
<link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm>
mit der Datei <filename>standard-supfile</filename>
aus dem Verzeichnis
<filename>/usr/share/examples/cvsup</filename>.
@ -1545,7 +1529,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<command>cvsup</command> aus <command>cron</command>
heraus laufen, um ihre Quellen automatisch auf Stand
zu bringen. Sie müssen die obige Sup-Datei
anpassen und <link linkend="cvsup">cvsup</link>
anpassen und <link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>mit <application>CVSup</application> synchronisieren</secondary></indexterm>
in Ihrer Umgebung konfigurieren.</para>
<note>
@ -1569,12 +1553,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>mit CTM synchronisieren</secondary>
</indexterm>
<para><application><link linkend="ctm">CTM</link></application>
<para><application><link linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>mit CTM synchronisieren</secondary></indexterm>
kommt in Frage, wenn Sie
über eine schlechte Internet-Anbindung (hoher Preis
oder nur E-Mail Zugriff) verfügen. Der Umgang mit
@ -1600,14 +1579,9 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
Schwierigkeiten geraten, wenn Sie versuchen, nur einen Teil
der Quellen zu übersetzen.</para>
<indexterm>
<primary>-CURRENT</primary>
<secondary>übersetzen</secondary>
</indexterm>
<para>Sehen Sie sich das <filename>Makefile</filename> in
<filename>/usr/src</filename> genau an, bevor Sie
&os.current; übersetzen. Wenn Sie
&os.current; übersetzen<indexterm><primary>-CURRENT</primary><secondary>übersetzen</secondary></indexterm>. Wenn Sie
&os; das erste Mal aktualisieren, sollten Sie sowohl
<link linkend="makeworld">einen Kernel als auch das
System neu installieren</link>.
@ -1696,14 +1670,10 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<sect3>
<title>Benutzen von &os.stable;</title>
<indexterm>
<primary>-STABLE</primary>
<secondary>benutzen</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>Lesen Sie Mailingliste &a.stable.name;, damit Sie über
Abhängigkeiten beim Bau von &os.stable; und Sachen, die
Abhängigkeiten beim Bau von &os.stable;<indexterm><primary>-STABLE</primary><secondary>benutzen</secondary></indexterm> und Sachen, die
besondere Aufmerksamkeit erfordern, informiert sind.
Umstrittene Fehlerbehebungen oder Änderungen werden von
den Entwicklern auf dieser Liste bekannt gegeben. Dies
@ -1746,21 +1716,9 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<orderedlist>
<listitem>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary>mit <application>CVSup</application>
synchronisieren</secondary>
</indexterm>
<para>Benutzen Sie das Programm
<link linkend="cvsup">cvsup</link>
mit der Datei <filename>stable-supfile</filename>
<link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm>
mit der Datei <filename>stable-supfile</filename><indexterm><primary>-STABLE</primary><secondary>mit <application>CVSup</application> synchronisieren</secondary></indexterm>
aus dem Verzeichnis
<filename>/usr/share/examples/cvsup</filename>.
Dies ist die empfohlene Methode, da Sie die ganzen
@ -1774,13 +1732,8 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>mit CTM synchronisieren</secondary>
</indexterm>
<para>Benutzen Sie <application><link linkend="ctm">
CTM</link></application>. Wenn Sie über
CTM</link></application><indexterm><primary>-STABLE</primary><secondary>mit CTM synchronisieren</secondary></indexterm>. Wenn Sie über
keine schnelle und billige Internet-Anbindung
verfügen, sollten Sie diese Methode in Betracht
ziehen.</para>
@ -1797,12 +1750,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>übersetzen</secondary>
</indexterm>
<para>Bevor Sie &os.stable; übersetzen, sollten Sie sich
<para>Bevor Sie &os.stable; übersetzen<indexterm><primary>-STABLE</primary><secondary>übersetzen</secondary></indexterm>, sollten Sie sich
das <filename>Makefile</filename> in
<filename>/usr/src</filename> genau anschauen. Wenn Sie
&os; das erste Mal aktualisieren, sollten Sie sowohl

View file

@ -485,28 +485,20 @@
einiger der weltgrößten IT-Firmen, darunter:</para>
<itemizedlist>
<indexterm><primary>Apple</primary></indexterm>
<listitem>
<para><ulink url="http://www.apple.com/">Apple</ulink></para>
<para><ulink url="http://www.apple.com/">Apple</ulink><indexterm><primary>Apple</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Cisco</primary></indexterm>
<para><ulink url="http://www.cisco.com/">Cisco</ulink></para>
<para><ulink url="http://www.cisco.com/">Cisco</ulink><indexterm><primary>Cisco</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Juniper</primary></indexterm>
<para><ulink url="http://www.juniper.net/">Juniper</ulink></para>
<para><ulink url="http://www.juniper.net/">Juniper</ulink><indexterm><primary>Juniper</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>NetApp</primary></indexterm>
<para><ulink url="http://www.netapp.com/">NetApp</ulink></para>
<para><ulink url="http://www.netapp.com/">NetApp</ulink><indexterm><primary>NetApp</primary></indexterm></para>
</listitem>
</itemizedlist>
@ -515,101 +507,59 @@
<itemizedlist>
<listitem>
<indexterm>
<primary>Yahoo!</primary>
</indexterm>
<para><ulink
url="http://www.yahoo.com/">Yahoo!</ulink></para>
url="http://www.yahoo.com/">Yahoo!</ulink><indexterm><primary>Yahoo!</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Yandex/primary></primary></indexterm>
<para><ulink url="http://www.yandex.ru/">Yandex</ulink></para>
<para><ulink url="http://www.yandex.ru/">Yandex</ulink><indexterm><primary>Yandex/primary></primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>Apache</primary>
</indexterm>
<para><ulink
url="http://www.apache.org/">Apache</ulink></para>
url="http://www.apache.org/">Apache</ulink><indexterm><primary>Apache</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>Rambler</primary>
</indexterm>
<para><ulink url="http://www.rambler.ru/">Rambler</ulink></para>
<para><ulink url="http://www.rambler.ru/">Rambler</ulink><indexterm><primary>Rambler</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Sina</primary></indexterm>
<para><ulink url="http://www.sina.com/">Sina</ulink></para>
<para><ulink url="http://www.sina.com/">Sina</ulink><indexterm><primary>Sina</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>Pair Networks</primary>
</indexterm>
<para><ulink url="http://www.pair.com/">Pair
Networks</ulink></para>
Networks</ulink><indexterm><primary>Pair Networks</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>Sony Japan</primary>
</indexterm>
<para><ulink url="http://www.sony.co.jp/">Sony
Japan</ulink></para>
Japan</ulink><indexterm><primary>Sony Japan</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>Netcraft</primary>
</indexterm>
<para><ulink
url="http://www.netcraft.com/">Netcraft</ulink></para>
url="http://www.netcraft.com/">Netcraft</ulink><indexterm><primary>Netcraft</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>NetEase</primary>
</indexterm>
<para><ulink url="http://www.163.com/">NetEase</ulink></para>
<para><ulink url="http://www.163.com/">NetEase</ulink><indexterm><primary>NetEase</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>Weathernews</primary>
</indexterm>
<para><ulink
url="http://www.wni.com/">Weathernews</ulink></para>
url="http://www.wni.com/">Weathernews</ulink><indexterm><primary>Weathernews</primary></indexterm></para>
</listitem>
<listitem>
<indexterm>
<primary>TELEHOUSE America</primary>
</indexterm>
<para><ulink url="http://www.telehouse.com/">TELEHOUSE
America</ulink></para>
America</ulink><indexterm><primary>TELEHOUSE America</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Experts Exchange</primary></indexterm>
<para><ulink url="http://www.experts-exchange.com/">Experts
Exchange</ulink></para>
Exchange</ulink><indexterm><primary>Experts Exchange</primary></indexterm></para>
</listitem>
</itemizedlist>
@ -987,32 +937,13 @@
id="development-cvs-repository"/></term>
<listitem>
<indexterm>
<primary>CVS</primary>
<secondary>Repository</secondary>
</indexterm>
<indexterm>
<primary>Concurrent-Versions-System</primary>
<see>CVS</see>
</indexterm>
<indexterm>
<primary>SVN</primary>
<secondary>Repository</secondary>
</indexterm>
<indexterm>
<primary>Subversion</primary>
<see>SVN</see>
</indexterm>
<para>Der Hauptquellbaum von &os; wurde über viele
Jahre ausschließlich mit <ulink
url="http://ximbiot.com/cvs/wiki/">CVS</ulink> gepflegt, einem
url="http://ximbiot.com/cvs/wiki/">CVS</ulink><indexterm><primary>CVS</primary><secondary>Repository</secondary></indexterm><indexterm><primary>Concurrent-Versions-System</primary><see>CVS</see></indexterm> gepflegt, einem
frei erhältlichen Versionskontrollsystem, welches
mit &os; geliefert wird. Im Juni 2008 begann das
&os; Project mit dem Umstieg auf <ulink
url="http://subversion.tigris.org">SVN</ulink> (Subversion).
url="http://subversion.tigris.org">SVN</ulink><indexterm><primary>SVN</primary><secondary>Repository</secondary></indexterm><indexterm><primary>Subversion</primary><see>SVN</see></indexterm> (Subversion).
Dieser Schritt wurde notwendig, weil
<application>CVS</application> aufgrund des rapide
wachsenden Quellcodebaumes und dem Umfang der bereits
@ -1053,11 +984,7 @@
id="development-committers"/></term>
<listitem>
<indexterm>
<primary>Committer</primary>
</indexterm>
<para>Die <firstterm>Committer</firstterm> sind Personen
<para>Die <firstterm>Committer</firstterm><indexterm><primary>Committer</primary></indexterm> sind Personen
mit <emphasis>Schreibzugriff</emphasis> auf den
CVS-Quellbaum (der Begriff <quote>Committer</quote>
stammt vom &man.cvs.1;-Befehl <command>commit</command>,
@ -1076,13 +1003,9 @@
id="development-core"/></term>
<listitem>
<indexterm>
<primary>Core-Team</primary>
</indexterm>
<para>Würde man das &os; Project mit einem
Unternehmen vergleichen, so wäre das
<firstterm>&os;-Core-Team</firstterm> das
<firstterm>&os;-Core-Team</firstterm><indexterm><primary>Core-Team</primary></indexterm> das
Gegenstück zum Vorstand. Die Hauptaufgabe des
Core-Teams ist es, das Projekt als Ganzes in gesunder
Verfassung zu halten und die weitere Entwicklung in die
@ -1124,10 +1047,6 @@
<term>Weitere Beitragende</term>
<listitem>
<indexterm>
<primary>Beitragende</primary>
</indexterm>
<para>Die größte Entwicklergruppe sind
nicht zuletzt die Anwender selbst, die
Rückmeldungen und Fehlerbehebungen in einem anhaltend
@ -1141,7 +1060,7 @@
<para><citetitle><ulink
url="&url.articles.contributors.en;/article.html">Die Liste
der zu &os; Beitragenden</ulink></citetitle> ist eine
der zu &os; Beitragenden</ulink></citetitle><indexterm><primary>Beitragende</primary></indexterm> ist eine
lange und wachsende. Also warum nicht selbst dort
stehen, indem Sie gleich persönlich etwas zu
&os; beitragen?</para>

View file

@ -173,15 +173,9 @@
Verfügung haben:</para>
<itemizedlist>
<indexterm id="ppp-isp">
<primary>ISP</primary>
</indexterm>
<indexterm id="ppp-ppp2">
<primary>PPP</primary>
</indexterm>
<listitem>
<para>Einen Account bei einem Internet Service Provider (ISP),
zu dem Sie mit PPP eine Verbindung aufbauen können.</para>
<para>Einen Account bei einem Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm>,
zu dem Sie mit PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm> eine Verbindung aufbauen können.</para>
</listitem>
<listitem>
@ -195,32 +189,13 @@
</listitem>
<listitem>
<indexterm id="ppp-pap">
<primary>PAP</primary>
</indexterm>
<indexterm id="ppp-chap">
<primary>CHAP</primary>
</indexterm>
<indexterm id="ppp-unix">
<primary>UNIX</primary>
</indexterm>
<indexterm id="ppp-login">
<primary>Login Name</primary>
</indexterm>
<indexterm id="ppp-password">
<primary>Passwort</primary>
</indexterm>
<para>Ihren Login-Namen und Ihr Passwort (entweder ein
reguläres Login/Passwort-Paar im &unix;-Stil oder
ein PAP bzw. CHAP Login/Passwort-Paar).</para>
<para>Ihren Login-Namen<indexterm id="ppp-login"><primary>Login Name</primary></indexterm> und Ihr Passwort<indexterm id="ppp-password"><primary>Passwort</primary></indexterm> (entweder ein
reguläres Login/Passwort-Paar im &unix;-Stil<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> oder
ein PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> bzw. CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm> Login/Passwort-Paar).</para>
</listitem>
<listitem>
<indexterm id="ppp-nameserver">
<primary>Nameserver</primary>
</indexterm>
<para>Die IP-Adresse von einem oder mehreren Nameservern.
<para>Die IP-Adresse von einem oder mehreren Nameservern<indexterm id="ppp-nameserver"><primary>Nameserver</primary></indexterm>.
Üblicherweise werden Ihnen von Ihrem ISP zwei
IP-Adressen für diesen Zweck zur Verfügung gestellt.
Wenn Sie keine solche IP-Adresse von Ihrem
@ -261,11 +236,7 @@
</listitem>
<listitem>
<indexterm id="ppp-static-ip">
<primary>feste IP-Adresse</primary>
</indexterm>
<para>Wenn Ihnen Ihr ISP eine statische IP-Adresse zur
<para>Wenn Ihnen Ihr ISP eine statische IP-Adresse<indexterm id="ppp-static-ip"><primary>feste IP-Adresse</primary></indexterm> zur
Verfügung stellt, können Sie diese eintragen.
Andernfalls lassen wir uns einfach von der Gegenstelle
eine IP-Adresse zuweisen.</para>
@ -418,12 +389,7 @@
<term>Zeilen 6 &amp; 7:</term>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>User-PPP</secondary>
</indexterm>
<para>Die Zeichenfolge für die Einwahl. User-PPP
<para>Die Zeichenfolge für die Einwahl. User-PPP<indexterm><primary>PPP</primary><secondary>User-PPP</secondary></indexterm>
verwendet eine expect-send Syntax, ähnlich dem
&man.chat.8;-Programm. Weitere Informationen zu den
Eigenschaften dieser Sprache bietet die Manual-Seite.</para>
@ -526,10 +492,7 @@
<term>Zeile 15:</term>
<listitem>
<indexterm><primary>PAP</primary></indexterm>
<indexterm><primary>CHAP</primary></indexterm>
<para>Wenn Sie PAP oder CHAP einsetzen, gibt es an
<para>Wenn Sie PAP<indexterm><primary>PAP</primary></indexterm> oder CHAP<indexterm><primary>CHAP</primary></indexterm> einsetzen, gibt es an
dieser Stelle keinen Login-Prompt, weshalb Sie diese
Zeile auskommentieren oder löschen sollten. Der
Abschnitt <link linkend="userppp-PAPnCHAP">Authentifizierung
@ -560,9 +523,7 @@ protocol: ppp</screen>
<term>Zeile 16:</term>
<listitem>
<indexterm><primary>Zeitbeschränkung</primary></indexterm>
<para>Setzt einen Zeitrahmen (in Sekunden), innerhalb
<para>Setzt einen Zeitrahmen<indexterm><primary>Zeitbeschränkung</primary></indexterm> (in Sekunden), innerhalb
dessen eine Reaktion erfolgen muss. In diesem Fall,
wird die Verbindung nach 300&nbsp;Sekunden automatisch
geschlossen, wenn keine Aktivität zu
@ -577,14 +538,12 @@ protocol: ppp</screen>
<varlistentry>
<term>Zeile 17:</term>
<listitem>
<indexterm><primary>ISP</primary></indexterm>
<para>Gibt die IP-Adresse für das Interface an.
Der String <replaceable>x.x.x.x</replaceable> sollte
durch die IP-Adresse ersetzt werden, die Ihnen Ihr
Provider zugeteilt hat. Der String
<replaceable>y.y.y.y</replaceable> sollte durch die
IP-Adresse ersetzt werden, die Ihr ISP als Gateway
IP-Adresse ersetzt werden, die Ihr ISP <indexterm><primary>ISP</primary></indexterm> als Gateway
angegeben hat (das ist der Rechner, mit dem Ihr Rechner
eine Verbindung aufbaut). Wenn Ihnen Ihr ISP keine
Gateway Adresse zur Verfügung gestellt hat,
@ -1111,9 +1070,7 @@ set nbns 203.14.100.5</programlisting>
<varlistentry>
<term>Zeile 14:</term>
<listitem>
<indexterm><primary>Passwort</primary></indexterm>
<para>Diese Zeile legt Ihr PAP/CHAP Passwort fest. Sie
<para>Diese Zeile legt Ihr PAP/CHAP Passwort<indexterm><primary>Passwort</primary></indexterm> fest. Sie
müssen den richtigen Wert für
<replaceable>MyPassword</replaceable> eingeben.
Sie können eine zusätzliche Zeile, wie etwa:</para>
@ -1451,12 +1408,7 @@ ifconfig_tun0=</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>Server</secondary>
</indexterm>
<para>Als <quote>Server</quote> &ndash; Ihr Rechner ist in
<para>Als <quote>Server</quote><indexterm><primary>PPP</primary><secondary>Server</secondary></indexterm> &ndash; Ihr Rechner ist in
ein Netzwerk eingebunden und stellt die PPP-Verbindung
für andere Rechner im Netzwerk her.</para>
</listitem>
@ -2755,9 +2707,7 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
</listitem>
<listitem>
<indexterm><primary>Defaultroute</primary></indexterm>
<para>Den Defaultrouter geben Sie durch die Modifikation
<para>Den Defaultrouter<indexterm><primary>Defaultroute</primary></indexterm> geben Sie durch die Modifikation
folgender Zeile an:</para>
<programlisting>defaultrouter="NO"</programlisting>

View file

@ -517,10 +517,9 @@ boot:</screen>
του loader:</para>
<itemizedlist>
<indexterm><primary>single-user mode</primary></indexterm>
<listitem>
<para>Για να ξεκινήσετε το συνηθισμένο πυρήνα σας, αλλά σε
êáôÜóôáóç åíüò ÷ñÞóôç:</para>
êáôÜóôáóç åíüò ÷ñÞóôç:<indexterm><primary>single-user mode</primary></indexterm></para>
<screen><userinput>boot -s</userinput></screen>
</listitem>

View file

@ -1464,14 +1464,10 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<sect3>
<title>Χρησιμοποιώντας το &os.current;</title>
<indexterm>
<primary>-CURRENT</primary>
<secondary>using</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>Γραφτείτε στις λίστες &a.current.name; και
&a.svn-src-head.name;. Äåí åßíáé áðëþò êáëÞ éäÝá, åßíáé
&a.svn-src-head.name;<indexterm><primary>-CURRENT</primary><secondary>using</secondary></indexterm>. Äåí åßíáé áðëþò êáëÞ éäÝá, åßíáé
<emphasis>βασικό</emphasis> να το κάνετε. Αν δεν είστε
γραμμένος στη λίστα <emphasis>&a.current.name;</emphasis>, δεν
θα βλέπετε τα σχόλια σχετικά με την τρέχουσα κατάσταση του
@ -1502,20 +1498,9 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
μπορεί να γίνει με δύο τρόπους:</para>
<orderedlist>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with <application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Χρησιμοποιήστε το πρόγραμμα <link
linkend="cvsup">cvsup</link> óå óõíäõáóìü ìå ôï
linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> óå óõíäõáóìü ìå ôï
<filename>supfile</filename> με την ονομασία
<filename>standard-supfile</filename> το οποίο θα βρείτε
στον κατάλογο
@ -1523,7 +1508,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
Αυτή είναι και η πλέον συνιστώμενη μέθοδος, καθώς σας
επιτρέπει να ανακτήσετε όλη τη συλλογή με μια κίνηση, και
στις επόμενες ανανεώσεις θα παίρνετε μόνο τις αλλαγές.
Ðïëëïß ÷ñÞóôåò åêôåëïýí ôï <command>cvsup</command> ìÝóù
Ðïëëïß ÷ñÞóôåò åêôåëïýí ôï <command>cvsup</command><indexterm><primary>-CURRENT</primary><secondary>Syncing with <application>CVSup</application></secondary></indexterm> ìÝóù
του <command>cron</command> ώστε να κρατάνε τον πηγαίο
κώδικα του συστήματος τους πάντα ανανεωμένο αυτόματα. Θα
πρέπει να προσαρμόσετε το υπόδειγμα του
@ -1553,13 +1538,8 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with CTM</secondary>
</indexterm>
<para>Χρησιμοποιήστε την υπηρεσία <application><link
linkend="ctm">CTM</link></application>. Áí Ý÷åôå ðïëý êáêÞ
linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Syncing with CTM</secondary></indexterm>. Áí Ý÷åôå ðïëý êáêÞ
συνδεσιμότητα (υψηλό κόστος σύνδεσης ή πρόσβαση μόνο μέσω
email) το <application>CTM</application> αποτελεί για σας
μια εναλλακτική λύση. Μπορεί ωστόσο να σας δημιουργήσει
@ -1583,11 +1563,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
του κώδικα εξαρτώνται από ανανεώσεις σε άλλα, και δεν μπορούν
να μεταγλωττιστούν αυτόνομα.</para>
<indexterm>
<primary>-CURRENT</primary>
<secondary>compiling</secondary>
</indexterm>
<para>Ðñéí ìåôáãëùôôßóåôå ôï &os.current;, äéáâÜóôå ðñïóåêôéêÜ ôï
<para>Ðñéí ìåôáãëùôôßóåôå ôï &os.current;<indexterm><primary>-CURRENT</primary><secondary>compiling</secondary></indexterm>, äéáâÜóôå ðñïóåêôéêÜ ôï
<filename>Makefile</filename> στον κατάλογο
<filename>/usr/src</filename>. Θα πρέπει να <link
linkend="makeworld">μεταγλωττίσετε τον πυρήνα και όλο το
@ -1677,15 +1653,11 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<sect3>
<title>Χρησιμοποιώντας το &os.stable;</title>
<indexterm>
<primary>-STABLE</primary>
<secondary>using</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>Γραφτείτε συνδρομητής στη λίστα &a.stable.name;. Θα είστε
έτσι ενημερωμένοι για εξαρτήσεις μεταγλώττισης που ίσως
åìöáíéóôïýí óôï &os.stable;, Þ ãéá Üëëá ðñïâëÞìáôá ðïõ ÷ñÞæïõí
åìöáíéóôïýí óôï &os.stable;<indexterm><primary>-STABLE</primary><secondary>using</secondary></indexterm>, Þ ãéá Üëëá ðñïâëÞìáôá ðïõ ÷ñÞæïõí
ειδικής προσοχής. Στη λίστα αυτή θα βρίσκετε επίσης
ανακοινώσεις από μέλη της ομάδας ανάπτυξης, όταν πρόκειται να
συμπεριληφθεί κάποια αμφιλεγόμενη ανανέωση ή διόρθωση, δίνοντας
@ -1728,20 +1700,10 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
τρόποι για να γίνει αυτό:</para>
<orderedlist>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with <application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Χρησιμοποιήστε το πρόγραμμα <link
linkend="cvsup">cvsup</link> óå óõíäõáóìü ìå ôï
linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> óå óõíäõáóìü ìå ôï
<filename>supfile</filename> με την ονομασία
<filename>stable-supfile</filename> το οποίο θα βρείτε
στον κατάλογο
@ -1754,18 +1716,13 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
κώδικα του συστήματος τους πάντα ανανεωμένο αυτόματα. Θα
πρέπει να προσαρμόσετε το υπόδειγμα του
<filename>supfile</filename> που δίνουμε παραπάνω, και να
ñõèìßóåôå ôï <link linkend="cvsup">cvsup</link> ãéá ôï
ñõèìßóåôå ôï <link linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>syncing with <application>CVSup</application></secondary></indexterm> ãéá ôï
περιβάλλον σας.</para>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with CTM</secondary>
</indexterm>
<para>Χρησιμοποιήστε την υπηρεσία <application><link
linkend="ctm">CTM</link></application>. Áí äåí Ý÷åôå
linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>syncing with CTM</secondary></indexterm>. Áí äåí Ý÷åôå
γρήγορη και φτηνή σύνδεση με το Internet, αυτή είναι η
συνιστώμενη μέθοδος.</para>
</listitem>
@ -1782,12 +1739,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>compiling</secondary>
</indexterm>
<para>Ðñéí ìåôáãëùôôßóåôå ôï &os.stable;, äéáâÜóôå ðñïóåêôéêÜ ôï
<para>Ðñéí ìåôáãëùôôßóåôå ôï &os.stable;<indexterm><primary>-STABLE</primary><secondary>compiling</secondary></indexterm>, äéáâÜóôå ðñïóåêôéêÜ ôï
<filename>Makefile</filename> στον κατάλογο
<filename>/usr/src</filename>. Θα πρέπει να <link
linkend="makeworld">μεταγλωττίσετε τον πυρήνα και όλο το

View file

@ -265,16 +265,13 @@
στα αρχεία ρυθμίσεων:</para>
<itemizedlist>
<indexterm><primary>POSIX</primary></indexterm>
<listitem>
<para>Την <envar>LANG</envar> για λειτουργίες που ανήκουν στην
ïéêïãÝíåéá &posix; &man.setlocale.3;</para>
ïéêïãÝíåéá &posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3;</para>
</listitem>
<listitem>
<indexterm><primary>MIME</primary></indexterm>
<para>Ôçí <envar>MM_CHARSET</envar> ãéá ôï óýíïëï ÷áñáêôÞñùí MIME
<para>Ôçí <envar>MM_CHARSET</envar> ãéá ôï óýíïëï ÷áñáêôÞñùí MIME<indexterm><primary>MIME</primary></indexterm>
των εφαρμογών.</para>
</listitem>
</itemizedlist>

View file

@ -1196,9 +1196,8 @@ www.example.org</programlisting>
εξασφαλίσετε <emphasis>ένα</emphasis> από τα παρακάτω:</para>
<itemizedlist>
<indexterm><primary>MX record</primary></indexterm>
<listitem>
<para>Íá âåâáéùèåßôå üôé ç åããñáöÞ MX (ìå ôï ÷áìçëüôåñï áñéèìü)
<para>Íá âåâáéùèåßôå üôé ç åããñáöÞ MX<indexterm><primary>MX record</primary></indexterm> (ìå ôï ÷áìçëüôåñï áñéèìü)
στο DNS σας, δείχνει προς τη διεύθυνση IP του
μηχανήματος σας.</para>
</listitem>

View file

@ -1279,12 +1279,8 @@ Exports list on foobar:
<title>Machine Types</title>
<itemizedlist>
<indexterm>
<primary>NIS</primary>
<secondary>master server</secondary>
</indexterm>
<listitem>
<para>A <emphasis>NIS master server</emphasis>. This
<para>A <emphasis>NIS master server</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>. This
server, analogous to a &windowsnt; primary domain
controller, maintains the files used by all of the NIS
clients. The <filename>passwd</filename>,
@ -1299,12 +1295,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>slave server</secondary>
</indexterm>
<para><emphasis>NIS slave servers</emphasis>. Similar to
<para><emphasis>NIS slave servers</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>. Similar to
the &windowsnt; backup domain controllers, NIS slave
servers maintain copies of the NIS master's data files.
NIS slave servers provide the redundancy, which is
@ -1315,12 +1306,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>client</secondary>
</indexterm>
<para><emphasis>NIS clients</emphasis>. NIS clients, like
<para><emphasis>NIS clients</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>. NIS clients, like
most &windowsnt; workstations, authenticate against the
NIS server (or the &windowsnt; domain controller in the
&windowsnt; workstations case) to log on.</para>

View file

@ -178,15 +178,9 @@
<para>Το κείμενο αυτό προϋποθέτει ότι έχετε τα παρακάτω:</para>
<itemizedlist>
<indexterm id="ppp-isp">
<primary>ISP</primary>
</indexterm>
<indexterm id="ppp-ppp2">
<primary>PPP</primary>
</indexterm>
<listitem>
<para>Ëïãáñéáóìü óå êÜðïéï Ðáñï÷Ýá Õðçñåóéþí Internet (ISP) óôïí
ïðïßï óõíäÝåóôå ÷ñçóéìïðïéþíôáò PPP.</para>
<para>Ëïãáñéáóìü óå êÜðïéï Ðáñï÷Ýá Õðçñåóéþí Internet (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm> óôïí
ïðïßï óõíäÝåóôå ÷ñçóéìïðïéþíôáò PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
</listitem>
<listitem>
@ -200,33 +194,14 @@
</listitem>
<listitem>
<indexterm id="ppp-pap">
<primary>PAP</primary>
</indexterm>
<indexterm id="ppp-chap">
<primary>CHAP</primary>
</indexterm>
<indexterm id="ppp-unix">
<primary>UNIX</primary>
</indexterm>
<indexterm id="ppp-login">
<primary>login name</primary>
</indexterm>
<indexterm id="ppp-password">
<primary>password</primary>
</indexterm>
<para>Ôï üíïìá ÷ñÞóôç (login) êáé ôïí êùäéêü óáò (password).
Åßôå êáíïíéêü üíïìá êáé êùäéêü (ôýðïõ &unix;) Þ Ýíá æåýãïò
ïíüìáôïò / êùäéêïý ôýðïõ PAP Þ CHAP.</para>
<para>Ôï üíïìá ÷ñÞóôç (login)<indexterm id="ppp-login"><primary>login name</primary></indexterm> êáé ôïí êùäéêü óáò (password)<indexterm id="ppp-password"><primary>password</primary></indexterm>.
Åßôå êáíïíéêü üíïìá êáé êùäéêü (ôýðïõ &unix;)<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> Þ Ýíá æåýãïò
ïíüìáôïò / êùäéêïý ôýðïõ PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> Þ CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>.</para>
</listitem>
<listitem>
<indexterm id="ppp-nameserver">
<primary>nameserver</primary>
</indexterm>
<para>Τις IP διευθύνσεις ενός ή περισσότερων διακομιστών
ïíïìÜôùí (DNS). ÖõóéïëïãéêÜ, ï ISP óáò èá óáò äþóåé äýï
ïíïìÜôùí (DNS)<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>. ÖõóéïëïãéêÜ, ï ISP óáò èá óáò äþóåé äýï
τέτοιες διευθύνσεις. Αν δεν έχετε τουλάχιστον μία, μπορείτε
να ενεργοποιήσετε την εντολή <command>enable dns</command> στο
<filename>ppp.conf</filename> και το
@ -262,14 +237,10 @@
</listitem>
<listitem>
<indexterm id="ppp-static-ip">
<primary>static IP address</primary>
</indexterm>
<para>Αν ο ISP σας παρέχει στατική διεύθυνση και όνομα υπολογιστή
(hostname) μπορείτε να χρησιμοποιήσετε αυτά. Διαφορετικά,
θα αφήσουμε τον απομακρυσμένο υπολογιστή να δώσει όποια
äéåýèõíóç IP èåùñåß êáôÜëëçëç.</para>
äéåýèõíóç IP èåùñåß êáôÜëëçëç<indexterm id="ppp-static-ip"><primary>static IP address</primary></indexterm>.</para>
</listitem>
</itemizedlist>
@ -414,13 +385,8 @@
<term>Γραμμές 6 &amp; 7:</term>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>user PPP</secondary>
</indexterm>
<para>Το αλφαριθμητικό που θα χρησιμοποιηθεί για την κλήση.
Ôï PPP ÷ñÞóôç ÷ñçóéìïðïéåß óýíôáîç expect-send ðáñüìïéá ìå
Ôï PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> ÷ñÞóôç ÷ñçóéìïðïéåß óýíôáîç expect-send ðáñüìïéá ìå
αυτή που χρησιμοποιεί το πρόγραμμα &man.chat.8;. Δείτε τη
σελίδα manual για πληροφορίες σχετικά με τις δυνατότητες
αυτής της γλώσσας.</para>
@ -519,13 +485,11 @@
<term>Γραμμή 15:</term>
<listitem>
<indexterm><primary>PAP</primary></indexterm>
<indexterm><primary>CHAP</primary></indexterm>
<para>Αν χρησιμοποιείτε PPP ή CHAP, δεν θα υπάρχει στο σημείο
αυτό προτροπή εισόδου (login), και θα πρέπει να μετατρέψετε
τη γραμμή αυτή σε σχόλιο ή να την αφαιρέσετε. Δείτε την
<link linkend="userppp-PAPnCHAP">Ðéóôïðïßçóç PAP
êáé CHAP</link> ãéá ðåñéóóüôåñåò ëåðôïìÝñåéåò.</para>
<link linkend="userppp-PAPnCHAP">Ðéóôïðïßçóç PAP<indexterm><primary>PAP</primary></indexterm>
êáé CHAP</link><indexterm><primary>CHAP</primary></indexterm> ãéá ðåñéóóüôåñåò ëåðôïìÝñåéåò.</para>
<para>Το αλφαριθμητικό εισόδου χρησιμοποιεί σύνταξη παρόμοια
με το &man.chat.8;, όπως συμβαίνει και με το αλφαριθμητικό
@ -550,9 +514,7 @@ protocol: ppp</screen>
<term>Γραμμή 16:</term>
<listitem>
<indexterm><primary>timeout</primary></indexterm>
<para>ÈÝôåé ôï ÷ñüíï áäñÜíåéáò (óå äåõôåñüëåðôá) ãéá ôç
<para>ÈÝôåé ôï ÷ñüíï<indexterm><primary>timeout</primary></indexterm> áäñÜíåéáò (óå äåõôåñüëåðôá) ãéá ôç
σύνδεση. Εδώ, η σύνδεση θα κλείσει αυτόματα αν δεν υπάρχει
κίνηση για 300 δευτερόλεπτα. Αν δεν θέλετε να γίνεται
ποτέ τερματισμός της σύνδεσης λόγω αδράνειας, θέστε αυτή τη
@ -565,8 +527,6 @@ protocol: ppp</screen>
<term>Γραμμή 17:</term>
<listitem>
<indexterm><primary>ISP</primary></indexterm>
<para>Θέτει τη διεύθυνση της διεπαφής. Το αλφαριθμητικό
<replaceable>x.x.x.x</replaceable> θα πρέπει να
αντικατασταθεί με τη διεύθυνση IP που σας έχει αποδοθεί από
@ -574,7 +534,7 @@ protocol: ppp</screen>
<replaceable>y.y.y.y</replaceable> θα πρέπει να
αντικατασταθεί με την διεύθυνση IP που έχει καθορίσει ο
ISP σας ως πύλη (gateway, το μηχάνημα στο οποίο συνδέεστε).
Áí ï ISP óáò äåí óáò Ý÷åé äþóåé äéåýèõíóç ðýëçò,
Áí ï ISP<indexterm><primary>ISP</primary></indexterm> óáò äåí óáò Ý÷åé äþóåé äéåýèõíóç ðýëçò,
χρησιμοποιήστε την <hostid
role="netmask">10.0.0.2/0</hostid>. Αν πρέπει να
χρησιμοποιήσετε μια IP διεύθυνση που έχετε
@ -1108,11 +1068,9 @@ set nbns 203.14.100.5</programlisting>
<term>Γραμμή 14:</term>
<listitem>
<indexterm><primary>password</primary></indexterm>
<para>Η γραμμή αυτή καθορίζει τον κωδικό για τα PAP/CHAP. Θα
χρειαστεί να εισάγετε την σωστή τιμή για το
<replaceable>MyPassword</replaceable>. ºóùò èÝëåôå íá
<replaceable>MyPassword</replaceable><indexterm><primary>password</primary></indexterm>. ºóùò èÝëåôå íá
προσθέσετε μια ακόμα γραμμή, όπως την παρακάτω:</para>
<programlisting>16 accept PAP</programlisting>
@ -1168,11 +1126,7 @@ set nbns 203.14.100.5</programlisting>
<title>Χρησιμοποιώντας τη Δυνατότητα Μετάφρασης Διευθύνσεων (NAT) του
PPP</title>
<indexterm>
<primary>PPP</primary><secondary>NAT</secondary>
</indexterm>
<para>Ôï PPP Ý÷åé ôçí éêáíüôçôá íá ÷ñçóéìïðïéÞóåé äéêü ôïõ åóùôåñéêü
<para>Ôï PPP<indexterm><primary>PPP</primary><secondary>NAT</secondary></indexterm> Ý÷åé ôçí éêáíüôçôá íá ÷ñçóéìïðïéÞóåé äéêü ôïõ åóùôåñéêü
NAT, χωρίς να απαιτούνται οι ικανότητες ανακατεύθυνσης του πυρήνα.
Μπορείτε να ενεργοποιήσετε αυτή τη λειτουργία με την ακόλουθη
γραμμή στο <filename>/etc/ppp/ppp.conf</filename>:</para>
@ -1450,12 +1404,7 @@ ifconfig_tun0=</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>server</secondary>
</indexterm>
<para>Ùò åîõðçñåôçôÞò (<quote>server</quote>) &mdash; ôï ìç÷Üíçìá
<para>Ùò åîõðçñåôçôÞò (<quote>server</quote>)<indexterm><primary>PPP</primary><secondary>server</secondary></indexterm> &mdash; ôï ìç÷Üíçìá
σας είναι συνδεμένο στο δίκτυο και χρησιμοποιείται για να
συνδέσει άλλους υπολογιστές, χρησιμοποιώντας το PPP.</para>
</listitem>
@ -2758,10 +2707,8 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
</listitem>
<listitem>
<indexterm><primary>default route</primary></indexterm>
<para>Ορίστε τον προεπιλεγμένο δρομολογητή, αλλάζοντας τη
ãñáììÞ:</para>
ãñáììÞ<indexterm><primary>default route</primary></indexterm>:</para>
<programlisting>defaultrouter="NO"</programlisting>

View file

@ -139,11 +139,9 @@
</listitem>
<listitem>
<indexterm><primary>åñãáóßåò åêôýðùóçò</primary></indexterm>
<para>Επιτρέπει σε χρήστες να στέλνουν αρχεία προς εκτύπωση. Οι
αποστολές αυτές είναι γνωστές ως
<emphasis>åñãáóßåò (jobs)</emphasis>.</para>
<emphasis>åñãáóßåò (jobs)</emphasis><indexterm><primary>åñãáóßåò åêôýðùóçò</primary></indexterm>.</para>
</listitem>
<listitem>
@ -206,12 +204,10 @@
</listitem>
<listitem>
<indexterm><primary>&tex;</primary></indexterm>
<para>Το <application>LPD</application> μπορεί άνετα να εκτελεί
μια εργασία εκτύπωσης διαμέσου φίλτρων και να προσθέτει κεφαλίδες
ημερομηνίας/ώρας ή να μετατρέπει κάποιο ειδικό τύπο αρχείου
(üðùò Ýíá áñ÷åßï &tex; DVI) óå Ýíá ôýðï êáôáíïçôü áðü ôïí
(üðùò Ýíá áñ÷åßï &tex;<indexterm><primary>&tex;</primary></indexterm> DVI) óå Ýíá ôýðï êáôáíïçôü áðü ôïí
εκτυπωτή σας. Αυτές οι διαδικασίες δεν χρειάζεται να γίνονται
χειροκίνητα.</para>
</listitem>
@ -324,12 +320,8 @@
διασυνδέσεων:</para>
<itemizedlist>
<indexterm>
<primary>åêôõðùôÝò</primary>
<secondary>óåéñéáêïß</secondary>
</indexterm>
<listitem>
<para>Ïé <emphasis>ÓåéñéáêÝò</emphasis> äéáóõíäÝóåéò, ãíùóôÝò
<para>Ïé <emphasis>ÓåéñéáêÝò</emphasis><indexterm><primary>åêôõðùôÝò</primary><secondary>óåéñéáêïß</secondary></indexterm> äéáóõíäÝóåéò, ãíùóôÝò
και ως RS-232 ή θύρες COM, χρησιμοποιούν την σειριακή θύρα
του υπολογιστή σας για να στείλουν δεδομένα στον εκτυπωτή.
Οι σειριακές διασυνδέσεις είναι συνήθεις στην βιομηχανία
@ -343,12 +335,7 @@
</listitem>
<listitem>
<indexterm>
<primary>åêôõðùôÝò</primary>
<secondary>ðáñÜëëçëïé</secondary>
</indexterm>
<para>Ïé <emphasis>ÐáñÜëëçëåò</emphasis> äéáóõíäÝóåéò
<para>Ïé <emphasis>ÐáñÜëëçëåò</emphasis><indexterm><primary>åêôõðùôÝò</primary><secondary>ðáñÜëëçëïé</secondary></indexterm> äéáóõíäÝóåéò
χρησιμοποιούν την παράλληλη θύρα του υπολογιστή σας για να
στέλνουν δεδομένα στον εκτυπωτή. Οι παράλληλες διασυνδέσεις
είναι διαδεδομένες στο εμπόριο και είναι γρηγορότερες από τις
@ -357,22 +344,13 @@
διασυνδέσεις δεν προβλέπονται επιλογές ρύθμισης επικοινωνίας,
κάνοντας την ρύθμιση τους εξαιρετικά απλή.</para>
<indexterm>
<primary>centronics</primary>
<see>ðáñÜëëçëïé åêôõðùôÝò</see>
</indexterm>
<para>Οι παράλληλες διασυνδέσεις είναι γνωστές και ως
äéáóõíäÝóåéò <quote>Centronics</quote>, ïíïìáóßá ðñïåñ÷üìåíç
äéáóõíäÝóåéò <quote>Centronics</quote><indexterm><primary>centronics</primary><see>ðáñÜëëçëïé åêôõðùôÝò</see></indexterm>, ïíïìáóßá ðñïåñ÷üìåíç
από τον τύπο του ακροδέκτη του εκτυπωτή.</para>
</listitem>
<listitem>
<indexterm>
<primary>åêôõðùôÝò</primary>
<secondary>USB</secondary>
</indexterm>
<para>Ïé äéáóõíäÝóåéò USB, óõíôïìïãñáößá áðü ôï Universal
<para>Ïé äéáóõíäÝóåéò USB<indexterm><primary>åêôõðùôÝò</primary><secondary>USB</secondary></indexterm>, óõíôïìïãñáößá áðü ôï Universal
Serial Bus, δουλεύουν σε ακόμη μεγαλύτερες ταχύτητες από την
παράλληλη και την RS-232 σειριακή διασύνδεση. Τα καλώδια τους
είναι απλά και φτηνά. Η USB είναι ανώτερη από την Σειριακή
@ -460,9 +438,7 @@
</listitem>
<listitem>
<indexterm><primary>null-modem cable</primary></indexterm>
<para>¸íá êáëþäéï <emphasis>null-modem</emphasis> åíþíåé
<para>¸íá êáëþäéï <emphasis>null-modem</emphasis><indexterm><primary>null-modem cable</primary></indexterm> åíþíåé
κατευθείαν μερικά pins, ανταλλάσσει μερικά άλλα (για
παράδειγμα, τα pins αποστολής και λήψης), ενώ
βραχυκυκλώνει μερικά άλλα, εσωτερικά, στο προστατευτικό
@ -971,9 +947,7 @@ showpage</programlisting>
</step>
<step>
<indexterm><primary>óåëßäåò êåöáëßäáò</primary></indexterm>
<para>ÁðåíåñãïðïéÞóôå ôéò óåëßäåò êåöáëßäáò (åßíáé åíåñãÝò áðü
<para>ÁðåíåñãïðïéÞóôå ôéò óåëßäåò êåöáëßäáò<indexterm><primary>óåëßäåò êåöáëßäáò</primary></indexterm> (åßíáé åíåñãÝò áðü
προεπιλογή) εισάγοντας την ικανότητα <literal>sh</literal>.
Για περισσότερες πληροφορίες δείτε την ενότητα <link
linkend="printing-no-header-pages">Παρεμπόδιση Σελίδων
@ -1774,12 +1748,7 @@ $%&amp;'()*+,-./01234567
</listitem>
<listitem>
<indexterm>
<primary>åêôõðþóåéò</primary>
<secondary>ößëôñá</secondary>
</indexterm>
<para>¸íá <emphasis>ößëôñï ìåôáôñïðÞò</emphasis> ìåôáôñÝðåé Ýíá
<para>¸íá <emphasis>ößëôñï ìåôáôñïðÞò</emphasis><indexterm><primary>åêôõðþóåéò</primary><secondary>ößëôñá</secondary></indexterm> ìåôáôñÝðåé Ýíá
αρχείο ειδικής μορφής σε ένα τύπο αρχείου κατάλληλο για εκτύπωση
από τον συγκεκριμένο εκτυπωτή. Για παράδειγμα, τα δεδομένα
στοιχειοθεσίας ditroff δεν μπορούν να εκτυπωθούν κατευθείαν,
@ -4895,9 +4864,7 @@ cfA013rose dequeued
<term>LPRng</term>
<listitem>
<indexterm><primary>LPRng</primary></indexterm>
<para>Ôï <application>LPRng</application>, ôï ïðïßï óêüðéìá
<para>Ôï <application>LPRng</application><indexterm><primary>LPRng</primary></indexterm>, ôï ïðïßï óêüðéìá
σημαίνει <quote>LPR: the Next Generation (η Επόμενη
Γενιά)</quote> είναι μια από την αρχή υλοποίηση του PLP.
Ο Patrick Powell και ο Justin Mason (κύριος συντηρητής του PLP)
@ -4912,9 +4879,7 @@ cfA013rose dequeued
<term>CUPS</term>
<listitem>
<indexterm><primary>CUPS</primary></indexterm>
<para>Ôï <application>CUPS</application>, Þ áëëéþò Common UNIX
<para>Ôï <application>CUPS</application><indexterm><primary>CUPS</primary></indexterm>, Þ áëëéþò Common UNIX
Printing System, παρέχει μια φορητή πλατφόρμα εκτυπώσεων για
λειτουργικά συστήματα βασισμένα στο &unix;. Αναπτύχθηκε από την
Easy Software Products για να προωθήσει μια στάνταρ λύση
@ -4941,9 +4906,7 @@ cfA013rose dequeued
<term>HPLIP</term>
<listitem>
<indexterm><primary>HPLIP</primary></indexterm>
<para>Ôï <application>HPLIP</application>, Þ Óýóôçìá Áðåéêüíéóçò
<para>Ôï <application>HPLIP</application><indexterm><primary>HPLIP</primary></indexterm>, Þ Óýóôçìá Áðåéêüíéóçò
και Εκτύπωσης της HP για &linux;, είναι μια σουίτα εφαρμογών
για συσκευές της HP, που υποστηρίζει λειτουργίες όπως η εκτύπωση,
η σάρωση και η αποστολή / λήψη φαξ. Η σουίτα αυτή χρησιμοποιεί

View file

@ -3529,7 +3529,7 @@ ControlPersist yes</screen>
<procedure>
<step>
<para>Remove the port's files via
<para>Remove the port's files and directory with
<command>svn remove</command>.</para>
</step>

View file

@ -85,8 +85,8 @@
<para>Read through the FAQ and Handbook periodically. If
anything is badly explained, out of date or even just
completely wrong, let us know. Even better, send us a fix
(Docbook is not difficult to learn, but there is no objection
to ASCII submissions).</para>
(Docbook is not difficult to learn, but there is no
objection to ASCII submissions).</para>
</listitem>
<listitem>
@ -95,8 +95,8 @@
language, you can help translate additional documents or
verify that the translations are up-to-date. First take a
look at the <ulink
url="&url.books.fdp-primer;/translations.html">Translations
FAQ</ulink> in the FreeBSD Documentation Project Primer.
url="&url.books.fdp-primer;/translations.html">Translations
FAQ</ulink> in the FreeBSD Documentation Project Primer.
You are not committing yourself to translating every
single FreeBSD document by doing this &mdash; as a
volunteer, you can do as much or as little translation as
@ -107,12 +107,12 @@
</listitem>
<listitem>
<para>Read the &a.questions; and &ng.misc;
occasionally (or even regularly). It can be very
satisfying to share your expertise and help people solve
their problems; sometimes you may even learn something new
yourself! These forums can also be a source of ideas for
things to work on.</para>
<para>Read the &a.questions; and &ng.misc; occasionally (or
even regularly). It can be very satisfying to share your
expertise and help people solve their problems; sometimes
you may even learn something new yourself! These forums
can also be a source of ideas for things to work
on.</para>
</listitem>
</orderedlist>
</sect2>
@ -123,24 +123,24 @@
<para>Most of the tasks listed here require either a
considerable investment of time, or an in-depth knowledge of
the FreeBSD kernel, or both. However, there are also many
useful tasks which are suitable for <quote>weekend
hackers</quote>.</para>
useful tasks which are suitable for
<quote>weekend hackers</quote>.</para>
<orderedlist>
<listitem>
<para>If you run FreeBSD-CURRENT and have a good Internet
connection, there is a machine <hostid
role="fqdn">current.FreeBSD.org</hostid> which builds a
full release once a day&mdash;every now and again, try to
install the latest release from it and report any failures
in the process.</para>
connection, there is a machine
<hostid role="fqdn">current.FreeBSD.org</hostid> which
builds a full release once a day&mdash;every now and
again, try to install the latest release from it and
report any failures in the process.</para>
</listitem>
<listitem>
<para>Read the &a.bugs;. There might be a
problem you can comment constructively on or with patches
you can test. Or you could even try to fix one of the
problems yourself.</para>
<para>Read the &a.bugs;. There might be a problem you can
comment constructively on or with patches you can test.
Or you could even try to fix one of the problems
yourself.</para>
</listitem>
<listitem>
@ -175,22 +175,22 @@
<listitem>
<para>If you have contributed any ports and you had to make
&os;-specific changes, send your patches
back to the original authors (this will make your life
easier when they bring out the next version).</para>
&os;-specific changes, send your patches back to the
original authors (this will make your life easier when
they bring out the next version).</para>
</listitem>
<listitem>
<para>Get copies of formal standards like &posix;. You can
get some links about these standards at the <ulink
url="&url.base;/projects/c99/index.html">FreeBSD
C99 &amp; POSIX Standards Conformance Project</ulink> web
site. Compare FreeBSD's behavior to that required by the
standard. If the behavior differs, particularly in subtle
or obscure corners of the specification, send in a PR
about it. If you are able, figure out how to fix it and
include a patch in the PR. If you think the standard is
wrong, ask the standards body to consider the
get some links about these standards at the
<ulink url="&url.base;/projects/c99/index.html">FreeBSD
C99 &amp; POSIX Standards Conformance Project</ulink>
web site. Compare FreeBSD's behavior to that required by
the standard. If the behavior differs, particularly in
subtle or obscure corners of the specification, send in a
PR about it. If you are able, figure out how to fix it
and include a patch in the PR. If you think the standard
is wrong, ask the standards body to consider the
question.</para>
</listitem>
@ -232,12 +232,11 @@
page</title>
<para>The <ulink url="http://wiki.freebsd.org/IdeasPage">&os;
list of
projects and ideas for volunteers</ulink> is also available
for people willing to contribute to the &os; project. The
list is being regularly updated and contains items for both
programmers and non-programmers with information about each
project.</para>
list of projects and ideas for volunteers</ulink> is also
available for people willing to contribute to the &os;
project. The list is being regularly updated and contains
items for both programmers and non-programmers with
information about each project.</para>
</sect2>
</sect1>
@ -254,33 +253,33 @@
technical interest should be mailed to the &a.hackers;.
Likewise, people with an interest in such things (and a
tolerance for a <emphasis>high</emphasis> volume of mail!) may
subscribe to the &a.hackers;.
See <ulink
url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">The
FreeBSD Handbook</ulink> for more information about this and
subscribe to the &a.hackers;. See <ulink
url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">The
FreeBSD Handbook</ulink> for more information about this and
other mailing lists.</para>
<para>If you find a bug or are submitting a specific change,
please report it using the &man.send-pr.1; program or its
<ulink url="&url.base;/send-pr.html">WEB-based
equivalent</ulink>. Try to fill-in each field of the bug
equivalent</ulink>. Try to fill-in each field of the bug
report. Unless they exceed 65KB, include any patches directly
in the report. If the patch is suitable to be applied to the
source tree put <literal>[PATCH]</literal> in the synopsis of
the report. When including patches, <emphasis>do
not</emphasis> use cut-and-paste because cut-and-paste turns
tabs into spaces and makes them unusable. When patches are a
lot larger than 20KB, consider compressing them (eg. with
&man.gzip.1; or &man.bzip2.1;) and using &man.uuencode.1; to
include their compressed form in your problem report.</para>
the report. When including patches,
<emphasis>do not</emphasis> use cut-and-paste because
cut-and-paste turns tabs into spaces and makes them unusable.
When patches are a lot larger than 20KB, consider compressing
them (eg. with &man.gzip.1; or &man.bzip2.1;) and using
&man.uuencode.1; to include their compressed form in your
problem report.</para>
<para>After filing a report, you should receive confirmation
along with a tracking number. Keep this tracking number so
that you can update us with details about the problem by
sending mail to &a.bugfollowup;. Use
the number as the message subject, e.g. <literal>"Re:
kern/3377"</literal>. Additional information for any bug
report should be submitted this way.</para>
sending mail to &a.bugfollowup;. Use the number as the
message subject, e.g. <literal>"Re: kern/3377"</literal>.
Additional information for any bug report should be submitted
this way.</para>
<para>If you do not receive confirmation in a timely fashion (3
days to a week, depending on your email connection) or are,
@ -290,7 +289,8 @@
<para>See also <ulink
url="&url.articles.problem-reports;/article.html">this
article</ulink> on how to write good problem reports.</para>
article</ulink> on how to write good problem
reports.</para>
</sect2>
<sect2>
@ -317,14 +317,14 @@
<para>An addition or change to the existing source code is a
somewhat trickier affair and depends a lot on how far out of
date you are with the current state of FreeBSD
development. There is a special on-going release of FreeBSD
known as <quote>FreeBSD-CURRENT</quote> which is made
available in a variety of ways for the convenience of
developers working actively on the system. See
<ulink url="&url.books.handbook;/current-stable.html">The
FreeBSD Handbook</ulink> for more information about getting
and using FreeBSD-CURRENT.</para>
date you are with the current state of FreeBSD development.
There is a special on-going release of FreeBSD known as
<quote>FreeBSD-CURRENT</quote> which is made available in a
variety of ways for the convenience of developers working
actively on the system. See <ulink
url="&url.books.handbook;/current-stable.html">The FreeBSD
Handbook</ulink> for more information about getting and
using FreeBSD-CURRENT.</para>
<para>Working from older sources unfortunately means that your
changes may sometimes be too obsolete or too divergent for
@ -339,8 +339,8 @@
with the &man.diff.1; command.</para>
<para>The preferred &man.diff.1; format for submitting patches
is the unified output format generated by <command>diff
-u</command>.</para>
is the unified output format generated by
<command>diff -u</command>.</para>
<indexterm>
<primary><command>diff</command></primary>
@ -380,14 +380,14 @@
program on it. Archives created with &man.shar.1; are also
welcome.</para>
<para>If your change is of a potentially sensitive nature,
such as if you are unsure of copyright issues governing its further
distribution then you should send it to &a.core;
directly rather than submitting it with &man.send-pr.1;. The
&a.core; reaches a much smaller group of people who
do much of the day-to-day work on FreeBSD. Note that this
group is also <emphasis>very busy</emphasis> and so you should
only send mail to them where it is truly necessary.</para>
<para>If your change is of a potentially sensitive nature, such
as if you are unsure of copyright issues governing its further
distribution then you should send it to &a.core; directly
rather than submitting it with &man.send-pr.1;. The &a.core;
reaches a much smaller group of people who do much of the
day-to-day work on FreeBSD. Note that this group is also
<emphasis>very busy</emphasis> and so you should only send
mail to them where it is truly necessary.</para>
<para>Please refer to &man.intro.9; and &man.style.9; for
some information on coding style. We would appreciate it if
@ -412,28 +412,27 @@
<orderedlist>
<listitem>
<indexterm><primary>BSD copyright</primary></indexterm>
<para>The BSD copyright. This copyright is most preferred
due to its <quote>no strings attached</quote> nature and
general attractiveness to commercial enterprises. Far
from discouraging such commercial use, the FreeBSD Project
actively encourages such participation by commercial
interests who might eventually be inclined to invest
something of their own into FreeBSD.</para>
<para>The BSD copyright<indexterm><primary>BSD
copyright</primary></indexterm>. This copyright is most
preferred due to its <quote>no strings attached</quote>
nature and general attractiveness to commercial
enterprises. Far from discouraging such commercial use,
the FreeBSD Project actively encourages such participation
by commercial interests who might eventually be inclined
to invest something of their own into FreeBSD.</para>
</listitem>
<listitem>
<indexterm>
<primary>GPL</primary>
<see>GNU General Public License</see>
</indexterm>
<para>
<indexterm>
<primary>GPL</primary>
<see>GNU General Public License</see>
</indexterm>
<indexterm>
<primary>GNU General Public License</primary>
</indexterm>
<para>The GNU General Public License, or <quote>GPL</quote>.
<indexterm>
<primary>GNU General Public License</primary>
</indexterm>
The GNU General Public License, or <quote>GPL</quote>.
This license is not quite as popular with us due to the
amount of extra effort demanded of anyone using the code
for commercial purposes, but given the sheer quantity of
@ -537,6 +536,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<sect3>
<title>Donating Hardware</title>
<indexterm><primary>donations</primary></indexterm>
<para>The FreeBSD Project happily accepts donations of
@ -547,5 +547,4 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</sect3>
</sect2>
</sect1>
</article>

View file

@ -3406,6 +3406,11 @@
<email>execve@gmail.com</email></para>
</listitem>
<listitem>
<para>Gavin McDonald
<email>gavin@16degrees.com.au</email></para>
</listitem>
<listitem>
<para>Gavin Mu
<email>gavin@FreeBSDChina.org</email></para>
@ -10653,6 +10658,11 @@
<email>virtual.lark@gmail.com</email></para>
</listitem>
<listitem>
<para>Vladimir Kondratiev
<email>wulf@mail.mipt.ru</email></para>
</listitem>
<listitem>
<para>Vladimir Kurtikov
<email>vk@vk.pp.ru</email></para>

View file

@ -7,10 +7,6 @@
-->
<itemizedlist>
<listitem>
<para>&a.ariff.email;</para>
</listitem>
<listitem>
<para>&a.tabthorpe.email;</para>
</listitem>
@ -95,10 +91,6 @@
<para>&a.gjb.email;</para>
</listitem>
<listitem>
<para>&a.art.email;</para>
</listitem>
<listitem>
<para>&a.kib.email;</para>
</listitem>
@ -111,10 +103,6 @@
<para>&a.gber.email;</para>
</listitem>
<listitem>
<para>&a.pb.email;</para>
</listitem>
<listitem>
<para>&a.tdb.email;</para>
</listitem>
@ -123,10 +111,6 @@
<para>&a.gblach.email;</para>
</listitem>
<listitem>
<para>&a.mbr.email;</para>
</listitem>
<listitem>
<para>&a.wblock.email;</para>
</listitem>
@ -171,10 +155,6 @@
<para>&a.brueffer.email;</para>
</listitem>
<listitem>
<para>&a.markus.email;</para>
</listitem>
<listitem>
<para>&a.oleg.email;</para>
</listitem>
@ -203,18 +183,10 @@
<para>&a.charnier.email;</para>
</listitem>
<listitem>
<para>&a.jon.email;</para>
</listitem>
<listitem>
<para>&a.loader.email;</para>
</listitem>
<listitem>
<para>&a.luoqi.email;</para>
</listitem>
<listitem>
<para>&a.ache.email;</para>
</listitem>
@ -251,10 +223,6 @@
<para>&a.cracauer.email;</para>
</listitem>
<listitem>
<para>&a.brucec.email;</para>
</listitem>
<listitem>
<para>&a.culot.email;</para>
</listitem>
@ -267,10 +235,6 @@
<para>&a.bapt.email;</para>
</listitem>
<listitem>
<para>&a.davidc.email;</para>
</listitem>
<listitem>
<para>&a.brd.email;</para>
</listitem>
@ -299,22 +263,10 @@
<para>&a.rdivacky.email;</para>
</listitem>
<listitem>
<para>&a.mdodd.email;</para>
</listitem>
<listitem>
<para>&a.danfe.email;</para>
</listitem>
<listitem>
<para>&a.dd.email;</para>
</listitem>
<listitem>
<para>&a.iedowse.email;</para>
</listitem>
<listitem>
<para>&a.bdrewery.email;</para>
</listitem>
@ -327,26 +279,14 @@
<para>&a.olivierd.email;</para>
</listitem>
<listitem>
<para>&a.bruno.email;</para>
</listitem>
<listitem>
<para>&a.ale.email;</para>
</listitem>
<listitem>
<para>&a.peadar.email;</para>
</listitem>
<listitem>
<para>&a.deischen.email;</para>
</listitem>
<listitem>
<para>&a.eivind.email;</para>
</listitem>
<listitem>
<para>&a.julian.email;</para>
</listitem>
@ -359,18 +299,10 @@
<para>&a.lme.email;</para>
</listitem>
<listitem>
<para>&a.rse.email;</para>
</listitem>
<listitem>
<para>&a.ru.email;</para>
</listitem>
<listitem>
<para>&a.le.email;</para>
</listitem>
<listitem>
<para>&a.se.email;</para>
</listitem>
@ -407,10 +339,6 @@
<para>&a.feld.email;</para>
</listitem>
<listitem>
<para>&a.green.email;</para>
</listitem>
<listitem>
<para>&a.lioux.email;</para>
</listitem>
@ -427,10 +355,6 @@
<para>&a.blackend.email;</para>
</listitem>
<listitem>
<para>&a.olli.email;</para>
</listitem>
<listitem>
<para>&a.decke.email;</para>
</listitem>
@ -479,14 +403,6 @@
<para>&a.daichi.email;</para>
</listitem>
<listitem>
<para>&a.bgray.email;</para>
</listitem>
<listitem>
<para>&a.dg.email;</para>
</listitem>
<listitem>
<para>&a.grehan.email;</para>
</listitem>
@ -611,18 +527,10 @@
<para>&a.gj.email;</para>
</listitem>
<listitem>
<para>&a.weongyo.email;</para>
</listitem>
<listitem>
<para>&a.peterj.email;</para>
</listitem>
<listitem>
<para>&a.jinmei.email;</para>
</listitem>
<listitem>
<para>&a.ahze.email;</para>
</listitem>
@ -651,22 +559,10 @@
<para>&a.pluknet.email;</para>
</listitem>
<listitem>
<para>&a.cokane.email;</para>
</listitem>
<listitem>
<para>&a.kargl.email;</para>
</listitem>
<listitem>
<para>&a.kato.email;</para>
</listitem>
<listitem>
<para>&a.kris.email;</para>
</listitem>
<listitem>
<para>&a.keramida.email;</para>
</listitem>
@ -715,10 +611,6 @@
<para>&a.taras.email;</para>
</listitem>
<listitem>
<para>&a.jkoshy.email;</para>
</listitem>
<listitem>
<para>&a.wkoszek.email;</para>
</listitem>
@ -735,14 +627,6 @@
<para>&a.gabor.email;</para>
</listitem>
<listitem>
<para>&a.anchie.email;</para>
</listitem>
<listitem>
<para>&a.rik.email;</para>
</listitem>
<listitem>
<para>&a.kuriyama.email;</para>
</listitem>
@ -763,10 +647,6 @@
<para>&a.clement.email;</para>
</listitem>
<listitem>
<para>&a.mlaier.email;</para>
</listitem>
<listitem>
<para>&a.erwin.email;</para>
</listitem>
@ -795,10 +675,6 @@
<para>&a.leeym.email;</para>
</listitem>
<listitem>
<para>&a.sam.email;</para>
</listitem>
<listitem>
<para>&a.oliver.email;</para>
</listitem>
@ -859,10 +735,6 @@
<para>&a.kevlo.email;</para>
</listitem>
<listitem>
<para>&a.zml.email;</para>
</listitem>
<listitem>
<para>&a.nox.email;</para>
</listitem>
@ -903,18 +775,10 @@
<para>&a.rmacklem.email;</para>
</listitem>
<listitem>
<para>&a.kmacy.email;</para>
</listitem>
<listitem>
<para>&a.rm.email;</para>
</listitem>
<listitem>
<para>&a.mtm.email;</para>
</listitem>
<listitem>
<para>&a.jmallett.email;</para>
</listitem>
@ -1103,10 +967,6 @@
<para>&a.hiren.email;</para>
</listitem>
<listitem>
<para>&a.hmp.email;</para>
</listitem>
<listitem>
<para>&a.fluffy.email;</para>
</listitem>
@ -1115,10 +975,6 @@
<para>&a.np.email;</para>
</listitem>
<listitem>
<para>&a.wpaul.email;</para>
</listitem>
<listitem>
<para>&a.rpaulo.email;</para>
</listitem>
@ -1151,10 +1007,6 @@
<para>&a.csjp.email;</para>
</listitem>
<listitem>
<para>&a.wes.email;</para>
</listitem>
<listitem>
<para>&a.gerald.email;</para>
</listitem>
@ -1163,14 +1015,6 @@
<para>&a.sperber.email;</para>
</listitem>
<listitem>
<para>&a.sepotvin.email;</para>
</listitem>
<listitem>
<para>&a.mpp.email;</para>
</listitem>
<listitem>
<para>&a.thomas.email;</para>
</listitem>
@ -1191,10 +1035,6 @@
<para>&a.lbr.email;</para>
</listitem>
<listitem>
<para>&a.darrenr.email;</para>
</listitem>
<listitem>
<para>&a.crees.email;</para>
</listitem>
@ -1219,10 +1059,6 @@
<para>&a.beech.email;</para>
</listitem>
<listitem>
<para>&a.matteo.email;</para>
</listitem>
<listitem>
<para>&a.luigi.email;</para>
</listitem>
@ -1239,10 +1075,6 @@
<para>&a.rodrigc.email;</para>
</listitem>
<listitem>
<para>&a.guido.email;</para>
</listitem>
<listitem>
<para>&a.rea.email;</para>
</listitem>
@ -1255,10 +1087,6 @@
<para>&a.ps.email;</para>
</listitem>
<listitem>
<para>&a.wsalamon.email;</para>
</listitem>
<listitem>
<para>&a.bsam.email;</para>
</listitem>
@ -1271,10 +1099,6 @@
<para>&a.bschmidt.email;</para>
</listitem>
<listitem>
<para>&a.sos.email;</para>
</listitem>
<listitem>
<para>&a.wosch.email;</para>
</listitem>
@ -1331,14 +1155,6 @@
<para>&a.wxs.email;</para>
</listitem>
<listitem>
<para>&a.nork.email;</para>
</listitem>
<listitem>
<para>&a.simokawa.email;</para>
</listitem>
<listitem>
<para>&a.syrinx.email;</para>
</listitem>
@ -1359,10 +1175,6 @@
<para>&a.bms.email;</para>
</listitem>
<listitem>
<para>&a.jls.email;</para>
</listitem>
<listitem>
<para>&a.demon.email;</para>
</listitem>
@ -1399,14 +1211,6 @@
<para>&a.brian.email;</para>
</listitem>
<listitem>
<para>&a.sson.email;</para>
</listitem>
<listitem>
<para>&a.ssouhlal.email;</para>
</listitem>
<listitem>
<para>&a.loos.email;</para>
</listitem>
@ -1415,10 +1219,6 @@
<para>&a.uqs.email;</para>
</listitem>
<listitem>
<para>&a.mohans.email;</para>
</listitem>
<listitem>
<para>&a.vsevolod.email;</para>
</listitem>
@ -1463,10 +1263,6 @@
<para>&a.ryusuke.email;</para>
</listitem>
<listitem>
<para>&a.suz.email;</para>
</listitem>
<listitem>
<para>&a.nyan.email;</para>
</listitem>
@ -1479,10 +1275,6 @@
<para>&a.tota.email;</para>
</listitem>
<listitem>
<para>&a.tanimura.email;</para>
</listitem>
<listitem>
<para>&a.romain.email;</para>
</listitem>
@ -1503,10 +1295,6 @@
<para>&a.mi.email;</para>
</listitem>
<listitem>
<para>&a.gordon.email;</para>
</listitem>
<listitem>
<para>&a.lth.email;</para>
</listitem>
@ -1595,10 +1383,6 @@
<para>&a.ivoras.email;</para>
</listitem>
<listitem>
<para>&a.ticso.email;</para>
</listitem>
<listitem>
<para>&a.stefan.email;</para>
</listitem>
@ -1627,10 +1411,6 @@
<para>&a.peter.email;</para>
</listitem>
<listitem>
<para>&a.dwhite.email;</para>
</listitem>
<listitem>
<para>&a.nwhitehorn.email;</para>
</listitem>
@ -1675,14 +1455,6 @@
<para>&a.zeising.email;</para>
</listitem>
<listitem>
<para>&a.phantom.email;</para>
</listitem>
<listitem>
<para>&a.sephe.email;</para>
</listitem>
<listitem>
<para>&a.zont.email;</para>
</listitem>

View file

@ -3,6 +3,26 @@
<!-- $FreeBSD$ -->
<itemizedlist>
<listitem>
<para>&a.kmacy.email; (2005 - 2012)</para>
</listitem>
<listitem>
<para>&a.zml.email; (2009 - 2012)</para>
</listitem>
<listitem>
<para>&a.jkoshy.email; (1998 - 2012)</para>
</listitem>
<listitem>
<para>&a.brucec.email; (2010 - 2012)</para>
</listitem>
<listitem>
<para>&a.bgray.email; (2012)</para>
</listitem>
<listitem>
<para>&a.randi.email; (2010 - 2012)</para>
</listitem>
@ -47,6 +67,30 @@
<para>&a.steve.email; (1996 - 2012)</para>
</listitem>
<listitem>
<para>&a.weongyo.email; (2007 - 2011)</para>
</listitem>
<listitem>
<para>&a.ticso.email; (2002 - 2011)</para>
</listitem>
<listitem>
<para>&a.rse.email; (1997 - 2011)</para>
</listitem>
<listitem>
<para>&a.mlaier.email; (2004 - 2011)</para>
</listitem>
<listitem>
<para>&a.gordon.email; (2002 - 2011)</para>
</listitem>
<listitem>
<para>&a.art.email; (2011)</para>
</listitem>
<listitem>
<para>&a.jacula.email; (2010 - 2011)</para>
</listitem>
@ -99,6 +143,50 @@
<para>&a.scrappy.email; (1996 - 2011)</para>
</listitem>
<listitem>
<para>&a.wes.email; (1998 - 2010)</para>
</listitem>
<listitem>
<para>&a.simokawa.email; (1999 - 2010)</para>
</listitem>
<listitem>
<para>&a.sepotvin.email; (2007 - 2010)</para>
</listitem>
<listitem>
<para>&a.sam.email; (2002 - 2010)</para>
</listitem>
<listitem>
<para>&a.nork.email; (2002 - 2010)</para>
</listitem>
<listitem>
<para>&a.mbr.email; (2001 - 2010)</para>
</listitem>
<listitem>
<para>&a.dd.email; (2001 - 2010)</para>
</listitem>
<listitem>
<para>&a.anchie.email; (2010)</para>
</listitem>
<listitem>
<para>&a.olli.email; (2008 - 2010)</para>
</listitem>
<listitem>
<para>&a.kato.email; (1996 - 2010)</para>
</listitem>
<listitem>
<para>&a.bruno.email; (2005 - 2010)</para>
</listitem>
<listitem>
<para>&a.snb.email; (2009 - 2010)</para>
</listitem>
@ -163,6 +251,58 @@
<para>&a.jesusr.email; (1998 - 2010)</para>
</listitem>
<listitem>
<para>&a.ssouhlal.email; (2004 - 2009)</para>
</listitem>
<listitem>
<para>&a.sson.email; (2008 - 2009)</para>
</listitem>
<listitem>
<para>&a.markus.email; (2006 - 2009)</para>
</listitem>
<listitem>
<para>&a.green.email; (1999 - 2009)</para>
</listitem>
<listitem>
<para>&a.darrenr.email; (1997 - 2009)</para>
</listitem>
<listitem>
<para>&a.ariff.email; (2005 - 2009)</para>
</listitem>
<listitem>
<para>&a.sos.email; (1993 - 2009)</para>
</listitem>
<listitem>
<para>&a.mtm.email; (2003 - 2009)</para>
</listitem>
<listitem>
<para>&a.matteo.email; (2006 - 2009)</para>
</listitem>
<listitem>
<para>&a.jon.email; (2000 - 2009)</para>
</listitem>
<listitem>
<para>&a.guido.email; (1993 - 2009)</para>
</listitem>
<listitem>
<para>&a.dwhite.email; (1998 - 2009)</para>
</listitem>
<listitem>
<para>&a.cokane.email; (2000 - 2009)</para>
</listitem>
<listitem>
<para>&a.sat.email; (2006 - 2009)</para>
</listitem>
@ -223,10 +363,42 @@
<para>&a.gioria.email; (1999 - 2009)</para>
</listitem>
<listitem>
<para>&a.rik.email; (2003 - 2008)</para>
</listitem>
<listitem>
<para>&a.pb.email; (2003 - 2008)</para>
</listitem>
<listitem>
<para>&a.mpp.email; (1995 - 2008)</para>
</listitem>
<listitem>
<para>&a.luoqi.email; (1998 - 2008)</para>
</listitem>
<listitem>
<para>&a.iedowse.email; (2000 - 2008)</para>
</listitem>
<listitem>
<para>&a.tg.email; (1995 - 2009)</para>
</listitem>
<listitem>
<para>&a.kris.email; (1999 - 2008)</para>
</listitem>
<listitem>
<para>&a.sephe.email; (2007 - 2008)</para>
</listitem>
<listitem>
<para>&a.davidc.email; (2001 - 2008)</para>
</listitem>
<listitem>
<para>&a.kishore.email; (2007 - 2008)</para>
</listitem>
@ -415,6 +587,38 @@
<para>&a.hsu.email; ( - 2008)</para>
</listitem>
<listitem>
<para>&a.wpaul.email; (1995 - 2007)</para>
</listitem>
<listitem>
<para>&a.suz.email; (2002 - 2007)</para>
</listitem>
<listitem>
<para>&a.le.email; (2004 - 2007)</para>
</listitem>
<listitem>
<para>&a.jls.email; (2006 - 2007)</para>
</listitem>
<listitem>
<para>&a.jinmei.email; (2007)</para>
</listitem>
<listitem>
<para>&a.hmp.email; (2004 - 2007)</para>
</listitem>
<listitem>
<para>&a.phantom.email; (1999 - 2007)</para>
</listitem>
<listitem>
<para>&a.mohans.email; (2006 - 2007)</para>
</listitem>
<listitem>
<para>&a.farrokhi.email; (2006 - 2007)</para>
</listitem>
@ -499,6 +703,22 @@
<para>&a.archie.email; (1998 - 2007)</para>
</listitem>
<listitem>
<para>&a.tanimura.email; (1999 - 2006)</para>
</listitem>
<listitem>
<para>&a.peadar.email; (2004 - 2006)</para>
</listitem>
<listitem>
<para>&a.wsalamon.email; (2005 - 2006)</para>
</listitem>
<listitem>
<para>&a.mdodd.email; (1999 - 2006)</para>
</listitem>
<listitem>
<para>&a.vkashyap.email; (2004 - 2006)</para>
</listitem>
@ -631,6 +851,10 @@
<para>&a.hanai.email; (1997 - 2006)</para>
</listitem>
<listitem>
<para>&a.eivind.email; (1997 - 2005)</para>
</listitem>
<listitem>
<para>&a.viny.email; (2004 - 2005)</para>
</listitem>
@ -715,6 +939,10 @@
<para>&a.alex.email; ( - 2004)</para>
</listitem>
<listitem>
<para>&a.dg.email; (1993 - 2003)</para>
</listitem>
<listitem>
<para>&a.dwcjr.email; (2002 - 2003)</para>
</listitem>

View file

@ -542,42 +542,37 @@
This information is currently kept in
<filename>src/usr.sbin/sysinstall/dist.c</filename>.</para>
<para>After the release has been built, a number of file should
be updated to announce the release to the world.</para>
<para>After the release has been built, a number of files should
be updated to announce the release to the world. These files
are relative to <literal>head/</literal> within the
<literal>doc/</literal> subversion tree.</para>
<itemizedlist>
<listitem>
<para><filename>doc/share/images/articles/releng/branches-releng<replaceable>X</replaceable>.pic</filename></para>
<para><filename>share/images/articles/releng/branches-releng<replaceable>X</replaceable>.pic</filename></para>
</listitem>
<listitem>
<para><filename>www/share/xml/advisories.xml</filename></para>
<para><filename>head/share/xml/release.ent</filename></para>
</listitem>
<listitem>
<para><filename>www/share/xml/includes.release.xml</filename></para>
<para><filename>en_US.ISO8859-1/htdocs/releases/*</filename></para>
</listitem>
<listitem>
<para><filename>www/share/xml/includes.release.xsl</filename></para>
<para><filename>en_US.ISO8859-1/htdocs/releng/index.xml</filename></para>
</listitem>
<listitem>
<para><filename>www/en/releases/*</filename></para>
<para><filename>share/xml/news.xml</filename></para>
</listitem>
</itemizedlist>
<listitem>
<para><filename>www/en/releng/index.xml</filename></para>
</listitem>
<listitem>
<para><filename>www/en/news/news.xml</filename></para>
</listitem>
<listitem>
<para><filename>www/en/search/web.atoz</filename></para>
</listitem>
<para>Additionally, update the <quote>BSD Family Tree</quote>
file:</para>
<itemizedlist>
<listitem>
<para><filename>src/share/misc/bsd-family-tree</filename></para>
</listitem>

File diff suppressed because it is too large Load diff

View file

@ -9,7 +9,7 @@
<chapterinfo>
<authorgroup>
<author>
<firstname>Jean-Francois</firstname>
<firstname>Jean-Francois</firstname>
<surname>Dockes</surname>
<contrib>Contributed by </contrib>
</author>
@ -35,31 +35,35 @@
<itemizedlist>
<listitem>
<para>A system call interface (read, write, ioctls) to
digitized sound and mixer functions. The ioctl command set
is compatible with the legacy <emphasis>OSS</emphasis> or
<emphasis>Voxware</emphasis> interface, allowing common
multimedia applications to be ported without
modification.</para>
<para>A system call interface (read, write, ioctls) to
digitized sound and mixer functions. The ioctl command set
is compatible with the legacy <emphasis>OSS</emphasis> or
<emphasis>Voxware</emphasis> interface, allowing common
multimedia applications to be ported without
modification.</para>
</listitem>
<listitem>
<para>Common code for processing sound data (format
conversions, virtual channels).</para>
<para>Common code for processing sound data (format
conversions, virtual channels).</para>
</listitem>
<listitem>
<para>A uniform software interface to hardware-specific audio
interface modules.</para>
<para>A uniform software interface to hardware-specific audio
interface modules.</para>
</listitem>
<listitem>
<para>Additional support for some common hardware interfaces
(ac97), or shared hardware-specific code (ex: ISA DMA
routines).</para>
<para>Additional support for some common hardware interfaces
(ac97), or shared hardware-specific code (ex: ISA DMA
routines).</para>
</listitem>
</itemizedlist>
<para>The support for specific sound cards is implemented by
hardware-specific drivers, which provide channel and mixer interfaces
to plug into the generic <devicename>pcm</devicename> code.</para>
hardware-specific drivers, which provide channel and mixer
interfaces to plug into the generic <devicename>pcm</devicename>
code.</para>
<para>In this chapter, the term <devicename>pcm</devicename> will
refer to the central, common part of the sound driver, as
@ -75,8 +79,7 @@
<para>As an alternative, or in addition to starting from a working
example, you can find a commented driver template at
<ulink url="http://people.FreeBSD.org/~cg/template.c">
http://people.FreeBSD.org/~cg/template.c</ulink></para>
http://people.FreeBSD.org/~cg/template.c</ulink></para>
</sect1>
<sect1 id="oss-files">
@ -92,7 +95,6 @@
while the <filename>pci/</filename>, <filename>isa/</filename>
and <filename>usb/</filename> directories have the drivers
for PCI and ISA boards, and for USB audio devices.</para>
</sect1>
<sect1 id="pcm-probe-and-attach">
@ -107,13 +109,13 @@
<para>However, sound drivers differ in some ways:</para>
<itemizedlist>
<listitem>
<para>They declare themselves as <devicename>pcm</devicename>
class devices, with a <structname>struct
snddev_info</structname> device private structure:</para>
<para>They declare themselves as <devicename>pcm</devicename>
class devices, with a
<structname>struct snddev_info</structname> device private
structure:</para>
<programlisting> static driver_t xxx_driver = {
<programlisting> static driver_t xxx_driver = {
"pcm",
xxx_methods,
sizeof(struct snddev_info)
@ -122,77 +124,80 @@
DRIVER_MODULE(snd_xxxpci, pci, xxx_driver, pcm_devclass, 0, 0);
MODULE_DEPEND(snd_xxxpci, snd_pcm, PCM_MINVER, PCM_PREFVER,PCM_MAXVER);</programlisting>
<indexterm><primary>device drivers</primary><secondary>sound</secondary></indexterm>
<para>Most sound drivers need to store additional private
information about their device. A private data structure is
usually allocated in the attach routine. Its address is
passed to <devicename>pcm</devicename> by the calls to
<function>pcm_register()</function> and
<function>mixer_init()</function>.
<devicename>pcm</devicename> later passes back this address
as a parameter in calls to the sound driver
interfaces.</para>
<para>Most sound drivers<indexterm><primary>device
drivers</primary><secondary>sound</secondary></indexterm>
need to store additional private information about their
device. A private data structure is usually allocated in
the attach routine. Its address is passed to
<devicename>pcm</devicename> by the calls to
<function>pcm_register()</function> and
<function>mixer_init()</function>.
<devicename>pcm</devicename> later passes back this address
as a parameter in calls to the sound driver
interfaces.</para>
</listitem>
<listitem>
<para>The sound driver attach routine should declare its MIXER
or AC97 interface to <devicename>pcm</devicename> by calling
<function>mixer_init()</function>. For a MIXER interface,
this causes in turn a call to <link linkend="xxxmixer-init">
<function>xxxmixer_init()</function></link>.</para>
<para>The sound driver attach routine should declare its MIXER
or AC97 interface to <devicename>pcm</devicename> by calling
<function>mixer_init()</function>. For a MIXER interface,
this causes in turn a call to <link
linkend="xxxmixer-init"><function>xxxmixer_init()</function></link>.</para>
</listitem>
<listitem>
<para>The sound driver attach routine declares its general
CHANNEL configuration to <devicename>pcm</devicename> by
calling <function>pcm_register(dev, sc, nplay,
nrec)</function>, where <varname>sc</varname> is the address
for the device data structure, used in further calls from
<devicename>pcm</devicename>, and <varname>nplay</varname>
and <varname>nrec</varname> are the number of play and
record channels.</para>
<para>The sound driver attach routine declares its general
CHANNEL configuration to <devicename>pcm</devicename> by
calling <function>pcm_register(dev, sc, nplay,
nrec)</function>, where <varname>sc</varname> is the address
for the device data structure, used in further calls from
<devicename>pcm</devicename>, and <varname>nplay</varname>
and <varname>nrec</varname> are the number of play and
record channels.</para>
</listitem>
<listitem>
<para>The sound driver attach routine declares each of its
channel objects by calls to
<function>pcm_addchan()</function>. This sets up the
channel glue in <devicename>pcm</devicename> and causes in
turn a call to
<link linkend="xxxchannel-init">
<function>xxxchannel_init()</function></link>.</para>
<para>The sound driver attach routine declares each of its
channel objects by calls to
<function>pcm_addchan()</function>. This sets up the
channel glue in <devicename>pcm</devicename> and causes in
turn a call to
<link linkend="xxxchannel-init">
<function>xxxchannel_init()</function></link>.</para>
</listitem>
<listitem>
<para>The sound driver detach routine should call
<function>pcm_unregister()</function> before releasing its
resources.</para>
<para>The sound driver detach routine should call
<function>pcm_unregister()</function> before releasing its
resources.</para>
</listitem>
</itemizedlist>
<para>There are two possible methods to handle non-PnP devices:</para>
<para>There are two possible methods to handle non-PnP
devices:</para>
<itemizedlist>
<listitem>
<para>Use a <function>device_identify()</function> method
(example: <filename>sound/isa/es1888.c</filename>). The
<function>device_identify()</function> method probes for the
hardware at known addresses and, if it finds a supported
device, creates a new pcm device which is then passed to
probe/attach.</para>
<para>Use a <function>device_identify()</function> method
(example: <filename>sound/isa/es1888.c</filename>). The
<function>device_identify()</function> method probes for the
hardware at known addresses and, if it finds a supported
device, creates a new pcm device which is then passed to
probe/attach.</para>
</listitem>
<listitem>
<para>Use a custom kernel configuration with appropriate hints
for pcm devices (example:
<filename>sound/isa/mss.c</filename>).</para>
<para>Use a custom kernel configuration with appropriate hints
for pcm devices (example:
<filename>sound/isa/mss.c</filename>).</para>
</listitem>
</itemizedlist>
<para><devicename>pcm</devicename> drivers should implement
<function>device_suspend</function>,
<function>device_resume</function> and
<function>device_shutdown</function> routines, so that power
management and module unloading function correctly.</para>
<function>device_suspend</function>,
<function>device_resume</function> and
<function>device_shutdown</function> routines, so that power
management and module unloading function correctly.</para>
</sect1>
<sect1 id="oss-interfaces">
@ -200,7 +205,7 @@
<para>The interface between the <devicename>pcm</devicename> core
and the sound drivers is defined in terms of <link
linkend="kernel-objects">kernel objects</link>.</para>
linkend="kernel-objects">kernel objects</link>.</para>
<para>There are two main interfaces that a sound driver will
usually provide: <emphasis>CHANNEL</emphasis> and either
@ -216,86 +221,84 @@
<title>The CHANNEL Interface</title>
<sect3>
<title>Common Notes for Function Parameters</title>
<title>Common Notes for Function Parameters</title>
<para>Sound drivers usually have a private data structure to
describe their device, and one structure for each play and
record data channel that it supports.</para>
<para>Sound drivers usually have a private data structure to
describe their device, and one structure for each play and
record data channel that it supports.</para>
<para>For all CHANNEL interface functions, the first parameter
is an opaque pointer.</para>
<para>The second parameter is a pointer to the private
channel data structure, except for
<function>channel_init()</function> which has a pointer to the
private device structure (and returns the channel pointer
for further use by <devicename>pcm</devicename>).</para>
<para>For all CHANNEL interface functions, the first parameter
is an opaque pointer.</para>
<para>The second parameter is a pointer to the private
channel data structure, except for
<function>channel_init()</function> which has a pointer to
the private device structure (and returns the channel
pointer for further use by
<devicename>pcm</devicename>).</para>
</sect3>
<sect3>
<title>Overview of Data Transfer Operations</title>
<title>Overview of Data Transfer Operations</title>
<para>For sound data transfers, the
<devicename>pcm</devicename> core and the sound drivers
communicate through a shared memory area, described by a
<structname>struct snd_dbuf</structname>.</para>
<para>For sound data transfers, the
<devicename>pcm</devicename> core and the sound drivers
communicate through a shared memory area, described by a
<structname>struct snd_dbuf</structname>.</para>
<para><structname>struct snd_dbuf</structname> is private to
<devicename>pcm</devicename>, and sound drivers obtain
values of interest by calls to accessor functions
(<function>sndbuf_getxxx()</function>).</para>
<para><structname>struct snd_dbuf</structname> is private to
<devicename>pcm</devicename>, and sound drivers obtain
values of interest by calls to accessor functions
(<function>sndbuf_getxxx()</function>).</para>
<para>The shared memory area has a size of
<function>sndbuf_getsize()</function> and is divided into
fixed size blocks of <function>sndbuf_getblksz()</function>
bytes.</para>
<para>The shared memory area has a size of
<function>sndbuf_getsize()</function> and is divided into
fixed size blocks of <function>sndbuf_getblksz()</function>
bytes.</para>
<para>When playing, the general transfer mechanism is as
follows (reverse the idea for recording):</para>
<para>When playing, the general transfer mechanism is as
follows (reverse the idea for recording):</para>
<itemizedlist>
<listitem>
<para><devicename>pcm</devicename> initially fills up the
buffer, then calls the sound driver's <link
linkend="channel-trigger">
<function>xxxchannel_trigger()</function></link>
function with a parameter of PCMTRIG_START.</para>
</listitem>
<itemizedlist>
<listitem>
<para><devicename>pcm</devicename> initially fills up the
buffer, then calls the sound driver's <link
linkend="channel-trigger">
<function>xxxchannel_trigger()</function></link>
function with a parameter of PCMTRIG_START.</para>
</listitem>
<listitem>
<para>The sound driver then arranges to repeatedly
transfer the whole memory area
(<function>sndbuf_getbuf()</function>,
<function>sndbuf_getsize()</function>) to the device, in
blocks of <function>sndbuf_getblksz()</function> bytes.
It calls back the <function>chn_intr()</function>
<devicename>pcm</devicename> function for each
transferred block (this will typically happen at
interrupt time).</para>
</listitem>
<listitem>
<para><function>chn_intr()</function> arranges to copy new
data to the area that was transferred to the device (now
free), and make appropriate updates to the
<structname>snd_dbuf</structname> structure.</para>
</listitem>
</itemizedlist>
<listitem>
<para>The sound driver then arranges to repeatedly
transfer the whole memory area
(<function>sndbuf_getbuf()</function>,
<function>sndbuf_getsize()</function>) to the device, in
blocks of <function>sndbuf_getblksz()</function> bytes.
It calls back the <function>chn_intr()</function>
<devicename>pcm</devicename> function for each
transferred block (this will typically happen at
interrupt time).</para>
</listitem>
<listitem>
<para><function>chn_intr()</function> arranges to copy new
data to the area that was transferred to the device (now
free), and make appropriate updates to the
<structname>snd_dbuf</structname> structure.</para>
</listitem>
</itemizedlist>
</sect3>
<sect3 id="xxxchannel-init">
<title>channel_init</title>
<title>channel_init</title>
<para><function>xxxchannel_init()</function> is called to
initialize each of the play or record channels. The calls
are initiated from the sound driver attach routine. (See
the <link linkend="pcm-probe-and-attach">probe and attach
section</link>).</para>
<para><function>xxxchannel_init()</function> is called to
initialize each of the play or record channels. The calls
are initiated from the sound driver attach routine. (See
the <link linkend="pcm-probe-and-attach">probe and attach
section</link>).</para>
<programlisting> static void *
<programlisting> static void *
xxxchannel_init(kobj_t obj, void *data,
struct snd_dbuf *b, struct pcm_channel *c, int dir)<co id="co-chinit-params"/>
{
@ -305,46 +308,43 @@
return ch;<co id="co-chinit-return"/>
}</programlisting>
<calloutlist>
<calloutlist>
<callout arearefs="co-chinit-params">
<para><varname>b</varname> is the address for the channel
<structname>struct snd_dbuf</structname>. It should be
initialized in the function by calling
<function>sndbuf_alloc()</function>. The buffer size to
use is normally a small multiple of the 'typical' unit
transfer size for your device.</para>
<callout arearefs="co-chinit-params">
<para><varname>b</varname> is the address for the channel
<structname>struct snd_dbuf</structname>. It should be
initialized in the function by calling
<function>sndbuf_alloc()</function>. The buffer size to
use is normally a small multiple of the 'typical' unit
transfer size for your device.</para>
<para><varname>c</varname> is the
<devicename>pcm</devicename> channel control structure
pointer. This is an opaque object. The function should
store it in the local channel structure, to be used in
later calls to <devicename>pcm</devicename> (ie:
<function>chn_intr(c)</function>).</para>
<para><varname>c</varname> is the
<devicename>pcm</devicename> channel control structure
pointer. This is an opaque object. The function should
store it in the local channel structure, to be used in
later calls to <devicename>pcm</devicename> (ie:
<function>chn_intr(c)</function>).</para>
<para><varname>dir</varname> indicates the channel
direction (<literal>PCMDIR_PLAY</literal> or
<literal>PCMDIR_REC</literal>).</para>
</callout>
<callout arearefs="co-chinit-return">
<para>The function should return a pointer to the private
area used to control this channel. This will be passed
as a parameter to other channel interface calls.</para>
</callout>
</calloutlist>
<para><varname>dir</varname> indicates the channel
direction (<literal>PCMDIR_PLAY</literal> or
<literal>PCMDIR_REC</literal>).</para>
</callout>
<callout arearefs="co-chinit-return">
<para>The function should return a pointer to the private
area used to control this channel. This will be passed
as a parameter to other channel interface calls.</para>
</callout>
</calloutlist>
</sect3>
<sect3>
<title>channel_setformat</title>
<title>channel_setformat</title>
<para><function>xxxchannel_setformat()</function> should set
up the hardware for the specified channel for the specified
sound format.</para>
<para><function>xxxchannel_setformat()</function> should set
up the hardware for the specified channel for the specified
sound format.</para>
<programlisting> static int
<programlisting> static int
xxxchannel_setformat(kobj_t obj, void *data, u_int32_t format)<co id="co-chsetformat-params"/>
{
struct xxx_chinfo *ch = data;
@ -352,51 +352,49 @@
return 0;
}</programlisting>
<calloutlist>
<callout arearefs="co-chsetformat-params">
<para><varname>format</varname> is specified as an
<literal>AFMT_XXX value</literal>
(<filename>soundcard.h</filename>).</para>
</callout>
</calloutlist>
<calloutlist>
<callout arearefs="co-chsetformat-params">
<para><varname>format</varname> is specified as an
<literal>AFMT_XXX value</literal>
(<filename>soundcard.h</filename>).</para>
</callout>
</calloutlist>
</sect3>
<sect3>
<title>channel_setspeed</title>
<title>channel_setspeed</title>
<para><function>xxxchannel_setspeed()</function> sets up the
channel hardware for the specified sampling speed, and
returns the possibly adjusted speed.</para>
<para><function>xxxchannel_setspeed()</function> sets up the
channel hardware for the specified sampling speed, and
returns the possibly adjusted speed.</para>
<programlisting> static int
<programlisting> static int
xxxchannel_setspeed(kobj_t obj, void *data, u_int32_t speed)
{
struct xxx_chinfo *ch = data;
...
return speed;
}</programlisting>
</sect3>
<sect3>
<title>channel_setblocksize</title>
<title>channel_setblocksize</title>
<para><function>xxxchannel_setblocksize()</function> sets the
block size, which is the size of unit transactions between
<devicename>pcm</devicename> and the sound driver, and
between the sound driver and the device. Typically, this
would be the number of bytes transferred before an interrupt
occurs. During a transfer, the sound driver should call
<devicename>pcm</devicename>'s
<function>chn_intr()</function> every time this size has
been transferred.</para>
<para><function>xxxchannel_setblocksize()</function> sets the
block size, which is the size of unit transactions between
<devicename>pcm</devicename> and the sound driver, and
between the sound driver and the device. Typically, this
would be the number of bytes transferred before an interrupt
occurs. During a transfer, the sound driver should call
<devicename>pcm</devicename>'s
<function>chn_intr()</function> every time this size has
been transferred.</para>
<para>Most sound drivers only take note of the block size
here, to be used when an actual transfer will be
started.</para>
<para>Most sound drivers only take note of the block size
here, to be used when an actual transfer will be
started.</para>
<programlisting> static int
<programlisting> static int
xxxchannel_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
{
struct xxx_chinfo *ch = data;
@ -404,26 +402,24 @@
return blocksize;<co id="co-chsetblocksize-return"/>
}</programlisting>
<calloutlist>
<callout arearefs="co-chsetblocksize-return">
<para>The function returns the possibly adjusted block
size. In case the block size is indeed changed,
<function>sndbuf_resize()</function> should be called to
adjust the buffer.</para>
</callout>
</calloutlist>
<calloutlist>
<callout arearefs="co-chsetblocksize-return">
<para>The function returns the possibly adjusted block
size. In case the block size is indeed changed,
<function>sndbuf_resize()</function> should be called to
adjust the buffer.</para>
</callout>
</calloutlist>
</sect3>
<sect3 id="channel-trigger">
<title>channel_trigger</title>
<title>channel_trigger</title>
<para><function>xxxchannel_trigger()</function> is called by
<devicename>pcm</devicename> to control data transfer
operations in the driver.</para>
<para><function>xxxchannel_trigger()</function> is called by
<devicename>pcm</devicename> to control data transfer
operations in the driver.</para>
<programlisting> static int
<programlisting> static int
xxxchannel_trigger(kobj_t obj, void *data, int go)<co id="co-chtrigger-params"/>
{
struct xxx_chinfo *ch = data;
@ -431,120 +427,115 @@
return 0;
}</programlisting>
<calloutlist>
<callout arearefs="co-chtrigger-params">
<para><varname>go</varname> defines the action for the
current call. The possible values are:</para>
<itemizedlist>
<calloutlist>
<callout arearefs="co-chtrigger-params">
<para><varname>go</varname> defines the action for the
current call. The possible values are:</para>
<listitem>
<para><literal>PCMTRIG_START</literal>: the driver
should start a data transfer from or to the channel
buffer. If needed, the buffer base and size can be
retrieved through
<function>sndbuf_getbuf()</function> and
<function>sndbuf_getsize()</function>.</para>
</listitem>
<itemizedlist>
<listitem>
<para><literal>PCMTRIG_START</literal>: the driver
should start a data transfer from or to the channel
buffer. If needed, the buffer base and size can be
retrieved through
<function>sndbuf_getbuf()</function> and
<function>sndbuf_getsize()</function>.</para>
</listitem>
<listitem>
<para><literal>PCMTRIG_EMLDMAWR</literal> /
<literal>PCMTRIG_EMLDMARD</literal>: this tells the
driver that the input or output buffer may have been
updated. Most drivers just ignore these
calls.</para>
</listitem>
<listitem>
<para><literal>PCMTRIG_EMLDMAWR</literal> /
<literal>PCMTRIG_EMLDMARD</literal>: this tells the
driver that the input or output buffer may have been
updated. Most drivers just ignore these
calls.</para>
</listitem>
<listitem>
<para><literal>PCMTRIG_STOP</literal> /
<literal>PCMTRIG_ABORT</literal>: the driver should
stop the current transfer.</para>
</listitem>
</itemizedlist>
</callout>
</calloutlist>
<note><para>If the driver uses ISA DMA,
<function>sndbuf_isadma()</function> should be called before
performing actions on the device, and will take care of the
DMA chip side of things.</para>
</note>
<listitem>
<para><literal>PCMTRIG_STOP</literal> /
<literal>PCMTRIG_ABORT</literal>: the driver should
stop the current transfer.</para>
</listitem>
</itemizedlist>
</callout>
</calloutlist>
<note>
<para>If the driver uses ISA DMA,
<function>sndbuf_isadma()</function> should be called
before performing actions on the device, and will take
care of the DMA chip side of things.</para>
</note>
</sect3>
<sect3>
<title>channel_getptr</title>
<para><function>xxxchannel_getptr()</function> returns the
current offset in the transfer buffer. This will typically
be called by <function>chn_intr()</function>, and this is how
<devicename>pcm</devicename> knows where it can transfer
new data.</para>
<title>channel_getptr</title>
<para><function>xxxchannel_getptr()</function> returns the
current offset in the transfer buffer. This will typically
be called by <function>chn_intr()</function>, and this is
how <devicename>pcm</devicename> knows where it can transfer
new data.</para>
</sect3>
<sect3>
<title>channel_free</title>
<para><function>xxxchannel_free()</function> is called to free
up channel resources, for example when the driver is
unloaded, and should be implemented if the channel data
structures are dynamically allocated or if
<function>sndbuf_alloc()</function> was not used for buffer
allocation.</para>
<title>channel_free</title>
<para><function>xxxchannel_free()</function> is called to free
up channel resources, for example when the driver is
unloaded, and should be implemented if the channel data
structures are dynamically allocated or if
<function>sndbuf_alloc()</function> was not used for buffer
allocation.</para>
</sect3>
<sect3>
<title>channel_getcaps</title>
<title>channel_getcaps</title>
<programlisting> struct pcmchan_caps *
<programlisting> struct pcmchan_caps *
xxxchannel_getcaps(kobj_t obj, void *data)
{
return &amp;xxx_caps;<co id="co-chgetcaps-return"/>
}</programlisting>
<calloutlist>
<callout arearefs="co-chgetcaps-return">
<para>The routine returns a pointer to a (usually
statically-defined) <structname>pcmchan_caps</structname>
structure (defined in
<filename>sound/pcm/channel.h</filename>. The structure holds
the minimum and maximum sampling frequencies, and the
accepted sound formats. Look at any sound driver for an
example.</para>
</callout>
</calloutlist>
<calloutlist>
<callout arearefs="co-chgetcaps-return">
<para>The routine returns a pointer to a (usually
statically-defined)
<structname>pcmchan_caps</structname> structure (defined
in <filename>sound/pcm/channel.h</filename>. The
structure holds the minimum and maximum sampling
frequencies, and the accepted sound formats. Look at
any sound driver for an example.</para>
</callout>
</calloutlist>
</sect3>
<sect3>
<title>More Functions</title>
<title>More Functions</title>
<para><function>channel_reset()</function>,
<function>channel_resetdone()</function>, and
<function>channel_notify()</function> are for special purposes
and should not be implemented in a driver without discussing
it on the &a.multimedia;.</para>
<para><function>channel_reset()</function>,
<function>channel_resetdone()</function>, and
<function>channel_notify()</function> are for special
purposes and should not be implemented in a driver without
discussing it on the &a.multimedia;.</para>
<para><function>channel_setdir()</function> is deprecated.</para>
<para><function>channel_setdir()</function> is
deprecated.</para>
</sect3>
</sect2>
<sect2>
<title>The MIXER Interface</title>
<sect3 id="xxxmixer-init">
<title>mixer_init</title>
<title>mixer_init</title>
<para><function>xxxmixer_init()</function> initializes the
hardware and tells <devicename>pcm</devicename> what mixer
devices are available for playing and recording</para>
<para><function>xxxmixer_init()</function> initializes the
hardware and tells <devicename>pcm</devicename> what mixer
devices are available for playing and recording</para>
<programlisting> static int
<programlisting> static int
xxxmixer_init(struct snd_mixer *m)
{
struct xxx_info *sc = mix_getdevinfo(m);
@ -560,29 +551,28 @@
return 0;
}</programlisting>
<calloutlist>
<callout arearefs="co-mxini-sd">
<para>Set bits in an integer value and call
<function>mix_setdevs()</function> and
<function>mix_setrecdevs()</function> to tell
<devicename>pcm</devicename> what devices exist.</para>
</callout>
</calloutlist>
<para>Mixer bits definitions can be found in
<filename>soundcard.h</filename>
(<literal>SOUND_MASK_XXX</literal> values and
<literal>SOUND_MIXER_XXX</literal> bit shifts).</para>
<calloutlist>
<callout arearefs="co-mxini-sd">
<para>Set bits in an integer value and call
<function>mix_setdevs()</function> and
<function>mix_setrecdevs()</function> to tell
<devicename>pcm</devicename> what devices exist.</para>
</callout>
</calloutlist>
<para>Mixer bits definitions can be found in
<filename>soundcard.h</filename>
(<literal>SOUND_MASK_XXX</literal> values and
<literal>SOUND_MIXER_XXX</literal> bit shifts).</para>
</sect3>
<sect3>
<title>mixer_set</title>
<title>mixer_set</title>
<para><function>xxxmixer_set()</function> sets the volume
level for one mixer device.</para>
<para><function>xxxmixer_set()</function> sets the volume
level for one mixer device.</para>
<programlisting> static int
<programlisting> static int
xxxmixer_set(struct snd_mixer *m, unsigned dev,
unsigned left, unsigned right)<co id="co-mxset-params"/>
{
@ -591,31 +581,32 @@
return left | (right &lt;&lt; 8);<co id="co-mxset-return"/>
}</programlisting>
<calloutlist>
<callout arearefs="co-mxset-params">
<para>The device is specified as a <literal>SOUND_MIXER_XXX</literal>
value</para> <para>The volume values are specified in
range [0-100]. A value of zero should mute the
device.</para>
</callout>
<calloutlist>
<callout arearefs="co-mxset-params">
<para>The device is specified as a
<literal>SOUND_MIXER_XXX</literal> value</para>
<callout arearefs="co-mxset-return">
<para>As the hardware levels probably will not match the
input scale, and some rounding will occur, the routine
returns the actual level values (in range 0-100) as
shown.</para>
</callout>
</calloutlist>
<para>The volume values are specified in range [0-100].
A value of zero should mute the device.</para>
</callout>
<callout arearefs="co-mxset-return">
<para>As the hardware levels probably will not match the
input scale, and some rounding will occur, the routine
returns the actual level values (in range 0-100) as
shown.</para>
</callout>
</calloutlist>
</sect3>
<sect3>
<title>mixer_setrecsrc</title>
<title>mixer_setrecsrc</title>
<para><function>xxxmixer_setrecsrc()</function> sets the
recording source device.</para>
<para><function>xxxmixer_setrecsrc()</function> sets the
recording source device.</para>
<programlisting> static int
<programlisting> static int
xxxmixer_setrecsrc(struct snd_mixer *m, u_int32_t src)<co id="co-mxsr-params"/>
{
struct xxx_info *sc = mix_getdevinfo(m);
@ -626,62 +617,61 @@
return src;<co id="co-mxsr-return"/>
}</programlisting>
<calloutlist>
<callout arearefs="co-mxsr-params">
<para>The desired recording devices are specified as a
bit field</para>
</callout>
<calloutlist>
<callout arearefs="co-mxsr-params">
<para>The desired recording devices are specified as a
bit field</para>
</callout>
<callout arearefs="co-mxsr-return">
<para>The actual devices set for recording are returned.
Some drivers can only set one device for recording. The
function should return -1 if an error occurs.</para>
</callout>
</calloutlist>
<callout arearefs="co-mxsr-return">
<para>The actual devices set for recording are returned.
Some drivers can only set one device for recording. The
function should return -1 if an error occurs.</para>
</callout>
</calloutlist>
</sect3>
<sect3>
<title>mixer_uninit, mixer_reinit</title>
<title>mixer_uninit, mixer_reinit</title>
<para><function>xxxmixer_uninit()</function> should ensure
that all sound is muted and if possible mixer hardware
should be powered down </para>
<para><function>xxxmixer_reinit()</function> should ensure
that the mixer hardware is powered up and any settings not
controlled by <function>mixer_set()</function> or
<function>mixer_setrecsrc()</function> are restored.</para>
<para><function>xxxmixer_uninit()</function> should ensure
that all sound is muted and if possible mixer hardware
should be powered down </para>
<para><function>xxxmixer_reinit()</function> should ensure
that the mixer hardware is powered up and any settings not
controlled by <function>mixer_set()</function> or
<function>mixer_setrecsrc()</function> are restored.</para>
</sect3>
</sect2>
<sect2>
<title>The AC97 Interface</title>
<indexterm><primary>AC97</primary></indexterm>
<indexterm><primary>AC97</primary></indexterm>
<para>The <emphasis>AC97</emphasis> interface is implemented
by drivers with an AC97 codec. It only has three methods:</para>
by drivers with an AC97 codec. It only has three
methods:</para>
<itemizedlist>
<listitem>
<para><function>xxxac97_init()</function> returns the number
of ac97 codecs found.</para>
</listitem>
<listitem><para><function>xxxac97_init()</function> returns
the number of ac97 codecs found.</para>
</listitem>
<listitem><para><function>ac97_read()</function> and
<function>ac97_write()</function> read or write a specified
register.</para>
</listitem>
<listitem>
<para><function>ac97_read()</function> and
<function>ac97_write()</function> read or write a
specified register.</para>
</listitem>
</itemizedlist>
<para>The <emphasis>AC97</emphasis> interface is used by the
AC97 code in <devicename>pcm</devicename> to perform higher
level operations. Look at
<filename>sound/pci/maestro3.c</filename> or many others under
<filename>sound/pci/</filename> for an example.</para>
AC97 code in <devicename>pcm</devicename> to perform higher
level operations. Look at
<filename>sound/pci/maestro3.c</filename> or many others under
<filename>sound/pci/</filename> for an example.</para>
</sect2>
</sect1>
</chapter>

View file

@ -13,7 +13,7 @@
<surname>Kamp</surname>
<contrib>Contributed by </contrib>
</author>
<author>
<author>
<firstname>Giorgos</firstname>
<surname>Keramidas</surname>
</author>
@ -23,70 +23,76 @@
<title>Source Tree Guidelines and Policies</title>
<para>This chapter documents various guidelines and policies in force for
the FreeBSD source tree.</para>
<para>This chapter documents various guidelines and policies in
force for the FreeBSD source tree.</para>
<sect1 id="policies-style">
<title>Style Guidelines</title>
<indexterm><primary>style</primary></indexterm>
<para>Consistent coding style is extremely important, particularly
with large projects like &os;. Code should follow the &os; coding
styles described in &man.style.9; and
with large projects like &os;. Code should follow the &os;
coding styles described in &man.style.9; and
&man.style.Makefile.5;.</para>
</sect1>
<sect1 id="policies-maintainer">
<title><makevar>MAINTAINER</makevar> on Makefiles</title>
<indexterm><primary>ports maintainer</primary></indexterm>
<para>If a particular portion of the &os; <filename>src/</filename>
distribution is being maintained by a person or group of persons,
this is communicated through an entry in the
<filename>src/MAINTAINERS</filename> file. Maintainers of ports
within the Ports Collection express their maintainership to the
world by adding a <makevar>MAINTAINER</makevar> line to the
<para>If a particular portion of the &os;
<filename>src/</filename> distribution is being maintained by a
person or group of persons, this is communicated through an
entry in the <filename>src/MAINTAINERS</filename> file.
Maintainers of ports within the Ports Collection express their
maintainership to the world by adding a
<makevar>MAINTAINER</makevar> line to the
<filename>Makefile</filename> of the port in question:</para>
<programlisting><makevar>MAINTAINER</makevar>= <replaceable>email-addresses</replaceable></programlisting>
<tip>
<para>For other parts of the repository, or for sections not listed
as having a maintainer, or when you are unsure who the active
maintainer is, try looking at the recent commit history of the
relevant parts of the source tree. It is quite often the case
that a maintainer is not explicitly named, but the people who are
actively working in a part of the source tree for, say, the last
couple of years are interested in reviewing changes. Even if this
is not specifically mentioned in the documentation or the source
itself, asking for a review as a form of courtesy is a very
reasonable thing to do.</para>
<para>For other parts of the repository, or for sections not
listed as having a maintainer, or when you are unsure who the
active maintainer is, try looking at the recent commit history
of the relevant parts of the source tree. It is quite often
the case that a maintainer is not explicitly named, but the
people who are actively working in a part of the source tree
for, say, the last couple of years are interested in reviewing
changes. Even if this is not specifically mentioned in the
documentation or the source itself, asking for a review as a
form of courtesy is a very reasonable thing to do.</para>
</tip>
<para>The role of the maintainer is as follows:</para>
<itemizedlist>
<listitem>
<para>The maintainer owns and is responsible for that code. This means
that he or she is responsible for fixing bugs and answering problem reports
pertaining to that piece of the code, and in the case of contributed
software, for tracking new versions, as appropriate.</para>
<para>The maintainer owns and is responsible for that code.
This means that he or she is responsible for fixing bugs and
answering problem reports pertaining to that piece of the
code, and in the case of contributed software, for tracking
new versions, as appropriate.</para>
</listitem>
<listitem>
<para>Changes to directories which have a maintainer defined shall be sent
to the maintainer for review before being committed. Only if the
maintainer does not respond for an unacceptable period of time, to
several emails, will it be acceptable to commit changes without review
by the maintainer. However, it is suggested that you try to have the
changes reviewed by someone else if at all possible.</para>
<para>Changes to directories which have a maintainer defined
shall be sent to the maintainer for review before being
committed. Only if the maintainer does not respond for an
unacceptable period of time, to several emails, will it be
acceptable to commit changes without review by the
maintainer. However, it is suggested that you try to have
the changes reviewed by someone else if at all
possible.</para>
</listitem>
<listitem>
<para>It is of course not acceptable to add a person or group as
maintainer unless they agree to assume this duty. On the other hand it
does not have to be a committer and it can easily be a group of
people.</para>
<para>It is of course not acceptable to add a person or group
as maintainer unless they agree to assume this duty. On the
other hand it does not have to be a committer and it can
easily be a group of people.</para>
</listitem>
</itemizedlist>
</sect1>
@ -115,37 +121,44 @@
<indexterm><primary>contributed software</primary></indexterm>
<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>
<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>
<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
advantages and drawbacks. No clear winner has emerged.</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 advantages and drawbacks. No clear winner has
emerged.</para>
<para>Since this is the case, after some debate one of these methods has
been selected as the <quote>official</quote> method and will be required
for future imports of software of this kind. Furthermore, it is
strongly suggested that existing contributed software converge on this
model over time, as it has significant advantages over the old method,
including the ability to easily obtain diffs relative to the
<quote>official</quote> versions of the source by everyone (even without
direct repository access). This will make it significantly easier to return changes
to the primary developers of the contributed software.</para>
<para>Since this is the case, after some debate one of these
methods has been selected as the <quote>official</quote> method
and will be required for future imports of software of this
kind. Furthermore, it is strongly suggested that existing
contributed software converge on this model over time, as it has
significant advantages over the old method, including the
ability to easily obtain diffs relative to the
<quote>official</quote> versions of the source by everyone (even
without direct repository access). This will make it
significantly easier to return changes to the primary developers
of the contributed software.</para>
<para>Ultimately, however, it comes down to the people actually doing the
work. If using this model is particularly unsuited to the package being
dealt with, exceptions to these rules may be granted only with the
approval of the core team and with the general consensus of the other
developers. The ability to maintain the package in the future will be a
key issue in the decisions.</para>
<para>Ultimately, however, it comes down to the people actually
doing the work. If using this model is particularly unsuited to
the package being dealt with, exceptions to these rules may be
granted only with the approval of the core team and with the
general consensus of the other developers. The ability to
maintain the package in the future will be a key issue in the
decisions.</para>
<note>
<para>Because it makes it harder to import future versions
minor, trivial and/or
cosmetic changes are <emphasis>strongly discouraged</emphasis> on
files that are still tracking the vendor branch.</para>
minor, trivial and/or cosmetic changes are
<emphasis>strongly discouraged</emphasis> on files that are
still tracking the vendor branch.</para>
</note>
<sect2 id="vendor-import-svn">
@ -169,16 +182,16 @@
<para>If this is your first import after the switch to
<acronym>SVN</acronym>, you will have to flatten and clean
up the vendor tree, and bootstrap merge history in the main
tree. If not, you can safely omit this step.</para>
up the vendor tree, and bootstrap merge history in the
main tree. If not, you can safely omit this step.</para>
<para>During the conversion from <acronym>CVS</acronym> to
<acronym>SVN</acronym>, vendor branches were imported with
the same layout as the main tree. For example, the
<application>foo</application> vendor sources ended up in
<filename>vendor/<replaceable>foo</replaceable>/dist/contrib/<replaceable>foo</replaceable></filename>,
but it is pointless and rather inconvenient. What we really
want is to have the vendor source directly in
but it is pointless and rather inconvenient. What we
really want is to have the vendor source directly in
<filename>vendor/<replaceable>foo</replaceable>/dist</filename>,
like this:</para>
@ -192,9 +205,9 @@
<para>Note that, the <literal>propdel</literal> bit is
necessary because starting with 1.5, Subversion will
automatically add <literal>svn:mergeinfo</literal> to any
directory you copy or move. In this case, you will not need
this information, since you are not going to merge anything
from the tree you deleted.</para>
directory you copy or move. In this case, you will not
need this information, since you are not going to merge
anything from the tree you deleted.</para>
<note>
<para>You may want to flatten the tags as well. The
@ -202,19 +215,19 @@
the commit until the end.</para>
</note>
<para>Check the <filename>dist</filename> tree and perform any
cleanup that is deemed to be necessary. You may want to
disable keyword expansion, as it makes no sense on
<para>Check the <filename>dist</filename> tree and perform
any cleanup that is deemed to be necessary. You may want
to disable keyword expansion, as it makes no sense on
unmodified vendor code. In some cases, it can be even be
harmful.</para>
<screen>&prompt.user; <userinput><command>svn propdel</command> svn:keywords <option>-R</option> <filename>.</filename></userinput>
&prompt.user; <userinput><command>svn commit</command></userinput></screen>
<para>Bootstrapping of <literal>svn:mergeinfo</literal> on the
target directory (in the main tree) to the revision that
corresponds to the last change was made to the vendor tree
prior to importing new sources is also needed:</para>
<para>Bootstrapping of <literal>svn:mergeinfo</literal> on
the target directory (in the main tree) to the revision
that corresponds to the last change was made to the vendor
tree prior to importing new sources is also needed:</para>
<screen>&prompt.user; <userinput><command>cd</command> <filename>head/contrib/<replaceable>foo</replaceable></filename></userinput>
&prompt.user; <userinput><command>svn merge</command> <option>--record-only</option> <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist@<replaceable>12345678</replaceable> <filename>.</filename></userinput>
@ -228,16 +241,17 @@
<step>
<title>Importing New Sources</title>
<para>Prepare a full, clean tree of the vendor sources. With
<acronym>SVN</acronym>, we can keep a full distribution in
the vendor tree without bloating the main tree. Import
everything but merge only what is needed.</para>
<para>Prepare a full, clean tree of the vendor sources.
With <acronym>SVN</acronym>, we can keep a full
distribution in the vendor tree without bloating the main
tree. Import everything but merge only what is
needed.</para>
<para>Note that you will need to add any files that were added
since the last vendor import, and remove any that were
removed. To facilitate this, you should prepare sorted
lists of the contents of the vendor tree and of the sources
you are about to import:</para>
<para>Note that you will need to add any files that were
added since the last vendor import, and remove any that
were removed. To facilitate this, you should prepare
sorted lists of the contents of the vendor tree and of the
sources you are about to import:</para>
<screen>&prompt.user; <userinput><command>cd</command> <filename>vendor/<replaceable>foo</replaceable>/dist</filename></userinput>
&prompt.user; <userinput><command>svn list</command> <option>-R</option> | <command>grep</command> <option>-v</option> '/$' | <command>sort</command> > <filename>../<replaceable>old</replaceable></filename></userinput>
@ -265,11 +279,11 @@
&prompt.user; <userinput><command>comm</command> <option>-13</option> <filename>../<replaceable>old</replaceable></filename> <filename>../<replaceable>new</replaceable></filename> | <command>xargs</command> svn add</userinput></screen>
<warning>
<para>If there are new directories in the new distribution,
the last command will fail. You will have to add the
directories, and run it again. Conversely, if any
directories were removed, you will have to remove them
manually.</para>
<para>If there are new directories in the new
distribution, the last command will fail. You will have
to add the directories, and run it again. Conversely,
if any directories were removed, you will have to remove
them manually.</para>
</warning>
<para>Check properties on any new files:</para>
@ -302,8 +316,9 @@
<note>
<para>You are ready to commit, but you should first check
the output of <command>svn stat</command> and <command>svn
diff</command> to make sure everything is in order.</para>
the output of <command>svn stat</command> and
<command>svn diff</command> to make sure everything is
in order.</para>
</note>
<para>Once you have committed the new vendor release, you
@ -312,12 +327,13 @@
<screen>&prompt.user; <userinput><command>svn copy</command> <filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</filename> <filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/<replaceable>9.9</replaceable></filename></userinput></screen>
<para>To get the new tag, you can update your working copy of
<para>To get the new tag, you can update your working copy
of
<filename>vendor/<replaceable>foo</replaceable></filename>.</para>
<note>
<para>If you choose to do the copy in the checkout instead,
do not forget to remove the generated
<para>If you choose to do the copy in the checkout
instead, do not forget to remove the generated
<literal>svn:mergeinfo</literal> as described
above.</para>
</note>
@ -335,10 +351,11 @@
&prompt.user; <userinput><command>svn update</command></userinput>
&prompt.user; <userinput><command>svn merge</command> <option>--accept=postpone</option> <filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</filename></userinput></screen>
<para>Resolve any conflicts, and make sure that any files that
were added or removed in the vendor tree have been properly
added or removed in the main tree. It is always a good idea
to check differences against the vendor branch:</para>
<para>Resolve any conflicts, and make sure that any files
that were added or removed in the vendor tree have been
properly added or removed in the main tree. It is always
a good idea to check differences against the vendor
branch:</para>
<screen>&prompt.user; <userinput><command>svn diff</command> <option>--no-diff-deleted</option> <option>--old=</option><filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</filename> <option>--new=</option><filename>.</filename></userinput></screen>
@ -347,16 +364,16 @@
vendor tree but not in the main tree.</para>
<note>
<para>With <acronym>SVN</acronym>, there is no concept of on
or off the vendor branch. If a file that previously had
local modifications no longer does, just remove any
<para>With <acronym>SVN</acronym>, there is no concept of
on or off the vendor branch. If a file that previously
had local modifications no longer does, just remove any
left-over cruft, such as &os; version tags, so it no
longer shows up in diffs against the vendor tree.</para>
</note>
<para>If any changes are required for the world to build with
the new sources, make them now &mdash; and test until you
are satisfied that everything build and runs
<para>If any changes are required for the world to build
with the new sources, make them now &mdash; and test until
you are satisfied that everything build and runs
correctly.</para>
</step>
@ -378,93 +395,103 @@
<sect1 id="policies-encumbered">
<title>Encumbered Files</title>
<para>It might occasionally be necessary to include an encumbered file in
the FreeBSD source tree. For example, if a device requires a small
piece of binary code to be loaded to it before the device will operate,
and we do not have the source to that code, then the binary file is said
to be encumbered. The following policies apply to including encumbered
files in the FreeBSD source tree.</para>
<para>It might occasionally be necessary to include an encumbered
file in the FreeBSD source tree. For example, if a device
requires a small piece of binary code to be loaded to it before
the device will operate, and we do not have the source to that
code, then the binary file is said to be encumbered. The
following policies apply to including encumbered files in the
FreeBSD source tree.</para>
<orderedlist>
<listitem>
<para>Any file which is interpreted or executed by the system CPU(s)
and not in source format is encumbered.</para>
<para>Any file which is interpreted or executed by the system
CPU(s) and not in source format is encumbered.</para>
</listitem>
<listitem>
<para>Any file with a license more restrictive than BSD or GNU is
encumbered.</para>
<para>Any file with a license more restrictive than BSD or GNU
is encumbered.</para>
</listitem>
<listitem>
<para>A file which contains downloadable binary data for use by the
hardware is not encumbered, unless (1) or (2) apply to it. It must
be stored in an architecture neutral ASCII format (file2c or
uuencoding is recommended).</para>
<para>A file which contains downloadable binary data for use
by the hardware is not encumbered, unless (1) or (2) apply
to it. It must be stored in an architecture neutral ASCII
format (file2c or uuencoding is recommended).</para>
</listitem>
<listitem>
<para>Any encumbered file requires specific approval from the
<ulink url="&url.base;/administration.html#t-core">Core Team</ulink> before it is added to the
repository.</para>
<para>Any encumbered file requires specific approval from the
<ulink url="&url.base;/administration.html#t-core">Core
Team</ulink> before it is added to the repository.</para>
</listitem>
<listitem>
<para>Encumbered files go in <filename>src/contrib</filename> or
<filename>src/sys/contrib</filename>.</para>
<para>Encumbered files go in <filename>src/contrib</filename>
or <filename>src/sys/contrib</filename>.</para>
</listitem>
<listitem>
<para>The entire module should be kept together. There is no point in
splitting it, unless there is code-sharing with non-encumbered
code.</para>
<para>The entire module should be kept together. There is no
point in splitting it, unless there is code-sharing with
non-encumbered code.</para>
</listitem>
<listitem>
<para>Object files are named
<para>Object files are named
<filename><replaceable>arch</replaceable>/<replaceable>filename</replaceable>.o.uu></filename>.</para>
</listitem>
<listitem>
<para>Kernel files:</para>
<para>Kernel files:</para>
<orderedlist>
<listitem>
<para>Should always be referenced in
<filename>conf/files.*</filename> (for build simplicity).</para>
<orderedlist>
<listitem>
<para>Should always be referenced in
<filename>conf/files.*</filename> (for build
simplicity).</para>
</listitem>
<listitem>
<para>Should always be in <filename>LINT</filename>, but the
<ulink url="&url.base;/administration.html#t-core">Core Team</ulink> decides per case if it
should be commented out or not. The
<ulink url="&url.base;/administration.html#t-core">Core Team</ulink> can, of course, change
their minds later on.</para>
</listitem>
<listitem>
<para>Should always be in <filename>LINT</filename>, but
the <ulink
url="&url.base;/administration.html#t-core">Core
Team</ulink> decides per case if it should be
commented out or not. The <ulink
url="&url.base;/administration.html#t-core">Core
Team</ulink> can, of course, change their minds later
on.</para>
</listitem>
<listitem>
<para>The <firstterm>Release Engineer</firstterm>
decides whether or not it goes into the release.</para>
</listitem>
</orderedlist>
<listitem>
<para>The <firstterm>Release Engineer</firstterm>
decides whether or not it goes into the release.</para>
</listitem>
</orderedlist>
</listitem>
<listitem>
<para>User-land files:</para>
<para>User-land files:</para>
<orderedlist>
<listitem>
<indexterm><primary>core team</primary></indexterm>
<para>The <ulink url="&url.base;/administration.html#t-core">Core team</ulink> decides if
the code should be part of <command>make world</command>.</para>
</listitem>
<orderedlist>
<listitem>
<para>The <ulink
url="&url.base;/administration.html#t-core">Core
team</ulink><indexterm><primary>core
team</primary></indexterm> decides if
the code should be part of
<command>make world</command>.</para>
</listitem>
<listitem>
<indexterm><primary>release engineering</primary></indexterm>
<para>The <ulink url="&url.base;/administration.html#t-re">Release Engineering</ulink>
decides if it goes into the release.</para>
</listitem>
</orderedlist>
<listitem>
<para>The <ulink
url="&url.base;/administration.html#t-re">Release
Engineering</ulink><indexterm><primary>release
engineering</primary></indexterm>
decides if it goes into the release.</para>
</listitem>
</orderedlist>
</listitem>
</orderedlist>
</sect1>
@ -491,10 +518,11 @@
<title>Shared Libraries</title>
<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
rules. Generally, the resulting numbers will have nothing to do with
the release version of the software.</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 rules. Generally, the resulting numbers
will have nothing to do with the release version of the
software.</para>
<para>The three principles of shared library building are:</para>
@ -504,57 +532,64 @@
</listitem>
<listitem>
<para>If there is a change that is backwards compatible, bump minor
number (note that ELF systems ignore the minor number)</para>
<para>If there is a change that is backwards compatible, bump
minor number (note that ELF systems ignore the minor
number)</para>
</listitem>
<listitem>
<para>If there is an incompatible change, bump major number</para>
<para>If there is an incompatible change, bump major
number</para>
</listitem>
</itemizedlist>
<para>For instance, added functions and bugfixes result in the minor
version number being bumped, while deleted functions, changed function
call syntax, etc. will force the major version number to change.</para>
<para>For instance, added functions and bugfixes result in the
minor version number being bumped, while deleted functions,
changed function call syntax, etc. will force the major version
number to change.</para>
<para>Stick to version numbers of the form major.minor
(<replaceable>x</replaceable>.<replaceable>y</replaceable>). Our a.out
dynamic linker does not handle version numbers of the form
(<replaceable>x</replaceable>.<replaceable>y</replaceable>).
Our a.out dynamic linker does not handle version numbers of the
form
<replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>
well. Any version number after the <replaceable>y</replaceable>
(i.e. the third digit) is totally ignored when comparing shared lib
version numbers to decide which library to link with. Given two shared
libraries that differ only in the <quote>micro</quote> revision,
<command>ld.so</command> will link with the higher one. That is, if you link
with <filename>libfoo.so.3.3.3</filename>, the linker only records
<literal>3.3</literal> in the headers, and will link with anything
starting with
<replaceable>libfoo.so.3</replaceable>.<replaceable>(anything &gt;=
3)</replaceable>.<replaceable>(highest
(i.e. the third digit) is totally ignored when comparing shared
lib version numbers to decide which library to link with. Given
two shared libraries that differ only in the
<quote>micro</quote> revision, <command>ld.so</command> will
link with the higher one. That is, if you link with
<filename>libfoo.so.3.3.3</filename>, the linker only records
<literal>3.3</literal> in the headers, and will link with
anything starting with
<replaceable>libfoo.so.3</replaceable>.<replaceable>(anything
&gt;= 3)</replaceable>.<replaceable>(highest
available)</replaceable>.</para>
<note>
<para><command>ld.so</command> will always use the highest
<quote>minor</quote> revision. For instance, it will use
<filename>libc.so.2.2</filename> in preference to
<filename>libc.so.2.0</filename>, even if the program was initially
linked with <filename>libc.so.2.0</filename>.</para>
<filename>libc.so.2.0</filename>, even if the program was
initially linked with <filename>libc.so.2.0</filename>.</para>
</note>
<para>In addition, our ELF dynamic linker does not handle minor version
numbers at all. However, one should still specify a major and minor
version number as our <filename>Makefile</filename>s <quote>do the right thing</quote>
based on the type of system.</para>
<para>In addition, our ELF dynamic linker does not handle minor
version numbers at all. However, one should still specify a
major and minor version number as our
<filename>Makefile</filename>s <quote>do the right thing</quote>
based on the type of system.</para>
<para>For non-port libraries, it is also our policy to change the shared
library version number only once between releases. In addition, it is
our policy to change the major shared library version number only once
between major OS releases (i.e. from 6.0 to 7.0). When you make a
change to a system library that requires the version number to be
bumped, check the <filename>Makefile</filename>'s commit logs. It is the
responsibility of the committer to ensure that the first such change
since the release will result in the shared library version number in
the <filename>Makefile</filename> to be updated, and any subsequent
changes will not.</para>
<para>For non-port libraries, it is also our policy to change the
shared library version number only once between releases. In
addition, it is our policy to change the major shared library
version number only once between major OS releases (i.e. from
6.0 to 7.0). When you make a change to a system library that
requires the version number to be bumped, check the
<filename>Makefile</filename>'s commit logs. It is the
responsibility of the committer to ensure that the first such
change since the release will result in the shared library
version number in the <filename>Makefile</filename> to be
updated, and any subsequent changes will not.</para>
</sect1>
</chapter>

View file

@ -21,18 +21,19 @@ INSTALL_ONLY_COMPRESSED?=
# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
SRCS+= see-also/chapter.xml
SRCS+= xhtml-markup/chapter.xml
SRCS+= docbook-markup/chapter.xml
SRCS+= xml-primer/chapter.xml
SRCS+= stylesheets/chapter.xml
SRCS+= tools/chapter.xml
SRCS+= working-copy/chapter.xml
SRCS+= structure/chapter.xml
SRCS+= doc-build/chapter.xml
SRCS+= the-website/chapter.xml
SRCS+= tools/chapter.xml
SRCS+= xml-primer/chapter.xml
SRCS+= xhtml-markup/chapter.xml
SRCS+= docbook-markup/chapter.xml
SRCS+= stylesheets/chapter.xml
SRCS+= translations/chapter.xml
SRCS+= writing-style/chapter.xml
SRCS+= editor-config/chapter.xml
SRCS+= see-also/chapter.xml
SRCS+= examples/appendix.xml

View file

@ -250,16 +250,17 @@ The time is 09:18</screen></entry>
&chap.overview;
&chap.tools;
&chap.working-copy;
&chap.structure;
&chap.doc-build;
&chap.the-website;
&chap.xml-primer;
&chap.xhtml-markup;
&chap.docbook-markup;
&chap.stylesheets;
&chap.structure;
&chap.doc-build;
&chap.the-website;
&chap.translations;
&chap.writing-style;
&chap.psgml-mode;
&chap.editor-config;
&chap.see-also;
&app.examples;

View file

@ -11,17 +11,18 @@
-->
<!ENTITY chap.overview SYSTEM "overview/chapter.xml">
<!ENTITY chap.xml-primer SYSTEM "xml-primer/chapter.xml">
<!ENTITY chap.tools SYSTEM "tools/chapter.xml">
<!ENTITY chap.working-copy SYSTEM "working-copy/chapter.xml">
<!ENTITY chap.structure SYSTEM "structure/chapter.xml">
<!ENTITY chap.doc-build SYSTEM "doc-build/chapter.xml">
<!ENTITY chap.the-website SYSTEM "the-website/chapter.xml">
<!ENTITY chap.xml-primer SYSTEM "xml-primer/chapter.xml">
<!ENTITY chap.xhtml-markup SYSTEM "xhtml-markup/chapter.xml">
<!ENTITY chap.docbook-markup SYSTEM "docbook-markup/chapter.xml">
<!ENTITY chap.stylesheets SYSTEM "stylesheets/chapter.xml">
<!ENTITY chap.structure SYSTEM "structure/chapter.xml">
<!ENTITY chap.the-website SYSTEM "the-website/chapter.xml">
<!ENTITY chap.translations SYSTEM "translations/chapter.xml">
<!ENTITY chap.writing-style SYSTEM "writing-style/chapter.xml">
<!ENTITY chap.psgml-mode SYSTEM "psgml-mode/chapter.xml">
<!ENTITY chap.editor-config SYSTEM "editor-config/chapter.xml">
<!ENTITY chap.see-also SYSTEM "see-also/chapter.xml">
<!ENTITY chap.doc-build SYSTEM "doc-build/chapter.xml">
<!ENTITY app.examples SYSTEM "examples/appendix.xml">

View file

@ -34,75 +34,37 @@
<chapter id="doc-build">
<title>The Documentation Build Process</title>
<para>This chapter's main purpose is to clearly explain
<emphasis>how the documentation build process is
organized</emphasis>, and <emphasis>how to affect modifications
to this process</emphasis>.</para>
<para>After you have finished reading this chapter you
should:</para>
<itemizedlist>
<listitem>
<para>Know what you need to build the FDP documentation, in
addition to those mentioned in the
<link linkend="tools">XML tools chapter</link>.</para>
</listitem>
<listitem>
<para>Be able to read and understand the
<application>make</application> instructions that are present
in each document's <filename>Makefile</filename>s, as well as
an overview of the <filename>doc.project.mk</filename>
includes.</para>
</listitem>
<listitem>
<para>Be able to customize the build process by using
<application>make</application> variables and
<application>make</application> targets.</para>
</listitem>
</itemizedlist>
<para>This chapter covers organization of the documentation build
process and how &man.make.1; is used to control it.</para>
<sect1 id="doc-build-toolset">
<title>The FreeBSD Documentation Build Toolset</title>
<title>The &os; Documentation Build Toolset</title>
<para>Here are your tools. Use them every way you can.</para>
<para>These are the tools used to build and install the
<acronym>FDP</acronym> documentation.</para>
<itemizedlist>
<listitem>
<para>The primary build tool you will need is
<application>make</application>, but specifically
<para>The primary build tool is &man.make.1;, specifically
<application>Berkeley Make</application>.</para>
</listitem>
<listitem>
<para>Package building is handled by FreeBSD's
<application>pkg_create</application>. If you are not using
FreeBSD, you will either have to live without packages, or
compile the source yourself.</para>
<para>Package building is handled by &os;'s
&man.pkg.create.1;.</para>
</listitem>
<listitem>
<para><application>gzip</application> is needed to create
compressed versions of the document.
<application>bzip2</application> compression and
<application>zip</application> archives are also supported.
<application>tar</application> is supported, but package
building demands it.</para>
<para>&man.gzip.1; is used to create compressed versions of
the document. &man.bzip2.1; archives are also supported.
&man.tar.1; is used for package building.</para>
</listitem>
<listitem>
<para><application>install</application> is the default method
to install the documentation. There are alternatives,
however.</para>
<para>&man.install.1; is used to install the
documentation.</para>
</listitem>
</itemizedlist>
<note>
<para>It is unlikely you will have any trouble finding these
last two, they are mentioned for completeness only.</para>
</note>
</sect1>
<sect1 id="doc-build-makefiles">
@ -111,7 +73,7 @@
Documentation Tree</title>
<para>There are three main types of <filename>Makefile</filename>s
in the FreeBSD Documentation Project tree.</para>
in the &os; Documentation Project tree.</para>
<itemizedlist>
<listitem>
@ -150,13 +112,13 @@ COMPAT_SYMLINK = en
DOC_PREFIX?= ${.CURDIR}/..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"</programlisting>
<para>In quick summary, the first four non-empty lines define
the <application>make</application> variables,
<makevar>SUBDIR</makevar>, <makevar>COMPAT_SYMLINK</makevar>,
and <makevar>DOC_PREFIX</makevar>.</para>
<para>The first four non-empty lines define the &man.make.1;
variables <makevar>SUBDIR</makevar>,
<makevar>COMPAT_SYMLINK</makevar>, and
<makevar>DOC_PREFIX</makevar>.</para>
<para>The first <makevar>SUBDIR</makevar> statement, as well as
the <makevar>COMPAT_SYMLINK</makevar> statement, shows how to
<para>The <makevar>SUBDIR</makevar> statement and
<makevar>COMPAT_SYMLINK</makevar> statement show how to
assign a value to a variable, overriding any previous
value.</para>
@ -172,7 +134,7 @@ DOC_PREFIX?= ${.CURDIR}/..
<filename>Makefile</filename> thinks it is - the user can
override this and provide the correct value.</para>
<para>Now what does it all mean? <makevar>SUBDIR</makevar>
<para>What does it all mean? <makevar>SUBDIR</makevar>
mentions which subdirectories below this one the build process
should pass any work on to.</para>
@ -182,24 +144,24 @@ DOC_PREFIX?= ${.CURDIR}/..
point to <filename>en_US.ISO-8859-1</filename>).</para>
<para><makevar>DOC_PREFIX</makevar> is the path to the root of
the FreeBSD Document Project tree. This is not always that
easy to find, and is also easily overridden, to allow for
flexibility. <makevar>.CURDIR</makevar> is a
<application>make</application> builtin variable with the path
to the current directory.</para>
the &os; Document Project tree. This is not always that easy
to find, and is also easily overridden, to allow for
flexibility. <makevar>.CURDIR</makevar> is a &man.make.1;
builtin variable with the path to the current
directory.</para>
<para>The final line includes the FreeBSD Documentation
Project's project-wide <application>make</application> system
file <filename>doc.project.mk</filename> which is the glue
which converts these variables into build instructions.</para>
<para>The final line includes the &os; Documentation Project's
project-wide &man.make.1; system file
<filename>doc.project.mk</filename> which is the glue which
converts these variables into build instructions.</para>
</sect2>
<sect2 id="doc-make">
<title>Documentation <filename>Makefile</filename>s</title>
<para>These <filename>Makefile</filename>s set a bunch of
<application>make</application> variables that describe how to
build the documentation contained in that directory.</para>
<para>These <filename>Makefile</filename>s set &man.make.1;
variables that describe how to build the documentation
contained in that directory.</para>
<para>Here is an example:</para>
@ -219,10 +181,9 @@ DOC_PREFIX?= ${.CURDIR}/../../..
.include "$(DOC_PREFIX)/share/mk/docproj.docbook.mk"</programlisting>
<para>The <makevar>MAINTAINER</makevar> variable is a very
important one. This variable provides the ability to claim
ownership over a document in the FreeBSD Documentation
Project, whereby you gain the responsibility for maintaining
<para>The <makevar>MAINTAINER</makevar> variable allows
committers to claim ownership of a document in the &os;
Documentation Project, and take responsibility for maintaining
it.</para>
<para><makevar>DOC</makevar> is the name (sans the
@ -240,22 +201,17 @@ DOC_PREFIX?= ${.CURDIR}/../../..
default, should be non-empty if only compressed documents are
desired in the build.</para>
<note>
<para>We covered optional variable assignments in the
<link linkend="sub-make">previous section</link>.</para>
</note>
<para>The <makevar>DOC_PREFIX</makevar> and include statements
should be familiar already.</para>
</sect2>
</sect1>
<sect1 id="make-includes">
<title>FreeBSD Documentation Project
<title>&os; Documentation Project
<application>Make</application> Includes</title>
<para>This is best explained by inspection of the code. Here are
the system include files:</para>
<para>&man.make.1; includes are best explained by inspection of
the code. Here are the system include files:</para>
<itemizedlist>
<listitem>
@ -321,10 +277,10 @@ PRI_LANG?= en_US.ISO8859-1
default.</para>
<note>
<para><makevar>PRI_LANG</makevar> in no way affects what
<para><makevar>PRI_LANG</makevar> does not affect which
documents can, or even will, be built. Its main use is
creating links to commonly referenced documents into the
FreeBSD documentation install root.</para>
&os; documentation install root.</para>
</note>
</sect3>
@ -332,11 +288,10 @@ PRI_LANG?= en_US.ISO8859-1
<title>Conditionals</title>
<para>The <literal>.if defined(DOC)</literal> line is an
example of a <application>make</application> conditional
which, like in other programs, defines behavior if some
condition is true or if it is false.
<literal>defined</literal> is a function which returns
whether the variable given is defined or not.</para>
example of a &man.make.1; conditional which, like in other
programs, defines behavior if some condition is true or if
it is false. <literal>defined</literal> is a function which
returns whether the variable given is defined or not.</para>
<para><literal>.if ${DOCFORMAT} == "docbook"</literal>, next,
tests whether the <makevar>DOCFORMAT</makevar> variable is
@ -351,9 +306,8 @@ PRI_LANG?= en_US.ISO8859-1
<sect2>
<title><filename>doc.subdir.mk</filename></title>
<para>This is too long to explain by inspection, you should be
able to work it out with the knowledge gained from the
previous chapters, and a little help given here.</para>
<para>This file is too long to explain in detail. These notes
describe the most important features.</para>
<sect3>
<title>Variables</title>
@ -389,8 +343,8 @@ PRI_LANG?= en_US.ISO8859-1
<literal><replaceable>target</replaceable>:
<replaceable>dependency1 dependency2
...</replaceable></literal> tuples, where to build
<literal>target</literal>, you need to build the given
dependencies first.</para>
<literal>target</literal>, the given
dependencies must be built first.</para>
<para>After that descriptive tuple, instructions on how to
build the target may be given, if the conversion process

View file

@ -46,8 +46,9 @@
not answer to the &a.doc;.</para>
<para>DocBook was originally developed by HaL Computer Systems and
O'Reilly &amp; Associates to be a <acronym>DTD</acronym> for
writing technical documentation <footnote><para>A short history
O'Reilly &amp; Associates to be a Document Type Definition
(<acronym>DTD</acronym>) for writing technical documentation
<footnote><para>A short history
can be found under <ulink
url="http://www.oasis-open.org/docbook/intro.shtml#d0e41">
http://www.oasis-open.org/docbook/intro.shtml#d0e41</ulink>.</para></footnote>.
@ -92,31 +93,262 @@
<title>&os; Extensions</title>
<para>The &os; Documentation Project has extended the
DocBook <acronym>DTD</acronym> by adding some new elements.
These elements serve to make some of the markup more
precise.</para>
<para>Where a &os;-specific element is listed below, it is
clearly marked.</para>
DocBook <acronym>DTD</acronym> with additional elements and
entities. These additions serve to make some of the markup
easier or more precise.</para>
<para>Throughout the rest of this document, the term
<quote>DocBook</quote> is used to mean the &os;-extended
DocBook <acronym>DTD</acronym>.</para>
<note>
<para>There is nothing about these extensions that is &os;
specific, it was just felt that they were useful
<para>Most of these extensions are not unique to &os;,
it was just felt that they were useful
enhancements for this particular project. Should anyone
from any of the other *nix camps (NetBSD, OpenBSD, Linux,
&hellip;) be interested in collaborating on a standard
DocBook extension set, please get in touch with
DocBook extension set, please contact
&a.doceng;.</para>
</note>
<para>The &os; extensions are not (currently) in the
Ports Collection. They are stored in the &os; Subversion
tree, as <ulink
url="http://svnweb.FreeBSD.org/doc/head/share/xml/freebsd.dtd">head/share/xml/freebsd.dtd</ulink>.</para>
<sect2 id="docbook-markup-freebsd-extensions-elements">
<title>&os; Elements</title>
<para>The additional &os; elements are not (currently) in the
Ports Collection. They are stored in the &os; Subversion
tree, as <ulink
url="http://svnweb.FreeBSD.org/doc/head/share/xml/freebsd.dtd">head/share/xml/freebsd.dtd</ulink>.</para>
<para>&os;-specific elements used in the examples below are
clearly marked.</para>
</sect2>
<sect2 id="docbook-markup-freebsd-extensions-entities">
<title>&os; Entities</title>
<para>This table shows some of the most useful entities
available in the <acronym>FDP</acronym>. For a complete list,
see the <filename>*.ent</filename> files in
<filename class="directory">doc/share/xml</filename>.</para>
<informaltable frame="none" pgwide="1">
<tgroup cols="3">
<colspec colname="entity"/>
<colspec colname="expandsto"/>
<colspec colname="notes"/>
<tbody valign="top">
<row>
<entry namest="entity" nameend="notes">&os; Name Entities</entry>
<entry></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;os;</literal></entry>
<entry><literal>&os;</literal></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;os.stable;</literal></entry>
<entry><literal>&os.stable;</literal></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;os.current;</literal></entry>
<entry><literal>&os.current;</literal></entry>
<entry></entry>
</row>
<row>
<entry></entry>
</row>
<row>
<entry namest="entity" nameend="notes">Manual Page Entities</entry>
<entry></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;man.ls.1;</literal></entry>
<entry>&man.ls.1;</entry>
<entry>Usage: <literal>&amp;man.ls.1; is the manual page for <sgmltag class="starttag">command</sgmltag>ls<sgmltag class="endtag">command</sgmltag>.</literal></entry>
</row>
<row>
<entry><literal>&amp;man.cp.1;</literal></entry>
<entry>&man.cp.1;</entry>
<entry>Usage: <literal>The manual page for <sgmltag class="starttag">command</sgmltag>cp<sgmltag class="endtag">command</sgmltag> is &amp;man.cp.1;.</literal></entry>
</row>
<row>
<entry><literal>&amp;man.<replaceable>command</replaceable>.<replaceable>sectionnumber</replaceable>;</literal></entry>
<entry><emphasis>link to
<replaceable>command</replaceable> manual page in
section
<replaceable>sectionnumber</replaceable></emphasis></entry>
<entry>Entities are defined for all the <ulink
url="&url.base;/cgi/man.cgi">&os; manual
pages</ulink>.</entry>
</row>
<row>
<entry></entry>
</row>
<row>
<entry namest="entity" nameend="notes">&os; Mailing List Entities</entry>
<entry></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;a.doc;</literal></entry>
<entry><literal>&a.doc;</literal></entry>
<entry>Usage: <literal>A link to the &amp;a.doc;.</literal></entry>
</row>
<row>
<entry><literal>&amp;a.questions;</literal></entry>
<entry><literal>&a.questions;</literal></entry>
<entry>Usage: <literal>A link to the &amp;a.questions;.</literal></entry>
</row>
<row>
<entry><literal>&amp;a.<replaceable>listname</replaceable>;</literal></entry>
<entry><emphasis>link to
<replaceable>listname</replaceable></emphasis></entry>
<entry>Entities are defined for all the <ulink
url="&url.books.handbook;/eresources.html#eresources-mail">&os;
mailing lists</ulink>.</entry>
</row>
<row>
<entry></entry>
</row>
<row>
<entry namest="entity" nameend="notes">&os; Document Link Entities</entry>
<entry></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;url.books.handbook;</literal></entry>
<entry><literal>&url.books.handbook;</literal></entry>
<entry>Usage: <literal>A link to the <sgmltag
class="starttag">ulink
url="&amp;url.books.handbook;/advanced-networking.html"</sgmltag>Advanced
Networking<sgmltag class="endtag">ulink</sgmltag>
chapter of the Handbook.</literal></entry>
</row>
<row>
<entry><literal>&amp;url.books.<replaceable>bookname</replaceable>;</literal></entry>
<entry><emphasis>relative path to
<replaceable>bookname</replaceable></emphasis></entry>
<entry>Entities are defined for all the <ulink
url="&url.doc.langbase;/books/">&os;
books</ulink>.</entry>
</row>
<row>
<entry><literal>&amp;url.articles.committers-guide;</literal></entry>
<entry><literal>&url.articles.committers-guide;</literal></entry>
<entry>Usage: <literal>A link to the <sgmltag
class="starttag">ulink
url="&amp;url.articles.committers-guide;"</sgmltag>Committer's
Guide<sgmltag class="endtag">ulink</sgmltag>
article.</literal></entry>
</row>
<row>
<entry><literal>&amp;url.articles.<replaceable>articlename</replaceable>;</literal></entry>
<entry><emphasis>relative path to
<replaceable>articlename</replaceable></emphasis></entry>
<entry>Entities are defined for all the <ulink
url="&url.doc.langbase;/articles/">&os;
articles</ulink>.</entry>
</row>
<row>
<entry></entry>
</row>
<row>
<entry namest="entity" nameend="notes">Other Operating System Name Entities</entry>
<entry></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;linux;</literal></entry>
<entry>&linux;</entry>
<entry>The &linux; operating system.</entry>
</row>
<row>
<entry><literal>&amp;unix;</literal></entry>
<entry>&unix;</entry>
<entry>The &unix; operating system.</entry>
</row>
<row>
<entry><literal>&amp;windows;</literal></entry>
<entry>&windows;</entry>
<entry>The &windows; operating system.</entry>
</row>
<row>
<entry></entry>
</row>
<row>
<entry namest="entity" nameend="notes">Miscellaneous Entities</entry>
<entry></entry>
<entry></entry>
</row>
<row>
<entry><literal>&amp;prompt.root;</literal></entry>
<entry><literal>&prompt.root;</literal></entry>
<entry>The <username>root</username> user
prompt.</entry>
</row>
<row>
<entry><literal>&amp;prompt.user;</literal></entry>
<entry><literal>&prompt.user;</literal></entry>
<entry>A prompt for an unprivileged user.</entry>
</row>
<row>
<entry><literal>&amp;postscript;</literal></entry>
<entry>&postscript;</entry>
<entry>The
&postscript; programming language.</entry>
</row>
<row>
<entry><literal>&amp;tex;</literal></entry>
<entry>&tex;</entry>
<entry>The
&tex; typesetting language.</entry>
</row>
<row>
<entry><literal>&amp;xorg;</literal></entry>
<entry>&xorg;</entry>
<entry>The &xorg; open source X
Window System.</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</sect2>
</sect1>
<sect1 id="docbook-markup-fpi">
@ -1057,16 +1289,48 @@ This is the file called 'foo2'</screen>
<para>Usage:</para>
<programlisting><sgmltag class="starttag">para</sgmltag>FreeBSD is without doubt <sgmltag class="starttag">emphasis</sgmltag>the<sgmltag class="endtag">emphasis</sgmltag>
premiere Unix like operating system for the Intel architecture.<sgmltag class="endtag">para</sgmltag></programlisting>
premiere &amp;unix;-like operating system for the Intel
architecture.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
<para>FreeBSD is without doubt <emphasis>the</emphasis>
premiere Unix like operating system for the Intel
premiere &unix;-like operating system for the Intel
architecture.</para>
</example>
</sect2>
<sect2 id="docbook-markup-acronyms">
<title>Acronyms</title>
<para>Many computer terms are <emphasis>acronyms</emphasis>,
words formed from the first letter of each word in a
phrase. Acronyms are marked up into
<sgmltag>acronym</sgmltag> elements. It is helpful to the
reader when an acronym is defined on the first use, as shown
in the example below.</para>
<example>
<title>Acronyms</title>
<para>Usage:</para>
<programlisting><sgmltag class="starttag">para</sgmltag>Request For Comments (<sgmltag class="starttag">acronym</sgmltag>RFC<sgmltag class="endtag">acronym</sgmltag>) 1149
defined the use of avian carriers for transmission of
Internet Protocol (<sgmltag class="starttag">acronym</sgmltag>IP<sgmltag class="endtag">acronym</sgmltag>) data. The
quantity of <sgmltag class="starttag">acronym</sgmltag>IP<sgmltag class="endtag">acronym</sgmltag> data currently
transmitted in that manner is unknown.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
<para>Request For Comments (<acronym>RFC</acronym>) 1149
defined the use of avian carriers for transmission of
Internet Protocol (<acronym>IP</acronym>) data. The
quantity of <acronym>IP</acronym> data currently
transmitted in that manner is unknown.</para>
</example>
</sect2>
<sect2 id="docbook-markup-quotations">
<title>Quotations</title>
@ -1083,13 +1347,14 @@ This is the file called 'foo2'</screen>
<programlisting><sgmltag class="starttag">para</sgmltag>However, make sure that the search does not go beyond the
<sgmltag class="starttag">quote</sgmltag>boundary between local and public administration<sgmltag class="endtag">quote</sgmltag>,
as RFC 1535 calls it.<sgmltag class="endtag">para</sgmltag></programlisting>
as <sgmltag class="starttag">acronym</sgmltag>RFC<sgmltag class="endtag">acronym</sgmltag> 1535 calls it.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
<para>However, make sure that the search does not go beyond
the <quote>boundary between local and public
administration</quote>, as RFC 1535 calls it.</para>
administration</quote>, as <acronym>RFC</acronym> 1535
calls it.</para>
</example>
</sect2>
@ -1572,24 +1837,26 @@ This is the file called 'foo2'</screen>
<sect2 id="docbook-markup-email-addresses">
<title>Email Addresses</title>
<para>Email addresses are marked up with
<sgmltag>email</sgmltag> tags. In the <acronym>HTML</acronym>
output format, the wrapped text becomes a hyperlink to the
email address. Other output formats that support hyperlinks
may also make the email address into a link.</para>
<para>Email addresses are marked up as <sgmltag>email</sgmltag>
elements. In the <acronym>HTML</acronym> output format, the
wrapped text becomes a hyperlink to the email address. Other
output formats that support hyperlinks may also make the email
address into a link.</para>
<example>
<title><sgmltag>email</sgmltag> with a Hyperlink</title>
<para>Usage:</para>
<programlisting><sgmltag class="starttag">para</sgmltag>Questions about &amp;os; may be sent to
<sgmltag class="starttag">email</sgmltag>questions@&amp;os;.org<sgmltag class="endtag">email</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
<programlisting><sgmltag class="starttag">para</sgmltag>An email address that does not actually exist, like
<sgmltag class="starttag">email</sgmltag>notreal@example.com<sgmltag class="endtag">email</sgmltag>, can be used as an
example.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
<para>Questions about &os; may be sent to
<email>questions@&os;.org</email>.</para>
<para>An email address that does not actually exist, like
<email>notreal@example.com</email>, can be used as an
example.</para>
</example>
<para>A &os;-specific extension allows setting the
@ -1602,13 +1869,15 @@ This is the file called 'foo2'</screen>
<para>Usage:</para>
<programlisting><sgmltag class="starttag">para</sgmltag>Questions about &amp;os; may be sent to
<sgmltag class="starttag">email role="nolink"</sgmltag>questions@&amp;os;.org<sgmltag class="endtag">email</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
<programlisting><sgmltag class="starttag">para</sgmltag>Sometimes a link to an email address like
<sgmltag class="starttag">email role="nolink"</sgmltag>notreal@example.com<sgmltag class="endtag">email</sgmltag> is not
desired.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
<para>Questions about &os; may be sent to
<email role="nolink">questions@&os;.org</email>.</para>
<para>Sometimes a link to an email address like
<email role="nolink">notreal@example.com</email> is not
desired.</para>
</example>
</sect2>
@ -1631,9 +1900,10 @@ This is the file called 'foo2'</screen>
exported by a <filename>Makefile</filename> that can be
given as a parameter to <command>make</command>.
<sgmltag>makevar</sgmltag> identifies a variable that can be
set (in the environment, on the <command>make</command>
command line, or within the <filename>Makefile</filename>)
to influence the process.</para>
set (in the environment, on the command line with
<command>make</command>, or within the
<filename>Makefile</filename>) to influence the
process.</para>
<example>
<title><sgmltag>maketarget</sgmltag> and
@ -1767,6 +2037,31 @@ This is the file called 'foo2'</screen>
</example>
</sect2>
<sect2 id="docbook-markup-gui-buttons">
<title>Showing <acronym>GUI</acronym> Buttons</title>
<para>Buttons presented by a graphical user interface are marked
with <sgmltag>guibutton</sgmltag>. To make the text look more
like a graphical button, brackets and non-breaking spaces are
added surrounding the text.</para>
<example>
<title><sgmltag>guibutton</sgmltag></title>
<para>Usage:</para>
<programlisting><sgmltag class="starttag">para</sgmltag>Edit the file, then click
<sgmltag class="starttag">guibutton</sgmltag>[&amp;nbsp;Save&amp;nbsp;]<sgmltag class="endtag">guibutton</sgmltag> to save the
changes.<sgmltag class="endtag">para</sgmltag></programlisting>
<para>Appearance:</para>
<para>Edit the file, then click
<guibutton>[&nbsp;Save&nbsp;]</guibutton> to save the
changes.</para>
</example>
</sect2>
<sect2 id="docbook-markup-system-errors">
<title>Quoting System Errors</title>

View file

@ -0,0 +1,121 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2013 Warren Block
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS
IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
$FreeBSD$
-->
<chapter id="editor-config">
<title>Editor Configuration</title>
<para>Adjusting text editor configuration can make working on
document files quicker and easier, and help documents conform to
<acronym>FDP</acronym> guidelines.</para>
<sect1 id="editor-config-vim">
<title><application>Vim</application></title>
<para>Install from <filename role="package">editors/vim</filename>
or <filename role="package">editors/vim-lite</filename>.</para>
<para>Edit <filename>~/.vimrc</filename>, adding these
lines:</para>
<programlisting>augroup sgmledit
autocmd FileType sgml set formatoptions=cq2l " Special formatting options
autocmd FileType sgml set textwidth=70 " Wrap lines at 70 columns
autocmd FileType sgml set shiftwidth=2 " Automatically indent
autocmd FileType sgml set softtabstop=2 " Tab key indents 2 spaces
autocmd FileType sgml set tabstop=8 " Replace 8 spaces with a tab
autocmd FileType sgml set autoindent " Automatic indentation
augroup END</programlisting>
</sect1>
<sect1 id="editor-config-emacs">
<title><application>Emacs</application></title>
<para>Install from
<filename role="package">editors/emacs</filename>
or <filename role="package">editors/xemacs</filename>.</para>
<para>Edit <filename>~/.emacs</filename>, adding these
lines:</para>
<programlisting> (defun local-sgml-mode-hook
(setq fill-column 70
indent-tabs-mode nil
next-line-add-newlines nil
standard-indent 4
sgml-indent-data t)
(auto-fill-mode t)
(setq sgml-catalog-files '("/usr/local/share/xml/catalog")))
(add-hook 'psgml-mode-hook
'(lambda () (local-psgml-mode-hook)))</programlisting>
</sect1>
<sect1 id="editor-config-nano">
<title><application>nano</application></title>
<para>Install from
<filename role="package">editors/nano</filename> or
<filename role="package">editors/nano-devel</filename>.</para>
<para>Configuration:</para>
<screen>&prompt.user; <userinput>cp /usr/local/share/nano/xml.nanorc ~/.nanorc</userinput></screen>
<para>Use <command>printf</command> to add lines to the
configuration file. Some have embedded <keycap>Tab</keycap>
characters, making this easier than editing the file
directly:</para>
<screen>&prompt.user; <userinput>printf '# trailing whitespace\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf 'color ,blue "[[:space:]]+$"\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf '# multiples of eight spaces at the start a line\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf '# (after zero or more tabs) should be a tab\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf 'color ,blue "^([\t]*[ ]{8})+"\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf '# tabs after spaces\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf 'color ,yellow "( )+\t"\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf '# lines longer than 70 characters\n' >> ~/.nanorc</userinput>
&prompt.user; <userinput>printf 'color ,red "^(([ ]{2})+|(\t+))*[ ]{1}[^ ]{1}"\n' >> ~/.nanorc</userinput></screen>
<para>Specify additional helpful options when running the
editor.</para>
<screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
<para>Users of &man.csh.1; can define an alias in
<filename>~/.cshrc</filename> to automate these options:</para>
<programlisting>alias nano "nano -AKipwz -r 70 -T8"</programlisting>
<para>After the alias is defined, the options will be added
automatically:</para>
<screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
</sect1>
</chapter>

View file

@ -34,23 +34,24 @@
<appendix id="examples">
<title>Examples</title>
<para>This appendix contains example XML files and command lines
you can use to convert them from one output format to another. If
you have successfully installed the Documentation Project tools
then you should be able to use these examples directly.</para>
<para>This appendix contains example <acronym>XML</acronym> files
and the commands to convert them from one output format to
another. After installing the Documentation Project tools (see
<xref linkend="tools-required"/>), these examples can be used
directly.</para>
<para>These examples are not exhaustive&mdash;they do not contain
all the elements you might want to use, particularly in your
document's front matter. For more examples of DocBook markup you
should examine the XML source for this and other documents,
available in the <application>svn</application>
all the elements that might be desirable to use, particularly in a
document's front matter. For more examples of DocBook markup,
examine the <acronym>XML</acronym> source for this and other
documents available in the <application>svn</application>
<literal>doc</literal> repository, or available online starting at
<ulink url="http://svnweb.FreeBSD.org/doc/"></ulink>.</para>
<para>To avoid confusion, these examples use the standard DocBook
4.1 DTD rather than the FreeBSD extension. They also use the
stock stylesheets distributed by Norm Walsh, rather than any
customizations made to those stylesheets by the FreeBSD
4.1 <acronym>DTD</acronym> rather than the &os; extension. They
also use the stock stylesheets distributed by Norm Walsh, rather
than any customizations made to those stylesheets by the &os;
Documentation Project. This makes them more useful as generic
DocBook examples.</para>
@ -60,50 +61,50 @@
<example>
<title>DocBook <sgmltag>book</sgmltag></title>
<programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<programlisting>&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"&gt;
<book lang='en'>
<bookinfo>
<title>An Example Book</title>
<sgmltag class="starttag">book lang='en'</sgmltag>
<sgmltag class="starttag">bookinfo</sgmltag>
<sgmltag class="starttag">title</sgmltag>An Example Book<sgmltag class="endtag">title</sgmltag>
<author>
<firstname>Your first name</firstname>
<surname>Your surname</surname>
<affiliation>
<address><email>foo@example.com</email></address>
</affiliation>
</author>
<sgmltag class="starttag">author</sgmltag>
<sgmltag class="starttag">firstname</sgmltag>Your first name<sgmltag class="endtag">firstname</sgmltag>
<sgmltag class="starttag">surname</sgmltag>Your surname<sgmltag class="endtag">surname</sgmltag>
<sgmltag class="starttag">affiliation</sgmltag>
<sgmltag class="starttag">address</sgmltag><sgmltag class="starttag">email</sgmltag>foo@example.com<sgmltag class="endtag">email</sgmltag><sgmltag class="endtag">address</sgmltag>
<sgmltag class="endtag">affiliation</sgmltag>
<sgmltag class="endtag">author</sgmltag>
<copyright>
<year>2000</year>
<holder>Copyright string here</holder>
</copyright>
<sgmltag class="starttag">copyright</sgmltag>
<sgmltag class="starttag">year</sgmltag>2000<sgmltag class="endtag">year</sgmltag>
<sgmltag class="starttag">holder</sgmltag>Copyright string here<sgmltag class="endtag">holder</sgmltag>
<sgmltag class="endtag">copyright</sgmltag>
<abstract>
<para>If your book has an abstract then it should go here.</para>
</abstract>
</bookinfo>
<sgmltag class="starttag">abstract</sgmltag>
<sgmltag class="starttag">para</sgmltag>If your book has an abstract then it should go here.<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">abstract</sgmltag>
<sgmltag class="endtag">bookinfo</sgmltag>
<preface>
<title>Preface</title>
<sgmltag class="starttag">preface</sgmltag>
<sgmltag class="starttag">title</sgmltag>Preface<sgmltag class="endtag">title</sgmltag>
<para>Your book may have a preface, in which case it should be placed
here.</para>
</preface>
<sgmltag class="starttag">para</sgmltag>Your book may have a preface, in which case it should be placed
here.<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">preface</sgmltag>
<chapter>
<title>My First Chapter</title>
<sgmltag class="starttag">chapter</sgmltag>
<sgmltag class="starttag">title</sgmltag>My First Chapter<sgmltag class="endtag">title</sgmltag>
<para>This is the first chapter in my book.</para>
<sgmltag class="starttag">para</sgmltag>This is the first chapter in my book.<sgmltag class="endtag">para</sgmltag>
<sect1>
<title>My First Section</title>
<sgmltag class="starttag">sect1</sgmltag>
<sgmltag class="starttag">title</sgmltag>My First Section<sgmltag class="endtag">title</sgmltag>
<para>This is the first section in my book.</para>
</sect1>
</chapter>
</book>]]></programlisting>
<sgmltag class="starttag">para</sgmltag>This is the first section in my book.<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">sect1</sgmltag>
<sgmltag class="endtag">chapter</sgmltag>
<sgmltag class="endtag">book</sgmltag></programlisting>
</example>
</sect1>
@ -113,63 +114,58 @@
<example>
<title>DocBook <sgmltag>article</sgmltag></title>
<programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<programlisting>&lt;!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"&gt;
<article lang='en'>
<articleinfo>
<title>An Example Article</title>
<sgmltag class="starttag">article lang='en'</sgmltag>
<sgmltag class="starttag">articleinfo</sgmltag>
<sgmltag class="starttag">title</sgmltag>An Example Article<sgmltag class="endtag">title</sgmltag>
<author>
<firstname>Your first name</firstname>
<surname>Your surname</surname>
<affiliation>
<address><email>foo@example.com</email></address>
</affiliation>
</author>
<sgmltag class="starttag">author</sgmltag>
<sgmltag class="starttag">firstname</sgmltag>Your first name<sgmltag class="endtag">firstname</sgmltag>
<sgmltag class="starttag">surname</sgmltag>Your surname<sgmltag class="endtag">surname</sgmltag>
<sgmltag class="starttag">affiliation</sgmltag>
<sgmltag class="starttag">address</sgmltag><sgmltag class="starttag">email</sgmltag>foo@example.com<sgmltag class="endtag">email</sgmltag><sgmltag class="endtag">address</sgmltag>
<sgmltag class="endtag">affiliation</sgmltag>
<sgmltag class="endtag">author</sgmltag>
<copyright>
<year>2000</year>
<holder>Copyright string here</holder>
</copyright>
<sgmltag class="starttag">copyright</sgmltag>
<sgmltag class="starttag">year</sgmltag>2000<sgmltag class="endtag">year</sgmltag>
<sgmltag class="starttag">holder</sgmltag>Copyright string here<sgmltag class="endtag">holder</sgmltag>
<sgmltag class="endtag">copyright</sgmltag>
<abstract>
<para>If your article has an abstract then it should go here.</para>
</abstract>
</articleinfo>
<sgmltag class="starttag">abstract</sgmltag>
<sgmltag class="starttag">para</sgmltag>If your article has an abstract then it should go here.<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">abstract</sgmltag>
<sgmltag class="endtag">articleinfo</sgmltag>
<sect1>
<title>My First Section</title>
<sgmltag class="starttag">sect1</sgmltag>
<sgmltag class="starttag">title</sgmltag>My First Section<sgmltag class="endtag">title</sgmltag>
<para>This is the first section in my article.</para>
<sgmltag class="starttag">para</sgmltag>This is the first section in my article.<sgmltag class="endtag">para</sgmltag>
<sect2>
<title>My First Sub-Section</title>
<sgmltag class="starttag">sect2</sgmltag>
<sgmltag class="starttag">title</sgmltag>My First Sub-Section<sgmltag class="endtag">title</sgmltag>
<para>This is the first sub-section in my article.</para>
</sect2>
</sect1>
</article>]]></programlisting>
<sgmltag class="starttag">para</sgmltag>This is the first sub-section in my article.<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">sect2</sgmltag>
<sgmltag class="endtag">sect1</sgmltag>
<sgmltag class="endtag">article</sgmltag></programlisting>
</example>
</sect1>
<sect1 id="examples-formatted">
<title>Producing Formatted Output</title>
<para>This section assumes that you have installed the software
listed in the <filename
role="package">textproc/docproj</filename> port, either by
hand, or by using the port. Further, it is assumed that your
software is installed in subdirectories under
<filename>/usr/local/</filename>, and the directory where
binaries have been installed is in your <envar>PATH</envar>.
Adjust the paths as necessary for your system.</para>
<para>Before using these examples, install the required tools as
shown in <xref linkend="tools-required"/>.</para>
<sect2>
<title>Using Jade</title>
<title>Using <application>Jade</application></title>
<example>
<title>Converting DocBook to HTML (One Large File)</title>
<title>Converting DocBook to <acronym>XHTML</acronym> (One
Large File)</title>
<screen>&prompt.user; <userinput>jade -V nochunks \ <co id="examples-co-jade-1-nochunks"/>
-c /usr/local/share/xml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-1-catalog"/>
@ -190,23 +186,27 @@
<para>Specifies the catalogs that
<application>Jade</application> will need to process.
Three catalogs are required. The first is a catalog
that contains information about the DSSSL stylesheets.
The second contains information about the DocBook DTD.
The third contains information specific to
<application>Jade</application>.</para>
that contains information about the
<acronym>DSSSL</acronym> stylesheets. The second
contains information about the DocBook
<acronym>DTD</acronym>. The third contains information
specific to <application>Jade</application>.</para>
</callout>
<callout arearefs="examples-co-jade-1-dsssl">
<para>Specifies the full path to the DSSSL stylesheet that
<para>Specifies the full path to the
<acronym>DSSSL</acronym> stylesheet that
<application>Jade</application> will use when processing
the document.</para>
</callout>
<callout arearefs="examples-co-jade-1-transform">
<para>Instructs <application>Jade</application> to perform
a <emphasis>transformation</emphasis> from one DTD to
another. In this case, the input is being transformed
from the DocBook DTD to the HTML DTD.</para>
a <emphasis>transformation</emphasis> from one
<acronym>DTD</acronym> to another. In this case, the
input is being transformed from the DocBook
<acronym>DTD</acronym> to the <acronym>XHTML</acronym>
<acronym>DTD</acronym>.</para>
</callout>
<callout arearefs="examples-co-jade-1-filename">
@ -219,8 +219,8 @@
</example>
<example>
<title>Converting DocBook to HTML (Several Small
Files)</title>
<title>Converting DocBook to <acronym>XHTML</acronym> (Several
Small Files)</title>
<screen>&prompt.user; <userinput>jade \
-c /usr/local/share/xml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-2-catalog"/>
@ -234,45 +234,50 @@
<para>Specifies the catalogs that
<application>Jade</application> will need to process.
Three catalogs are required. The first is a catalog
that contains information about the DSSSL stylesheets.
The second contains information about the DocBook DTD.
The third contains information specific to Jade.</para>
that contains information about the
<acronym>DSSSL</acronym> stylesheets. The second
contains information about the DocBook
<acronym>DTD</acronym>. The third contains information
specific to <application>Jade</application>.</para>
</callout>
<callout arearefs="examples-co-jade-2-dsssl">
<para>Specifies the full path to the DSSSL stylesheet that
<para>Specifies the full path to the
<acronym>DSSSL</acronym> stylesheet that
<application>Jade</application> will use when processing
the document.</para>
</callout>
<callout arearefs="examples-co-jade-2-transform">
<para>Instructs <application>Jade</application> to perform
a <emphasis>transformation</emphasis> from one DTD to
another. In this case, the input is being transformed
from the DocBook DTD to the HTML DTD.</para>
a <emphasis>transformation</emphasis> from one
<acronym>DTD</acronym> to another. In this case, the
input is being transformed from the DocBook
<acronym>DTD</acronym> to the <acronym>XHTML</acronym>
<acronym>DTD</acronym>.</para>
</callout>
<callout arearefs="examples-co-jade-2-filename">
<para>Specifies the file that
<application>Jade</application> should process. The
stylesheets determine how the individual HTML files will
be named, and the name of the <quote>root</quote> file
(i.e., the one that contains the start of the
document.</para>
stylesheets determine how the individual
<acronym>XHTML</acronym> files will be named, and the
name of the <quote>root</quote> file, the one that
contains the start of the document.</para>
</callout>
</calloutlist>
<para>This example may still only generate one HTML file,
depending on the structure of the document you are
processing, and the stylesheet's rules for splitting
output.</para>
<para>This example may still only generate one
<acronym>XHTML</acronym> file, depending on the structure of
the document you are processing, and the stylesheet's rules
for splitting output.</para>
</example>
<example id="examples-docbook-postscript">
<title>Converting DocBook to Postscript</title>
<title>Converting DocBook to &postscript;</title>
<para>The source XML file must be converted to a &tex;
file.</para>
<para>The source <acronym>XML</acronym> file must be converted
to a &tex; file.</para>
<screen>&prompt.user; <userinput>jade -V tex-backend \ <co id="examples-co-jade-3-tex-backend"/>
-c /usr/local/share/xml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-3-catalog"/>
@ -291,13 +296,16 @@
<para>Specifies the catalogs that
<application>Jade</application> will need to process.
Three catalogs are required. The first is a catalog
that contains information about the DSSSL stylesheets.
The second contains information about the DocBook DTD.
The third contains information specific to Jade.</para>
that contains information about the
<acronym>DSSSL</acronym> stylesheets. The second
contains information about the DocBook
<acronym>DTD</acronym>. The third contains information
specific to <application>Jade</application>.</para>
</callout>
<callout arearefs="examples-co-jade-3-dsssl">
<para>Specifies the full path to the DSSSL stylesheet that
<para>Specifies the full path to the
<acronym>DSSSL</acronym> stylesheet that
<application>Jade</application> will use when processing
the document.</para>
</callout>
@ -314,11 +322,11 @@
<screen>&prompt.user; <userinput>tex "&amp;jadetex" <replaceable>file</replaceable>.tex</userinput></screen>
<para>You have to run <command>tex</command> <emphasis>at
least</emphasis> three times. The first run processes the
document, and determines areas of the document which are
referenced from other parts of the document, for use in
indexing, and so on.</para>
<para><command>tex</command> commands must be run
<emphasis>at least</emphasis> three times. The first run
processes the document, and determines areas of the document
which are referenced from other parts of the document, for
use in indexing, and so on.</para>
<para>Do not be alarmed if you see warning messages such as
<errorname>LaTeX Warning: Reference `136' on page 5
@ -337,21 +345,21 @@
<filename><replaceable>file</replaceable>.dvi</filename>.</para>
<para>Finally, run <command>dvips</command> to convert the
<filename>.dvi</filename> file to Postscript.</para>
<filename>.dvi</filename> file to &postscript;.</para>
<screen>&prompt.user; <userinput>dvips -o <replaceable>file</replaceable>.ps <replaceable>file.dvi</replaceable></userinput></screen>
</example>
<example>
<title>Converting DocBook to PDF</title>
<title>Converting DocBook to <acronym>PDF</acronym></title>
<para>The first part of this process is identical to that when
converting DocBook to Postscript, using the same
<para>The first part of this process is identical to that of
converting DocBook to &postscript;, using the same
<command>jade</command> command line (<xref
linkend="examples-docbook-postscript"/>).</para>
<para>When the <filename>.tex</filename> file has been
generated you run <application>pdfTeX</application>.
<para>After the <filename>.tex</filename> file has been
generated, run <application>pdfTeX</application>.
However, use the <literal>&amp;pdfjadetex</literal> macro
package instead.</para>

View file

@ -47,7 +47,7 @@
<acronym>FDP</acronym>. Willingness to contribute is the only
membership requirement.</para>
<para>This primer shows the reader how to:</para>
<para>This primer shows how to:</para>
<itemizedlist>
<listitem>
@ -64,8 +64,8 @@
</listitem>
<listitem>
<para>Submit changes back for review and eventual inclusion in
the &os; documentation.</para>
<para>Submit changes back for review and inclusion in the &os;
documentation.</para>
</listitem>
</itemizedlist>
@ -110,185 +110,144 @@
<para>Translation teams are responsible for translating the
Handbook and web site into different languages. Manual pages
are not translated.</para>
are not translated at present.</para>
<para>Documentation source for the &os; web site, Handbook, and
<acronym>FAQ</acronym> is available in the Subversion
<acronym>FAQ</acronym> is available in the documentation
repository at
<literal>https://svn.FreeBSD.org/doc/</literal>.</para>
<para>Source for manual pages is available in a separate
Subversion repository located at
source repository located at
<literal>https://svn.FreeBSD.org/base/</literal>.</para>
<para>Documentation commit messages are visible with
<application>svn</application>. Commit messages are also
<command>svn log</command>. Commit messages are also
archived at <ulink url="&a.svn-doc-all.url;"></ulink>.</para>
<para>In addition, many people have written tutorials or how-to
articles about &os;. Some are stored as part of the
<acronym>FDP</acronym> files. In other cases, the author has
decided to keep the documentation separate. The
<acronym>FDP</acronym> endeavors to provide links to as much of
this external documentation as possible.</para>
<para>Many people have written tutorials or how-to articles about
&os;. Some are stored as part of the <acronym>FDP</acronym>
files. In other cases, the author has decided to keep the
documentation separate. The <acronym>FDP</acronym> endeavors to
provide links to as much of this external documentation as
possible.</para>
</sect1>
<sect1 id="overview-quick-start">
<title>Quick Start</title>
<para>Here we describe the steps contributors must take before
making changes to the <acronym>FDP</acronym>. New
contributors will interact with other members of the &os;
Documentation Team, which can assist in learning to use
<acronym>XML</acronym> and the suggestions in
<xref linkend="writing-style-guide"/>. If a new user
contributes regularly, a Documentation Team member may be
assigned as a mentor to guide the user through the process from
contributor to documentation committer.</para>
<para>Some preparatory steps must be taken before editing the &os;
documentation. First, subscribe to the &a.doc;. Some team
members also interact on the <literal>#bsddocs</literal>
<acronym>IRC</acronym> channel on
<ulink url="http://www.efnet.org/">EFnet</ulink>. These people
can help with questions or problems involving the
documentation.</para>
<procedure>
<step>
<para>Subscribe to the &a.doc;. Some members of the mailing
list also interact on the <literal>#bsddocs</literal>
<acronym>IRC</acronym> channel on <ulink
url="http://www.efnet.org/">EFnet</ulink>.</para>
</step>
<step>
<para>Install the
<filename role="package">textproc/docproj</filename>
package or port. This meta-port installs all of the
utilities needed by the <acronym>FDP</acronym>.</para>
software needed to edit and build &os; documentation.</para>
</step>
<step>
<para>Install a local working copy of the documentation
from a mirror of the &os; repository. For the fastest
download, pick the nearest mirror from the list of <ulink
url="&url.books.handbook;/subversion-mirrors.html">Subversion
mirror sites</ulink>. If <filename
class="directory">/usr/doc</filename> already exists, move
or delete it first to prevent file conflicts.</para>
<para>Install a local working copy of the documentation from a
mirror of the &os; repository in
<filename class="directory">~/doc</filename> (see
<xref linkend="working-copy"/>).</para>
<screen>&prompt.user; <userinput>svn checkout https://<replaceable>svn0.us-west.FreeBSD.org</replaceable>/doc/head <replaceable>/usr/doc</replaceable></userinput></screen>
</step>
<screen>&prompt.user; <userinput>svn checkout https://<replaceable>svn0.us-west.FreeBSD.org</replaceable>/doc/head <replaceable>~/doc</replaceable></userinput></screen>
</step>
<step>
<para>Before making any documentation edits, configure your
editor to conform to <acronym>FDP</acronym> standards.
How to do so varies by editor. Some editor configurations
are listed in <xref linkend="writing-style"/>. The editor
should be configured as follows:</para>
<step>
<para>Configure the text editor:</para>
<itemizedlist>
<listitem>
<para>Word wrap set to 70 characters.</para>
</listitem>
<itemizedlist>
<listitem>
<para>Word wrap set to 70 characters.</para>
</listitem>
<listitem>
<para>Tab stops set to 2.</para>
</listitem>
<listitem>
<para>Tab stops set to 2.</para>
</listitem>
<listitem>
<para>Replace each group of 8 leading spaces with a
single tab.</para>
</listitem>
</itemizedlist>
</step>
<listitem>
<para>Replace each group of 8 leading spaces with a
single tab.</para>
</listitem>
</itemizedlist>
<step>
<para>Locate the file to edit. Run
<command>svn up</command> within the local working copy to
make sure that it is up to date. Before making major
changes to a file, discuss the proposed changes with the
&a.doc;.</para>
<para>Specific editor configurations are listed in
<xref linkend="editor-config"/>.</para>
</step>
<para>When making edits, determine which tags and entities
are needed to achieve the desired formatting. One way to
learn is to compare some text in the
<acronym>HTML</acronym> formatted version of the document
to the tags which surround the text or the entities that
represent that text in the <acronym>XML</acronym> file.
References to the commonly used tags and entities can be
found in <xref linkend="xhtml-markup"/> and
<xref linkend="docbook-markup"/>.</para>
</step>
<step>
<para>Update the local working copy:</para>
<step>
<para>After edits are complete, check for problems by
running:</para>
<screen>&prompt.user; <userinput>svn up <replaceable>~/doc</replaceable></userinput></screen>
</step>
<screen>&prompt.user; <userinput>igor -R filename.xml | less -RS</userinput></screen>
<step>
<para>Edit the documentation files that require changes. If a
file needs major changes, consult the mailing list for
input.</para>
<para>Review the output and edit the file to fix any listed
tab errors, spelling mistakes, and improper grammar. Save
the changes and rerun this command to find any remaining
problems. Repeat until all of the errors that you deem
fixable are resolved. If you get stuck trying to fix
errors, ask for assistance on the &a.doc;.</para>
</step>
<para>References to tag and entity usage can be found in
<xref linkend="xhtml-markup"/> and
<xref linkend="docbook-markup"/>.</para>
</step>
<step>
<para><emphasis>Always</emphasis> build-test changes before
submitting them. By default, typing
<userinput>make</userinput> in the top-level directory of
the type of documentation being edited will generate that
documentation in split HTML format. For example, to build
the English version of the Handbook, type
<command>make</command> in the
<filename>en_US.ISO8859-1/books/handbook/</filename>
directory. This step is necessary to make sure that the
edits do not break the build.</para>
</step>
<step>
<para>After editing, check for problems by running:</para>
<step>
<para>In order to build the output in other formats, other
<application>make</application> targets are defined in
<filename>head/share/mk/doc.docbook.mk</filename>. Use
quotes around the list of formats when building more than
one format with a single command.</para>
<screen>&prompt.user; <userinput>igor -R filename.xml | less -RS</userinput></screen>
<para>For example, to convert the document to both
<literal>.html</literal> and <literal>.txt</literal>, use
this command:</para>
<para>Review the output and edit the file to fix any problems
shown, then rerun the command to find any remaining
problems. Repeat until all of the errors are
resolved.</para>
</step>
<screen>&prompt.user; <userinput>make FORMATS="html txt"</userinput></screen>
<step>
<para><emphasis>Always</emphasis> build-test changes before
submitting them. Running <userinput>make</userinput> in the
top-level directory of the documentation being edited will
generate that documentation in split HTML format. For
example, to build the English version of the Handbook in
<acronym>HTML</acronym>, run <command>make</command> in the
<filename>en_US.ISO8859-1/books/handbook/</filename>
directory.</para>
</step>
<para>Once these steps are successfully completed, generate
a <quote>diff file</quote> of the changes. While in
<filename class="directory">/usr/doc</filename>, run this
command, replacing <replaceable>bsdinstall</replaceable>
with the name of the directory containing the
edits:</para>
<step>
<para>When changes are complete and tested, generate a
<quote>diff file</quote>:</para>
<screen>&prompt.user; <userinput>svn diff > <replaceable>bsdinstall</replaceable>.diff.txt</userinput></screen>
</step>
<screen>&prompt.user; <userinput>cd /usr/doc</userinput>
&prompt.user; <userinput>svn diff > <replaceable>bsdinstall</replaceable>.diff.txt</userinput></screen>
<step>
<para>Submit the diff file using the web-based <ulink
url="&url.base;/support.html#gnats">Problem
Report</ulink> system or with &man.send-pr.1;. If using
the web form, input a synopsis of <emphasis>[patch]
<replaceable>short description of
problem</replaceable></emphasis>. Select the category
<literal>docs</literal> and the class
<literal>doc-bug</literal>. The body of the message
should contain a short description of the edits and any
important discussion points. Use the
<guibutton>[&nbsp;Browse...&nbsp;]</guibutton> button to
attach the <literal>.diff.txt</literal> file and enter
the captcha phrase.</para>
<para>Give the diff file a descriptive name. In the example
above, changes have been made to the
<filename class="directory">bsdinstall</filename> portion of
the Handbook.</para>
</step>
<para>It is important to remember that the
<acronym>FDP</acronym> is comprised of volunteers who
review edits in their spare time and who live in different
time zones around the globe. It takes time to review
edits and to either commit them or respond if additional
edits are required. If you do not receive a response in a
reasonable amount of time, send a follow-up email to the
&a.doc; and ask if anyone has had a chance to review the
patch or if additional information is required.</para>
</step>
</procedure>
</sect1>
</chapter>
<step>
<para>Submit the diff file using the web-based
<ulink url="&url.base;/support.html#gnats">Problem
Report</ulink> system or with &man.send-pr.1;. If using
the web form, enter a synopsis of
<emphasis>[patch] <replaceable>short description of
problem</replaceable></emphasis>. Select the category
<literal>docs</literal> and the class
<literal>doc-bug</literal>. In the body of the message,
enter a short description of the changes and any important
details about them. Use the
<guibutton>[&nbsp;Browse...&nbsp;]</guibutton> button to
attach the <literal>.diff.txt</literal>.</para>
</step>
</procedure>
</sect1>
</chapter>

View file

@ -32,12 +32,11 @@
-->
<chapter id="structure">
<title>Structuring Documents Under <filename>doc/</filename></title>
<title>Documentation Directory Structure</title>
<para>The <filename>doc/</filename> tree is organized in a
particular fashion, and the documents that are part of the FDP are
in turn organized in a particular fashion. The aim is to make it
simple to add new documentation into the tree and:</para>
<para>Files and directories in the
<filename class="directory">doc/</filename> tree follow a
structure meant to:</para>
<orderedlist>
<listitem>
@ -57,51 +56,63 @@
</listitem>
</orderedlist>
<para>In addition, the documentation tree has to accommodate
documentation that could be in many different languages and in
many different encodings. It is important that the structure of
the documentation tree does not enforce any particular defaults or
cultural preferences.</para>
<para>In addition, the documentation tree must accommodate
documents in many different languages and encodings. It is
important that the documentation tree structure does not enforce
any particular defaults or cultural preferences.</para>
<sect1 id="structure-top">
<title>The Top Level, <filename>doc/</filename></title>
<title>The Top Level,
<filename class="directory">doc/</filename></title>
<para>There are two types of directory under
<filename>doc/</filename>, each with very specific directory
names and meanings.</para>
<filename class="directory">doc/</filename>, each with very
specific directory names and meanings.</para>
<segmentedlist>
<segtitle>Directory</segtitle>
<informaltable pgwide="1" frame="none">
<tgroup cols="2">
<thead>
<row>
<entry>Directory</entry>
<entry>Usage</entry>
</row>
</thead>
<segtitle>Meaning</segtitle>
<tbody>
<row>
<entry valign="top">
<filename class="directory">share</filename></entry>
<seglistitem>
<seg><filename>share/</filename></seg>
<entry>Contains files that are not specific to the various
translations and encodings of the documentation.
Contains subdirectories to further categorize the
information. For example, the files that comprise the
&man.make.1; infrastructure are in
<filename class="directory">share/mk</filename>, while
the additional <acronym>XML</acronym> support files
(such as the &os; extended DocBook
<acronym>DTD</acronym>) are in <filename
class="directory">share/xml</filename>.</entry>
</row>
<seg>Contains files that are not specific to the various
translations and encodings of the documentation. Contains
subdirectories to further categorize the information. For
example, the files that comprise the &man.make.1;
infrastructure are in <filename>share/mk</filename>, while
the additional XML support files (such as the FreeBSD
extended DocBook DTD) are in
<filename>share/xml</filename>.</seg>
</seglistitem>
<row>
<entry valign="top"><filename
class="directory"><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename></entry>
<seglistitem>
<seg><filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename></seg>
<seg>One directory exists for each available translation and
encoding of the documentation, for example
<filename>en_US.ISO8859-1/</filename> and
<filename>zh_TW.Big5/</filename>. The names are long, but
by fully specifying the language and encoding we prevent any
future headaches should a translation team want to provide
the documentation in the same language but in more than one
encoding. This also completely isolates us from any
problems that might be caused by a switch to Unicode.</seg>
</seglistitem>
</segmentedlist>
<entry>One directory exists for each available translation
and encoding of the documentation, for example
<filename class="directory">en_US.ISO8859-1/</filename>
and <filename class="directory">zh_TW.Big5/</filename>.
The names are long, but by fully specifying the language
and encoding we prevent any future headaches when a
translation team wants to provide documentation in the
same language but in more than one encoding. This also
avoids problems that might be caused by a future switch
to Unicode.</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</sect1>
<sect1 id="structure-locale">
@ -113,51 +124,61 @@
documentation is split into up to three more categories at
this level, indicated by the different directory names.</para>
<segmentedlist>
<segtitle>Directory</segtitle>
<informaltable pgwide="1" frame="none">
<tgroup cols="2">
<thead>
<row>
<entry>Directory</entry>
<entry>Usage</entry>
</row>
</thead>
<segtitle>Contents</segtitle>
<tbody>
<row>
<entry valign="top">
<filename class="directory">articles</filename></entry>
<seglistitem>
<seg><filename>articles</filename></seg>
<entry>Documentation marked up as a DocBook
<sgmltag>article</sgmltag> (or equivalent). Reasonably
short, and broken up into sections. Normally only
available as one <acronym>XHTML</acronym> file.</entry>
</row>
<seg>Documentation marked up as a DocBook
<sgmltag>article</sgmltag> (or equivalent). Reasonably
short, and broken up into sections. Normally only available
as one XHTML file.</seg>
</seglistitem>
<row>
<entry valign="top"><filename>books</filename></entry>
<seglistitem>
<seg><filename>books</filename></seg>
<entry>Documentation marked up as a DocBook
<sgmltag>book</sgmltag> (or equivalent). Book length,
and broken up into chapters. Normally available as both
one large <acronym>XHTML</acronym> file (for people with
fast connections, or who want to print it easily from a
browser) and as a collection of linked, smaller
files.</entry>
</row>
<seg>Documentation marked up as a DocBook
<sgmltag>book</sgmltag> (or equivalent). Book length, and
broken up into chapters. Normally available as both one
large XHTML file (for people with fast connections, or who
want to print it easily from a browser) and as a collection
of linked, smaller files.</seg>
</seglistitem>
<row>
<entry valign="top">
<filename class="directory">man</filename></entry>
<seglistitem>
<seg><filename>man</filename></seg>
<entry>For translations of the system manual pages. This
directory will contain one or more <filename
class="directory">man<replaceable>n</replaceable></filename>
directories, corresponding to the sections that have
been translated.</entry>
</row>
</tbody>
</tgroup>
</informaltable>
<seg>For translations of the system manual pages. This
directory will contain one or more
<filename>man<replaceable>n</replaceable></filename>
directories, corresponding to the sections that have been
translated.</seg>
</seglistitem>
</segmentedlist>
<para>Not every
<filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename>
directory will contain all of these directories. It depends on
how much translation has been accomplished by that translation
team.</para>
<para>Not every <filename
class="directory"><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename>
directory will have all of these subdirectories. It depends
on how much translation has been accomplished by that
translation team.</para>
</sect1>
<sect1 id="structure-document">
<title>Document Specific Information</title>
<title>Document-Specific Information</title>
<para>This section contains specific notes about particular
documents managed by the FDP.</para>
@ -167,12 +188,12 @@
<subtitle><filename>books/handbook/</filename></subtitle>
<para>The Handbook is written to comply with the FreeBSD DocBook
extended DTD.</para>
<para>The Handbook is written in DocBook <acronym>XML</acronym>
using the &os; DocBook extended <acronym>DTD</acronym>.</para>
<para>The Handbook is organized as a DocBook
<sgmltag>book</sgmltag>. It is then divided into
<sgmltag>part</sgmltag>s, each of which may contain several
<sgmltag>book</sgmltag>. The book is divided into
<sgmltag>part</sgmltag>s, each of which contains several
<sgmltag>chapter</sgmltag>s. <sgmltag>chapter</sgmltag>s are
further subdivided into sections (<sgmltag>sect1</sgmltag>)
and subsections (<sgmltag>sect2</sgmltag>,
@ -187,20 +208,20 @@
<note>
<para>The Handbook's organization may change over time, and
this document may lag in detailing the organizational
changes. If you have any questions about how the Handbook
is organized, please contact the &a.doc;.</para>
changes. Post questions about Handbook organization to
&a.doc;.</para>
</note>
<sect4>
<title><filename>Makefile</filename></title>
<para>The <filename>Makefile</filename> defines some
variables that affect how the XML source is converted to
other formats, and lists the various source files that
make up the Handbook. It then includes the standard
<filename>doc.project.mk</filename> file, to bring in the
rest of the code that handles converting documents from
one format to another.</para>
variables that affect how the <acronym>XML</acronym>
source is converted to other formats, and lists the
various source files that make up the Handbook. It then
includes the standard <filename>doc.project.mk</filename>,
to bring in the rest of the code that handles converting
documents from one format to another.</para>
</sect4>
<sect4>
@ -223,7 +244,8 @@
</sect4>
<sect4>
<title><filename><replaceable>directory</replaceable>/chapter.xml</filename></title>
<title><filename
class="directory"><replaceable>directory</replaceable>/chapter.xml</filename></title>
<para>Each chapter in the Handbook is stored in a file
called <filename>chapter.xml</filename> in a separate
@ -235,23 +257,23 @@
<para>For example, if one of the chapter files
contains:</para>
<programlisting><![CDATA[
<chapter id="kernelconfig">
<programlisting><sgmltag class="starttag">chapter id="kernelconfig"</sgmltag>
...
</chapter>]]></programlisting>
<sgmltag class="endtag">chapter</sgmltag></programlisting>
<para>Then it will be called
<filename>chapter.xml</filename> in the
<filename>kernelconfig</filename> directory. In general,
the entire contents of the chapter will be held in this
the entire contents of the chapter are in this one
file.</para>
<para>When the XHTML version of the Handbook is produced,
this will yield <filename>kernelconfig.html</filename>.
This is because of the <literal>id</literal> value, and is
not related to the name of the directory.</para>
<para>When the <acronym>XHTML</acronym> version of the
Handbook is produced, this will yield
<filename>kernelconfig.html</filename>. This is because
of the <literal>id</literal> value, and is not related to
the name of the directory.</para>
<para>In earlier versions of the Handbook the files were
<para>In earlier versions of the Handbook, the files were
stored in the same directory as
<filename>book.xml</filename>, and named after the value
of the <literal>id</literal> attribute on the file's
@ -259,12 +281,12 @@
to include images in each chapter. Images for each
Handbook chapter are stored within <filename
class="directory">share/images/books/handbook</filename>.
Note that localized version of these images should be
placed in the same directory as the XML sources for each
chapter. Namespace collisions would be inevitable, and it
is easier to work with several directories with a few
files in them than it is to work with one directory that
has many files in it.</para>
The localized version of these images should be
placed in the same directory as the <acronym>XML</acronym>
sources for each chapter. Namespace collisions are
inevitable, and it is easier to work with several
directories with a few files in them than it is to work
with one directory that has many files in it.</para>
<para>A brief look will show that there are many directories
with individual <filename>chapter.xml</filename> files,
@ -273,27 +295,18 @@
<filename>printing/chapter.xml</filename>.</para>
<important>
<para>Chapters and/or directories should not be named in a
fashion that reflects their ordering within the
Handbook. This ordering might change as the content
within the Handbook is reorganized; this sort of
reorganization should not (generally) include the need
to rename files (unless entire chapters are being
promoted or demoted within the hierarchy).</para>
<para>Do not name chapters or directories after
their ordering within the Handbook. This ordering can
change as the content within the Handbook is
reorganized. Reorganization should be possible without
renaming files, unless entire chapters are being
promoted or demoted within the hierarchy.</para>
</important>
<para>Each <filename>chapter.xml</filename> file will not
be a complete XML document. In particular, they will not
have their own DOCTYPE lines at the start of the
files.</para>
<para>This is unfortunate as it makes it impossible to treat
these as generic XML files and simply convert them to
HTML, RTF, PS, and other formats in the same way the main
Handbook is generated. This <emphasis>would</emphasis>
force you to rebuild the Handbook every time you want to
see the effect a change has had on just one
chapter.</para>
<para>The <filename>chapter.xml</filename> files are not
complete <acronym>XML</acronym> documents that can be
built individually. They can only be built
as parts of the whole Handbook.</para>
</sect4>
</sect3>
</sect2>

View file

@ -32,35 +32,45 @@
-->
<chapter id="stylesheets">
<title>Stylesheets</title>
<title>Style Sheets</title>
<para>XML says nothing about how a document should be displayed to
the user, or rendered on paper. To do that, various languages
have been developed to describe stylesheets, including XSLT, XSL FO
or CSS.</para>
<para><acronym>XML</acronym> is concerned with content, and says
nothing about how that content should be presented to the reader
or rendered on paper. Multiple <emphasis>style sheet</emphasis>
languages have been developed to describe visual layout, including
Extensible Stylesheet Language Transformation
(<acronym>XSLT</acronym>), Document Style Semantics and
Specification Language (<acronym>DSSSL</acronym>), and Cascading
Style Sheets (<acronym>CSS</acronym>).</para>
<para>We use XSLT stylesheets to transform DocBook into XHTML and then
we apply CSS formatting to XHTML pages. Currently, the printable
output is rendered with legacy DSSSL stylesheets but this may
probably change in the future.</para>
<para>The <acronym>FDP</acronym> documents use
<acronym>XSLT</acronym> stylesheets to transform DocBook into
<acronym>XHTML</acronym>, and then <acronym>CSS</acronym>
formatting is applied to the <acronym>XHTML</acronym> pages.
Printable output is currently rendered with legacy
<acronym>DSSSL</acronym> stylesheets, but this will probably
change in the future.</para>
<sect1 id="stylesheets-css">
<title>CSS</title>
<title><acronym>CSS</acronym></title>
<para>Cascading Stylesheets (CSS) are a mechanism for attaching
style information (font, weight, size, color, and so forth) to
elements in an XHTML document without abusing XHTML to do
<para>Cascading Style Sheets (<acronym>CSS</acronym>) are a
mechanism for attaching style information (font, weight, size,
color, and so forth) to elements in an <acronym>XHTML</acronym>
document without abusing <acronym>XHTML</acronym> to do
so.</para>
<sect2>
<title>The DocBook Documents</title>
<para>The FreeBSD DSSSL stylesheets include a reference to a
stylesheet, <filename>docbook.css</filename>, which is
expected to appear in the same directory as the XHTML files.
The project-wide CSS file is copied from
<filename>doc/share/misc/docbook.css</filename> when documents
are converted to XHTML, and is installed automatically.</para>
<para>The &os; <acronym>XSLT</acronym> and
<acronym>DSSSL</acronym> stylesheets refer to
<filename>docbook.css</filename>, which is expected to be
present in the same directory as the <acronym>XHTML</acronym>
files. The project-wide <acronym>CSS</acronym> file is copied
from <filename>doc/share/misc/docbook.css</filename> when
documents are converted to <acronym>XHTML</acronym>, and is
installed automatically.</para>
</sect2>
</sect1>
</chapter>

View file

@ -34,55 +34,6 @@
<chapter id="the-website">
<title>The Website</title>
<sect1 id="the-website-prep">
<title>Preparation</title>
<para>Use a disk with sufficient free space. A full copy of
the documentation and web site files takes over 700&nbsp;MB.
Allowing a full gigabyte provides some breathing room. This
space will hold the XML tools, the documentation tree, temporary
build space and the installed web pages.</para>
<note>
<para>Make sure the documentation ports are updated to the
latest version. See
<ulink url="&url.books.handbook;/ports.html#ports-using">the
Handbook section on ports</ulink> for more
information.</para>
</note>
<sect2 id="the-website-svn">
<title>Using <command>svn</command></title>
<para><command>svn</command> is needed to check out the
documentation and web site files from the
<literal>doc</literal> Subversion repository.
<command>svn</command> can be installed with &man.pkg.add.1;
or from the &os; Ports Collection by running:</para>
<screen>&prompt.root; <userinput><command>cd /usr/ports/devel/subversion</command></userinput>
&prompt.root; <userinput><command>make</command> <maketarget>install clean</maketarget></userinput></screen>
<para>To check out the source files for the &os; web site and
the rest of the documentation, run:</para>
<screen>&prompt.user; <userinput><command>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/ <replaceable>~/doc</replaceable></command></userinput></screen>
<para><ulink
url="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</ulink>
is a public <literal>SVN</literal> server. Select the closest
mirror and verify the mirror server certificate from the list
of
<ulink url="&url.books.handbook;/svn-mirrors.html">Subversion
mirror sites</ulink>.</para>
<para>After the checkout completes, the current version of the
&os; documentation, including the web site files, will be
present in
<filename class="directory">~/doc</filename>.</para>
</sect2>
</sect1>
<sect1 id="the-website-build">
<title>Build the Web Pages</title>

View file

@ -34,133 +34,54 @@
<chapter id="tools">
<title>Tools</title>
<para>The FDP uses a number of different software tools to help
manage the FreeBSD documentation, convert it to different output
formats, and so on. You will need to use these tools yourself if
you are to work with the FreeBSD documentation.</para>
<para>Several software tools are used to manage the FreeBSD
documentation and render it to different output formats. Some of
these tools are required and must be installed before working
through the examples in the following chapters. Some are
optional, adding capabilities or making the job of creating
documentation less demanding.</para>
<para>All these tools are available as FreeBSD Ports and Packages,
greatly simplifying the work you have to do to install
them.</para>
<sect1 id="tools-required">
<title>Required Tools</title>
<para>You will need to install these tools before you work through
any of the examples in later chapters. The actual usage of these
tools is covered in later chapters.</para>
<tip>
<title>Use <filename role="package">textproc/docproj</filename> If
Possible</title>
<para>You can save yourself a lot of time if you install the
<filename role="package">textproc/docproj</filename> port. This
is a <emphasis>meta-port</emphasis> which does not contain any
software itself. Instead, it depends on various other ports
being installed correctly. Installing this port
<emphasis>should</emphasis> automatically download and install
all of the packages listed in this chapter that you need.</para>
<para>One of the packages that you might need is the
<application>JadeTeX</application> macro set. In turn, this
macro set requires &tex; to be installed. &tex; is a large
package, and you only need it if you want to produce Postscript
or PDF output.</para>
<para>To save yourself time and space you must specify whether or
not you want <application>JadeTeX</application> (and therefore
&tex;) installed when you install this port. Either do:</para>
<screen>&prompt.root; <userinput>make JADETEX=yes install</userinput></screen>
<para>or</para>
<screen>&prompt.root; <userinput>make JADETEX=no install</userinput></screen>
<para>as necessary. Alternatively you may install
<filename role="package">textproc/docproj-jadetex</filename> or
<filename role="package">textproc/docproj-nojadetex</filename>.
These slave ports define the <makevar>JADETEX</makevar> variable
for you, therefore they will install the same suite of
applications on your machine. Note that you can produce only
XHTML or ASCII text output if you do not install
<application>JadeTeX</application>. PostScript or PDF output
requires &tex;.</para>
</tip>
<sect1 id="tools-mandatory">
<title>Mandatory Tools</title>
<para>Install
<filename role="package">textproc/docproj</filename> from the
Ports Collection. This <emphasis>meta-port</emphasis> installs
all the applications required to do useful work with the &os;
documentation. Some further notes on particular components are
given below.</para>
<sect2>
<title>Software</title>
<title><acronym>DTD</acronym>s and
<acronym>Entities</acronym></title>
<para>These programs are required before you can usefully work
with the FreeBSD documentation, and they will allow you to
convert the documentation to XHTML, plain text, and RTF
formats. They are all included in <filename
role="package">textproc/docproj</filename>.</para>
<para>&os; documentation uses several Document Type Definitions
(<acronym>DTD</acronym>s) and sets of <acronym>XML</acronym>
entities. These are all installed by the
<filename role="package">textproc/docproj</filename>
port.</para>
<variablelist>
<varlistentry>
<term><application>Jade</application>
(<filename role="package">textproc/jade</filename>)</term>
<listitem>
<para>A DSSSL implementation. Used for converting marked
up documents to other formats, including HTML and
&tex;.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><application>Links</application>
(<filename role="package">www/links</filename>)</term>
<listitem>
<para>A text-mode WWW browser that can also convert
XHTML files to plain text.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><application>peps</application>
(<filename role="package">graphics/peps</filename>)</term>
<listitem>
<para>Some of the documentation includes images, some of
which are stored as EPS files. These must be converted
to PNG before most web browsers will display
them.</para>
</listitem>
</varlistentry>
</variablelist>
</sect2>
<sect2>
<title>DTDs and Entities</title>
<para>These are the DTDs and entity sets used by the FDP. They
need to be installed before you can work with any of the
documentation.</para>
<variablelist>
<varlistentry>
<term>XHTML DTD (<filename
<term><acronym>XHTML</acronym> <acronym>DTD</acronym>
(<filename
role="package">textproc/xhtml</filename>)</term>
<listitem>
<para>XHTML is the markup language of choice for the World
Wide Web, and is used throughout the FreeBSD web
site.</para>
<para><acronym>XHTML</acronym> is the markup language of
choice for the World Wide Web, and is used throughout
the &os; web site.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>DocBook DTD (<filename
<term>DocBook <acronym>DTD</acronym> (<filename
role="package">textproc/docbook-xml-450</filename>)</term>
<listitem>
<para>DocBook is designed for marking up technical
documentation. All the FreeBSD documentation is written
in DocBook.</para>
documentation. Most of the &os; documentation is
written in DocBook.</para>
</listitem>
</varlistentry>
@ -170,11 +91,11 @@
role="package">textproc/iso8879</filename>)</term>
<listitem>
<para>19 of the ISO 8879:1986 character entity sets used
by many DTDs. Includes named mathematical symbols,
additional characters in the Latin character set
(accents, diacriticals, and so on), and Greek
symbols.</para>
<para>Character entities from the ISO 8879:1986 standard
used by many <acronym>DTD</acronym>s. Includes named
mathematical symbols, additional characters in the Latin
character set (accents, diacriticals, and so on), and
Greek symbols.</para>
</listitem>
</varlistentry>
</variablelist>
@ -184,10 +105,8 @@
<sect1 id="tools-optional">
<title>Optional Tools</title>
<para>You do not need to have any of the following installed.
However, you may find it easier to work with the documentation
if you do, and they may give you more flexibility in the output
formats that can be generated.</para>
<para>These applications are not required, but can make working on
the documentation easier or add capabilities.</para>
<sect2>
<title>Software</title>
@ -195,33 +114,37 @@
<variablelist>
<varlistentry>
<term><application>JadeTeX</application>,
<application>teTeX</application> and Modular DocBook Stylesheets
<application>teTeX</application> and Modular DocBook
Stylesheets
(<filename role="package">print/jadetex</filename>,
<filename role="package">print/teTeX</filename> and
<filename role="package">textproc/dsssl-docbook-modular</filename>)</term>
<filename
role="package">textproc/dsssl-docbook-modular</filename>)</term>
<listitem>
<para><application>Jade</application>,
<application>teTeX</application> and Modular DocBook Stylesheets are used to convert
DocBook documents to DVI, Postscript, and PDF formats.
The <application>JadeTeX</application> macros are needed
in order to do this.</para>
<application>teTeX</application> and Modular DocBook
Stylesheets are used to convert DocBook documents to
DVI, Postscript, and PDF formats. The
<application>JadeTeX</application> macros are needed to
do this.</para>
<para>If you do not intend to convert your documentation
to one of these formats (i.e., HTML and plain text
are sufficient) then you do not need to install
these.</para>
<para>If <acronym>XHTML</acronym> and plain text output
formats are adequate, then this program is not needed
and the option to install it from the
<filename role="package">textproc/docproj</filename>
configuration screen can be disabled.</para>
</listitem>
</varlistentry>
<important>
<para>If you decide to install
<application>JadeTeX</application> and
<application>teTeX</application> then you will need to
configure <application>teTeX</application> after
<application>JadeTeX</application> has been installed.
<filename>print/jadetex/pkg-message</filename>
contains detailed instructions explaining what you
need to do.</para>
</important>
<varlistentry>
<term><application>Vim</application>
(<filename role="package">editors/vim</filename>)</term>
<listitem>
<para>A popular editor for working with
<acronym>XML</acronym> and derived documents, like
DocBook <acronym>XML</acronym>.</para>
</listitem>
</varlistentry>
@ -232,22 +155,15 @@
<filename role="package">editors/xemacs</filename>)</term>
<listitem>
<para>Both these editors include a special mode for
editing documents marked up according to an SGML DTD.
This mode includes commands to reduce the amount of
typing you need, and help reduce the possibility of
<para>Both of these editors include a special mode for
editing documents marked up according to an
<acronym>XML</acronym> <acronym>DTD</acronym>. This
mode includes commands to reduce the amount of typing
needed, and help reduce the possibility of
errors.</para>
<para>You do not need to use them; any text editor can be
used to edit marked up documents. You may find they
make you more efficient.</para>
</listitem>
</varlistentry>
</variablelist>
<para>If anyone has recommendations for other software that is
useful when manipulating XML documents, please let &a.doceng;
know, so they can be added to this list.</para>
</sect2>
</sect1>
</chapter>

View file

@ -0,0 +1,193 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2013 Warren Block
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS
IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
$FreeBSD$
-->
<chapter id="working-copy">
<title>The Working Copy</title>
<para>The <emphasis>working copy</emphasis> is a copy of the &os;
repository documentation tree downloaded onto the local computer.
Changes are made to the local working copy, tested, and then
submitted as patches to be committed to the main
repository.</para>
<para>A full copy of the documentation tree can occupy 700 megabytes
of disk space. Allow for a full gigabyte of space to have room
for temporary files and test versions of various output
formats.</para>
<para><ulink
url="&url.books.handbook;/svn.html"><application>Subversion</application></ulink>
is used to manage the &os; documentation files. It is installed
by <filename role="package">textproc/docproj</filename> as one of
the required applications.</para>
<sect1 id="working-copy-doc-and-src">
<title>Documentation and Manual Pages</title>
<para>&os; documentation is not just books and articles. Manual
pages for all the commands and configuration files are also part
of the documentation, and part of the <acronym>FDP</acronym>'s
territory. Two repositories are involved:
<literal>doc</literal> for the books and articles, and
<literal>base</literal> for the operating system and manual
pages. To edit manual pages, the <literal>base</literal>
repository must be checked out separately.</para>
<para>Repositories may contain multiple versions of documentation
and source code. New modifications are almost always made only
to the latest version, called <literal>head</literal>.</para>
</sect1>
<sect1 id="working-copy-choosing-mirror">
<title>Choosing a Mirror</title>
<para>To increase speed and reduce download time, select a mirror
from the list of <ulink
url="&url.books.handbook;/svn-mirrors.html">Subversion
mirror sites</ulink> that is close to your location.
Substitute the chosen mirror <acronym>URL</acronym> for the
<replaceable>https://svn0.us-west.FreeBSD.org/</replaceable>
used in these examples.</para>
</sect1>
<sect1 id="working-copy-choosing-directory">
<title>Choosing a Directory</title>
<para>&os; documentation is traditionally stored in
<filename class="directory">/usr/doc/</filename>, and system
source code with manual pages in
<filename class="directory">/usr/src/</filename>. These
directory trees are relocatable, and users may want to put the
working copies in other locations to avoid interfering with
existing information in the main directories. The examples
that follow use <filename class="directory">~/doc</filename>
and <filename class="directory">~/src</filename>, both
subdirectories of the user's home directory.</para>
</sect1>
<sect1 id="working-copy-checking-out">
<title>Checking Out a Copy</title>
<para>A download of a working copy from the repository is called
a <emphasis>checkout</emphasis>, and done with
<command>svn checkout</command>. This example checks out a
copy of the latest version (<literal>head</literal>) of
the main documentation tree:</para>
<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org/doc/head</replaceable> <replaceable>~/doc</replaceable></userinput></screen>
<para>A checkout of the source code to work on manual pages is
very similar:</para>
<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org/base/head</replaceable> <replaceable>~/src</replaceable></userinput></screen>
</sect1>
<sect1 id="working-copy-updating">
<title>Updating a Working Copy</title>
<para>The documents and files in the &os; repository change daily.
People modify files and commit changes frequently. Even a short
time after an initial checkout, there will already be
differences between the local working copy and the main &os;
repository. To update the local version with the changes that
have been made to the main repository, use
<command>svn update</command> on the directory containing the
local working copy:</para>
<screen>&prompt.user; <userinput>svn update <replaceable>~/doc</replaceable></userinput></screen>
<para>Get in the protective habit of using
<command>svn update</command> before editing document files.
Someone else may have edited that file very recently, and the
local working copy will not include the latest changes until it
has been updated. Editing the newest version of a file is much
easier than trying to combine an older, edited local file with
the newer version from the repository.</para>
</sect1>
<sect1 id="working-copy-revert">
<title>Reverting Changes</title>
<para>Sometimes it turns out that changes were
not necessary after all, or the writer just wants to start over.
Files can be <quote>reset</quote> to their unchanged form with
<command>svn revert</command>. For example, to erase the edits
made to <filename>chapter.xml</filename> and reset it to
unmodified form:</para>
<screen>&prompt.user; <userinput>svn revert chapter.xml</userinput></screen>
</sect1>
<sect1 id="working-copy-making-diff">
<title>Making a Diff</title>
<para>After edits to a file or group of files are completed, the
differences between the local working copy and the version on
the &os; repository must be collected into a single file for
submission. These <emphasis>diff</emphasis> files are produced
by redirecting the output of <command>svn diff</command> into a
file:</para>
<screen>&prompt.user; <userinput>cd <replaceable>~/doc</replaceable></userinput>
&prompt.user; <userinput>svn diff &gt; <replaceable>doc-fix-spelling.diff</replaceable></userinput></screen>
<para>Give the file a meaningful name that identifies the
contents. The example above is for spelling fixes to the whole
documentation tree.</para>
<para>If the diff file is to be submitted with the web
<quote><ulink url="&url.base;/send-pr.html">Submit a &os;
problem report</ulink></quote> interface, add a
<filename>.txt</filename> extension to give the earnest and
simple-minded web form a clue that the contents are plain
text.</para>
<para>Be careful: <command>svn diff</command> includes all changes
made in the current directory and any subdirectories. If there
are files in the working copy with edits that are not ready to
be submitted yet, provide a list of only the files that are to
be included:</para>
<screen>&prompt.user; <userinput>cd <replaceable>~/doc</replaceable></userinput>
&prompt.user; <userinput>svn diff <replaceable>disks/chapter.xml printers/chapter.xml</replaceable> &gt; <replaceable>disks-printers.diff</replaceable></userinput></screen>
</sect1>
<sect1 id="working-copy-subversion-references">
<title><application>Subversion</application> References</title>
<para>These examples show very basic usage of
<application>Subversion</application>. More detail is available
in the <ulink
url="http://svnbook.red-bean.com/">Subversion Book</ulink>
and the <ulink
url="http://subversion.apache.org/docs/">Subversion
documentation</ulink>.</para>
</sect1>
</chapter>

View file

@ -38,7 +38,7 @@
<title>Tips</title>
<para>Technical documentation can be improved by consistent use of
several principes. Most of these can be classified into three
several principles. Most of these can be classified into three
goals: <emphasis>be clear</emphasis>,
<emphasis>be complete</emphasis>, and
<emphasis>be concise</emphasis>. These goals can conflict with
@ -75,7 +75,7 @@
A trivial example is better than no example. A good example
is better yet. Do not give bad examples, identifiable by
apologies or sentences like <quote>but really it should never
be done that way</quote>. Bad examples are worse than no
be done that way</quote>. Bad examples are worse than no
examples. Give good examples, because <emphasis>even when
warned not to use the example as shown</emphasis>, the
reader will usually just use the example as shown.</para>
@ -119,7 +119,7 @@
<title>Guidelines</title>
<para>To promote consistency between the myriad authors of the
FreeBSD documentation, some guidelines have been drawn up for
&os; documentation, some guidelines have been drawn up for
authors to follow.</para>
<variablelist>
@ -148,7 +148,7 @@
<listitem>
<para>Do not use contractions. Always spell the phrase out
in full. <quote>Don't use contractions</quote> would be
in full. <quote>Don't use contractions</quote> is
wrong.</para>
<para>Avoiding contractions makes for a more formal tone, is
@ -166,7 +166,7 @@
from the others with a comma and the word
<quote>and</quote>.</para>
<para>For example, look at the following:</para>
<para>For example:</para>
<blockquote>
<para>This is a list of one, two and three items.</para>
@ -190,66 +190,62 @@
<term>Avoid redundant phrases</term>
<listitem>
<para>Try not to use redundant phrases. In particular,
<para>Do not use redundant phrases. In particular,
<quote>the command</quote>, <quote>the file</quote>, and
<quote>man command</quote> are probably redundant.</para>
<quote>man command</quote> are often redundant.</para>
<para>These two examples show this for commands. The second
example is preferred.</para>
<para>For example, commands:</para>
<informalexample>
<para>Use the command <command>svn</command> to update
your sources.</para>
<para>Wrong: Use the command <command>svn</command> to
update sources.</para>
</informalexample>
<informalexample>
<para>Use <command>svn</command> to update your
<para>Right: Use <command>svn</command> to update
sources.</para>
</informalexample>
<para>These two examples show this for filenames. The
second example is preferred.</para>
<para>Filenames:</para>
<informalexample>
<para>&hellip; in the filename
<para>Wrong: &hellip; in the filename
<filename>/etc/rc.local</filename>&hellip;</para>
</informalexample>
<informalexample>
<para>&hellip; in
<para>Right: &hellip; in
<filename>/etc/rc.local</filename>&hellip;</para>
</informalexample>
<para>These two examples show this for manual references.
The second example is preferred (the second example uses
<sgmltag>citerefentry</sgmltag>).</para>
<para>Manual page references (the second example uses
<sgmltag>citerefentry</sgmltag> with the
<literal>&amp;man.csh.1;</literal> entity):.</para>
<informalexample>
<para>See <command>man csh</command> for more
<para>Wrong: See <command>man csh</command> for more
information.</para>
</informalexample>
<informalexample>
<para>See &man.csh.1;.</para>
<para>Right: See &man.csh.1;.</para>
</informalexample>
</listitem>
</varlistentry>
<varlistentry>
<term>Two spaces at the end of sentences</term>
<term>Two spaces between sentences</term>
<listitem>
<para>Always use two spaces at the end of sentences, as this
improves readability, and eases use of tools such as
<para>Always use two spaces between sentences, as it
improves readability and eases use of tools such as
<application>Emacs</application>.</para>
<para>While it may be argued that a capital letter following
a period denotes a new sentence, this is not the case,
especially in name usage.
<quote>Jordan K. Hubbard</quote> is a good example; it has
a capital <literal>H</literal> following a period and a
space, and there certainly is not a new sentence
there.</para>
<para>A period and spaces followed by a capital letter
does not always mark a new sentence, especially in names.
<quote>Jordan K. Hubbard</quote> is a good example. It
has a capital <literal>H</literal> following a period and
a space, and is certainly not a new sentence.</para>
</listitem>
</varlistentry>
</variablelist>
@ -283,79 +279,57 @@
<sect2>
<title>Acronyms</title>
<para>Acronyms should generally be spelled out the first time
they appear in a document, as in: <quote>Network Time Protocol
(<acronym role="Network Time Protocol">NTP</acronym>)</quote>.
After the acronym has been defined, you should generally use
the acronym only (not the whole term, unless it makes more
sense contextually to use the whole term). Usually, acronyms
are defined only one per document. But if you prefer, you can
also define them the first time they appear in each
chapter.</para>
<para>Acronyms should be defined the first time they appear in a
document, as in:
<quote>Network Time Protocol (<acronym>NTP</acronym>)</quote>.
After the acronym has been defined, use the acronym alone
unless it makes more sense contextually to use the whole term.
Acronyms are usually defined only once per chapter or per
document.</para>
<para>All acronyms should be enclosed in
<sgmltag>acronym</sgmltag> tags, with a
<literal>role</literal> attribute with the full term defined.
This allows a link to the glossary to be created, and for
mouseovers to be rendered with the fully expanded term.</para>
<sgmltag>acronym</sgmltag> tags.</para>
</sect2>
<sect2>
<title>Indentation</title>
<para>Each file starts with indentation set at column 0,
<para>The first line in each file starts with no indentation,
<emphasis>regardless</emphasis> of the indentation level of
the file which might contain this one.</para>
the file which might contain the current file.</para>
<para>Opening tags increase the indentation level by 2 spaces.
Closing tags decrease the indentation level by 2 spaces.
Blocks of 8 spaces at the start of a line should be replaced
with a tab. Do not use spaces in front of tabs, and do not
add extraneous whitespace at the end of a line. Content
within elements should be indented by two spaces if the
content runs over more than one line.</para>
<para>Opening tags increase the indentation level by two spaces.
Closing tags decrease the indentation level by two spaces.
Blocks of eight spaces at the start of a line should be
replaced with a tab. Do not use spaces in front of tabs, and
do not add extraneous whitespace at the end of a line.
Content within elements should be indented by two spaces if
the content runs over more than one line.</para>
<para>For example, the source for this section looks something
like:</para>
<para>For example, the source for this section looks like
this:</para>
<programlisting><![CDATA[+--- This is column 0
V
<chapter>
<title>...</title>
<programlisting><sgmltag class="starttag">chapter</sgmltag>
<sgmltag class="starttag">title</sgmltag>...<sgmltag class="endtag">title</sgmltag>
<sect1>
<title>...</title>
<sgmltag class="starttag">sect1</sgmltag>
<sgmltag class="starttag">title</sgmltag>...<sgmltag class="endtag">title</sgmltag>
<sect2>
<title>Indentation</title>
<sgmltag class="starttag">sect2</sgmltag>
<sgmltag class="starttag">title</sgmltag>Indentation<sgmltag class="endtag">title</sgmltag>
<para>Each file starts with indentation set at column 0,
<emphasis>regardless</emphasis> of the indentation level of the file
which might contain this one.</para>
<sgmltag class="starttag">para</sgmltag>The first line in each file starts with no indentation,
<sgmltag class="starttag">emphasis</sgmltag>regardless<sgmltag class="endtag">emphasis</sgmltag> of the indentation level of
the file which might contain the current file.<sgmltag class="endtag">para</sgmltag>
...
</sect2>
</sect1>
</chapter>]]></programlisting>
<para>If you use <application>Emacs</application> or
<application>XEmacs</application> to edit the files then
<literal>sgml-mode</literal> should be loaded automatically,
and the <application>Emacs</application> local variables at
the bottom of each file should enforce these styles.</para>
<para><application>Vim</application> users might want to
configure their editor with:</para>
<programlisting>augroup sgmledit
autocmd FileType sgml set formatoptions=cq2l " Special formatting options
autocmd FileType sgml set textwidth=70 " Wrap lines at 70 columns
autocmd FileType sgml set shiftwidth=2 " Automatically indent
autocmd FileType sgml set softtabstop=2 " Tab key indents 2 spaces
autocmd FileType sgml set tabstop=8 " Replace 8 spaces with a tab
autocmd FileType sgml set autoindent " Automatic indentation
augroup END</programlisting>
<sgmltag class="endtag">sect2</sgmltag>
<sgmltag class="endtag">sect1</sgmltag>
<sgmltag class="endtag">chapter</sgmltag></programlisting>
<para>Configurations to help various text editors conform to
these guidelines can be found in
<xref linkend="editor-config"/>.</para>
</sect2>
<sect2>
@ -369,31 +343,31 @@ augroup END</programlisting>
at the same indent as a previous tag should not:</para>
<informalexample>
<programlisting><![CDATA[<article lang='en'>
<articleinfo>
<title>NIS</title>
<programlisting><sgmltag class="starttag">article lang='en'</sgmltag>
<sgmltag class="starttag">articleinfo</sgmltag>
<sgmltag class="starttag">title</sgmltag>NIS<sgmltag class="endtag">title</sgmltag>
<pubdate>October 1999</pubdate>
<sgmltag class="starttag">pubdate</sgmltag>October 1999<sgmltag class="endtag">pubdate</sgmltag>
<abstract>
<para>...
<sgmltag class="starttag">abstract</sgmltag>
<sgmltag class="starttag">para</sgmltag>...
...
...</para>
</abstract>
</articleinfo>
...<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">abstract</sgmltag>
<sgmltag class="endtag">articleinfo</sgmltag>
<sect1>
<title>...</title>
<sgmltag class="starttag">sect1</sgmltag>
<sgmltag class="starttag">title</sgmltag>...<sgmltag class="endtag">title</sgmltag>
<para>...</para>
</sect1>
<sgmltag class="starttag">para</sgmltag>...<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">sect1</sgmltag>
<sect1>
<title>...</title>
<sgmltag class="starttag">sect1</sgmltag>
<sgmltag class="starttag">title</sgmltag>...<sgmltag class="endtag">title</sgmltag>
<para>...</para>
</sect1>
</article>]]></programlisting>
<sgmltag class="starttag">para</sgmltag>...<sgmltag class="endtag">para</sgmltag>
<sgmltag class="endtag">sect1</sgmltag>
<sgmltag class="endtag">article</sgmltag></programlisting>
</informalexample>
</sect3>
@ -428,25 +402,23 @@ augroup END</programlisting>
</sect2>
<sect2>
<title>White Space Changes</title>
<title>Whitespace Changes</title>
<para>When committing changes, <emphasis>do not commit changes
to the content at the same time as changes to the
<para><emphasis>Do not commit changes
to content at the same time as changes to
formatting</emphasis>.</para>
<para>This is so that the teams that convert the documentation
to other languages can quickly see what content has actually
changed in your commit, without having to decide whether a
line has changed because of the content, or just because it
has been refilled.</para>
<para>When content and whitespace changes are kept separate,
translation teams can easily see whether a change was content
that must be translated or only whitespace.</para>
<para>For example, if you have added two sentences to a
paragraph, such that the line lengths on the paragraph now go
over 80 columns, first commit your change with the too-long
line lengths. Then fix the line wrapping, and commit this
<para>For example, if two sentences have been added to a
paragraph so that the line lengths now go
over 80 columns, first commit the change with the too-long
lines. Then fix the line wrapping, and commit this
second change. In the commit message for the second change,
be sure to indicate that this is a whitespace-only change, and
that the translation team can ignore it.</para>
indicate that this is a whitespace-only change that can be
ignored by translators.</para>
</sect2>
<sect2>
@ -468,18 +440,18 @@ GB. Hardware compression &hellip;</literallayout>
<itemizedlist>
<listitem>
<para>between numbers and units:</para>
<programlisting><![CDATA[57600&nbsp;bps]]></programlisting>
<programlisting>57600&amp;nbsp;bps</programlisting>
</listitem>
<listitem>
<para>between program names and version numbers:</para>
<programlisting><![CDATA[FreeBSD&nbsp;4.7]]></programlisting>
<programlisting>&amp;os;&amp;nbsp;9.2</programlisting>
</listitem>
<listitem>
<para>between multiword names (use with caution when
applying this to more than 3-4 word names like
<quote>The FreeBSD Brazilian Portuguese Documentation
<quote>The &os; Brazilian Portuguese Documentation
Project</quote>):</para>
<programlisting><![CDATA[Sun&nbsp;Microsystems]]></programlisting>
</listitem>
@ -491,7 +463,7 @@ GB. Hardware compression &hellip;</literallayout>
<title>Word List</title>
<para>This list of words shows the correct spelling and
capitalization when used in FreeBSD Documentation. If a word is
capitalization when used in &os; documentation. If a word is
not on this list, ask about it on the &a.doc;.</para>
<informaltable frame="none" pgwide="0">
@ -507,12 +479,17 @@ GB. Hardware compression &hellip;</literallayout>
<tbody>
<row>
<entry>CD-ROM</entry>
<entry><sgmltag class="starttag">acronym</sgmltag><literal>CD-ROM</literal><sgmltag class="endtag">acronym</sgmltag></entry>
<entry><sgmltag
class="starttag">acronym</sgmltag><literal>CD-ROM</literal><sgmltag
class="endtag">acronym</sgmltag></entry>
</row>
<row>
<entry>DoS (Denial of Service)</entry>
<entry><sgmltag class="starttag">acronym</sgmltag><literal>DoS</literal><sgmltag class="endtag">acronym</sgmltag></entry>
<entry><sgmltag
class="starttag">acronym</sgmltag><literal>DoS</literal><sgmltag
class="endtag">acronym</sgmltag></entry>
</row>
<row>

View file

@ -60,9 +60,9 @@
<emphasis>transitional</emphasis> variants.</para>
<para>The <acronym>XHTML</acronym> <acronym>DTDs</acronym> are
available from the Ports&nbsp;Collection in
available from the Ports Collection in
<filename role="package">textproc/xhtml</filename>. They are
automatically installed as part of the <filename
automatically installed by the <filename
role="package">textproc/docproj</filename> port.</para>
<note>
@ -91,8 +91,8 @@
<para>There are a number of <acronym>XHTML</acronym>
<acronym>FPI</acronym>s, depending upon the version, or
<emphasis>level</emphasis> of <acronym>XHTML</acronym> to which
a document conforms. Most XHTML documents on the FreeBSD web
site comply with the transitional version of
a document conforms. Most <acronym>XHTML</acronym> documents on
the &os; web site comply with the transitional version of
<acronym>XHTML</acronym> 1.0.</para>
<programlisting>PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"</programlisting>
@ -106,7 +106,7 @@
<emphasis>head</emphasis>, contains meta-information about the
document, such as its title, the name of the author, the parent
document, and so on. The second section, the
<emphasis>body</emphasis>, contains the content that will be
<emphasis>body</emphasis>, contains content that will be
displayed to the user.</para>
<para>These sections are indicated with <sgmltag>head</sgmltag>
@ -118,17 +118,17 @@
<title>Normal <acronym>XHTML</acronym> Document
Structure</title>
<programlisting>&lt;html xmlns="http://www.w3.org/1999/xhtml">
&lt;head>
&lt;title><replaceable>The Document's Title</replaceable>&lt;/title>
&lt;/head>
<programlisting><sgmltag class="starttag">html xmlns="http://www.w3.org/1999/xhtml"</sgmltag>
<sgmltag class="starttag">head</sgmltag>
<sgmltag class="starttag">title</sgmltag><replaceable>The Document's Title</replaceable><sgmltag class="endtag">title</sgmltag>
<sgmltag class="endtag">head</sgmltag>
&lt;body>
<sgmltag class="starttag">body</sgmltag>
&hellip;
&lt;/body>
&lt;/html></programlisting>
<sgmltag class="endtag">body</sgmltag>
<sgmltag class="endtag">html</sgmltag></programlisting>
</example>
</sect1>
@ -153,19 +153,19 @@
<para>Usage:</para>
<programlisting>&lt;h1&gt;First section&lt;/h1&gt;
<programlisting><sgmltag class="starttag">h1</sgmltag>First section<sgmltag class="endtag">h1</sgmltag>
&lt;!-- Document introduction goes here --&gt;
&lt;h2&gt;This is the heading for the first section&lt;/h2&gt;
<sgmltag class="starttag">h2</sgmltag>This is the heading for the first section<sgmltag class="endtag">h2</sgmltag>
&lt;!-- Content for the first section goes here --&gt;
&lt;h3&gt;This is the heading for the first sub-section&lt;/h3&gt;
<sgmltag class="starttag">h3</sgmltag>This is the heading for the first sub-section<sgmltag class="endtag">h3</sgmltag>
&lt;!-- Content for the first sub-section goes here --&gt;
&lt;h2&gt;This is the heading for the second section&lt;/h2&gt;
<sgmltag class="starttag">h2</sgmltag>This is the heading for the second section<sgmltag class="endtag">h2</sgmltag>
&lt;!-- Content for the second section goes here --&gt;</programlisting>
</example>
@ -173,27 +173,8 @@
<para>Generally, an <acronym>XHTML</acronym> page should have
one first level heading (<sgmltag>h1</sgmltag>). This can
contain many second level headings (<sgmltag>h2</sgmltag>),
which can in turn contain many third level headings. Each
<sgmltag>h<replaceable>n</replaceable></sgmltag> element
should have the same element, but one further up the
hierarchy, preceding it. Leaving gaps in the numbering is to
be avoided.</para>
<example>
<title>Bad Ordering of
<sgmltag>h<replaceable>n</replaceable></sgmltag>
Elements</title>
<para>Usage:</para>
<programlisting>&lt;h1&gt;First section&lt;/h1&gt;
&lt;!-- Document introduction --&gt;
&lt;h3&gt;Sub-section&lt;/h3&gt;
&lt;!-- This is bad, &lt;h2&gt; has been left out --&gt;</programlisting>
</example>
which can in turn contain many third level headings. Do not
leave gaps in the numbering.</para>
</sect2>
<sect2 id="xhtml-markup-block-elements-paragraphs">
@ -207,8 +188,8 @@
<para>Usage:</para>
<programlisting><![CDATA[<p>This is a paragraph. It can contain just about any
other element.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p</sgmltag>This is a paragraph. It can contain just about any
other element.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
</sect2>
@ -216,22 +197,21 @@
<title>Block Quotations</title>
<para>A block quotation is an extended quotation from another
document that should not appear within the current
paragraph.</para>
document that will appear in a separate paragraph.</para>
<example>
<title><sgmltag>blockquote</sgmltag></title>
<para>Usage:</para>
<programlisting><![CDATA[<p>A small excerpt from the US Constitution:</p>
<programlisting><sgmltag class="starttag">p</sgmltag>A small excerpt from the US Constitution:<sgmltag class="endtag">p</sgmltag>
<blockquote>We the People of the United States, in Order to form
<sgmltag class="starttag">blockquote</sgmltag>We the People of the United States, in Order to form
a more perfect Union, establish Justice, insure domestic
Tranquility, provide for the common defence, promote the general
Welfare, and secure the Blessings of Liberty to ourselves and our
Posterity, do ordain and establish this Constitution for the
United States of America.</blockquote>]]></programlisting>
United States of America.<sgmltag class="endtag">blockquote</sgmltag></programlisting>
</example>
</sect2>
@ -241,12 +221,11 @@
<para><acronym>XHTML</acronym> can present the user with three
types of lists: ordered, unordered, and definition.</para>
<para>Typically, each entry in an ordered list will be
numbered, while each entry in an unordered list will be
preceded by a bullet point. Definition lists are composed of
two sections for each entry. The first section is the term
being defined, and the second section is the definition of the
term.</para>
<para>Entries in an ordered list will be numbered, while entries
in an unordered list will be preceded by bullet points.
Definition lists have two sections for each entry. The first
section is the term being defined, and the second section is
the definition.</para>
<para>Ordered lists are indicated by the <sgmltag>ol</sgmltag>
element, unordered lists by the <sgmltag>ul</sgmltag>
@ -270,31 +249,31 @@
<para>Usage:</para>
<programlisting><![CDATA[<p>An unordered list. Listitems will probably be
preceded by bullets.</p>
<programlisting><sgmltag class="starttag">p</sgmltag>An unordered list. Listitems will probably be
preceded by bullets.<sgmltag class="endtag">p</sgmltag>
<ul>
<li>First item</li>
<sgmltag class="starttag">ul</sgmltag>
<sgmltag class="starttag">li</sgmltag>First item<sgmltag class="endtag">li</sgmltag>
<li>Second item</li>
<sgmltag class="starttag">li</sgmltag>Second item<sgmltag class="endtag">li</sgmltag>
<li>Third item</li>
</ul>
<sgmltag class="starttag">li</sgmltag>Third item<sgmltag class="endtag">li</sgmltag>
<sgmltag class="endtag">ul</sgmltag>
<p>An ordered list, with list items consisting of multiple
<sgmltag class="starttag">p</sgmltag>An ordered list, with list items consisting of multiple
paragraphs. Each item (note: not each paragraph) will be
numbered.</p>
numbered.<sgmltag class="endtag">p</sgmltag>
<ol>
<li><p>This is the first item. It only has one paragraph.</p></li>
<sgmltag class="starttag">ol</sgmltag>
<sgmltag class="starttag">li</sgmltag><sgmltag class="starttag">p</sgmltag>This is the first item. It only has one paragraph.<sgmltag class="endtag">p</sgmltag><sgmltag class="endtag">li</sgmltag>
<li><p>This is the first paragraph of the second item.</p>
<sgmltag class="starttag">li</sgmltag><sgmltag class="starttag">p</sgmltag>This is the first paragraph of the second item.<sgmltag class="endtag">p</sgmltag>
<p>This is the second paragraph of the second item.</p></li>
<sgmltag class="starttag">p</sgmltag>This is the second paragraph of the second item.<sgmltag class="endtag">p</sgmltag><sgmltag class="endtag">li</sgmltag>
<li><p>This is the first and only paragraph of the third
item.</p></li>
</ol>]]></programlisting>
<sgmltag class="starttag">li</sgmltag><sgmltag class="starttag">p</sgmltag>This is the first and only paragraph of the third
item.<sgmltag class="endtag">p</sgmltag><sgmltag class="endtag">li</sgmltag>
<sgmltag class="endtag">ol</sgmltag></programlisting>
</example>
<example>
@ -302,34 +281,34 @@
<para>Usage:</para>
<programlisting><![CDATA[<dl>
<dt>Term 1</dt>
<programlisting><sgmltag class="starttag">dl</sgmltag>
<sgmltag class="starttag">dt</sgmltag>Term 1<sgmltag class="endtag">dt</sgmltag>
<dd><p>Paragraph 1 of definition 1.</p>
<sgmltag class="starttag">dd</sgmltag><sgmltag class="starttag">p</sgmltag>Paragraph 1 of definition 1.<sgmltag class="endtag">p</sgmltag>
<p>Paragraph 2 of definition 1.</p></dd>
<sgmltag class="starttag">p</sgmltag>Paragraph 2 of definition 1.<sgmltag class="endtag">p</sgmltag><sgmltag class="endtag">dd</sgmltag>
<dt>Term 2</dt>
<sgmltag class="starttag">dt</sgmltag>Term 2<sgmltag class="endtag">dt</sgmltag>
<dd><p>Paragraph 1 of definition 2.</p></dd>
<sgmltag class="starttag">dd</sgmltag><sgmltag class="starttag">p</sgmltag>Paragraph 1 of definition 2.<sgmltag class="endtag">p</sgmltag><sgmltag class="endtag">dd</sgmltag>
<dt>Term 3</dt>
<sgmltag class="starttag">dt</sgmltag>Term 3<sgmltag class="endtag">dt</sgmltag>
<dd><p>Paragraph 1 of definition 3.</p></dd>
</dl>]]></programlisting>
<sgmltag class="starttag">dd</sgmltag><sgmltag class="starttag">p</sgmltag>Paragraph 1 of definition 3.<sgmltag class="endtag">p</sgmltag><sgmltag class="endtag">dd</sgmltag>
<sgmltag class="endtag">dl</sgmltag></programlisting>
</example>
</sect2>
<sect2 id="xhtml-markup-block-elements-preformatted-text">
<title>Pre-formatted Text</title>
<para>Pre-formatted text can be shown to the user exactly as it
is in the file. Typically, this means that the text is shown
in a fixed font, multiple spaces are not merged into one, and
line breaks in the text are significant.</para>
<para>Pre-formatted text is shown to the user exactly as it is
in the file. Text is shown in a fixed font. Multiple spaces
and line breaks are shown exactly as they are in the
file.</para>
<para>In order to do this, wrap the content in the
<sgmltag>pre</sgmltag> element.</para>
<para>Wrap pre-formatted text in the <sgmltag>pre</sgmltag>
element.</para>
<example>
<title><sgmltag>pre</sgmltag></title>
@ -337,18 +316,18 @@
<para>For example, the <sgmltag>pre</sgmltag> tags could be
used to mark up an email message:</para>
<programlisting><![CDATA[<pre> From: nik@FreeBSD.org
<programlisting><sgmltag class="starttag">pre</sgmltag> From: nik@FreeBSD.org
To: freebsd-doc@FreeBSD.org
Subject: New documentation available
There is a new copy of my primer for contributors to the FreeBSD
Documentation Project available at
&lt;URL:http://people.FreeBSD.org/~nik/primer/index.html&gt;
&amp;lt;URL:http://people.FreeBSD.org/~nik/primer/index.html&amp;gt;
Comments appreciated.
N</pre>]]></programlisting>
N<sgmltag class="endtag">pre</sgmltag></programlisting>
<para>Keep in mind that <literal>&lt;</literal> and
<literal>&amp;</literal> still are recognized as special
@ -379,97 +358,104 @@
<para>Usage:</para>
<programlisting><![CDATA[<p>This is a simple 2x2 table.</p>
<programlisting><sgmltag class="starttag">p</sgmltag>This is a simple 2x2 table.<sgmltag class="endtag">p</sgmltag>
<table>
<tr>
<td>Top left cell</td>
<sgmltag class="starttag">table</sgmltag>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td</sgmltag>Top left cell<sgmltag class="endtag">td</sgmltag>
<td>Top right cell</td>
</tr>
<sgmltag class="starttag">td</sgmltag>Top right cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<tr>
<td>Bottom left cell</td>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td</sgmltag>Bottom left cell<sgmltag class="endtag">td</sgmltag>
<td>Bottom right cell</td>
</tr>
</table>]]></programlisting>
<sgmltag class="starttag">td</sgmltag>Bottom right cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<sgmltag class="endtag">table</sgmltag></programlisting>
</example>
<para>A cell can span multiple rows and columns. To indicate
this, add the <literal>rowspan</literal> and/or
<literal>colspan</literal> attributes, with values indicating
the number of rows or columns that should be spanned.</para>
<para>A cell can span multiple rows and columns by adding the
<sgmltag class="attribute">rowspan</sgmltag> or
<sgmltag class="attribute">colspan</sgmltag> attributes with
values for the number of rows or columns to be spanned.</para>
<example>
<title>Using <literal>rowspan</literal></title>
<title>Using
<sgmltag class="attribute">rowspan</sgmltag></title>
<para>Usage:</para>
<programlisting><![CDATA[<p>One tall thin cell on the left, two short cells next to
it on the right.</p>
<programlisting><sgmltag class="starttag">p</sgmltag>One tall thin cell on the left, two short cells next to
it on the right.<sgmltag class="endtag">p</sgmltag>
<table>
<tr>
<td rowspan="2">Long and thin</td>
</tr>
<sgmltag class="starttag">table</sgmltag>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td rowspan="2"</sgmltag>Long and thin<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<tr>
<td>Top cell</td>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td</sgmltag>Top cell<sgmltag class="endtag">td</sgmltag>
<td>Bottom cell</td>
</tr>
</table>]]></programlisting>
<sgmltag class="starttag">td</sgmltag>Bottom cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<sgmltag class="endtag">table</sgmltag></programlisting>
</example>
<example>
<title>Using <literal>colspan</literal></title>
<title>Using
<sgmltag class="attribute">colspan</sgmltag></title>
<para>Usage:</para>
<programlisting><![CDATA[<p>One long cell on top, two short cells below it.</p>
<programlisting><sgmltag class="starttag">p</sgmltag>One long cell on top, two short cells below it.<sgmltag class="endtag">p</sgmltag>
<table>
<tr>
<td colspan="2">Top cell</td>
</tr>
<sgmltag class="starttag">table</sgmltag>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td colspan="2"</sgmltag>Top cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<tr>
<td>Bottom left cell</td>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td</sgmltag>Bottom left cell<sgmltag class="endtag">td</sgmltag>
<td>Bottom right cell</td>
</tr>
</table>]]></programlisting>
<sgmltag class="starttag">td</sgmltag>Bottom right cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<sgmltag class="endtag">table</sgmltag></programlisting>
</example>
<example>
<title>Using <literal>rowspan</literal> and
<literal>colspan</literal> Together</title>
<title>Using <sgmltag class="attribute">rowspan</sgmltag> and
<sgmltag class="attribute">colspan</sgmltag>
Together</title>
<para>Usage:</para>
<programlisting><![CDATA[<p>On a 3x3 grid, the top left block is a 2x2 set of
cells merged into one. The other cells are normal.</p>
<programlisting><sgmltag class="starttag">p</sgmltag>On a 3x3 grid, the top left block is a 2x2 set of
cells merged into one. The other cells are normal.<sgmltag class="endtag">p</sgmltag>
<table>
<tr>
<td colspan="2" rowspan="2">Top left large cell</td>
<sgmltag class="starttag">table</sgmltag>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td colspan="2" rowspan="2"</sgmltag>Top left large cell<sgmltag class="endtag">td</sgmltag>
<td>Top right cell</td>
</tr>
<sgmltag class="starttag">td</sgmltag>Top right cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<tr>
<td>Middle right cell</td>
</tr>
<sgmltag class="starttag">tr</sgmltag>
&lt;!-- Because the large cell on the left merges into
this row, the first &lt;td&gt; will occur on its
right --&gt;
<tr>
<td>Bottom left cell</td>
<sgmltag class="starttag">td</sgmltag>Middle right cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<td>Bottom middle cell</td>
<sgmltag class="starttag">tr</sgmltag>
<sgmltag class="starttag">td</sgmltag>Bottom left cell<sgmltag class="endtag">td</sgmltag>
<td>Bottom right cell</td>
</tr>
</table>]]></programlisting>
<sgmltag class="starttag">td</sgmltag>Bottom middle cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="starttag">td</sgmltag>Bottom right cell<sgmltag class="endtag">td</sgmltag>
<sgmltag class="endtag">tr</sgmltag>
<sgmltag class="endtag">table</sgmltag></programlisting>
</example>
</sect2>
</sect1>
@ -482,15 +468,15 @@
<para>Two levels of emphasis are available in
<acronym>XHTML</acronym>, <sgmltag>em</sgmltag> and
<sgmltag>strong</sgmltag>. <sgmltag>em</sgmltag> is for a
<sgmltag>strong</sgmltag>. <sgmltag>em</sgmltag> is for a
normal level of emphasis and <sgmltag>strong</sgmltag>
indicates stronger emphasis.</para>
<para>Typically, <sgmltag>em</sgmltag> is rendered in italic
<para><sgmltag>em</sgmltag> is typically rendered in italic
and <sgmltag>strong</sgmltag> is rendered in bold. This is
not always the case, however, and should not be relied upon.
According to best practices, webpages only hold structural and
semantical information and stylesheets are later applied to
not always the case, and should not be relied upon. According
to best practices, web pages only hold structural and
semantical information, and stylesheets are later applied to
them. Think of semantics, not formatting, when using these
tags.</para>
@ -500,8 +486,8 @@
<para>Usage:</para>
<programlisting><![CDATA[<p><em>This</em> has been emphasized, while
<strong>this</strong> has been strongly emphasized.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p</sgmltag><sgmltag class="starttag">em</sgmltag>This<sgmltag class="endtag">em</sgmltag> has been emphasized, while
<sgmltag class="starttag">strong</sgmltag>this<sgmltag class="endtag">strong</sgmltag> has been strongly emphasized.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
</sect2>
@ -517,9 +503,8 @@
<para>Usage:</para>
<programlisting><![CDATA[<p>This document was originally written by
Nik Clayton, who can be reached by email as
<tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p</sgmltag>Many system settings are stored in
<sgmltag class="starttag">tt</sgmltag>/etc<sgmltag class="endtag">tt</sgmltag>.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
</sect2>
@ -533,75 +518,83 @@
<sect3 id="xhtml-markup-inline-elements-linking">
<title>Linking to Other Documents on the Web</title>
<para>A link points to the <acronym>URL</acronym> of another
<para>A link points to the <acronym>URL</acronym> of a
document on the web. The link is indicated with
<sgmltag>a</sgmltag>, and the <literal>href</literal>
attribute contains the <acronym>URL</acronym> of the target
document. The content of the element becomes the link, and
is normally indicated to the user in some way,
typically by a different color or underlining.</para>
<sgmltag>a</sgmltag>, and the
<sgmltag class="attribute">href</sgmltag> attribute contains
the <acronym>URL</acronym> of the target document. The
content of the element becomes the link, indicated to the
user by showing it in a different color or with an
underline.</para>
<example>
<title>Using <literal>&lt;a href="..."&gt;</literal></title>
<title>Using
<sgmltag class="starttag">a href="..."</sgmltag></title>
<para>Usage:</para>
<programlisting><![CDATA[<p>More information is available at the
<a href="http://www.FreeBSD.org/">FreeBSD web site</a>.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p</sgmltag>More information is available at the
<sgmltag class="starttag">a href="http://www.&amp;os;.org/"</sgmltag>&amp;os; web site<sgmltag class="endtag">a</sgmltag>.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
<para>These links will take the user to the top of the chosen
<para>This link always takes the user to the top of the linked
document.</para>
</sect3>
<sect3 id="xhtml-markup-inline-elements-other-parts">
<title>Linking to Other Parts of Documents</title>
<sect3 id="xhtml-markup-inline-elements-specific-parts">
<title>Linking to Specific Parts of Documents</title>
<para>Linking to a point within another document, or within
the same document, requires that the document author include
<emphasis>anchors</emphasis>. Anchors are indicated with
<sgmltag>a</sgmltag> and the <literal>id</literal> attribute
instead of <literal>href</literal>.</para>
<para>To link to a specific point within a document, that
document must include an <emphasis>anchor</emphasis> at the
desired point. Anchors are included by setting the
<sgmltag class="attribute">id</sgmltag> attribute of an
element to a name. This example creates an anchor by
setting the <sgmltag class="attribute">id</sgmltag>
attribute of a <sgmltag class="element">p</sgmltag>
element.</para>
<example>
<title>Using <literal>&lt;a id="..."&gt;</literal></title>
<title>Creating an Anchor</title>
<para>Usage:</para>
<programlisting><![CDATA[<p><a id="para1">This</a> paragraph can be referenced
in other links with the name <tt>para1</tt>.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p id="samplepara"</sgmltag>This paragraph can be referenced
in other links with the name <sgmltag class="starttag">tt</sgmltag>samplepara<sgmltag class="endtag">tt</sgmltag>.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
<para>To link to a named part of a document, write a normal
link to that document, but include the <acronym>ID</acronym>
of the anchor after a <literal>#</literal> symbol.</para>
<para>Links to anchors are similar to plain links, but include
a <literal>#</literal> symbol and the anchor's
<acronym>ID</acronym> at the end of the
<acronym>URL</acronym>.</para>
<example>
<title>Linking to a Named Part of Another Document</title>
<title>Linking to a Named Part of a Different
Document</title>
<para>Assume that the <literal>para1</literal> example
resides in a document called
<filename>foo.html</filename>.</para>
<para>The <literal>samplepara</literal> example is part of a
document called <filename>foo.html</filename>. A link to
that specific paragraph in the document is constructed in
this example.</para>
<programlisting><![CDATA[<p>More information can be found in the
<a href="foo.html#para1">first paragraph</a> of
<tt>foo.html</tt>.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p</sgmltag>More information can be found in the
<sgmltag class="starttag">a href="foo.html#samplepara"</sgmltag>sample paragraph<sgmltag class="endtag">a</sgmltag> of
<sgmltag class="starttag">tt</sgmltag>foo.html<sgmltag class="endtag">tt</sgmltag>.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
<para>If you are linking to a named anchor within the same
document then you can omit the document's URL, and just
include the name of the anchor (with the preceding
<literal>#</literal>).</para>
<para>To link to a named anchor within the same document, omit
the document's <acronym>URL</acronym>, and just use the
<literal>#</literal> symbol followed by the name of the
anchor.</para>
<example>
<title>Linking to a Named Part of the Same Document</title>
<para>Assume that the <literal>para1</literal> example
resides in this document:</para>
<para>The <literal>samplepara</literal> example
resides in this document. To link to it:</para>
<programlisting><![CDATA[<p>More information can be found in the
<a href="#para1">first paragraph</a> of this
document.</p>]]></programlisting>
<programlisting><sgmltag class="starttag">p</sgmltag>More information can be found in the
<sgmltag class="starttag">a href="#samplepara"</sgmltag>sample paragraph<sgmltag class="endtag">a</sgmltag> of this
document.<sgmltag class="endtag">p</sgmltag></programlisting>
</example>
</sect3>
</sect2>

File diff suppressed because it is too large Load diff

View file

@ -65,20 +65,18 @@
operating system, and the operating system programs are on the
disk, how is the operating system started?</para>
<para>This problem parallels one in the book <citetitle>The
Adventures of Baron Munchausen</citetitle>. A character had
fallen part way down a manhole, and pulled himself out by
grabbing his bootstraps, and lifting. In the early days of
computing the term <firstterm>bootstrap</firstterm> was applied
to the mechanism used to load the operating system, which has
become shortened to <quote>booting</quote>.</para>
<para>This problem parallels one in the book
<citetitle>The Adventures of Baron Munchausen</citetitle>. A
character had fallen part way down a manhole, and pulled himself
out by grabbing his bootstraps, and lifting. In the early days
of computing the term <firstterm>bootstrap</firstterm> was
applied to the mechanism used to load the operating system,
which has become shortened to <quote>booting</quote>.</para>
<indexterm><primary><acronym>BIOS</acronym></primary></indexterm>
<indexterm>
<primary>Basic Input/Output System</primary>
<see><acronym>BIOS</acronym></see>
</indexterm>
<indexterm><primary>Basic Input/Output
System</primary><see><acronym>BIOS</acronym></see></indexterm>
<para>On x86 hardware the Basic Input/Output System
(<acronym>BIOS</acronym>) is responsible for loading the
@ -340,7 +338,7 @@ boot:</screen>
<para>Finally, by default, the loader issues a 10 second wait
for key presses, and boots the kernel if it is not
interrupted. If interrupted, the user is presented with a
interrupted. If interrupted, the user is presented with a
prompt which understands the command set, where the user may
adjust variables, unload all modules, load modules, and then
finally boot or reboot.</para>
@ -504,10 +502,10 @@ boot:</screen>
<para>Here are some practical examples of loader usage:</para>
<itemizedlist>
<indexterm><primary>single-user mode</primary></indexterm>
<listitem>
<para>To boot the usual kernel in single-user mode:</para>
<para>To boot the usual kernel in single-user
mode<indexterm><primary>single-user
mode</primary></indexterm>:</para>
<screen><userinput>boot -s</userinput></screen>
</listitem>
@ -516,18 +514,16 @@ boot:</screen>
<para>To unload the usual kernel and modules, and then
load the previous or another kernel:</para>
<indexterm>
<primary><filename>kernel.old</filename></primary>
</indexterm>
<screen><userinput>unload</userinput>
<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
<para>Use <filename>kernel.GENERIC</filename> to refer to
the default kernel that comes with an installation, or
<filename>kernel.old</filename> to refer to the
previously installed kernel before a system upgrade or
before configuring a custom kernel.</para>
<filename>kernel.old</filename><indexterm>
<primary><filename>kernel.old</filename></primary></indexterm>
to refer to the previously installed kernel before a
system upgrade or before configuring a custom
kernel.</para>
<note>
<para>Use the following to load the usual modules with
@ -793,6 +789,7 @@ bitmap_name="<replaceable>/boot/splash.bin</replaceable>"</programlisting>
<para> </para>
</sect2> -->
</sect1>
<sect1 id="device-hints">

View file

@ -1288,9 +1288,9 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<para>A quick way of getting bug fixes. Any given commit is
just as likely to introduce new bugs as to fix existing
ones.</para>
<para>A quick way of getting bug fixes. Any given commit
is just as likely to introduce new bugs as to fix
existing ones.</para>
</listitem>
<listitem>
@ -1333,50 +1333,37 @@ Fetching 133 new ports or files... done.</screen>
one of the following methods:</para>
<orderedlist>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with
<application>Subversion</application>
</secondary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with
<application>CTM</application>
</secondary>
</indexterm>
<listitem>
<para>Use <link linkend="svn">svn</link> to check out
the desired development or release branch. This is
the recommended method, providing access to &os;
development as it occurs. Checkout the -CURRENT
code from the <literal>head</literal> branch of one
of the <link linkend="svn-mirrors">Subversion mirror
<para>Use <link
linkend="svn">svn</link><indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with
<application>Subversion</application></secondary>
</indexterm>
to check out the desired development or release
branch. This is the recommended method, providing
access to &os; development as it occurs. Checkout
the -CURRENT code from the <literal>head</literal>
branch of one of the <link
linkend="svn-mirrors">Subversion mirror
sites</link>. Due to the size of the repository,
it is recommended that only desired subtrees be
checked out.</para>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with CTM</secondary>
</indexterm>
<para>Use the <application><link
linkend="ctm">CTM</link></application> facility.
If you have bad connectivity such as high price
connections or only email access,
linkend="ctm">CTM</link></application><indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with CTM</secondary>
</indexterm> facility. If you have bad connectivity
such as high price connections or only email access,
<application>CTM</application> is an option, but it
is not as reliable as <application><link
linkend="svn">Subversion</link></application>.
is not as reliable as <application>
<link linkend="svn">Subversion</link></application>.
For this reason, <application><link
linkend="svn">Subversion</link></application>
is the recommended method for any system with
@ -1393,11 +1380,11 @@ Fetching 133 new ports or files... done.</screen>
compile just a subset is almost guaranteed to cause
problems.</para>
<indexterm>
<primary>-CURRENT</primary>
<secondary>compiling</secondary>
</indexterm>
<para>Before compiling &os.current;, read
<para>Before compiling
&os.current;<indexterm>
<primary>-CURRENT</primary>
<secondary>compiling</secondary>
</indexterm>, read
<filename>/usr/src/Makefile</filename> very carefully.
<link linkend="makeworld">Install a new kernel and
rebuild the world</link> the first time through as part
@ -1524,27 +1511,22 @@ Fetching 133 new ports or files... done.</screen>
already running a previous release of &os;:</para>
<orderedlist>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with
<application>Subversion</application></secondary>
</indexterm>
<listitem>
<para>Use <link linkend="svn">svn</link> to check out
the desired development or release branch. This is
the recommended method, providing access to &os;
development as it occurs. Branch names include
<literal>head</literal> for the current development
head, and branches identified in <ulink
url="&url.base;/releng/">the release engineering
page</ulink>, such as <literal>stable/9</literal>
<para>Use <link linkend="svn">svn</link><indexterm>
<primary>Subversion</primary>
</indexterm> to check out the desired development or
release branch. This is the recommended method,
providing access to &os; development as it occurs.
Branch names include <literal>head</literal> for the
current development head, and branches identified in
<ulink url="&url.base;/releng/">the release
engineering page</ulink>, such as
<literal>stable/9</literal><indexterm>
<primary>-STABLE</primary>
<secondary>syncing with
<application>Subversion</application></secondary>
</indexterm>
or <literal>releng/9.0</literal>. URL prefixes for
<application>Subversion</application> checkout of
the base system are shown in <link
@ -1556,29 +1538,25 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with CTM</secondary>
</indexterm>
<para>Consider using <application><link
linkend="ctm">CTM</link></application> if you do
not have a fast connection to the Internet.</para>
linkend="ctm">CTM</link></application><indexterm>
<primary>-STABLE</primary>
<secondary>syncing with CTM</secondary>
</indexterm> if you do not have a fast connection to
the Internet.</para>
</listitem>
</orderedlist>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>compiling</secondary>
</indexterm>
<para>Before compiling &os.stable;, read
<filename>/usr/src/Makefile</filename> carefully. <link
linkend="makeworld">Install a new kernel and rebuild
the world</link> the first time through as part of the
upgrading process. Read &a.stable; and
<para>Before compiling &os.stable;<indexterm>
<primary>-STABLE</primary>
<secondary>compiling</secondary>
</indexterm>, read
<filename>/usr/src/Makefile</filename> carefully.
<link linkend="makeworld">Install a new kernel and
rebuild the world</link> the first time through as part
of the upgrading process. Read &a.stable; and
<filename>/usr/src/UPDATING</filename> to keep
up-to-date on other bootstrapping procedures that
sometimes become necessary on the road to the next
@ -1732,12 +1710,12 @@ Fetching 133 new ports or files... done.</screen>
help about synchronizing to a newer version.</para>
<para>Updating the system from source is a more subtle process
than it might initially seem to be, and the &os; developers have
found it necessary over the years to change the recommended
approach fairly dramatically as new kinds of unavoidable
dependencies come to light. The rest of this section
describes the rationale behind the currently recommended
upgrade sequence.</para>
than it might initially seem to be, and the &os; developers
have found it necessary over the years to change the
recommended approach fairly dramatically as new kinds of
unavoidable dependencies come to light. The rest of this
section describes the rationale behind the currently
recommended upgrade sequence.</para>
<para>Any successful update sequence must deal with the
following issues:</para>
@ -1871,11 +1849,12 @@ Fetching 133 new ports or files... done.</screen>
<para><command>make
<maketarget>delete-old</maketarget></command></para>
<para>This target deletes old (obsolete) files. This is important
because sometimes they cause problems if left on the disk, for
example the presence of the old <filename>utmp.h</filename>
causes problems in some ports when the new
<filename>utmpx.h</filename> is installed.</para>
<para>This target deletes old (obsolete) files. This is
important because sometimes they cause problems if left on
the disk, for example the presence of the old
<filename>utmp.h</filename> causes problems in some ports
when the new <filename>utmpx.h</filename> is
installed.</para>
</listitem>
<listitem>
@ -1886,10 +1865,11 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<para><command>make <maketarget>delete-old-libs</maketarget></command></para>
<para><command>make
<maketarget>delete-old-libs</maketarget></command></para>
<para>Remove any obsolete libraries to avoid conflicts with newer
ones. Make sure that all ports have been rebuilt
<para>Remove any obsolete libraries to avoid conflicts with
newer ones. Make sure that all ports have been rebuilt
before old libraries are removed.</para>
</listitem>
</orderedlist>
@ -2660,27 +2640,28 @@ Script done, &hellip;</screen>
<primary>Deleting obsolete files and directories</primary>
</indexterm>
<para>As a part of the &os; development lifecycle, files and their
contents occasionally become obsolete. This may be because
functionality is implemented elsewhere, the version number of
the library has changed, or it was removed from the system
entirely. This includes old files, libraries, and directories,
which should be removed when updating the system. The benefit
is that the system is not cluttered with old files which take up
unnecessary space on the storage and backup media.
Additionally, if the old library has a security or stability
issue, the system should be updated to the newer library to keep
it safe and to prevent crashes caused by the old library.
Files, directories, and libraries which are considered obsolete
are listed in <filename>/usr/src/ObsoleteFiles.inc</filename>.
The following instructions should be used to remove obsolete
files during the system upgrade process.</para>
<para>As a part of the &os; development lifecycle, files and
their contents occasionally become obsolete. This may be
because functionality is implemented elsewhere, the version
number of the library has changed, or it was removed from the
system entirely. This includes old files, libraries, and
directories, which should be removed when updating the system.
The benefit is that the system is not cluttered with old files
which take up unnecessary space on the storage and backup
media. Additionally, if the old library has a security or
stability issue, the system should be updated to the newer
library to keep it safe and to prevent crashes caused by the
old library. Files, directories, and libraries which are
considered obsolete are listed in
<filename>/usr/src/ObsoleteFiles.inc</filename>. The
following instructions should be used to remove obsolete files
during the system upgrade process.</para>
<para>After the <command>make
<maketarget>installworld</maketarget></command>
and the subsequent <command>mergemaster</command> have finished
successfully, check for obsolete files and libraries as
follows:</para>
<para>After the
<command>make <maketarget>installworld</maketarget></command>
and the subsequent <command>mergemaster</command> have
finished successfully, check for obsolete files and libraries
as follows:</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make check-old</userinput></screen>
@ -2724,9 +2705,9 @@ Script done, &hellip;</screen>
<title>Warning</title>
<para>Deleting obsolete files will break applications that
still depend on those obsolete files. This is especially true
for old libraries. In most cases, the programs, ports, or
libraries that used the old library need to be recompiled
still depend on those obsolete files. This is especially
true for old libraries. In most cases, the programs, ports,
or libraries that used the old library need to be recompiled
before <command>make
<maketarget>delete-old-libs</maketarget></command> is
executed.</para>
@ -2734,28 +2715,29 @@ Script done, &hellip;</screen>
<para>Utilities for checking shared library dependencies are
available from the Ports Collection in
<filename role="package">sysutils/libchk</filename> or <filename
<filename role="package">sysutils/libchk</filename> or
<filename
role="package">sysutils/bsdadminscripts</filename>.</para>
<para>Obsolete shared libraries can conflict with newer libraries,
causing messages like these:</para>
<para>Obsolete shared libraries can conflict with newer
libraries, causing messages like these:</para>
<screen>/usr/bin/ld: warning: libz.so.4, needed by /usr/local/lib/libtiff.so, may conflict with libz.so.5
/usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5</screen>
<para>To solve these problems, determine which port installed the
library:</para>
<para>To solve these problems, determine which port installed
the library:</para>
<screen>&prompt.root; <userinput>pkg_info -W /usr/local/lib/libtiff.so</userinput>
/usr/local/lib/libtiff.so was installed by package tiff-3.9.4
&prompt.root; <userinput>pkg_info -W /usr/local/lib/libXext.so</userinput>
/usr/local/lib/libXext.so was installed by package libXext-1.1.1,1</screen>
<para>Then deinstall, rebuild and reinstall the port. <filename
role="package">ports-mgmt/portmaster</filename> can be used to
automate this process. After all ports are rebuilt and no
longer use the old libraries, delete the old libraries using the
following command:</para>
<para>Then deinstall, rebuild and reinstall the port.
<filename role="package">ports-mgmt/portmaster</filename> can
be used to automate this process. After all ports are rebuilt
and no longer use the old libraries, delete the old libraries
using the following command:</para>
<screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
@ -2818,7 +2800,9 @@ Script done, &hellip;</screen>
<qandaentry>
<question>
<para>My compile failed with lots of
signal 11<indexterm><primary>signal 11</primary></indexterm>
signal 11<indexterm>
<primary>signal 11</primary>
</indexterm>
(or other signal number) errors. What happened?</para>
</question>

View file

@ -397,12 +397,6 @@
<entry>Mono and C# applications on &os;</entry>
</row>
<row>
<entry>&a.mozilla.name;</entry>
<entry>Porting <application>Mozilla</application> to
&os;</entry>
</row>
<row>
<entry>&a.multimedia.name;</entry>
<entry>Multimedia applications</entry>
@ -449,6 +443,11 @@
firewall system</entry>
</row>
<row>
<entry>&a.pkg-fallout.name;</entry>
<entry>Fallout logs from package building</entry>
</row>
<row>
<entry>&a.platforms.name;</entry>
<entry>Concerning ports to non &intel; architecture
@ -1619,6 +1618,18 @@
</listitem>
</varlistentry>
<varlistentry>
<term>&a.pkg-fallout.name;</term>
<listitem>
<para><emphasis>Fallout logs from package building</emphasis></para>
<para>All packages building failures logs from the package building
clusters</para>
</listitem>
</varlistentry>
<varlistentry>
<term>&a.platforms.name;</term>

View file

@ -2292,55 +2292,47 @@ Mounting root from ufs:/dev/md0c
firewall</guimenuitem></term>
<listitem>
<indexterm>
<primary>FTP</primary>
<secondary>passive mode</secondary>
</indexterm>
<para>This option instructs &man.sysinstall.8;
to use passive mode for all FTP
operations.
This allows the user to pass through firewalls
that do not allow incoming connections on random TCP ports.
<para>This option instructs &man.sysinstall.8; to use
passive mode<indexterm>
<primary>FTP</primary>
<secondary>passive mode</secondary>
</indexterm> for all FTP operations. This allows the
user to pass through firewalls that do not allow
incoming connections on random TCP ports.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>FTP via a HTTP proxy: <guimenuitem>Install from an FTP server
through a http proxy</guimenuitem></term>
<term>FTP via a HTTP proxy: <guimenuitem>Install from an FTP
server through a http proxy</guimenuitem></term>
<listitem>
<indexterm>
<primary>FTP</primary>
<secondary>via a HTTP proxy</secondary>
</indexterm>
<para>This option instructs &man.sysinstall.8;
to use the HTTP
protocol to connect to a proxy
for all FTP operations. The proxy will translate
the requests and send them to the FTP server.
This allows the user to pass through firewalls
that do not allow FTP, but offer a HTTP
proxy.
In this case, specify the proxy in
<para>This option instructs &man.sysinstall.8; to use the
HTTP protocol to connect to a proxy for all FTP
operations. The proxy will translate the requests and
send them to the FTP server. This allows the user to
pass through firewalls that do not allow FTP, but offer
a HTTP proxy<indexterm>
<primary>FTP</primary>
<secondary>via a HTTP proxy</secondary>
</indexterm>. In this case, specify the proxy in
addition to the FTP server.</para>
</listitem>
</varlistentry>
</variablelist>
<para>For a proxy FTP server, give the name of the
server as part of the username, after an
<quote>@</quote> sign. The proxy server then <quote>fakes</quote>
the real server. For example, to install from
<hostid role="fqdn">ftp.FreeBSD.org</hostid>, using the proxy FTP
server <hostid role="fqdn">foo.example.com</hostid>, listening on port
1234, go to the options menu, set the FTP username
to <literal>ftp@ftp.FreeBSD.org</literal> and the password to
an
email address. As the installation media, specify FTP (or
passive FTP, if the proxy supports it), and the URL
<para>For a proxy FTP server, give the name of the server as
part of the username, after an <quote>@</quote> sign. The
proxy server then <quote>fakes</quote> the real server. For
example, to install from
<hostid role="fqdn">ftp.FreeBSD.org</hostid>, using the proxy
FTP server <hostid role="fqdn">foo.example.com</hostid>,
listening on port 1234, go to the options menu, set the FTP
username to <literal>ftp@ftp.FreeBSD.org</literal> and the
password to an email address. As the installation media,
specify FTP (or passive FTP, if the proxy supports it), and
the URL
<literal>ftp://foo.example.com:1234/pub/FreeBSD</literal>.</para>
<para>Since <filename class="directory">/pub/FreeBSD</filename>

View file

@ -78,84 +78,81 @@
<itemizedlist>
<listitem>
<indexterm><primary>preemptive
multitasking</primary></indexterm>
<para><emphasis>Preemptive multitasking</emphasis> with
dynamic priority adjustment to ensure smooth and fair
sharing of the computer between applications and users,
even under the heaviest of loads.</para>
<para><emphasis>Preemptive
multitasking</emphasis><indexterm>
<primary>preemptive multitasking</primary>
</indexterm> with dynamic priority adjustment to ensure
smooth and fair sharing of the computer between
applications and users, even under the heaviest of
loads.</para>
</listitem>
<listitem>
<indexterm><primary>multi-user
facilities</primary></indexterm>
<para><emphasis>Multi-user facilities</emphasis> which allow
many people to use a &os; system simultaneously for a
variety of things. This means, for example, that system
peripherals such as printers and tape drives are properly
shared between all users on the system or the network and
that individual resource limits can be placed on users or
groups of users, protecting critical system resources from
over-use.</para>
</listitem>
<listitem>
<indexterm><primary>TCP/IP networking</primary></indexterm>
<para>Strong <emphasis>TCP/IP networking</emphasis> with
support for industry standards such as SCTP, DHCP, NFS,
NIS, PPP, SLIP, IPsec, and IPv6. This means that your
&os; machine can interoperate easily with other systems as
well as act as an enterprise server, providing vital
functions such as NFS (remote file access) and email
services or putting your organization on the Internet with
WWW, FTP, routing and firewall (security) services.</para>
<para><emphasis>Multi-user facilities</emphasis><indexterm>
<primary>multi-user facilities</primary>
</indexterm> which allow many people to use a &os; system
simultaneously for a variety of things. This means, for
example, that system peripherals such as printers and tape
drives are properly shared between all users on the system
or the network and that individual resource limits can be
placed on users or groups of users, protecting critical
system resources from over-use.</para>
</listitem>
<listitem>
<indexterm><primary>memory protection</primary></indexterm>
<para><emphasis>Memory protection</emphasis> ensures that
applications (or users) cannot interfere with each other.
One application crashing will not affect others in any
way.</para>
<para>Strong <emphasis>TCP/IP
networking</emphasis><indexterm>
<primary>TCP/IP networking</primary>
</indexterm> with support for industry standards such as
SCTP, DHCP, NFS, NIS, PPP, SLIP, IPsec, and IPv6. This
means that your &os; machine can interoperate easily with
other systems as well as act as an enterprise server,
providing vital functions such as NFS (remote file access)
and email services or putting your organization on the
Internet with WWW, FTP, routing and firewall (security)
services.</para>
</listitem>
<listitem>
<indexterm>
<primary>X Window System</primary>
</indexterm>
<para><emphasis>Memory protection</emphasis><indexterm>
<primary>memory protection</primary>
</indexterm> ensures that applications (or users) cannot
interfere with each other. One application crashing will
not affect others in any way.</para>
</listitem>
<listitem>
<para>The industry standard <emphasis>X Window
System</emphasis> (X11R7) provides a graphical user
interface (GUI) for the cost of a common VGA card and
monitor and comes with full sources.</para>
System</emphasis><indexterm>
<primary>X Window System</primary>
</indexterm> (X11R7) provides a graphical user interface
(GUI) for the cost of a common VGA card and monitor and
comes with full sources.</para>
</listitem>
<listitem>
<indexterm>
<primary>binary compatibility</primary>
<secondary>Linux</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>SCO</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>SVR4</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>BSD/OS</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>NetBSD</secondary>
</indexterm>
<para><emphasis>Binary compatibility</emphasis> with many
<para>
<indexterm>
<primary>binary compatibility</primary>
<secondary>Linux</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>SCO</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>SVR4</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>BSD/OS</secondary>
</indexterm>
<indexterm>
<primary>binary compatibility</primary>
<secondary>NetBSD</secondary>
</indexterm>
<emphasis>Binary compatibility</emphasis> with many
programs built for Linux, SCO, SVR4, BSDI and
NetBSD.</para>
</listitem>
@ -177,35 +174,34 @@
compile.</para>
</listitem>
<listitem>
<indexterm><primary>virtual memory</primary></indexterm>
<para>Demand paged <emphasis>virtual memory</emphasis> and
<quote>merged VM/buffer cache</quote> design efficiently
satisfies applications with large appetites for memory
while still maintaining interactive response to other
users.</para>
<para>Demand paged <emphasis>virtual
memory</emphasis><indexterm>
<primary>virtual memory</primary>
</indexterm> and <quote>merged VM/buffer cache</quote>
design efficiently satisfies applications with large
appetites for memory while still maintaining interactive
response to other users.</para>
</listitem>
<listitem>
<indexterm>
<primary>Symmetric Multi-Processing (SMP)</primary>
</indexterm>
<para><emphasis>SMP</emphasis> support for machines with
multiple CPUs.</para>
<para><emphasis>SMP</emphasis><indexterm>
<primary>Symmetric Multi-Processing
(SMP)</primary>
</indexterm> support for machines with multiple
CPUs.</para>
</listitem>
<listitem>
<indexterm>
<primary>compilers</primary>
<secondary>C</secondary>
</indexterm>
<indexterm>
<primary>compilers</primary>
<secondary>C++</secondary>
</indexterm>
<para>A full complement of <emphasis>C</emphasis>
<para>
<indexterm>
<primary>compilers</primary>
<secondary>C</secondary>
</indexterm>
<indexterm>
<primary>compilers</primary>
<secondary>C++</secondary>
</indexterm>
A full complement of <emphasis>C</emphasis>
and <emphasis>C++</emphasis>
development tools.
Many additional languages for advanced research
@ -214,13 +210,12 @@
</listitem>
<listitem>
<indexterm><primary>source code</primary></indexterm>
<para><emphasis>Source code</emphasis> for the entire system
means you have the greatest degree of control over your
environment. Why be locked into a proprietary solution
at the mercy of your vendor when you can have a truly open
system?</para>
<para><emphasis>Source code</emphasis><indexterm>
<primary>source code</primary>
</indexterm> for the entire system means you have the
greatest degree of control over your environment. Why be
locked into a proprietary solution at the mercy of your
vendor when you can have a truly open system?</para>
</listitem>
<listitem>
@ -233,21 +228,20 @@
</listitem>
</itemizedlist>
<indexterm><primary>4.4BSD-Lite</primary></indexterm>
<indexterm>
<primary>Computer Systems Research Group (CSRG)</primary>
</indexterm>
<indexterm><primary>U.C. Berkeley</primary></indexterm>
<para>&os; is based on the 4.4BSD-Lite release from Computer
Systems Research Group (CSRG) at the University of California
at Berkeley, and carries on the distinguished tradition of BSD
systems development. In addition to the fine work provided by
CSRG, the &os;&nbsp;Project has put in many thousands of hours
in fine tuning the system for maximum performance and
reliability in real-life load situations. As many of the
commercial giants struggle to field PC operating systems with
such features, performance and reliability, &os; can offer
them <emphasis>now</emphasis>!</para>
<para>&os; is based on the 4.4BSD-Lite<indexterm>
<primary>4.4BSD-Lite</primary>
</indexterm> release from Computer
Systems Research Group (CSRG)<indexterm>
<primary>Computer Systems Research Group (CSRG)</primary>
</indexterm> at the University of California at Berkeley, and
carries on the distinguished tradition of BSD systems
development. In addition to the fine work provided by CSRG,
the &os;&nbsp;Project has put in many thousands of hours in
fine tuning the system for maximum performance and reliability
in real-life load situations. As many of the commercial
giants struggle to field PC operating systems with such
features, performance and reliability, &os; can offer them
<emphasis>now</emphasis>!</para>
<para>The applications to which &os; can be put are truly
limited only by your own imagination. From software
@ -278,16 +272,16 @@
<itemizedlist>
<listitem>
<indexterm><primary>FTP servers</primary></indexterm>
<para>FTP servers</para>
<para>FTP servers<indexterm>
<primary>FTP servers</primary>
</indexterm></para>
</listitem>
<listitem>
<indexterm><primary>web servers</primary></indexterm>
<para>World Wide Web servers (standard or secure
[SSL])</para>
<para>World Wide Web servers<indexterm>
<primary>web servers</primary>
</indexterm>
(standard or secure [SSL])</para>
</listitem>
<listitem>
@ -295,30 +289,32 @@
</listitem>
<listitem>
<indexterm><primary>firewall</primary></indexterm>
<indexterm><primary>NAT</primary></indexterm>
<para>Firewalls and NAT (<quote>IP masquerading</quote>)
gateways</para>
<para>Firewalls<indexterm>
<primary>firewall</primary>
</indexterm>
and NAT<indexterm>
<primary>NAT</primary>
</indexterm>
(<quote>IP masquerading</quote>) gateways</para>
</listitem>
<listitem>
<indexterm>
<primary>electronic mail</primary>
<see>email</see>
</indexterm>
<indexterm>
<primary>email</primary>
</indexterm>
<para>Electronic Mail servers</para>
<para>
<indexterm>
<primary>electronic mail</primary>
<see>email</see>
</indexterm>
<indexterm>
<primary>email</primary>
</indexterm>
Electronic Mail servers</para>
</listitem>
<listitem>
<indexterm><primary>USENET</primary></indexterm>
<para>USENET News or Bulletin Board Systems</para>
<para>USENET<indexterm>
<primary>USENET</primary>
</indexterm>
News or Bulletin Board Systems</para>
</listitem>
<listitem>
@ -356,27 +352,27 @@
</listitem>
<listitem>
<indexterm><primary>router</primary></indexterm>
<indexterm><primary>DNS Server</primary></indexterm>
<para><emphasis>Networking:</emphasis> Need a new router?
A name server (DNS)? A firewall to keep people out of your
<para><emphasis>Networking:</emphasis> Need a new
router?<indexterm>
<primary>router</primary>
</indexterm> A name server (DNS)?<indexterm>
<primary>DNS Server</primary>
</indexterm> A firewall to keep people out of your
internal network? &os; can easily turn that unused 386 or
486 PC sitting in the corner into an advanced router with
sophisticated packet-filtering capabilities.</para>
</listitem>
<listitem>
<indexterm>
<primary>X Window System</primary>
</indexterm>
<indexterm>
<primary>X Window System</primary>
<secondary>Accelerated-X</secondary>
</indexterm>
<para><emphasis>X Window workstation:</emphasis> &os; is a
<para>
<indexterm>
<primary>X Window System</primary>
</indexterm>
<indexterm>
<primary>X Window System</primary>
<secondary>Accelerated-X</secondary>
</indexterm>
<emphasis>X Window workstation:</emphasis> &os; is a
fine choice for an inexpensive X terminal solution,
using the freely available X11 server.
Unlike an X terminal, &os; allows many applications to
@ -387,13 +383,13 @@
</listitem>
<listitem>
<indexterm><primary>GNU Compiler
Collection</primary></indexterm>
<para><emphasis>Software Development:</emphasis> The basic
&os; system comes with a full complement of development
tools including the renowned GNU C/C++ compiler and
debugger.</para>
tools including the renowned GNU
C/C++<indexterm>
<primary>GNU Compiler Collection</primary>
</indexterm>
compiler and debugger.</para>
</listitem>
</itemizedlist>
@ -416,15 +412,15 @@
<itemizedlist>
<listitem>
<indexterm><primary>Apple</primary></indexterm>
<para><ulink
url="http://www.apple.com/">Apple</ulink></para>
url="http://www.apple.com/">Apple</ulink><indexterm>
<primary>Apple</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Cisco</primary></indexterm>
<para><ulink
url="http://www.cisco.com/">Cisco</ulink></para>
url="http://www.cisco.com/">Cisco</ulink><indexterm>
<primary>Cisco</primary></indexterm></para>
</listitem>
<listitem>
@ -433,9 +429,9 @@
</listitem>
<listitem>
<indexterm><primary>NetApp</primary></indexterm>
<para><ulink
url="http://www.netapp.com/">NetApp</ulink></para>
url="http://www.netapp.com/">NetApp</ulink><indexterm>
<primary>NetApp</primary></indexterm></para>
</listitem>
</itemizedlist>
@ -444,81 +440,78 @@
<itemizedlist>
<listitem>
<indexterm><primary>Yahoo!</primary></indexterm>
<para><ulink
url="http://www.yahoo.com/">Yahoo!</ulink></para>
url="http://www.yahoo.com/">Yahoo!</ulink><indexterm>
<primary>Yahoo!</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Yandex</primary></indexterm>
<para><ulink
url="http://www.yandex.ru/">Yandex</ulink></para>
url="http://www.yandex.ru/">Yandex</ulink><indexterm>
<primary>Yandex</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Apache</primary></indexterm>
<para><ulink
url="http://www.apache.org/">Apache</ulink></para>
url="http://www.apache.org/">Apache</ulink><indexterm>
<primary>Apache</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Rambler</primary></indexterm>
<para><ulink
url="http://www.rambler.ru/">Rambler</ulink></para>
url="http://www.rambler.ru/">Rambler</ulink><indexterm>
<primary>Rambler</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Sina</primary></indexterm>
<para><ulink url="http://www.sina.com/">Sina</ulink></para>
</listitem>
<listitem>
<indexterm><primary>Pair Networks</primary></indexterm>
<para><ulink
url="http://www.pair.com/">Pair Networks</ulink></para>
url="http://www.sina.com/">Sina</ulink><indexterm>
<primary>Sina</primary>
</indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Sony Japan</primary></indexterm>
<para><ulink url="http://www.pair.com/">Pair
Networks</ulink><indexterm>
<primary>Pair Networks</primary></indexterm></para>
</listitem>
<listitem>
<para><ulink url="http://www.sony.co.jp/">Sony
Japan</ulink><indexterm>
<primary>Sony Japan</primary></indexterm></para>
</listitem>
<listitem>
<para><ulink
url="http://www.sony.co.jp/">Sony Japan</ulink></para>
url="http://www.netcraft.com/">Netcraft</ulink><indexterm>
<primary>Netcraft</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Netcraft</primary></indexterm>
<para><ulink
url="http://www.netcraft.com/">Netcraft</ulink></para>
url="http://www.163.com/">NetEase</ulink><indexterm>
<primary>NetEase</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>NetEase</primary></indexterm>
<para><ulink
url="http://www.163.com/">NetEase</ulink></para>
url="http://www.weathernews.com/">Weathernews</ulink><indexterm>
<primary>Weathernews</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Weathernews</primary></indexterm>
<para><ulink
url="http://www.weathernews.com/">Weathernews</ulink></para>
</listitem>
<listitem>
<indexterm><primary>TELEHOUSE America</primary></indexterm>
<para><ulink url="http://www.telehouse.com/">TELEHOUSE
America</ulink></para>
America</ulink><indexterm>
<primary>TELEHOUSE America</primary>
</indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Experts Exchange</primary></indexterm>
<para><ulink url="http://www.experts-exchange.com/">Experts
Exchange</ulink></para>
Exchange</ulink><indexterm>
<primary>Experts Exchange</primary>
</indexterm></para>
</listitem>
</itemizedlist>
@ -572,11 +565,11 @@
<indexterm><primary>Greenman, David</primary></indexterm>
<indexterm><primary>Walnut Creek CDROM</primary></indexterm>
<para>The trio thought that the goal remained
worthwhile, even without Bill's support, and so they adopted the
name "&os;" coined by David Greenman. The
initial objectives were set after consulting with the system's
current users and, once it became clear that the project was
on the road to perhaps even becoming a reality, Jordan contacted
worthwhile, even without Bill's support, and so they adopted
the name "&os;" coined by David Greenman. The initial
objectives were set after consulting with the system's current
users and, once it became clear that the project was on the
road to perhaps even becoming a reality, Jordan contacted
Walnut Creek CDROM with an eye toward improving &os;'s
distribution channels for those many unfortunates without easy
access to the Internet. Walnut Creek CDROM not only supported
@ -734,33 +727,33 @@
<term>The SVN repositories<anchor
id="development-cvs-repository"/></term>
<listitem>
<indexterm>
<primary>CVS</primary>
</indexterm>
<para>
<indexterm>
<primary>CVS</primary>
</indexterm>
<indexterm>
<primary>CVS Repository</primary>
</indexterm>
<indexterm>
<primary>CVS Repository</primary>
</indexterm>
<indexterm>
<primary>Concurrent Versions System</primary>
<see>CVS</see>
</indexterm>
<indexterm>
<primary>Concurrent Versions System</primary>
<see>CVS</see>
</indexterm>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary>Subversion Repository</primary>
</indexterm>
<indexterm>
<primary>Subversion Repository</primary>
</indexterm>
<indexterm>
<primary>SVN</primary>
<see>Subversion</see>
</indexterm>
<para>For several years, the central source tree for &os;
<indexterm>
<primary>SVN</primary>
<see>Subversion</see>
</indexterm>
For several years, the central source tree for &os;
was maintained by
<ulink url="http://www.nongnu.org/cvs/">CVS</ulink>
(Concurrent Versions System), a freely available source
@ -780,7 +773,7 @@
your source tree</link> section for more information on
obtaining the &os; <literal>src/</literal> repository
and <link linkend="ports-using">Using the Ports
Collection</link> for details on obtaining the &os;
Collection</link> for details on obtaining the &os;
Ports Collection.</para>
</listitem>
</varlistentry>
@ -790,9 +783,8 @@
id="development-committers"/></term>
<listitem>
<indexterm><primary>committers</primary></indexterm>
<para>The <firstterm>committers</firstterm>
<para>The <firstterm>committers</firstterm><indexterm>
<primary>committers</primary></indexterm>
are the people who have <emphasis>write</emphasis>
access to the Subversion tree, and are authorized to
make modifications to the &os; source (the term
@ -811,19 +803,19 @@
id="development-core"/></term>
<listitem>
<indexterm><primary>core team</primary></indexterm>
<para>The <firstterm>&os; core team</firstterm>
would be equivalent to the board of directors if the
&os;&nbsp;Project were a company. The primary task of
the core team is to make sure the project, as a whole,
is in good shape and is heading in the right directions.
Inviting dedicated and responsible developers to join
our group of committers 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
2012. Elections are held every 2 years.</para>
<para>The <firstterm>&os; core team</firstterm><indexterm>
<primary>core team</primary>
</indexterm> would be equivalent to the board of
directors if the &os;&nbsp;Project were a company. The
primary task of the core team is to make sure the
project, as a whole, is in good shape and is heading in
the right directions. Inviting dedicated and
responsible developers to join our group of committers
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 2012. Elections are held
every 2 years.</para>
<para>Some core team members also have specific areas of
responsibility, meaning that they are committed to
@ -851,8 +843,6 @@
<term>Outside contributors</term>
<listitem>
<indexterm><primary>contributors</primary></indexterm>
<para>Last, but definitely not least, the largest group of
developers are the users themselves who provide feedback
and bug fixes to us on an almost constant basis. The
@ -864,7 +854,8 @@
<para><citetitle><ulink
url="&url.articles.contributors;/article.html">The
&os; Contributors List</ulink></citetitle> is a long
&os; Contributors List</ulink></citetitle><indexterm>
<primary>contributors</primary></indexterm> is a long
and growing one, so why not join it by contributing
something back to &os; today?</para>
@ -901,18 +892,18 @@
were over &os.numports; ports! The list of ports ranges from
http servers, to games, languages, editors, and almost
everything in between. The entire Ports Collection requires
approximately &ports.size;. To compile a port, you simply change
to the directory of the program you wish to install, type
<command>make install</command>, and let the system do the
rest. The full original distribution for each port you build
is retrieved dynamically
so you need only enough disk space to build the ports you
want. Almost every port is also provided as a pre-compiled
<quote>package</quote>, which can be installed with a simple
command (<command>pkg_add</command>) by those who do not wish
to compile their own ports from source. More information on
packages and ports can be found in <xref
linkend="ports"/>.</para>
approximately &ports.size;. To compile a port, you simply
change to the directory of the program you wish to install,
type <command>make install</command>, and let the system do
the rest. The full original distribution for each port you
build is retrieved dynamically so you need only enough disk
space to build the ports you want. Almost every port is also
provided as a pre-compiled <quote>package</quote>, which can
be installed with a simple command
(<command>pkg_add</command>) by those who do not wish to
compile their own ports from source. More information on
packages and ports can be found in
<xref linkend="ports"/>.</para>
</sect2>
<sect2>

View file

@ -253,10 +253,11 @@
variables in their configuration files:</para>
<itemizedlist>
<indexterm><primary>POSIX</primary></indexterm>
<listitem>
<para><envar>LANG</envar> for &posix; &man.setlocale.3;
family functions</para>
<para><envar>LANG</envar> for &posix;<indexterm>
<primary>POSIX</primary>
</indexterm>
&man.setlocale.3; family functions</para>
</listitem>
<listitem>

View file

@ -1102,10 +1102,9 @@ www.example.org</programlisting>
a host, one of these two must be configured:</para>
<itemizedlist>
<indexterm><primary>MX record</primary></indexterm>
<listitem>
<para>Make sure that the lowest-numbered
<acronym>MX</acronym> record in
<acronym>MX</acronym><indexterm><primary>MX record</primary></indexterm> record in
<acronym>DNS</acronym> points to the host's static IP
address.</para>
</listitem>

View file

@ -746,13 +746,28 @@
<entry>svn, <ulink
url="http://svn0.us-east.FreeBSD.org/">http</ulink>,
<ulink
url="https://svn0.us-east.FreeBSD.org/">https</ulink></entry>
url="https://svn0.us-east.FreeBSD.org/">https</ulink>, rsync</entry>
<entry>USA, New Jersey</entry>
<entry>SHA1
<literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
</row>
<row>
<entry><hostid
role="fqdn">svn0.eu.FreeBSD.org</hostid></entry>
<entry>svn, <ulink
url="http://svn0.eu.FreeBSD.org/">http</ulink>,
<ulink
url="https://svn0.eu.FreeBSD.org/">https</ulink>, rsync</entry>
<entry>Europe, UK</entry>
<entry>SHA1
<literal>39:B0:53:35:CE:60:C7:BB:00:54:96:96:71:10:94:BB:CE:1C:07:A7</literal></entry>
</row>
</tbody>
</tgroup>
</informaltable>

View file

@ -185,7 +185,8 @@
<screen>&prompt.root; <userinput>service inetd rcvar</userinput></screen>
<para>can be run to display the current effective setting.</para>
<para>can be run to display the current effective
setting.</para>
<para>Additionally, different command-line options can be passed
to <application>inetd</application> via the
@ -1332,51 +1333,49 @@ Exports list on foobar:
<title>Machine Types</title>
<itemizedlist>
<indexterm>
<primary>NIS</primary>
<secondary>master server</secondary>
</indexterm>
<listitem>
<para>A <emphasis>NIS master server</emphasis>. This
server, analogous to a &windowsnt; primary domain
<para>A <emphasis>NIS master server</emphasis><indexterm>
<primary>NIS</primary>
<secondary>master server</secondary>
</indexterm>.
This server, analogous to a &windowsnt; primary domain
controller, maintains the files used by all of the NIS
clients. The <filename>passwd</filename>,
<filename>group</filename>, and other various files used
by the NIS clients live on the master server.</para>
<note><para>It is possible for one machine to be an NIS
master server for more than one NIS domain. However,
this will not be covered in this introduction, which
assumes a relatively small-scale NIS
environment.</para></note>
<note>
<para>It is possible for one machine to be an NIS master
server for more than one NIS domain. However, this
will not be covered in this introduction, which
assumes a relatively small-scale NIS
environment.</para>
</note>
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>slave server</secondary>
</indexterm>
<para><emphasis>NIS slave servers</emphasis>. Similar to
the &windowsnt; backup domain controllers, NIS slave
servers maintain copies of the NIS master's data files.
NIS slave servers provide the redundancy, which is
needed in important environments. They also help to
balance the load of the master server: NIS Clients
always attach to the NIS server whose response they get
first, and this includes slave-server-replies.</para>
<para><emphasis>NIS slave servers</emphasis><indexterm>
<primary>NIS</primary>
<secondary>slave server</secondary>
</indexterm>. Similar to the &windowsnt; backup domain
controllers, NIS slave servers maintain copies of the
NIS master's data files. NIS slave servers provide the
redundancy, which is needed in important environments.
They also help to balance the load of the master server:
NIS Clients always attach to the NIS server whose
response they get first, and this includes
slave-server-replies.</para>
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>client</secondary>
</indexterm>
<para><emphasis>NIS clients</emphasis>. NIS clients, like
most &windowsnt; workstations, authenticate against the
NIS server (or the &windowsnt; domain controller in the
&windowsnt; workstations case) to log on.</para>
<para><emphasis>NIS clients</emphasis><indexterm>
<primary>NIS</primary>
<secondary>client</secondary>
</indexterm>.
NIS clients, like most &windowsnt; workstations,
authenticate against the NIS server (or the &windowsnt;
domain controller in the &windowsnt; workstations case)
to log on.</para>
</listitem>
</itemizedlist>
</sect3>
@ -1450,10 +1449,11 @@ Exports list on foobar:
</tgroup>
</informaltable>
<para>If this is the first time a <acronym>NIS</acronym> scheme
is being developed, it should be thoroughly planned ahead of
time. Regardless of network size, several decisions need to
be made as part of the planning process.</para>
<para>If this is the first time a <acronym>NIS</acronym>
scheme is being developed, it should be thoroughly planned
ahead of time. Regardless of network size, several
decisions need to be made as part of the planning
process.</para>
<sect4>
<title>Choosing a NIS Domain Name</title>
@ -1500,14 +1500,14 @@ Exports list on foobar:
for its NIS domain, very often the machine becomes
unusable. The lack of user and group information causes
most systems to temporarily freeze up. With this in mind
be sure to choose a machine that will not be
prone to being rebooted frequently, or one that might be
used for development. The NIS server should ideally be a
stand alone machine whose sole purpose in life is to be an
NIS server. If the network is not very
heavily used, it is acceptable to put the NIS server on a
machine running other services, however; if
the NIS server becomes unavailable, it will adversely affect
be sure to choose a machine that will not be prone to
being rebooted frequently, or one that might be used for
development. The NIS server should ideally be a stand
alone machine whose sole purpose in life is to be an NIS
server. If the network is not very heavily used, it is
acceptable to put the NIS server on a machine running
other services, however; if the NIS server becomes
unavailable, it will adversely affect
<emphasis>all</emphasis> NIS clients.</para>
</sect4>
</sect3>
@ -1544,8 +1544,8 @@ Exports list on foobar:
</indexterm>
<para>Setting up a master NIS server can be relatively
straight forward, depending on environmental needs. &os;
comes with support for NIS out-of-the-box. It only needs to
be enabled by adding the following lines to
comes with support for NIS out-of-the-box. It only needs
to be enabled by adding the following lines to
<filename>/etc/rc.conf</filename>:</para>
<procedure>
@ -1604,13 +1604,13 @@ Exports list on foobar:
that are kept in the <filename>/var/yp</filename>
directory. They are generated from configuration files in
the <filename>/etc</filename> directory of the NIS master,
with one exception: <filename>/etc/master.passwd</filename>.
This is for
a good reason, never propagate passwords for
with one exception:
<filename>/etc/master.passwd</filename>. This is for a
good reason, never propagate passwords for
<username>root</username> and other administrative
accounts to all the servers in the NIS domain. Therefore,
before the the NIS maps are initialized, configure the primary
password files:</para>
before the the NIS maps are initialized, configure the
primary password files:</para>
<screen>&prompt.root; <userinput>cp /etc/master.passwd /var/yp/master.passwd</userinput>
&prompt.root; <userinput>cd /var/yp</userinput>
@ -1760,10 +1760,10 @@ Don't forget to update map ypservers on ellington.</screen>
<para>There should be a directory called
<filename>/var/yp/test-domain</filename>. Copies of the
NIS master server's maps should be in this directory. These
files must always be up to date. The
following <filename>/etc/crontab</filename> entries on
the slave servers should do the job:</para>
NIS master server's maps should be in this directory.
These files must always be up to date. The following
<filename>/etc/crontab</filename> entries on the slave
servers should do the job:</para>
<programlisting>20 * * * * root /usr/libexec/ypxfr passwd.byname
21 * * * * root /usr/libexec/ypxfr passwd.byuid</programlisting>
@ -1788,25 +1788,25 @@ Don't forget to update map ypservers on ellington.</screen>
<title>NIS Clients</title>
<para>An NIS client establishes what is called a binding to a
particular NIS server using the
<command>ypbind</command> daemon. The
<command>ypbind</command> command checks the system's default
domain (as set by the <command>domainname</command>
command), and begins broadcasting RPC requests on the local
network. These requests specify the name of the domain for
which <command>ypbind</command> is attempting to establish a
particular NIS server using the <command>ypbind</command>
daemon. The <command>ypbind</command> command checks the
system's default domain (as set by the
<command>domainname</command> command), and begins
broadcasting RPC requests on the local network. These
requests specify the name of the domain for which
<command>ypbind</command> is attempting to establish a
binding. If a server that has been configured to serve the
requested domain receives one of the broadcasts, it will
respond to <command>ypbind</command>, which will record the
respond to <command>ypbind</command>, which will record the
server's address. If there are several servers available (a
master and several slaves, for example),
<command>ypbind</command> will use the address of the first
one to respond. From that point on, the client system will
direct all of its NIS requests to
that server. <command>ypbind</command> will
occasionally <quote>ping</quote> the server to make sure it
is still up and running. If it fails to receive a reply to
one of its pings within a reasonable amount of time,
direct all of its NIS requests to that server.
<command>ypbind</command> will occasionally
<quote>ping</quote> the server to make sure it is still up
and running. If it fails to receive a reply to one of its
pings within a reasonable amount of time,
<command>ypbind</command> will mark the domain as unbound
and begin broadcasting again in the hopes of locating
another server.</para>
@ -1815,9 +1815,10 @@ Don't forget to update map ypservers on ellington.</screen>
<title>Setting Up a NIS Client</title>
<indexterm>
<primary>NIS</primary> <secondary>client
configuration</secondary>
</indexterm> <para>Setting up a FreeBSD machine to be a NIS
<primary>NIS</primary>
<secondary>client configuration</secondary>
</indexterm>
<para>Setting up a FreeBSD machine to be a NIS
client is fairly straightforward.</para>
<procedure>
@ -1853,8 +1854,8 @@ nis_client_enable="YES"</programlisting>
</note>
<note>
<para>Keep in mind that at least one local account (i.e.
not imported via NIS) must exist in
<para>Keep in mind that at least one local account
(i.e. not imported via NIS) must exist in
<filename>/etc/master.passwd</filename> and this
account should also be a member of the group
<groupname>wheel</groupname>. If there is something
@ -2160,12 +2161,12 @@ basie&prompt.root;</screen>
<para>An attempt to implement these restrictions by separately
blocking each user, would require the addition of the
<literal>-<replaceable>user</replaceable></literal> line to
each system's <filename>passwd</filename>. One line for each user
who is not allowed to login onto that system. Forgetting just one
entry could cause significant trouble. It may be feasible to
do this correctly during the initial setup; however, eventually
someone will forget to add these lines
for new users.</para>
each system's <filename>passwd</filename>. One line for each
user who is not allowed to login onto that system. Forgetting
just one entry could cause significant trouble. It may be
feasible to do this correctly during the initial setup;
however, eventually someone will forget to add these lines for
new users.</para>
<para>Handling this situation with netgroups offers several
advantages. Each user need not be handled separately; they
@ -2322,11 +2323,11 @@ ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
</warning>
<para>After this change, the NIS map will only need modification
when a new employee joins the IT department. A similar approach
for the less important servers may be used by replacing
the old <literal>+:::::::::</literal> in their local version
of <filename>/etc/master.passwd</filename> with something like
this:</para>
when a new employee joins the IT department. A similar
approach for the less important servers may be used by
replacing the old <literal>+:::::::::</literal> in their local
version of <filename>/etc/master.passwd</filename> with
something like this:</para>
<programlisting>+@IT_EMP:::::::::
+@IT_APP:::::::::
@ -2368,9 +2369,9 @@ SMALLSRV IT_EMP IT_APP ITINTERN
USERBOX IT_EMP ITINTERN USERS</programlisting>
<para>This method of defining login restrictions works
reasonably well when it is possible to define groups of machines
with identical restrictions. Unfortunately, this is the
exception and not the rule. Most of the time, the ability
reasonably well when it is possible to define groups of
machines with identical restrictions. Unfortunately, this is
the exception and not the rule. Most of the time, the ability
to define login restrictions on a per-machine basis is
required.</para>
@ -2437,11 +2438,11 @@ TWO (,hotel,test-domain)
will automatically have access to the boxes.</para>
<para>One last word of caution: It may not always be advisable
to use machine-based netgroups. When deploying a couple
of dozen or even hundreds of identical machines for student
labs, role-based netgroups instead of
machine-based netgroups may be used to keep the size of the NIS
map within reasonable limits.</para>
to use machine-based netgroups. When deploying a couple of
dozen or even hundreds of identical machines for student labs,
role-based netgroups instead of machine-based netgroups may be
used to keep the size of the NIS map within reasonable
limits.</para>
</sect2>
<sect2>
@ -2454,9 +2455,9 @@ TWO (,hotel,test-domain)
<itemizedlist>
<listitem>
<para>Every time a new user is added to the lab, they
must be added to the master NIS server
and the <acronym>NIS</acronym> maps will need rebuilt. If
this step is omitted, the new user will not be able to login
must be added to the master NIS server and the
<acronym>NIS</acronym> maps will need rebuilt. If this
step is omitted, the new user will not be able to login
anywhere except on the NIS master. For example, if we
needed to add a new user <username>jsmith</username> to
the lab, we would:</para>
@ -2496,22 +2497,22 @@ TWO (,hotel,test-domain)
<sect2>
<title>NIS v1 Compatibility</title>
<para>&os;'s <application>ypserv</application> has some
support for serving NIS v1 clients. &os;'s NIS
implementation only uses the NIS v2 protocol; however, other
implementations include support for the v1 protocol for
backwards compatibility with older systems. The
<para>&os;'s <application>ypserv</application> has some support
for serving NIS v1 clients. &os;'s NIS implementation only
uses the NIS v2 protocol; however, other implementations
include support for the v1 protocol for backwards
compatibility with older systems. The
<application>ypbind</application> daemons supplied with these
systems will attempt to establish a binding to an NIS v1 server
even though they may never actually need it (and they may
persist in broadcasting in search of one even after they
systems will attempt to establish a binding to an NIS v1
server even though they may never actually need it (and they
may persist in broadcasting in search of one even after they
receive a response from a v2 server). Note that while support
for normal client calls is provided, this version of
<application>ypserv</application> does not handle v1 map
transfer requests. Additionally, it cannot be used as a master
or slave in conjunction with older NIS servers that only
support the v1 protocol. Fortunately, there probably are not
any such servers still in use today.</para>
transfer requests. Additionally, it cannot be used as a
master or slave in conjunction with older NIS servers that
only support the v1 protocol. Fortunately, there probably are
not any such servers still in use today.</para>
</sect2>
<sect2 id="network-nis-server-is-client">
@ -2624,20 +2625,20 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</
<para><acronym>LDAP</acronym>, the Lightweight Directory Access
Protocol, is an application layer protocol used to access,
modify, and authenticate (bind) using a distributed directory
information service. Think of it as a phone or record book which
stores several levels of hierarchical, homogeneous information.
It is often used in networks where users often need access to
several levels of internal information utilizing a single
account. For example, email authentication, pulling employee
contact information, and internal website authentication might
all make use of a single user in the <acronym>LDAP</acronym>
server's record base.</para>
information service. Think of it as a phone or record book
which stores several levels of hierarchical, homogeneous
information. It is often used in networks where users often
need access to several levels of internal information utilizing
a single account. For example, email authentication, pulling
employee contact information, and internal website
authentication might all make use of a single user in the
<acronym>LDAP</acronym> server's record base.</para>
<para>This section will not provide a history or the implementation
details of the protocol. These sections were authored to get an
<acronym>LDAP</acronym> server and/or client configured both
quickly and securely; however, any information base requires
planning and this is no exception.</para>
<para>This section will not provide a history or the
implementation details of the protocol. These sections were
authored to get an <acronym>LDAP</acronym> server and/or client
configured both quickly and securely; however, any information
base requires planning and this is no exception.</para>
<para>Planning should include what type of information will be
stored, what that information will be used for, whom should
@ -2647,25 +2648,25 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</
<sect2>
<title><acronym>LDAP</acronym> Terminology and Structure</title>
<para>Before continuing, several parts of <acronym>LDAP</acronym>
must be explained to prevent confusion. And confusion with
this configuration is relatively simple. To begin, all
directory entries consist of a group of
<emphasis>attributes</emphasis>. Each of these attribute sets
contain a name, a unique identifier known as a
<acronym>DN</acronym> or distinguished name normally built from
several other attributes such as the <acronym>RDN</acronym>.
The <acronym>RDN</acronym> or relative distinguished name, is
a more common name for the attribute. Like directories have
absolute and relative paths, consider a <acronym>DN</acronym>
as an absolute path and the <acronym>RDN</acronym> as the
relative path.</para>
<para>Before continuing, several parts of
<acronym>LDAP</acronym> must be explained to prevent
confusion. And confusion with this configuration is
relatively simple. To begin, all directory entries consist of
a group of <emphasis>attributes</emphasis>. Each of these
attribute sets contain a name, a unique identifier known as a
<acronym>DN</acronym> or distinguished name normally built
from several other attributes such as the
<acronym>RDN</acronym>. The <acronym>RDN</acronym> or
relative distinguished name, is a more common name for the
attribute. Like directories have absolute and relative paths,
consider a <acronym>DN</acronym> as an absolute path and the
<acronym>RDN</acronym> as the relative path.</para>
<para>As an example, an entry might look like the
following:</para>
following:</para>
<screen>&prompt.user; ldapsearch -xb "uid=trhodes,ou=users,o=example.com"</screen>
<programlisting># extended LDIF
#
# LDAPv3
@ -2690,11 +2691,11 @@ result: 0 Success
<para>In this example, it is very obvious what the various
attributes are; however, the <acronym>cn</acronym> attribute
should be noticed. This is the <acronym>RDN</acronym> discussed
previously. In addition, there is a unique user id provided
here. It is common practice to have specific uid or uuids for
entries to ease in any future migration.</para>
</sect2>
should be noticed. This is the <acronym>RDN</acronym>
discussed previously. In addition, there is a unique user id
provided here. It is common practice to have specific uid or
uuids for entries to ease in any future migration.</para>
</sect2>
<sect2>
<title>Configuring an <acronym>LDAP</acronym> Server</title>
@ -2713,7 +2714,7 @@ result: 0 Success
needed.</para>
<para>A few directories will be required from this point on,
at minimal, a data directory and a directory to store the
at minimal, a data directory and a directory to store the
certificates in. Create them both with the following
commands:</para>
@ -2724,7 +2725,7 @@ result: 0 Success
<para>Copy over the database configuration file:</para>
<screen>&prompt.root; <userinput>cp /usr/local/etc/openldap/DB_CONFIG.example /var/db/openldap-data/DB_CONFIG</userinput></screen>
<para>The next phase is to configure the <acronym>SSL</acronym>
certificates. While creating certificates is discussed in
the <link linkend="openssl">OpenSSL</link> section in this
@ -2736,9 +2737,10 @@ result: 0 Success
<para>The following commands must be executed in the
<filename class="directory">
/usr/local/etc/openldap/private</filename> directory. This
is important as the file permissions will need to be restrictive
and users should not have access to these files directly. To
create the certificates, issues the following commands.</para>
is important as the file permissions will need to be
restrictive and users should not have access to these files
directly. To create the certificates, issues the following
commands.</para>
<screen>&prompt.root; <userinput>openssl req -days 365 -nodes -new -x509 -keyout ca.key -out ../ca.crt</userinput></screen>
@ -2752,7 +2754,7 @@ result: 0 Success
<acronym>CA</acronym> for certificate authority.</para>
<para>The next task is to create a certificate signing request
and a private key. To do this, issue the following
and a private key. To do this, issue the following
commands:</para>
<screen>&prompt.root; <userinput>openssl req -days 365 -nodes -new -keyout server.key -out server.csr</userinput></screen>
@ -2770,13 +2772,13 @@ result: 0 Success
<screen>&prompt.root; <userinput>openssl x509 -req -days 3650 -in client.csr -out ../client.crt -CA ../ca.crt -CAkey ca.key</userinput></screen>
<para>Remember, again, to respect the common name attribute. This
is a common cause for confusion during the first attempt to
configure <acronym>LDAP</acronym>. In addition, ensure that
a total of eight (8) new files have been generated through
the proceeding commands. If so, the next step is to edit
<filename>/usr/local/etc/openldap/slapd.conf</filename> and add
the following options:</para>
<para>Remember, again, to respect the common name attribute.
This is a common cause for confusion during the first attempt
to configure <acronym>LDAP</acronym>. In addition, ensure
that a total of eight (8) new files have been generated
through the proceeding commands. If so, the next step is to
edit <filename>/usr/local/etc/openldap/slapd.conf</filename>
and add the following options:</para>
<programlisting>TLSCipherSuite HIGH:MEDIUM:+SSLv3
TLSCertificateFile /usr/local/etc/openldap/server.crt
@ -2790,12 +2792,12 @@ TLSCACertificateFile /usr/local/etc/openldap/ca.crt</programlisting>
<programlisting>TLS_CACERT /usr/local/etc/openldap/ca.crt
TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv3</programlisting>
<para>While editing these this file, set the <option>BASE</option>
to the desired values, and uncomment all three of the
<option>URI</option>, <option>SIZELIMIT</option> and
<option>TIMELIMIT</option> options. In addition, set the
<option>URI</option> to contain <option>ldap://</option>
and <option>ldaps://</option>.</para>
<para>While editing these this file, set the
<option>BASE</option> to the desired values, and uncomment all
three of the <option>URI</option>, <option>SIZELIMIT</option>
and <option>TIMELIMIT</option> options. In addition, set the
<option>URI</option> to contain <option>ldap://</option> and
<option>ldaps://</option>.</para>
<para>The resulting file should look similar to the following
shown here:</para>
@ -2823,16 +2825,17 @@ TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv3</programlisting>
<command>slappasswd</command> understands several hashing
formats, refer to the manual page for more information.</para>
<para>Edit <filename>/usr/local/etc/openldap/slapd.conf</filename>
and add the following lines:</para>
<para>Edit
<filename>/usr/local/etc/openldap/slapd.conf</filename> and
add the following lines:</para>
<programlisting>password-hash {sha}
allow bind_v2</programlisting>
<para>In addition, the <option>suffix</option> in this file must
be updated to match the <option>BASE</option> from the previous
configuration. The <option>rootdn</option> option should
also be set. A good recommendation is something like
be updated to match the <option>BASE</option> from the
previous configuration. The <option>rootdn</option> option
should also be set. A good recommendation is something like
<option>cn=Manager</option>. Before saving this file, place
the <option>rootpw</option> option in front of the password
output from the <command>slappasswd</command> and delete the
@ -2913,8 +2916,8 @@ cn: Manager</programlisting>
<screen>&prompt.root; <userinput>ldapadd -Z -D "cn=Manager,dc=example,dc=com" -W -f <replaceable>import.ldif</replaceable></userinput></screen>
<para>There will be a request for the password specified earlier,
and the output should look like this:</para>
<para>There will be a request for the password specified
earlier, and the output should look like this:</para>
<screen>Enter LDAP Password:
adding new entry "dc=example,dc=com"
@ -3064,14 +3067,16 @@ result: 0 Success
device is compiled into the kernel. To do this, add
<literal>device bpf</literal> to the kernel
configuration file, and rebuild the kernel. For more
information about building kernels, see <xref
linkend="kernelconfig"/>.</para> <para>The
<devicename>bpf</devicename> device is already part of
the <filename>GENERIC</filename> kernel that is supplied
with &os;, thus there is no need to build a custom kernel
for <acronym>DHCP</acronym>. In the case of a custom
kernel configuration file, this device must be present
for <acronym>DHCP</acronym> to function properly.</para>
information about building kernels, see
<xref linkend="kernelconfig"/>.</para>
<para>The <devicename>bpf</devicename> device is already
part of the <filename>GENERIC</filename> kernel that is
supplied with &os;, thus there is no need to build a
custom kernel for <acronym>DHCP</acronym>. In the case
of a custom kernel configuration file, this device must
be present for <acronym>DHCP</acronym> to function
properly.</para>
<note>
<para>For those who are particularly security conscious,
@ -3209,12 +3214,11 @@ dhclient_flags=""</programlisting>
(Internet Systems Consortium) implementation of the DHCP
server.</para>
<para>The server is not provided as part of &os;, and so
the <filename
role="package">net/isc-dhcp42-server</filename> port must
be installed to provide this service.
See <xref linkend="ports"/> for
more information on using the Ports Collection.</para>
<para>The server is not provided as part of &os;, and so the
<filename role="package">net/isc-dhcp42-server</filename>
port must be installed to provide this service. See
<xref linkend="ports"/> for more information on using the
Ports Collection.</para>
</sect3>
<sect3>
@ -3225,12 +3229,12 @@ dhclient_flags=""</programlisting>
<secondary>installation</secondary>
</indexterm>
<para>In order to configure the &os; system as a DHCP
server, first ensure that the &man.bpf.4;
device is compiled into the kernel. To do this, add
<literal>device bpf</literal> to the kernel
configuration file, and rebuild the kernel. For more
information about building kernels, see <xref
linkend="kernelconfig"/>.</para>
server, first ensure that the &man.bpf.4; device is
compiled into the kernel. To do this, add
<literal>device bpf</literal> to the kernel configuration
file, and rebuild the kernel. For more information about
building kernels, see
<xref linkend="kernelconfig"/>.</para>
<para>The <devicename>bpf</devicename> device is already
part of the <filename>GENERIC</filename> kernel that is
@ -3245,11 +3249,10 @@ dhclient_flags=""</programlisting>
correctly (although such programs still need
privileged access). The <devicename>bpf</devicename>
device <emphasis>is</emphasis> required to use DHCP, but
if the sensitivity of the system's security is high, this
device should not be included in
the kernel purely because the use of
<acronym>DHCP</acronym> may, at
some point in the future, be desired.</para>
if the sensitivity of the system's security is high,
this device should not be included in the kernel purely
because the use of <acronym>DHCP</acronym> may, at some
point in the future, be desired.</para>
</note>
<para>The next thing that is needed is to edit the
@ -4398,20 +4401,19 @@ mail IN A 192.168.1.5</programlisting>
name servers from forged <acronym>DNS</acronym> data, such
as spoofed <acronym>DNS</acronym> records. By using digital
signatures, a resolver can verify the integrity of the
record. Note that <acronym
role="Domain Name Security Extensions">DNSSEC</acronym>
only provides integrity via digitally signing the Resource
Records (<acronym role="Resource Record">RR</acronym>s).
It provides neither confidentiality nor protection against
false end-user assumptions. This means that it cannot
protect against people going to <hostid
role="domainname">example.net</hostid> instead of <hostid
role="domainname">example.com</hostid>. The only thing
<acronym>DNSSEC</acronym> does is authenticate that the data
has not been compromised in transit. The security of
<acronym>DNS</acronym> is an important step in securing the
Internet in general. For more in-depth details of how
<acronym>DNSSEC</acronym> works, the relevant
record. Note that <acronym role="Domain Name Security
Extensions">DNSSEC</acronym> only provides integrity via
digitally signing the Resource Records (<acronym
role="Resource Record">RR</acronym>s). It provides neither
confidentiality nor protection against false end-user
assumptions. This means that it cannot protect against people
going to <hostid role="domainname">example.net</hostid>
instead of <hostid role="domainname">example.com</hostid>.
The only thing <acronym>DNSSEC</acronym> does is authenticate
that the data has not been compromised in transit. The
security of <acronym>DNS</acronym> is an important step in
securing the Internet in general. For more in-depth details
of how <acronym>DNSSEC</acronym> works, the relevant
<acronym>RFC</acronym>s are a good place to start. See the
list in <xref linkend="dns-read"/>.</para>
@ -4955,12 +4957,12 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
<term><literal>ServerName www.example.com</literal></term>
<listitem>
<para><literal>ServerName</literal> allows an administrator
to set a host name which is sent back to clients for the
server. This is useful if the host is different than the
one that it is configured with (i.e., use
<hostid>www</hostid> instead
of the host's real name).</para>
<para><literal>ServerName</literal> allows an
administrator to set a host name which is sent back to
clients for the server. This is useful if the host is
different than the one that it is configured with (i.e.,
use <hostid>www</hostid> instead of the host's real
name).</para>
</listitem>
</varlistentry>
@ -5397,12 +5399,12 @@ DocumentRoot /www/someotherdomain.tld
FTP.</para>
<para>In some cases it may be desirable to restrict the access
of some users without
preventing them completely from using FTP. This can be
accomplished with the <filename>/etc/ftpchroot</filename>
file. This file lists users and groups subject to FTP access
restrictions. The &man.ftpchroot.5; manual page has all of
the details so it will not be described in detail here.</para>
of some users without preventing them completely from using
FTP. This can be accomplished with the
<filename>/etc/ftpchroot</filename> file. This file lists
users and groups subject to FTP access restrictions. The
&man.ftpchroot.5; manual page has all of the details so it
will not be described in detail here.</para>
<indexterm>
<primary>FTP</primary>
@ -5533,10 +5535,11 @@ DocumentRoot /www/someotherdomain.tld
&os; printers as if they were local printers.</para>
<para><application>Samba</application> software packages should
be included on the &os; installation media. If they were
not installed when first
installing &os;, then they may be installed from the <filename
role="package">net/samba34</filename> port or package.</para>
be included on the &os; installation media. If they were not
installed when first installing &os;, then they may be
installed from the
<filename role="package">net/samba34</filename> port or
package.</para>
<!-- mention LDAP, Active Directory, WinBIND, ACL, Quotas, PAM, .. -->
@ -5581,12 +5584,12 @@ DocumentRoot /www/someotherdomain.tld
reloaded after this configuration file is changed.</para>
<para>Once <application>swat</application> has been enabled in
<filename>inetd.conf</filename>, a web browser may be used to
connect to <ulink url="http://localhost:901"></ulink>. At
first login, the system
<username>root</username> account must be used.</para>
<filename>inetd.conf</filename>, a web browser may be used
to connect to <ulink url="http://localhost:901"></ulink>.
At first login, the system <username>root</username> account
must be used.</para>
<!-- XXX screenshots go here, loader is creating them
<!-- XXX screenshots go here, loader is creating them
XXXTR: I'll believe it when I see it. -->
<para>Once successfully logging on to the main
@ -5666,8 +5669,8 @@ DocumentRoot /www/someotherdomain.tld
requires clients to first log on before they can
access shared resources.</para>
<para>In share level security, clients do not need to log
onto the server with a valid username and password
<para>In share level security, clients do not need to
log onto the server with a valid username and password
before attempting to connect to a shared resource.
This was the default security model for older versions
of <application>Samba</application>.</para>
@ -5710,18 +5713,17 @@ DocumentRoot /www/someotherdomain.tld
<screen>&prompt.root; <userinput><command>pdbedit <option>-a</option> <option>-u</option> <replaceable>username</replaceable></command></userinput></screen>
</note>
<para>Please see the
<ulink
<para>Please see the <ulink
url="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/">Official
Samba HOWTO</ulink>
for additional information about configuration
options. With the basics outlined here, the minimal required
start running <application>Samba</application> will
be explained. Other documentation should be consulted in
addition to the information here.</para>
Samba HOWTO</ulink> for additional information about
configuration options. With the basics outlined here, the
minimal required start running
<application>Samba</application> will be explained. Other
documentation should be consulted in addition to the
information here.</para>
</sect3>
</sect2>
<sect2>
<title>Starting <application>Samba</application></title>
@ -5767,8 +5769,8 @@ Starting smbd.</screen>
the <application>winbindd</application> daemon will be
started as well.</para>
<para><application>Samba</application> may be stopped at any time
by typing:</para>
<para><application>Samba</application> may be stopped at any
time by typing:</para>
<screen>&prompt.root; <userinput>service samba stop</userinput></screen>
@ -5833,16 +5835,15 @@ Starting smbd.</screen>
</indexterm>
<para>In order to synchronize the clock, one or more
<acronym role="Network Time Protocol">NTP</acronym> servers
must be defined. The network
administrator or ISP may have set up an NTP server for this
purpose&mdash;check their documentation to see if this is the
case. There is an <ulink
url="http://support.ntp.org/bin/view/Servers/WebHome">online
list of publicly accessible NTP servers</ulink> which may be
referenced to find an NTP server nearest to the system.
Take care to review the policy for any chosen servers, and ask
for permission if required.</para>
<acronym role="Network Time Protocol">NTP</acronym> servers
must be defined. The network administrator or ISP may have
set up an NTP server for this purpose&mdash;check their
documentation to see if this is the case. There is an <ulink
url="http://support.ntp.org/bin/view/Servers/WebHome">online
list of publicly accessible NTP servers</ulink> which may be
referenced to find an NTP server nearest to the system. Take
care to review the policy for any chosen servers, and ask for
permission if required.</para>
<para>Choosing several unconnected NTP servers is a good idea in
case one of the servers being used becomes unreachable or
@ -5945,9 +5946,9 @@ driftfile /var/db/ntp.drift</programlisting>
<programlisting>restrict default ignore</programlisting>
<note>
<para>This will also prevent access from the server to
any servers listed in the local configuration. If there is
a need to synchronise the NTP server with an external NTP
<para>This will also prevent access from the server to any
servers listed in the local configuration. If there is a
need to synchronise the NTP server with an external NTP
server, allow only that specific server. See the
&man.ntp.conf.5; manual for more information.</para>
</note>

View file

@ -148,15 +148,9 @@
<para>This document assumes you have the following:</para>
<itemizedlist>
<indexterm id="ppp-isp">
<primary>ISP</primary>
</indexterm>
<indexterm id="ppp-ppp2">
<primary>PPP</primary>
</indexterm>
<listitem>
<para>An account with an Internet Service Provider (ISP)
which you connect to using PPP.</para>
<para>An account with an Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm>
which you connect to using PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
</listitem>
<listitem>
@ -170,32 +164,13 @@
</listitem>
<listitem>
<indexterm id="ppp-pap">
<primary>PAP</primary>
</indexterm>
<indexterm id="ppp-chap">
<primary>CHAP</primary>
</indexterm>
<indexterm id="ppp-unix">
<primary>UNIX</primary>
</indexterm>
<indexterm id="ppp-login">
<primary>login name</primary>
</indexterm>
<indexterm id="ppp-password">
<primary>password</primary>
</indexterm>
<para>Your login name and password. (Either a
regular &unix; style login and password pair, or a PAP
or CHAP login and password pair).</para>
<para>Your login name<indexterm id="ppp-login"><primary>login name</primary></indexterm> and password<indexterm id="ppp-password"><primary>password</primary></indexterm>. (Either a
regular &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> style login and password pair, or a PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm>
or CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm> login and password pair).</para>
</listitem>
<listitem>
<indexterm id="ppp-nameserver">
<primary>nameserver</primary>
</indexterm>
<para>The IP address of one or more name servers.
<para>The IP address of one or more name servers<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>.
Normally, you will be given two IP addresses by your
ISP to use for this. If they have not given you at
least one, then you can use the <command>enable
@ -384,12 +359,7 @@
<term>Line 6 &amp; 7:</term>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>user PPP</secondary>
</indexterm>
<para>The dial string. User PPP uses an expect-send
<para>The dial string. User PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> uses an expect-send
syntax similar to the &man.chat.8; program. Refer
to the manual page for information on the features
of this language.</para>
@ -484,9 +454,7 @@
<term>Line 15:</term>
<listitem>
<indexterm><primary>PAP</primary></indexterm>
<indexterm><primary>CHAP</primary></indexterm>
<para>If you are using PAP or CHAP, there will be no
<para>If you are using PAP<indexterm><primary>PAP</primary></indexterm> or CHAP<indexterm><primary>CHAP</primary></indexterm>, there will be no
login at this point, and this line should be
commented out or removed. See <link
linkend="userppp-PAPnCHAP">PAP and CHAP
@ -514,9 +482,7 @@ protocol: ppp</screen>
<term>Line 16:</term>
<listitem>
<indexterm><primary>timeout</primary></indexterm>
<para>Sets the default idle timeout (in seconds) for
<para>Sets the default idle timeout<indexterm><primary>timeout</primary></indexterm> (in seconds) for
the connection. Here, the connection will be closed
automatically after 300 seconds of inactivity. If
you never want to timeout, set this value to zero
@ -528,11 +494,9 @@ protocol: ppp</screen>
<varlistentry>
<term>Line 17:</term>
<listitem>
<indexterm><primary>ISP</primary></indexterm>
<para>Sets the interface addresses. The string
<replaceable>x.x.x.x</replaceable> should be
replaced by the IP address that your provider has
replaced by the IP address that your provider<indexterm><primary>ISP</primary></indexterm> has
allocated to you. The string
<replaceable>y.y.y.y</replaceable> should be
replaced by the IP address that your ISP indicated
@ -1063,9 +1027,7 @@ set nbns 203.14.100.5</programlisting>
<varlistentry>
<term>Line 14:</term>
<listitem>
<indexterm><primary>password</primary></indexterm>
<para>This line specifies your PAP/CHAP password.
<para>This line specifies your PAP/CHAP password<indexterm><primary>password</primary></indexterm>.
You will need to insert the correct value for
<replaceable>MyPassword</replaceable>. You may
want to add an additional line, such as:</para>

View file

@ -128,10 +128,8 @@
</listitem>
<listitem>
<indexterm><primary>print jobs</primary></indexterm>
<para>It enables users to submit files to be printed; these
submissions are known as <emphasis>jobs</emphasis>.</para>
submissions are known as <emphasis>jobs</emphasis><indexterm><primary>print jobs</primary></indexterm>.</para>
</listitem>
<listitem>
@ -189,11 +187,9 @@
</listitem>
<listitem>
<indexterm><primary>&tex;</primary></indexterm>
<para><application>LPD</application> can conveniently run
a job to be printed through filters to add date/time
headers or convert a special file format (such as a &tex;
headers or convert a special file format (such as a &tex;<indexterm><primary>&tex;</primary></indexterm>
DVI file) into a format the printer will understand.
You will not have to do these steps manually.</para>
</listitem>
@ -290,12 +286,7 @@
<itemizedlist>
<listitem>
<indexterm>
<primary>printers</primary>
<secondary>serial</secondary>
</indexterm>
<para><emphasis>Serial</emphasis> interfaces, also known
<para><emphasis>Serial</emphasis><indexterm><primary>printers</primary><secondary>serial</secondary></indexterm> interfaces, also known
as RS-232 or COM ports, use a serial port
on your computer to send data to the printer. Serial
interfaces are common in the computer industry and
@ -309,12 +300,7 @@
</listitem>
<listitem>
<indexterm>
<primary>printers</primary>
<secondary>parallel</secondary>
</indexterm>
<para><emphasis>Parallel</emphasis> interfaces use a
<para><emphasis>Parallel</emphasis><indexterm><primary>printers</primary><secondary>parallel</secondary></indexterm> interfaces use a
parallel port on your computer to send data to the
printer. Parallel interfaces are common in the PC
market and are faster than RS-232 serial. Cables are
@ -323,22 +309,13 @@
with parallel interfaces, making their configuration
exceedingly simple.</para>
<indexterm>
<primary>centronics</primary>
<see>parallel printers</see>
</indexterm>
<para>Parallel interfaces are sometimes known as
<quote>Centronics</quote> interfaces, named after the
<quote>Centronics</quote><indexterm><primary>centronics</primary><see>parallel printers</see></indexterm> interfaces, named after the
connector type on the printer.</para>
</listitem>
<listitem>
<indexterm>
<primary>printers</primary>
<secondary>USB</secondary>
</indexterm>
<para>USB interfaces, named for the Universal Serial
<para>USB<indexterm><primary>printers</primary><secondary>USB</secondary></indexterm> interfaces, named for the Universal Serial
Bus, can run at even faster speeds than parallel or
RS-232 serial interfaces. Cables are simple and
cheap. USB is superior to RS-232 Serial and to
@ -423,10 +400,7 @@
</listitem>
<listitem>
<indexterm><primary>null-modem
cable</primary></indexterm>
<para>A <emphasis>null-modem</emphasis> cable connects
<para>A <emphasis>null-modem</emphasis> cable<indexterm><primary>null-modem cable</primary></indexterm> connects
some pins straight through, swaps others (send data to
receive data, for example), and shorts some internally
in each connector hood. This type of cable is also
@ -714,12 +688,8 @@ showpage</programlisting>
<sect4 id="printing-checking-parallel">
<title>Checking a Parallel Printer</title>
<indexterm>
<primary>printers</primary>
<secondary>parallel</secondary>
</indexterm>
<para>This section tells you how to check if &os; can
communicate with a printer connected to a parallel
communicate with a printer connected to a parallel<indexterm><primary>printers</primary><secondary>parallel</secondary></indexterm>
port.</para>
<para><emphasis>To test a printer on a parallel
@ -926,9 +896,7 @@ showpage</programlisting>
</step>
<step>
<indexterm><primary>header pages</primary></indexterm>
<para>Turn off header pages (which are on by default) by
<para>Turn off header pages<indexterm><primary>header pages</primary></indexterm> (which are on by default) by
inserting the <literal>sh</literal> capability; see the
<link linkend="printing-no-header-pages">Suppressing
Header Pages</link> section for more
@ -1730,12 +1698,7 @@ $%&amp;'()*+,-./01234567
</listitem>
<listitem>
<indexterm>
<primary>printing</primary>
<secondary>filters</secondary>
</indexterm>
<para>A <emphasis>conversion filter</emphasis> converts
<para>A <emphasis>conversion filter</emphasis><indexterm><primary>printing</primary><secondary>filters</secondary></indexterm> converts
a specific file format into one the printer can render
onto paper. For example, ditroff typesetting data
cannot be directly printed, but you can install a
@ -4808,9 +4771,7 @@ cfA013rose dequeued</screen>
<term>LPRng</term>
<listitem>
<indexterm><primary>LPRng</primary></indexterm>
<para><application>LPRng</application>, which purportedly
<para><application>LPRng</application><indexterm><primary>LPRng</primary></indexterm>, which purportedly
means <quote>LPR: the Next Generation</quote> is a
complete rewrite of PLP. Patrick Powell and Justin Mason
(the principal maintainer of PLP) collaborated to make
@ -4824,9 +4785,7 @@ cfA013rose dequeued</screen>
<term>CUPS</term>
<listitem>
<indexterm><primary>CUPS</primary></indexterm>
<para><application>CUPS</application>, the Common UNIX
<para><application>CUPS</application><indexterm><primary>CUPS</primary></indexterm>, the Common UNIX
Printing System, provides a portable printing layer for
&unix;-based operating systems. It has been developed by
Easy Software Products to promote a standard printing
@ -4852,9 +4811,7 @@ cfA013rose dequeued</screen>
<term>HPLIP</term>
<listitem>
<indexterm><primary>HPLIP</primary></indexterm>
<para><application>HPLIP</application>, the HP &linux;
<para><application>HPLIP</application><indexterm><primary>HPLIP</primary></indexterm>, the HP &linux;
Imaging and Printing system, is an HP-developed suite of
programs that supports printing, scanning and fax
facilities for HP appliances. This suite of programs
@ -4926,15 +4883,12 @@ exit 2</programlisting>
"#$%&amp;'()*+,-./012345
#$%&amp;'()*+,-./0123456</screen>
<indexterm><primary>MS-DOS</primary></indexterm>
<indexterm><primary>OS/2</primary></indexterm>
<indexterm><primary>ASCII</primary></indexterm>
<para>You have become another victim of the
<emphasis>staircase effect</emphasis>, caused by
conflicting interpretations of what characters should
indicate a new line. &unix; style operating systems use a
single character: ASCII code 10, the line feed (LF).
&ms-dos;, &os2;, and others uses a pair of characters,
single character: ASCII<indexterm><primary>ASCII</primary></indexterm> code 10, the line feed (LF).
&ms-dos;<indexterm><primary>MS-DOS</primary></indexterm>, &os2;<indexterm><primary>OS/2</primary></indexterm>, and others uses a pair of characters,
ASCII code 10 <emphasis>and</emphasis> ASCII code 13 (the
carriage return or CR). Many printers use the &ms-dos;
convention for representing new-lines.</para>

View file

@ -1748,15 +1748,10 @@ jdoe@example.org</screen>
Troubleshooting</title>
<itemizedlist>
<indexterm>
<primary>Kerberos5</primary>
<secondary>troubleshooting</secondary>
</indexterm>
<listitem>
<para>When using either the Heimdal or
<acronym>MIT</acronym>
<application>Kerberos</application> ports, ensure that
<application>Kerberos</application><indexterm><primary>Kerberos5</primary><secondary>troubleshooting</secondary></indexterm> ports, ensure that
the <envar>PATH</envar> lists the
<application>Kerberos</application> versions of the
client applications before the system versions.</para>
@ -2444,57 +2439,57 @@ device crypto</screen>
</listitem>
</itemizedlist>
<sect3>
<sect3info>
<authorgroup>
<author>
<firstname>Tom</firstname>
<surname>Rhodes</surname>
<affiliation>
<address><email>trhodes@FreeBSD.org</email></address>
</affiliation>
<contrib>Written by </contrib>
</author>
</authorgroup>
</sect3info>
<sect3>
<sect3info>
<authorgroup>
<author>
<firstname>Tom</firstname>
<surname>Rhodes</surname>
<affiliation>
<address><email>trhodes@FreeBSD.org</email></address>
</affiliation>
<contrib>Written by </contrib>
</author>
</authorgroup>
</sect3info>
<title>Configuring IPsec on &os;</title>
<title>Configuring IPsec on &os;</title>
<para>To begin,
<filename role="package">security/ipsec-tools</filename>
must be installed from the Ports Collection. This software
provides a number of applications which support the
configuration.</para>
<para>To begin,
<filename role="package">security/ipsec-tools</filename>
must be installed from the Ports Collection. This software
provides a number of applications which support the
configuration.</para>
<para>The next requirement is to create two &man.gif.4;
pseudo-devices which will be used to tunnel packets and
allow both networks to communicate properly. As
<username>root</username>, run the following commands,
replacing <replaceable>internal</replaceable> and
<replaceable>external</replaceable> with the real IP
addresses of the internal and external interfaces of the two
gateways:</para>
<para>The next requirement is to create two &man.gif.4;
pseudo-devices which will be used to tunnel packets and
allow both networks to communicate properly. As
<username>root</username>, run the following commands,
replacing <replaceable>internal</replaceable> and
<replaceable>external</replaceable> with the real IP
addresses of the internal and external interfaces of the two
gateways:</para>
<screen>&prompt.root; <userinput>ifconfig gif0 create</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig gif0 create</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig gif0 <replaceable>internal1 internal2</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>ifconfig gif0 <replaceable>internal1 internal2</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>ifconfig gif0 tunnel <replaceable>external1 external2</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>ifconfig gif0 tunnel <replaceable>external1 external2</replaceable></userinput></screen>
<para>In this example, the corporate <acronym>LAN</acronym>'s
external <acronym>IP</acronym> address is <hostid
role="ipaddr">172.16.5.4</hostid> and its internal
<acronym>IP</acronym> address is <hostid
role="ipaddr">10.246.38.1</hostid>. The home
<acronym>LAN</acronym>'s external <acronym>IP</acronym>
address is <hostid role="ipaddr">192.168.1.12</hostid> and its
internal private <acronym>IP</acronym> address is <hostid
role="ipaddr">10.0.0.5</hostid>.</para>
<para>In this example, the corporate <acronym>LAN</acronym>'s
external <acronym>IP</acronym> address is
<hostid role="ipaddr">172.16.5.4</hostid> and its internal
<acronym>IP</acronym> address is
<hostid role="ipaddr">10.246.38.1</hostid>. The home
<acronym>LAN</acronym>'s external <acronym>IP</acronym>
address is <hostid role="ipaddr">192.168.1.12</hostid> and
its internal private <acronym>IP</acronym> address is
<hostid role="ipaddr">10.0.0.5</hostid>.</para>
<para>If this is confusing, review the following example output
from &man.ifconfig.8;:</para>
<para>If this is confusing, review the following example
output from &man.ifconfig.8;:</para>
<programlisting>Gateway 1:
<programlisting>Gateway 1:
gif0: flags=8051 mtu 1280
tunnel inet 172.16.5.4 --&gt; 192.168.1.12
@ -2508,10 +2503,10 @@ tunnel inet 192.168.1.12 --&gt; 172.16.5.4
inet 10.0.0.5 --&gt; 10.246.38.1 netmask 0xffffff00
inet6 fe80::250:bfff:fe3a:c1f%gif0 prefixlen 64 scopeid 0x4</programlisting>
<para>Once complete, both internal <acronym>IP</acronym>
addresses should be reachable using &man.ping.8;:</para>
<para>Once complete, both internal <acronym>IP</acronym>
addresses should be reachable using &man.ping.8;:</para>
<programlisting>priv-net# ping 10.0.0.5
<programlisting>priv-net# ping 10.0.0.5
PING 10.0.0.5 (10.0.0.5): 56 data bytes
64 bytes from 10.0.0.5: icmp_seq=0 ttl=64 time=42.786 ms
64 bytes from 10.0.0.5: icmp_seq=1 ttl=64 time=19.255 ms
@ -2532,26 +2527,26 @@ PING 10.246.38.1 (10.246.38.1): 56 data bytes
5 packets transmitted, 5 packets received, 0% packet loss
round-trip min/avg/max/stddev = 28.106/94.594/154.524/49.814 ms</programlisting>
<para>As expected, both sides have the ability to send and
receive <acronym>ICMP</acronym> packets from the privately
configured addresses. Next, both gateways must be told how
to route packets in order to correctly send traffic from
either network. The following command will achieve this
goal:</para>
<para>As expected, both sides have the ability to send and
receive <acronym>ICMP</acronym> packets from the privately
configured addresses. Next, both gateways must be told how
to route packets in order to correctly send traffic from
either network. The following command will achieve this
goal:</para>
<screen>&prompt.root; <userinput>corp-net# route add <replaceable>10.0.0.0 10.0.0.5 255.255.255.0</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>corp-net# route add <replaceable>10.0.0.0 10.0.0.5 255.255.255.0</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>corp-net# route add net <replaceable>10.0.0.0: gateway 10.0.0.5</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>corp-net# route add net <replaceable>10.0.0.0: gateway 10.0.0.5</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>priv-net# route add <replaceable>10.246.38.0 10.246.38.1 255.255.255.0</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>priv-net# route add <replaceable>10.246.38.0 10.246.38.1 255.255.255.0</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>priv-net# route add host <replaceable>10.246.38.0: gateway 10.246.38.1</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>priv-net# route add host <replaceable>10.246.38.0: gateway 10.246.38.1</replaceable></userinput></screen>
<para>At this point, internal machines should be reachable
from each gateway as well as from machines behind the
gateways. Again, use &man.ping.8; to confirm:</para>
<para>At this point, internal machines should be reachable
from each gateway as well as from machines behind the
gateways. Again, use &man.ping.8; to confirm:</para>
<programlisting>corp-net# ping 10.0.0.8
<programlisting>corp-net# ping 10.0.0.8
PING 10.0.0.8 (10.0.0.8): 56 data bytes
64 bytes from 10.0.0.8: icmp_seq=0 ttl=63 time=92.391 ms
64 bytes from 10.0.0.8: icmp_seq=1 ttl=63 time=21.870 ms
@ -2573,15 +2568,15 @@ PING 10.246.38.1 (10.246.38.107): 56 data bytes
5 packets transmitted, 5 packets received, 0% packet loss
round-trip min/avg/max/stddev = 21.145/31.721/53.491/12.179 ms</programlisting>
<para>Setting up the tunnels is the easy part. Configuring a
secure link is a more in depth process. The following
configuration uses pre-shared (<acronym>PSK</acronym>)
<acronym>RSA</acronym> keys. Other than the
<acronym>IP</acronym> addresses, the
<filename>/usr/local/etc/racoon/racoon.conf</filename> on
both gateways will be identical and look similar to:</para>
<para>Setting up the tunnels is the easy part. Configuring a
secure link is a more in depth process. The following
configuration uses pre-shared (<acronym>PSK</acronym>)
<acronym>RSA</acronym> keys. Other than the
<acronym>IP</acronym> addresses, the
<filename>/usr/local/etc/racoon/racoon.conf</filename> on
both gateways will be identical and look similar to:</para>
<programlisting>path pre_shared_key "/usr/local/etc/racoon/psk.txt"; #location of pre-shared key file
<programlisting>path pre_shared_key "/usr/local/etc/racoon/psk.txt"; #location of pre-shared key file
log debug; #log verbosity setting: set to 'notify' when testing and debugging is complete
padding # options are not to be changed
@ -2639,33 +2634,33 @@ sainfo (address 10.246.38.0/24 any address 10.0.0.0/24 any) # address $network/
compression_algorithm deflate;
}</programlisting>
<para>For descriptions of each available option, refer to the
manual page for <filename>racoon.conf</filename>.</para>
<para>For descriptions of each available option, refer to the
manual page for <filename>racoon.conf</filename>.</para>
<para>The Security Policy Database (<acronym>SPD</acronym>)
needs to be configured so that &os; and
<application>racoon</application> are able to encrypt and
decrypt network traffic between the hosts.</para>
<para>The Security Policy Database (<acronym>SPD</acronym>)
needs to be configured so that &os; and
<application>racoon</application> are able to encrypt and
decrypt network traffic between the hosts.</para>
<para>This can be achieved with a shell script, similar to the
following, on the corporate gateway. This file will be used
during system initialization and should be saved as
<filename>/usr/local/etc/racoon/setkey.conf</filename>.</para>
<para>This can be achieved with a shell script, similar to the
following, on the corporate gateway. This file will be used
during system initialization and should be saved as
<filename>/usr/local/etc/racoon/setkey.conf</filename>.</para>
<programlisting>flush;
<programlisting>flush;
spdflush;
# To the home network
spdadd 10.246.38.0/24 10.0.0.0/24 any -P out ipsec esp/tunnel/172.16.5.4-192.168.1.12/use;
spdadd 10.0.0.0/24 10.246.38.0/24 any -P in ipsec esp/tunnel/192.168.1.12-172.16.5.4/use;</programlisting>
<para>Once in place, <application>racoon</application> may be
started on both gateways using the following command:</para>
<para>Once in place, <application>racoon</application> may be
started on both gateways using the following command:</para>
<screen>&prompt.root; <userinput>/usr/local/sbin/racoon -F -f /usr/local/etc/racoon/racoon.conf -l /var/log/racoon.log</userinput></screen>
<screen>&prompt.root; <userinput>/usr/local/sbin/racoon -F -f /usr/local/etc/racoon/racoon.conf -l /var/log/racoon.log</userinput></screen>
<para>The output should be similar to the following:</para>
<para>The output should be similar to the following:</para>
<programlisting>corp-net# /usr/local/sbin/racoon -F -f /usr/local/etc/racoon/racoon.conf
<programlisting>corp-net# /usr/local/sbin/racoon -F -f /usr/local/etc/racoon/racoon.conf
Foreground mode.
2006-01-30 01:35:47: INFO: begin Identity Protection mode.
2006-01-30 01:35:48: INFO: received Vendor ID: KAME/racoon
@ -2678,43 +2673,43 @@ Foreground mode.
2006-01-30 01:36:18: INFO: IPsec-SA established: ESP/Tunnel 192.168.1.12[0]-&gt;172.16.5.4[0] spi=124397467(0x76a279b)
2006-01-30 01:36:18: INFO: IPsec-SA established: ESP/Tunnel 172.16.5.4[0]-&gt;192.168.1.12[0] spi=175852902(0xa7b4d66)</programlisting>
<para>To ensure the tunnel is working properly, switch to
another console and use &man.tcpdump.1; to view network
traffic using the following command. Replace
<literal>em0</literal> with the network interface card as
required:</para>
<para>To ensure the tunnel is working properly, switch to
another console and use &man.tcpdump.1; to view network
traffic using the following command. Replace
<literal>em0</literal> with the network interface card as
required:</para>
<screen>&prompt.root; <userinput>tcpdump -i em0 host <replaceable>172.16.5.4 and dst 192.168.1.12</replaceable></userinput></screen>
<screen>&prompt.root; <userinput>tcpdump -i em0 host <replaceable>172.16.5.4 and dst 192.168.1.12</replaceable></userinput></screen>
<para>Data similar to the following should appear on the
console. If not, there is an issue and debugging the
returned data will be required.</para>
<para>Data similar to the following should appear on the
console. If not, there is an issue and debugging the
returned data will be required.</para>
<programlisting>01:47:32.021683 IP corporatenetwork.com &gt; 192.168.1.12.privatenetwork.com: ESP(spi=0x02acbf9f,seq=0xa)
<programlisting>01:47:32.021683 IP corporatenetwork.com &gt; 192.168.1.12.privatenetwork.com: ESP(spi=0x02acbf9f,seq=0xa)
01:47:33.022442 IP corporatenetwork.com &gt; 192.168.1.12.privatenetwork.com: ESP(spi=0x02acbf9f,seq=0xb)
01:47:34.024218 IP corporatenetwork.com &gt; 192.168.1.12.privatenetwork.com: ESP(spi=0x02acbf9f,seq=0xc)</programlisting>
<para>At this point, both networks should be available and
seem to be part of the same network. Most likely both
networks are protected by a firewall. To allow traffic to
flow between them, rules need to be added to pass packets.
For the &man.ipfw.8; firewall, add the following lines to the
firewall configuration file:</para>
<para>At this point, both networks should be available and
seem to be part of the same network. Most likely both
networks are protected by a firewall. To allow traffic to
flow between them, rules need to be added to pass packets.
For the &man.ipfw.8; firewall, add the following lines to
the firewall configuration file:</para>
<programlisting>ipfw add 00201 allow log esp from any to any
<programlisting>ipfw add 00201 allow log esp from any to any
ipfw add 00202 allow log ah from any to any
ipfw add 00203 allow log ipencap from any to any
ipfw add 00204 allow log udp from any 500 to any</programlisting>
<note>
<para>The rule numbers may need to be altered depending on
the current host configuration.</para>
</note>
<note>
<para>The rule numbers may need to be altered depending on
the current host configuration.</para>
</note>
<para>For users of &man.pf.4; or &man.ipf.8;, the following
rules should do the trick:</para>
<para>For users of &man.pf.4; or &man.ipf.8;, the following
rules should do the trick:</para>
<programlisting>pass in quick proto esp from any to any
<programlisting>pass in quick proto esp from any to any
pass in quick proto ah from any to any
pass in quick proto ipencap from any to any
pass in quick proto udp from any port = 500 to any port = 500
@ -2725,16 +2720,16 @@ pass out quick proto ipencap from any to any
pass out quick proto udp from any port = 500 to any port = 500
pass out quick on gif0 from any to any</programlisting>
<para>Finally, to allow the machine to start support for the
<acronym>VPN</acronym> during system initialization, add the
following lines to <filename>/etc/rc.conf</filename>:</para>
<para>Finally, to allow the machine to start support for the
<acronym>VPN</acronym> during system initialization, add the
following lines to <filename>/etc/rc.conf</filename>:</para>
<programlisting>ipsec_enable="YES"
<programlisting>ipsec_enable="YES"
ipsec_program="/usr/local/sbin/setkey"
ipsec_file="/usr/local/etc/racoon/setkey.conf" # allows setting up spd policies on boot
racoon_enable="yes"</programlisting>
</sect3>
</sect2>
</sect3>
</sect2>
</sect1>
<sect1 id="openssh">
@ -2783,7 +2778,7 @@ racoon_enable="yes"</programlisting>
</sect2>
<sect2>
<title>Enabling The SSH Server</title>
<title>Enabling the SSH Server</title>
<indexterm>
<primary>OpenSSH</primary>
@ -2918,8 +2913,8 @@ bb:48:db:f2:93:57:80:b6:aa:bc:f5:d5:ba:8f:79:17 user@host.example.com</screen>
is stored in <filename>~/.ssh/id_dsa.pub</filename> or
<filename>~/.ssh/id_rsa.pub</filename>, respectively for the
<acronym>DSA</acronym> and <acronym>RSA</acronym> key types.
The public key must be placed in the
<filename>~/.ssh/authorized_keys</filename> file of the
The public key must be placed in
<filename>~/.ssh/authorized_keys</filename> on the
remote machine for both <acronym>RSA</acronym> or
<acronym>DSA</acronym> keys in order for the setup to
work.</para>
@ -2960,7 +2955,7 @@ bb:48:db:f2:93:57:80:b6:aa:bc:f5:d5:ba:8f:79:17 user@host.example.com</screen>
</sect2>
<sect2 id="security-ssh-agent">
<title>Using SSH Agent To Cache Keys</title>
<title>Using SSH Agent to Cache Keys</title>
<para>To load <acronym>SSH</acronym> keys into memory for use,
without needing to type the passphrase each time, use
@ -2990,7 +2985,7 @@ Identity added: /home/user/.ssh/id_dsa (/home/user/.ssh/id_dsa)
needs to be placed in <filename>~/.xinitrc</filename>. This
provides the &man.ssh-agent.1; services to all programs
launched in <application>&xorg;</application>. An example
<filename>~/.xinitrc</filename> file might look like
<filename>~/.xinitrc</filename> might look like
this:</para>
<programlisting>exec ssh-agent <replaceable>startxfce4</replaceable></programlisting>
@ -3217,7 +3212,7 @@ user@unfirewalled-system.example.org's password: <userinput>*******</userinput><
</sect1info>
<title>Filesystem Access Control Lists
(<acronym>ACL</acronym>s)</title>
(<acronym>ACL</acronym>)s</title>
<indexterm>
<primary>ACL</primary>
@ -3719,11 +3714,11 @@ VII. References <co id="co-ref"/></programlisting>
<sect1 id="security-resourcelimits">
<sect1info>
<authorgroup>
<author>
<firstname>Tom</firstname>
<surname>Rhodes</surname>
<contrib>Contributed by </contrib>
</author>
<author>
<firstname>Tom</firstname>
<surname>Rhodes</surname>
<contrib>Contributed by </contrib>
</author>
</authorgroup>
</sect1info>
@ -3742,9 +3737,9 @@ VII. References <co id="co-ref"/></programlisting>
group labels known as classes, which require changes not
only to this flat file but also the password database.
Potentially a single, more constrained user would require
an additional label added, the resource database needs to be
built using <command>cap_mkdb</command>, edits made to
the <filename>/etc/master.passwd</filename> file. In
an additional label to be added, the resource database
rebuilt using <command>cap_mkdb</command>, and edits made to
<filename>/etc/master.passwd</filename>. In
addition, the password database must be rebuilt using
<command>pwd_mkdb</command>. This multi-step process could be
very time consuming depending on how many users must be
@ -3767,35 +3762,37 @@ VII. References <co id="co-ref"/></programlisting>
<programlisting>options RACCT
options RCTL</programlisting>
<para>The entire system will need rebuilt. See <xref
linkend="kernelconfig"/>, which will provide instructions for
the process. Once this is complete, the <command>rctl</command>
may be used to set rules for the system.</para>
<para>The entire system will need rebuilt. See
<xref linkend="kernelconfig"/>, which will provide instructions
for the process. Once this is complete, the
<command>rctl</command> may be used to set rules for the
system.</para>
<para>Rule syntax is simple, controlled through the use of
a <emphasis>subject</emphasis>, a <emphasis>subject-id</emphasis>,
<emphasis>resource</emphasis>, and <emphasis>action</emphasis>.
Take the following example rule:</para>
a <emphasis>subject</emphasis>, a
<emphasis>subject-id</emphasis>, <emphasis>resource</emphasis>,
and <emphasis>action</emphasis>. Take the following example
rule:</para>
<programlisting>user:trhodes:<literal>maxproc</literal>:<literal>deny</literal>=10/user</programlisting>
<para>This rule shows a basic premise of a rule, here the
subject is <literal>user</literal> and the subject-id
is <literal>trhodes</literal>. The maxproc is, of course,
max number of processes, which is considered the action.
The action here is set to <literal>deny</literal>, which blocks
any new processes from being created. In the previous example,
the user, <literal>trhodes</literal> will be constrained
to <literal>10</literal> (ten) processes and no greater.
Other actions are available and could be log to the console,
pass a notification to &man.devd.8;, or
send a sigterm to the process.</para>
<para>This rule shows a basic premise of a rule, here the subject
is <literal>user</literal> and the subject-id is
<literal>trhodes</literal>. The maxproc is, of course, max
number of processes, which is considered the resource. The
action here is set to <literal>deny</literal>, which blocks any
new processes from being created. In the previous example, the
user, <literal>trhodes</literal> will be constrained to
<literal>10</literal> (ten) processes and no greater. Other
actions are available and could be log to the console, pass a
notification to &man.devd.8;, or send a sigterm to the
process.</para>
<para>Some care must be taken while adding rules. The one above
will unfortunately block my user from doing the most simple tasks
after I have logged in and executed a <command>screen</command>
session. When a resource limit has been hit, an error will
be printed, as in this example:</para>
will unfortunately block my user from doing the most simple
tasks after I have logged in and executed a
<command>screen</command> session. When a resource limit has
been hit, an error will be printed, as in this example:</para>
<screen>&prompt.user; <userinput>man test</userinput>
/usr/bin/man: Cannot fork: Resource temporarily unavailable
@ -3808,9 +3805,9 @@ eval: Cannot fork: Resource temporarily unavailable</screen>
<screen>&prompt.root; <userinput>rctl -a jail:httpd:memoryuse:deny=2G/jail</userinput></screen>
<para>Rules may also persist across reboots if they have been
added to <filename>/etc/rctl.conf</filename> file. The
format is a rule, without the preceding command. For example,
the previous rule could be added like the following:</para>
added to <filename>/etc/rctl.conf</filename>. The format is a
rule, without the preceding command. For example, the previous
rule could be added like the following:</para>
<programlisting># Block jail from using more than 2G memory:
jail:httpd:memoryuse:deny=2G/jail</programlisting>
@ -3826,7 +3823,7 @@ jail:httpd:memoryuse:deny=2G/jail</programlisting>
<screen>&prompt.root; <userinput>rctl -r user:trhodes</userinput></screen>
<para>Many other resources exist which can be used to excert
<para>Many other resources exist which can be used to exert
additional control over various <literal>subjects</literal>.
See &man.rctl.8; to learn about them.</para>
</sect1>

View file

@ -65,11 +65,10 @@
<title>Terminology</title>
<variablelist>
<indexterm><primary>bits-per-second</primary></indexterm>
<varlistentry>
<term><acronym>bps</acronym></term>
<listitem>
<para>Bits per Second (<acronym>bps</acronym>) is the rate
<para>Bits per Second<indexterm><primary>bits-per-second</primary></indexterm> (<acronym>bps</acronym>) is the rate
at which data is transmitted.</para>
</listitem>
</varlistentry>
@ -77,9 +76,7 @@
<varlistentry>
<term><acronym>DTE</acronym></term>
<listitem>
<indexterm><primary>DTE</primary></indexterm>
<para>An example of a Data Terminal Equipment
<para>An example of a Data Terminal Equipment<indexterm><primary>DTE</primary></indexterm>
(<acronym>DTE</acronym>) is a computer.</para>
</listitem>
</varlistentry>
@ -87,9 +84,7 @@
<varlistentry>
<term><acronym>DCE</acronym></term>
<listitem>
<indexterm><primary>DCE</primary></indexterm>
<para>An example of a Data Communications Equipment
<para>An example of a Data Communications Equipment<indexterm><primary>DCE</primary></indexterm>
(<acronym>DTE</acronym>) is a modem.</para>
</listitem>
</varlistentry>
@ -98,11 +93,9 @@
<term>RS-232</term>
<listitem>
<indexterm><primary>RS-232C cables</primary></indexterm>
<para>The original standard for hardware serial
communications. It is now usually referred to as
<acronym>TIA</acronym>-232</para>
<acronym>TIA</acronym>-232<indexterm><primary>RS-232C cables</primary></indexterm>.</para>
</listitem>
</varlistentry>
</variablelist>

View file

@ -741,12 +741,8 @@ passwd: done</screen>
<term><literal>coredumpsize</literal></term>
<listitem>
<indexterm><primary>coredumpsize</primary></indexterm>
<indexterm><primary>limiting users</primary>
<secondary>coredumpsize</secondary>
</indexterm>
<para>The limit on the size of a core file generated by a
program is subordinate to other limits on disk usage, such
<para>The limit on the size of a core file<indexterm><primary>coredumpsize</primary></indexterm> generated by a
program is subordinate to other limits<indexterm><primary>limiting users</primary><secondary>coredumpsize</secondary></indexterm> on disk usage, such
as <literal>filesize</literal>, or disk quotas.
This limit is often used as a less-severe method of
controlling disk space consumption. Since users do not
@ -760,12 +756,7 @@ passwd: done</screen>
<term><literal>cputime</literal></term>
<listitem>
<indexterm><primary>cputime</primary></indexterm>
<indexterm>
<primary>limiting users</primary>
<secondary>cputime</secondary>
</indexterm>
<para>The maximum amount of CPU time a user's process may
<para>The maximum amount of CPU<indexterm><primary>cputime</primary></indexterm><indexterm><primary>limiting users</primary><secondary>cputime</secondary></indexterm> time a user's process may
consume. Offending processes will be killed by the
kernel.</para>
@ -781,12 +772,7 @@ passwd: done</screen>
<term><literal>filesize</literal></term>
<listitem>
<indexterm><primary>filesize</primary></indexterm>
<indexterm>
<primary>limiting users</primary>
<secondary>filesize</secondary>
</indexterm>
<para>The maximum size of a file the user may own. Unlike
<para>The maximum size of a file<indexterm><primary>filesize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>filesize</secondary></indexterm> the user may own. Unlike
<link linkend="quotas">disk quotas</link>, this limit is
enforced on individual files, not the set of all files a
user owns.</para>
@ -797,12 +783,7 @@ passwd: done</screen>
<term><literal>maxproc</literal></term>
<listitem>
<indexterm><primary>maxproc</primary></indexterm>
<indexterm>
<primary>limiting users</primary>
<secondary>maxproc</secondary>
</indexterm>
<para>The maximum number of processes a user can run. This
<para>The maximum number of processes<indexterm><primary>maxproc</primary></indexterm><indexterm><primary>limiting users</primary><secondary>maxproc</secondary></indexterm> a user can run. This
includes foreground and background processes. This limit
may not be larger than the system limit specified by the
<varname>kern.maxproc</varname> &man.sysctl.8;. Setting
@ -818,12 +799,7 @@ passwd: done</screen>
<term><literal>memorylocked</literal></term>
<listitem>
<indexterm><primary>memorylocked</primary></indexterm>
<indexterm>
<primary>limiting users</primary>
<secondary>memorylocked</secondary>
</indexterm>
<para>The maximum amount of memory a process may request
<para>The maximum amount of memory<indexterm><primary>memorylocked</primary></indexterm><indexterm><primary>limiting users</primary><secondary>memorylocked</secondary></indexterm> a process may request
to be locked into main memory using &man.mlock.2;. Some
system-critical programs, such as &man.amd.8;, lock into
main memory so that if the system begins to swap, they do
@ -835,10 +811,7 @@ passwd: done</screen>
<term><literal>memoryuse</literal></term>
<listitem>
<indexterm><primary>memoryuse</primary></indexterm>
<indexterm><primary>limiting users</primary>
<secondary>memoryuse</secondary></indexterm>
<para>The maximum amount of memory a process may consume at
<para>The maximum amount of memory<indexterm><primary>memoryuse</primary></indexterm><indexterm><primary>limiting users</primary><secondary>memoryuse</secondary></indexterm> a process may consume at
any given time. It includes both core memory and swap
usage. This is not a catch-all limit for restricting
memory consumption, but is a good start.</para>
@ -849,11 +822,7 @@ passwd: done</screen>
<term><literal>openfiles</literal></term>
<listitem>
<indexterm><primary>openfiles</primary></indexterm>
<indexterm><primary>limiting users</primary>
<secondary>openfiles</secondary>
</indexterm>
<para>The maximum number of files a process may have open.
<para>The maximum number of files a process may have open<indexterm><primary>openfiles</primary></indexterm><indexterm><primary>limiting users</primary><secondary>openfiles</secondary></indexterm>.
In &os;, files are used to represent sockets and IPC
channels, so be careful not to set this too low. The
system-wide limit for this is defined by the
@ -865,12 +834,8 @@ passwd: done</screen>
<term><literal>sbsize</literal></term>
<listitem>
<indexterm><primary>sbsize</primary></indexterm>
<indexterm><primary>limiting users</primary>
<secondary>sbsize</secondary>
</indexterm>
<para>The limit on the amount of network memory, and
thus mbufs, a user may consume in order to limit network
thus mbufs<indexterm><primary>sbsize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>sbsize</secondary></indexterm>, a user may consume in order to limit network
communications.</para>
</listitem>
</varlistentry>
@ -879,11 +844,7 @@ passwd: done</screen>
<term><literal>stacksize</literal></term>
<listitem>
<indexterm><primary>stacksize</primary></indexterm>
<indexterm><primary>limiting users</primary>
<secondary>stacksize</secondary>
</indexterm>
<para>The maximum size of a process stack. This alone is
<para>The maximum size of a process stack<indexterm><primary>stacksize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>stacksize</secondary></indexterm>. This alone is
not sufficient to limit the amount of memory a program
may use so it should be used in conjunction with other
limits.</para>

View file

@ -344,7 +344,7 @@
<p>In addition, each *BSD project uses a ``ports'' system to make the
building of ported software much easier.</p>
<p><b>FreeBSD:</b> There are currently more than 16,000
<p><b>FreeBSD:</b> There are currently more than 24,000
applications ready to download and install in the FreeBSD ports
collection. On i386 and AMD64, the Linux emulation layer will
also run the vast majority of Linux applications. On the AMD64 and Itanium

View file

@ -157,11 +157,11 @@ Report//EN"
next due date in status.xml and link to the new report.
- Add a news entry to head/share/xml/news.xml. Template:
<event>
<title>June-October, 2006 Status Report</title>
<title>June-October 2006 Status Report</title>
<p>The June-October, 2006 Status Report is <a
href="&enbase;/news/status/report-2006-06-2006-10.html">now
available</a> with 49 entries.</p>
<p>The <a
href="&enbase;/news/status/report-2006-06-2006-10.html">June to October 2006 Status Report</a>
is now available with 49 entries.</p>
</event>
- Extract a text version with the command
lynx -dump -nolist report.html > report.txt and prettify it.

View file

@ -38,9 +38,8 @@
<p>Thanks to all the reporters for the excellent work! This report
contains 33 entries and we hope you enjoy reading it.</p>
<!-- XXX: set date for the next set of submissions -->
<p>The deadline for submissions covering between July and September 2013
is not yet decided.</p>
<p>The deadline for submissions covering between July and September
2013 is October 7th, 2013.</p>
</section>
<category>

View file

@ -52,7 +52,7 @@ Report//EN"
soon.</p>
<p>Bryan Drewery presented a short talk on the status of
Poudriere, the new package builder. This is useable for building
Poudriere, the new package builder. This is usable for building
package sets for local deployment and for the official &os;
packages. When the original package building infrastructure was
designed, it took most of a day to build a large port like

View file

@ -13,7 +13,7 @@
<body class="navinclude.about">
<h2>Next Quarterly Status Report submissions (April - June) due: July
<h2>Next Quarterly Status Report submissions (July - September) due: October
7th, 2013</h2>
<p>Use the <a href="http://www.FreeBSD.org/cgi/monthly.cgi">xml
@ -55,6 +55,8 @@
<h2>2013</h2>
<ul>
<li><a href="report-2013-04-2013-06.html">April, 2013 -
June, 2013</a></li>
<li><a href="report-2013-05-devsummit.html">BSDCan 2013 Developer
Summit Special</a></li>
<li><a href="report-2013-01-2013-03.html">January, 2013 -

View file

@ -10,7 +10,8 @@
<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>
<cvs:keyword
xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
</head>
<body class="navinclude.ports">
@ -19,14 +20,23 @@
<hr/>
<p>If you are installing FreeBSD from CD-ROM or an ftp site, the
<a href="&base;/cgi/man.cgi?query=sysinstall"><tt>sysinstall</tt></a>
application will allow you to install the Ports Collection directly.</p>
<p>The &os; installer programs allow the Ports Collection to be
installed at the same time as the operating system. See <a
href="&base;/cgi/man.cgi?query=bsdinstall"><tt>bsdinstall</tt></a>
for &os;&nbsp;9.X and later versions, or <a
href="&base;/cgi/man.cgi?query=sysinstall"><tt>sysinstall</tt></a>
for &os;&nbsp;8.X and earlier versions.</p>
<p>However, if you are not installing using that method, you may
<a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">
download the gzipped tarball</a> for the entire ports hierarchy. The
size of the file is &ports.size;.</p>
<p>If the Ports Collection is not initially installed, it can be added
with <a
href="&base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-portsnap.html"><tt>portsnap</tt></a>
or <a
href="&base;/doc/en_US.ISO8859-1/books/handbook/svn.html">Subversion</a>.</p>
<p>A <a
href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ports/ports.tar.gz">gzipped
tarball of the Ports Collection</a> can also be downloaded. The
current size of the file is &ports.size;.</p>
</body>
</html>

View file

@ -52,15 +52,24 @@
<tr>
<td>Release schedule reminder</td>
<td>1&nbsp;July&nbsp;2013</td>
<td>-</td>
<td>4&nbsp;July&nbsp;2013</td>
<td>Release Engineers send reminder announcement e-mail to developers
with updated schedule.</td>
</tr>
<tr>
<td>Code freeze begins</td>
<td>Code slush begins</td>
<td>6&nbsp;July&nbsp;2013</td>
<td>-</td>
<td>6&nbsp;July&nbsp;2013</td>
<td>Release Engineers announce that all further commits to the
&local.branch.stable; branch will not require explicit approval,
however new features should be avoided.</td>
</tr>
<tr>
<td>Code freeze begins</td>
<td>12&nbsp;July&nbsp;2013</td>
<td>12&nbsp;July&nbsp;2013</td>
<td>Release Engineers announce that all further commits to the
&local.branch.stable; branch will require explicit approval.
Certain blanket approvals will be granted for narrow areas of
@ -70,7 +79,7 @@
<tr>
<td>BETA1 builds begin</td>
<td>19&nbsp;July&nbsp;2013</td>
<td>-</td>
<td>19&nbsp;July&nbsp;2013</td>
<td>First beta test snapshot.</td>
</tr>

View file

@ -82,8 +82,8 @@
<tr>
<td><tt>stable/9</tt></td>
<td>Open</td>
<td>committers</td>
<td>Frozen</td>
<td>&contact.re;</td>
<td>Development branch for FreeBSD 9-STABLE.</td>
</tr>

View file

@ -289,10 +289,6 @@
<!ENTITY a.mono "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>Mono and C# applications on FreeBSD</link>">
<!ENTITY a.mono.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>freebsd-mono</link>">
<!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
<!ENTITY a.mozilla "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>FreeBSD port of the Mozilla browser mailing list</link>">
<!ENTITY a.mozilla.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>freebsd-mozilla</link>">
<!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
<!ENTITY a.multimedia "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>FreeBSD multimedia mailing list</link>">
<!ENTITY a.multimedia.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>freebsd-multimedia</link>">
@ -337,6 +333,10 @@
<!ENTITY a.pkg "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg.url;'>Binary package management and package tools discussion</link>">
<!ENTITY a.pkg.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg.url;'>freebsd-pkg</link>">
<!ENTITY a.pkg-fallout.url "&a.mailman.listinfo;/freebsd-pkg-fallout">
<!ENTITY a.pkg-fallout "<ulink url='&a.pkg-fallout.url;'>Fallout logs from package building</ulink>">
<!ENTITY a.pkg-fallout.name "<ulink url='&a.pkg-fallout.url;'>freebsd-pkg-fallout</ulink>">
<!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
<!ENTITY a.platforms "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>FreeBSD non-Intel platforms porting mailing list</link>">
<!ENTITY a.platforms.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>freebsd-platforms</link>">

View file

@ -10,59 +10,59 @@
<!ENTITY beta.second '
<table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
<thead>
<tr style="text-align: center;">
<td colspan="2">Version &amp; Platform</td>
<td>Distribution</td>
<td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<td>TODO List</td>
</tr>
<tr style="text-align: center;">
<td colspan="2">Version &amp; Platform</td>
<td>Distribution</td>
<td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<td>TODO List</td>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
<td colspan="2"></td>
<tr>
<td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
<td colspan="2"></td>
<td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td>
<td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td>
<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td>
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
<td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>i386</td>
<td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td>
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
<td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>i386</td>
<td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
</tbody>
</table>
'>
@ -76,58 +76,74 @@
<a name="helptest"></a>
<h2>Help With The Next FreeBSD Release&beta.plural;</h2>
<p>Our developers and release engineers are working on the
the next release&beta.plural; of FreeBSD; if you wish to help with testing,
please download the latest build&beta.plural;. Please note that these images
are, by their very nature, intended for testing and should not
be used in production environments.</p>
<p>Our developers and release engineers are working on the the
next release&beta.plural; of FreeBSD; if you wish to help with
testing, please download the latest build&beta.plural;. Please
note that these images are, by their very nature, intended for
testing and should not be used in production environments.</p>
<table class="tblbasic">
<thead>
<tr style="text-align: center;">
<td colspan="2">Version &amp; Platform</td>
<td>Distribution</td>
<td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<tr style="text-align: center;">
<td colspan="2">Version &amp; Platform</td>
<td>Distribution</td>
<td title="ISO9660 CD image"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<!--<td>Status page</td>-->
</tr>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
<td colspan="2"></td>
<tr>
<td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
<td colspan="2"></td>
<!--<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/&betarel.current;TODO">[View]</a></td>-->
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</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>
</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>
</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>
</tr>
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</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/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>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<!--
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>pc98</td>
<td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<!--
<tr>
<td></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>

View file

@ -1284,9 +1284,8 @@ www.ejemplo.org</programlisting>
requisitos:</para>
<itemizedlist>
<indexterm><primary>MX record</primary></indexterm>
<listitem>
<para>Asegurar que el registro MX de menor numeración de
<para>Asegurar que el registro MX<indexterm><primary>MX record</primary></indexterm> de menor numeración de
nuestro DNS apunta a la dirección IP de nuestra
máquina.</para>
</listitem>

View file

@ -283,11 +283,12 @@
<table>
<title>&man.lockmgr.9; List de verrou</title>
<tgroup cols="2">
<tgroup cols="4">
<thead>
<row>
<entry>Nom de la variable</entry>
<entry>Protégés</entry>
<entry/><entry/>
</row>
</thead>
<tbody>

View file

@ -561,10 +561,9 @@ boot:</screen>
chargeur:</para>
<itemizedlist>
<indexterm><primary>mode mono-utilisateur</primary></indexterm>
<listitem>
<para>Pour simplement démarrer votre noyau habituel,
mais en mode mono-utilisateur:</para>
mais en mode mono-utilisateur:<indexterm><primary>mode mono-utilisateur</primary></indexterm></para>
<screen><userinput>boot -s</userinput></screen>
</listitem>
@ -572,9 +571,6 @@ boot:</screen>
<listitem>
<para>Pour décharger votre noyau et modules habituels,
puis charger votre ancien (ou un autre) noyau:</para>
<indexterm>
<primary><filename>kernel.old</filename></primary>
</indexterm>
<screen><userinput>unload</userinput>
<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
@ -582,7 +578,7 @@ boot:</screen>
<para>Vous pouvez utiliser <filename>kernel.GENERIC</filename>
pour faire référence au noyau
générique du disque d'installation, ou
<filename>kernel.old</filename> pour désigner votre noyau
<filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> pour désigner votre noyau
précédent (quand vous avez mis &agrave; jour ou
configuré votre propre noyau, par exemple).</para>

View file

@ -978,13 +978,9 @@ Fetching 133 new ports or files... done.</screen>
<sect3>
<title>Utiliser &os.current;</title>
<indexterm>
<primary>-CURRENT</primary>
<secondary>utilisation</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>Inscrivez-vous &agrave; la &a.current.name; et la &a.svn-src-head.name;.
<para>Inscrivez-vous &agrave; la &a.current.name;<indexterm><primary>-CURRENT</primary><secondary>utilisation</secondary></indexterm> et la &a.svn-src-head.name;.
Ce n'est pas seulement une bonne idée, c'est
<emphasis>indispensable</emphasis>. Si vous n'êtes
pas sur la liste <emphasis>&a.current.name;</emphasis>, vous
@ -1018,19 +1014,8 @@ Fetching 133 new ports or files... done.</screen>
faire de deux manières:</para>
<orderedlist>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Synchronisation avec <application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Utilisez le programme <link linkend="cvsup">cvsup</link>
<para>Utilisez le programme <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm>
avec le fichier <filename>supfile</filename>
nommé <filename>standard-supfile</filename>
disponible dans le répertoire <filename
@ -1041,11 +1026,11 @@ Fetching 133 new ports or files... done.</screen>
uniquement ce qui a été modifié.
De nombreuses personnes exécutent
<command>cvsup</command> depuis
<command>cron</command> et maintiennent ainsi
<command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> et maintiennent ainsi
automatiquement &agrave; jour leurs sources. Vous devez
personnaliser l'exemple de <filename>supfile</filename>
précédent, et configurer
<link linkend="cvsup">cvsup</link> pour
<link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Synchronisation avec <application>CVSup</application></secondary></indexterm> pour
votre environnement.</para>
<note>
@ -1072,14 +1057,8 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Synchroniser avec
<application>CTM</application></secondary>
</indexterm>
<para>Utilisez <application><link
linkend="ctm">CTM</link></application>. Si vous
linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Synchroniser avec <application>CTM</application></secondary></indexterm>. Si vous
disposez d'une mauvaise connexion (connexions chères
ou seulement un accès au courrier électronique)
<application>CTM</application> est une bonne
@ -1110,12 +1089,7 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>compilation</secondary>
</indexterm>
<para>Avant de compiler &os.current;, lisez attentivement
<para>Avant de compiler &os.current;<indexterm><primary>-CURRENT</primary><secondary>compilation</secondary></indexterm>, lisez attentivement
le <filename>Makefile</filename> dans
<filename>/usr/src</filename>. Vous devriez au moins
la première fois <link
@ -1217,15 +1191,10 @@ Fetching 133 new ports or files... done.</screen>
<orderedlist>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>utilisation</secondary>
</indexterm>
<para>Inscrivez-vous &agrave; &agrave; la liste &a.stable.name;.
Vous serez tenu au courant des dépendances de
compilation qui peuvent apparaître dans la
branche &os.stable; ou de tout autre problème
branche &os.stable;<indexterm><primary>-STABLE</primary><secondary>utilisation</secondary></indexterm> ou de tout autre problème
demandant une attention particulière. Les
développeurs publieront également des annonces
sur cette liste lorsqu'ils envisagent une correction ou
@ -1277,18 +1246,7 @@ Fetching 133 new ports or files... done.</screen>
<orderedlist>
<listitem>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary>Synchronisation avec <application>CVSup</application></secondary>
</indexterm>
<para>Utilisez le programme <link linkend="cvsup">cvsup</link>
<para>Utilisez le programme <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm>
avec le fichier <filename>supfile</filename>
nommé <filename>stable-supfile</filename>
disponible dans le répertoire <filename
@ -1299,24 +1257,18 @@ Fetching 133 new ports or files... done.</screen>
uniquement ce qui a été modifié.
De nombreuses personnes exécutent
<command>cvsup</command> depuis
<command>cron</command> et maintiennent ainsi
<command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> et maintiennent ainsi
automatiquement &agrave; jour leurs sources. Vous devez
personnaliser l'exemple de <filename>supfile</filename>
précédent, et configurer
<link linkend="cvsup">cvsup</link> pour
<link linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>Synchronisation avec <application>CVSup</application></secondary></indexterm> pour
votre environnement.</para>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>Synchroniser avec
<application>CTM</application></secondary>
</indexterm>
<para>Utilisez <application><link
linkend="ctm">CTM</link></application>. Si vous
linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>Synchroniser avec <application>CTM</application></secondary></indexterm>. Si vous
ne disposez pas d'une connexion Internet rapide et
peu coûteuse, c'est la méthode que vous
devriez penser &agrave; utiliser.</para>
@ -1333,12 +1285,7 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>compilation</secondary>
</indexterm>
<para>Avant de compiler &os.stable;, lisez attentivement
<para>Avant de compiler &os.stable;<indexterm><primary>-STABLE</primary><secondary>compilation</secondary></indexterm>, lisez attentivement
le <filename>Makefile</filename> dans
<filename>/usr/src</filename>. Vous devriez au moins
la première fois <link

View file

@ -1309,9 +1309,8 @@ www.exemple.org</programlisting>
de l'une de ces deux choses:</para>
<itemizedlist>
<indexterm><primary>enregistrement MX</primary></indexterm>
<listitem>
<para>Assurez-vous que l'enregistrement MX (le nombre le
<para>Assurez-vous que l'enregistrement MX<indexterm><primary>enregistrement MX</primary></indexterm> (le nombre le
plus bas) de votre DNS pointe sur l'adresse IP de votre
machine.</para>
</listitem>

View file

@ -336,18 +336,14 @@
konfigurációs állományokban:</para>
<itemizedlist>
<indexterm><primary>POSIX</primary></indexterm>
<listitem>
<para>A <envar>LANG</envar> változót a &posix;
<para>A <envar>LANG</envar> változót a &posix;<indexterm><primary>POSIX</primary></indexterm>
&man.setlocale.3; családjának</para>
</listitem>
<listitem>
<indexterm><primary>MIME</primary></indexterm>
<para>A <envar>MM_CHARSET</envar> változót az
alkalmazás MIME
alkalmazás MIME<indexterm><primary>MIME</primary></indexterm>
karakterkészletéhez</para>
</listitem>
</itemizedlist>

View file

@ -1515,11 +1515,10 @@ www.minta.org</programlisting>
közül az egyik mindenképpen kelleni fog:</para>
<itemizedlist>
<indexterm><primary>MX rekord</primary></indexterm>
<listitem>
<para>Gondoskodjunk róla, hogy a hozzánk
tartozó DNS-ben (legkisebb sorszámú) MX
rekord a gépünk IP-címére
rekord<indexterm><primary>MX rekord</primary></indexterm> a gépünk IP-címére
mutat.</para>
</listitem>

View file

@ -194,13 +194,8 @@
rendelkezünk a következőkkel:</para>
<itemizedlist>
<indexterm
id="ppp-isp"><primary>internet-szolgáltató</primary></indexterm>
<indexterm id="ppp-ppp2"><primary>PPP
kapcsolat</primary></indexterm>
<listitem>
<para>Olyan internet-elõfizetés, ahol PPP-n
<para>Olyan internet-elõfizetés, ahol PPP-n<indexterm id="ppp-ppp2"><primary>PPP kapcsolat</primary></indexterm>
keresztül csatlakozunk</para>
</listitem>
@ -208,7 +203,7 @@
<para>Egy modem vagy más olyan
rendszerünkhöz csatlakozó eszköz,
amelyen keresztül el tudjuk érni az
internet-szolgáltatónkat</para>
internet-szolgáltatónkat<indexterm id="ppp-isp"><primary>internet-szolgáltató</primary></indexterm></para>
</listitem>
<listitem>
@ -218,26 +213,16 @@
</listitem>
<listitem>
<indexterm id="ppp-pap"><primary>PAP</primary></indexterm>
<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>
<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm>
<indexterm id="ppp-login"><primary>bejelentkezési
név</primary></indexterm>
<indexterm
id="ppp-password"><primary>jelszó</primary></indexterm>
<para>A bejelentkezési nevünk és
jelszavunk. (Vagy a megszokott &unix;-os
<para>A bejelentkezési nevünk<indexterm id="ppp-login"><primary>bejelentkezési név</primary></indexterm> és
jelszavunk<indexterm id="ppp-password"><primary>jelszó</primary></indexterm>. (Vagy a megszokott &unix;-os<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm>
felhasználói név és
jelszó páros, vagy egy PAP esetleg CHAP
jelszó páros, vagy egy PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> esetleg CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>
bejelentkezési név és
jelszó.)</para>
</listitem>
<listitem>
<indexterm id="ppp-nameserver"><primary>névszerver</primary></indexterm>
<para>Egy vagy több névszerver IP-címe.
<para>Egy vagy több névszerver<indexterm id="ppp-nameserver"><primary>névszerver</primary></indexterm> IP-címe.
Ehhez az internet-szolgáltatók
általában két IP-címet adnak
meg. Ha egyet sem kaptunk, akkor a
@ -288,11 +273,8 @@
</listitem>
<listitem>
<indexterm id="ppp-static-ip"><primary>statikus
IP-cím</primary></indexterm>
<para>Ha a szolgáltatónk statikus
IP-címet és rögzített
IP-címet<indexterm id="ppp-static-ip"><primary>statikus IP-cím</primary></indexterm> és rögzített
hálózati nevet is biztosít
nekünk, ezt is megadhatjuk. Minden más
esetben egyszerűen csak hagyjuk, hogy a rendszer
@ -476,13 +458,8 @@
<term>6. és 7. sorok:</term>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>felhasználói PPP</secondary>
</indexterm>
<para>A híváshoz használt
karakterlánc. A felhasználói PPP
karakterlánc. A felhasználói PPP<indexterm><primary>PPP</primary><secondary>felhasználói PPP</secondary></indexterm>
a &man.chat.8; programhoz hasonló
<quote>küldök-várok</quote>
típusú szerkesztést alkalmaz. A
@ -612,10 +589,7 @@
<term>15. sor:</term>
<listitem>
<indexterm><primary>PAP</primary></indexterm>
<indexterm><primary>CHAP</primary></indexterm>
<para>Ha a PAP vagy CHAP protokollok valamelyikét
<para>Ha a PAP<indexterm><primary>PAP</primary></indexterm> vagy CHAP<indexterm><primary>CHAP</primary></indexterm> protokollok valamelyikét
használjuk, akkor nem lesz
szükségünk a login
változóra, ezért ezt
@ -659,11 +633,9 @@ protocol: ppp</screen>
<term>16. sor:</term>
<listitem>
<indexterm><primary>idõkorlát</primary></indexterm>
<para>Beállítjuk a kapcsolathoz
tartozó alapértelmezett
idõkorlátot (másodpercben). Itt a
idõkorlátot<indexterm><primary>idõkorlát</primary></indexterm> (másodpercben). Itt a
kapcsolat automatikusan lezárul
300&nbsp;másodperc tétlenséget
követően. Ha nem akarunk ilyen
@ -679,12 +651,10 @@ protocol: ppp</screen>
<term>17. sor:</term>
<listitem>
<indexterm><primary>internet-szolgáltató</primary></indexterm>
<para>A felülethez tartozó címeket
állítja be. A
<replaceable>x.x.x.x</replaceable> helyére a
szolgáltató által kiosztott
szolgáltató<indexterm><primary>internet-szolgáltató</primary></indexterm> által kiosztott
IP-címet kell beírnunk. A
<replaceable>y.y.y.y</replaceable> helyett pedig a
szolgáltató
@ -1358,9 +1328,7 @@ set nbns 203.14.100.5</programlisting>
<term>14. sor:</term>
<listitem>
<indexterm><primary>jelszó</primary></indexterm>
<para>Ebben a sorban adjuk meg a PAP/CHAP jelszavunkat,
<para>Ebben a sorban adjuk meg a PAP/CHAP jelszavunkat<indexterm><primary>jelszó</primary></indexterm>,
<replaceable>AJelszavam</replaceable> helyett.
Szándénkunk
egyértelműsítése
@ -1771,15 +1739,10 @@ ifconfig_tun0=</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>szerver</secondary>
</indexterm>
<para><quote>szerverként</quote> &mdash; a
számítógépünk egy
hálózat része, ahol a többieket a
PPP használatával kapcsoljuk össze</para>
PPP<indexterm><primary>PPP</primary><secondary>szerver</secondary></indexterm> használatával kapcsoljuk össze</para>
</listitem>
</orderedlist>
@ -3293,10 +3256,8 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
</listitem>
<listitem>
<indexterm><primary>default route</primary></indexterm>
<para>Az alapértelmezett
átjárót az alábbi sor
átjárót<indexterm><primary>default route</primary></indexterm> az alábbi sor
módosításával tudjuk
beállítani úgy, hogy a</para>

View file

@ -491,13 +491,9 @@ boot:</screen>
<para>Qui ci sono alcuni esempi pratici sull'uso del loader:</para>
<itemizedlist>
<indexterm>
<primary>modalità singolo utente</primary>
</indexterm>
<listitem>
<para>Per avviare semplicemente il vostro kernel abituale,
ma in modalità singolo utente:</para>
ma in modalità singolo utente:<indexterm><primary>modalità singolo utente</primary></indexterm></para>
<screen><userinput>boot -s</userinput></screen>
</listitem>
@ -506,16 +502,12 @@ boot:</screen>
<para>Per scaricare dalla memoria i moduli e il kernel usuali,
e poi caricare solo il vecchio (o un altro) kernel:</para>
<indexterm>
<primary><filename>kernel.old</filename></primary>
</indexterm>
<screen><userinput>unload</userinput>
<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
<para>Puoi usare <filename>kernel.GENERIC</filename> per riferirti
al kernel generico che viene fornito nel disco d'installazione, o
<filename>kernel.old</filename> per riferirti al kernel installato
<filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> per riferirti al kernel installato
precedentemente (quando hai aggiornato o configurato il kernel, ad
esempio).</para>

View file

@ -1211,10 +1211,8 @@ www.example.org</programlisting>
queste due cose:</para>
<itemizedlist>
<indexterm><primary>record MX</primary></indexterm>
<listitem>
<para>Assicurati che il record MX (con il numero più basso)
<para>Assicurati che il record MX<indexterm><primary>record MX</primary></indexterm> (con il numero più basso)
relativo al tuo host nel tuo DNS punti all'indirizzo IP del tuo
host.</para>
</listitem>

View file

@ -1489,13 +1489,8 @@ Exports list on foobar:
<title>Tipi di macchine</title>
<itemizedlist>
<indexterm>
<primary>NIS</primary>
<secondary>master server</secondary>
</indexterm>
<listitem>
<para>Un <emphasis>server master NIS</emphasis>. Questo
<para>Un <emphasis>server master NIS</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>. Questo
server, analogamente a primary domain controller
&windowsnt; , mantiene i file usati da tutti i client
NIS. Il file <filename>passwd</filename>,
@ -1513,12 +1508,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>slave server</secondary>
</indexterm>
<para><emphasis>NIS slave server</emphasis>. Analogamente
<para><emphasis>NIS slave server</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>. Analogamente
a backup domain controller &windowsnt;, i server
slave NIS mantengono copie dei file di dati
del server master NIS. I server slave NIS garantiscono
@ -1530,12 +1520,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>client</secondary>
</indexterm>
<para><emphasis>NIS client</emphasis>. I client NIS,
<para><emphasis>NIS client</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>. I client NIS,
come la maggior parte delle workstation &windowsnt;
, si autenticano nei confronti del NIS server
(o del domain controller &windowsnt; nel caso di
@ -5193,14 +5178,10 @@ AddModule mod_php5.c
<term><literal>passdb backend</literal></term>
<listitem>
<indexterm><primary>NIS+</primary></indexterm>
<indexterm><primary>LDAP</primary></indexterm>
<indexterm><primary>SQL database</primary></indexterm>
<para><application>Samba</application> ha molti
modelli diversi di backend di autenticazione.
Puoi autenticare i client con LDAP, NIS+, un
database SQL, o un file di password modificato.
Puoi autenticare i client con LDAP<indexterm><primary>LDAP</primary></indexterm>, NIS+<indexterm><primary>NIS+</primary></indexterm>, un
database SQL<indexterm><primary>SQL database</primary></indexterm>, o un file di password modificato.
Il metodo di autenticazione di default
è <literal>smbpasswd</literal>, e questo
sarà l'unico coperto qui.</para>

View file

@ -1,42 +1,51 @@
# $FreeBSD$
# Original revision: 1.47
# Original revision: r41535
SUBDIR =
#SUBDIR+= bsdl-gpl
#SUBDIR+= building-products
#SUBDIR+= casestudy-argentina.com
#SUBDIR+= committers-guide
#SUBDIR+= compiz-fusion
#SUBDIR+= console-server
SUBDIR+= contributing
#SUBDIR+= contributing-ports
SUBDIR+= contributors
#SUBDIR+= cups
#SUBDIR+= custom-gcc
#SUBDIR+= cvs-freebsd
#SUBDIR+= cvsup-advanced
#SUBDIR+= explaining-bsd
SUBDIR+= fbsd-from-scratch
#SUBDIR+= filtering-bridges
SUBDIR+= fonts
#SUBDIR+= freebsd-questions
#SUBDIR+= freebsd-update-server
#SUBDIR+= geom-class
#SUBDIR+= hats
#SUBDIR+= gjournal-desktop
#SUBDIR+= hubs
SUBDIR+= ipsec-must
#SUBDIR+= java-tomcat
#SUBDIR+= laptop
#SUBDIR+= ldap-auth
#SUBDIR+= linux-comparison
#SUBDIR+= linux-emulation
#SUBDIR+= linux-users
#SUBDIR+= mailing-list-faq
#SUBDIR+= mh
#SUBDIR+= nanobsd
#SUBDIR+= new-users
#SUBDIR+= p4-primer
#SUBDIR+= pam
#SUBDIR+= port-mentor-guidelines
#SUBDIR+= portbuild
#SUBDIR+= pr-guidelines
SUBDIR+= problem-reports
#SUBDIR+= pxe
#SUBDIR+= rc-scripting
#SUBDIR+= relaydelay
#SUBDIR+= releng
#SUBDIR+= releng-packages
#SUBDIR+= remote-install
#SUBDIR+= serial-uart
#SUBDIR+= solid-state
#SUBDIR+= vinum
#SUBDIR+= vm-design
# ROOT_SYMLINKS+= new-users

View file

@ -3578,13 +3578,8 @@ ISDN BRI
<title>マシンの分類</title>
<itemizedlist>
<indexterm>
<primary>NIS</primary>
<secondary>マスタサーバ</secondary>
</indexterm>
<listitem>
<para><emphasis>NIS マスターサーバ</emphasis>
<para><emphasis>NIS マスターサーバ</emphasis><indexterm><primary>NIS</primary><secondary>マスタサーバ</secondary></indexterm>
このサーバは &windowsnt;
で言うところのプライマリドメインコントローラにあたります。
すべての NIS クライアントで利用されるファイルを保守します。
@ -3599,12 +3594,7 @@ ISDN BRI
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>スレーブサーバ</secondary>
</indexterm>
<para><emphasis>NIS スレーブサーバ</emphasis>
<para><emphasis>NIS スレーブサーバ</emphasis><indexterm><primary>NIS</primary><secondary>スレーブサーバ</secondary></indexterm>
&windowsnt; のバックアップドメインコントローラに似たもので、
NIS スレーブサーバは NIS
マスターサーバのデータファイルのコピーを保持します。
@ -3616,12 +3606,7 @@ ISDN BRI
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>クライアント</secondary>
</indexterm>
<para><emphasis>NIS クライアント</emphasis>
<para><emphasis>NIS クライアント</emphasis><indexterm><primary>NIS</primary><secondary>クライアント</secondary></indexterm>
NIS クライアントは大部分の &windowsnt;
ワークステーションのように、ログオンに際して
NIS サーバ (&windowsnt; ワークステーションの場合は

View file

@ -526,9 +526,8 @@ boot:</screen>
<para>次にあげるのは、ローダの実践的な使用例です。</para>
<itemizedlist>
<indexterm><primary>シングルユーザモード</primary></indexterm>
<listitem>
<para>普段使っているカーネルをシングルユーザモードで起動します。</para>
<para>普段使っているカーネルをシングルユーザモード<indexterm><primary>シングルユーザモード</primary></indexterm>で起動します。</para>
<screen><userinput>boot -s</userinput></screen>
</listitem>
@ -536,9 +535,6 @@ boot:</screen>
<listitem>
<para>普段使っているカーネルとモジュールをアンロードし、
古い (もしくは別の) カーネルをロードします。</para>
<indexterm>
<primary><filename>kernel.old</filename></primary>
</indexterm>
<screen><userinput>unload</userinput>
<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
@ -549,7 +545,7 @@ boot:</screen>
また、直前にインストールされていたカーネル (たとえば、
カーネルを自分で設定したり、
アップグレードしたりした場合) を指定するには
<filename>kernel.old</filename> とします。</para>
<filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> とします。</para>
<note>
<para>普段のカーネルで使っているモジュールを

View file

@ -1325,13 +1325,9 @@ Fetching 133 new ports or files... done.</screen>
<sect3>
<title>&os.current; を使う</title>
<indexterm>
<primary>-CURRENT</primary>
<secondary>使用</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>&a.current.name;&a.svn-src-head.name; メーリングリスト
<para>&a.current.name;&a.svn-src-head.name;<indexterm><primary>-CURRENT</primary><secondary>使用</secondary></indexterm> メーリングリスト
に加わってください。
さまざまな人がシステムの現在の状態について述べているコメントを見たり、
システムを正常に保つための重要な情報を見逃さないために、
@ -1356,41 +1352,21 @@ Fetching 133 new ports or files... done.</screen>
からソースの入手するには、以下のようないくつかの方法があります。</para>
<orderedlist>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary><application>Subversion</application> を使った同期</secondary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary><application>CTM</application> を使った同期</secondary>
</indexterm>
<listitem>
<para><link linkend="svn">svn</link> を使って、
<para><link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> を使って、
希望する開発ブランチ、
もしくはリリースブランチをチェックアウトしてください。
この方法は、開発中の &os; リポジトリへのアクセスを提供しており、
推奨されています。
<link linkend="svn-mirrors">Subversion ミラーサイト</link>
のひとつの <literal>head</literal> ブランチから
-CURRENT コードをチェックアウトしてください。
-CURRENT<indexterm><primary>-CURRENT</primary><secondary><application>Subversion</application> を使った同期</secondary></indexterm> コードをチェックアウトしてください。
リポジトリサイズの観点から、
希望するサブツリーのみをチェックアウトすることが推奨されます。</para>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>CTM を使った同期</secondary>
</indexterm>
<para><application><link linkend="ctm">CTM</link></application>を用いる。
<para><application><link linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>CTM を使った同期</secondary></indexterm>を用いる。
接続料が高額だったり、email でのアクセスしかできないような、
あまり良質でない TCP/IP 接続の場合には、<application>CTM</application>
を利用すると良いでしょう。ただし、<application><link
@ -1413,11 +1389,7 @@ Fetching 133 new ports or files... done.</screen>
一部のみをコンパイルしようとすると、
ほぼ間違いなく問題が起きます。</para>
<indexterm>
<primary>-CURRENT</primary>
<secondary>コンパイル</secondary>
</indexterm>
<para>&os.current; をコンパイルする前に
<para>&os.current; をコンパイル<indexterm><primary>-CURRENT</primary><secondary>コンパイル</secondary></indexterm>する前に
<filename>/usr/src/Makefile</filename>
を注意深く読んでください。
アップグレードの処理の一部として、最初に
@ -1546,21 +1518,9 @@ Fetching 133 new ports or files... done.</screen>
からアップグレードするには、
以下のようないくつかの方法があります。</para>
<orderedlist>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary><application>Subversion</application>
を使った同期</secondary>
</indexterm>
<orderedlist>
<listitem>
<para><link linkend="svn">svn</link> を使って、
<para><link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> を使って、
希望する開発ブランチ、
もしくはリリースブランチをチェックアウしてください。
この方法は、開発中の &os; リポジトリへのアクセスを提供しており、
@ -1571,7 +1531,7 @@ Fetching 133 new ports or files... done.</screen>
の特定のブランチでは
<literal>stable/9</literal>、または
<literal>releng/9.0</literal> となります。
<application>Subversion</application>
<application>Subversion</application><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application> を使った同期</secondary></indexterm>
を使ってベースシステムをチェックアウトする際の
URL のプレフィックスは、<link
linkend="svn-mirrors">Subversion ミラーサイト</link>
@ -1581,25 +1541,15 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>CTM を使って同期する</secondary>
</indexterm>
<para>インターネットへの接続に高速な回線を利用できないのであれば、
<application><link linkend="ctm">CTM</link></application>
<application><link linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>CTM を使って同期する</secondary></indexterm>
を検討してみましょう。</para>
</listitem>
</orderedlist>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>構築、コンパイル</secondary>
</indexterm>
<para>&os.stable; をコンパイルする前に、
<para>&os.stable;<indexterm><primary>-STABLE</primary><secondary>構築、コンパイル</secondary></indexterm> をコンパイルする前に、
<filename>/usr/src/Makefile</filename> をよく読んでください。
アップグレードの処理の一部として最初に
<link linkend="makeworld">新しいカーネルをインストールして、

View file

@ -1012,10 +1012,9 @@ www.example.org</programlisting>
次の二つのうちのどちらかができていることを確認してください。</para>
<itemizedlist>
<indexterm><primary>MX レコード</primary></indexterm>
<listitem>
<para>自分のドメインでの
(一番値の小さい) MX レコードが自分のホストの
(一番値の小さい) MX レコード<indexterm><primary>MX レコード</primary></indexterm>が自分のホストの
IP アドレスを差していることを確認する。</para>
</listitem>

View file

@ -3,7 +3,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: r41875
Original revision: r42318
$FreeBSD$
-->
@ -754,13 +754,28 @@
<entry>svn, <ulink
url="http://svn0.us-east.FreeBSD.org/">http</ulink>,
<ulink
url="https://svn0.us-east.FreeBSD.org/">https</ulink></entry>
url="https://svn0.us-east.FreeBSD.org/">https</ulink>, rsync</entry>
<entry>USA, ニュージャージ</entry>
<entry>SHA1
<literal>06:D1:23:DE:5E:7A:F7:2B:7A:7E:74:95:5F:54:8D:5C:B0:D6:2E:8F</literal></entry>
</row>
<row>
<entry><hostid
role="fqdn">svn0.eu.FreeBSD.org</hostid></entry>
<entry>svn, <ulink
url="http://svn0.eu.FreeBSD.org/">http</ulink>,
<ulink
url="https://svn0.eu.FreeBSD.org/">https</ulink>, rsync</entry>
<entry>Europe, UK</entry>
<entry>SHA1
<literal>39:B0:53:35:CE:60:C7:BB:00:54:96:96:71:10:94:BB:CE:1C:07:A7</literal></entry>
</row>
</tbody>
</tgroup>
</informaltable>

View file

@ -20,7 +20,7 @@
the contents of <title> will be preferred over <p>.
$FreeBSD$
Original revision: r42240
Original revision: r42373
-->
<news>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@ -33,6 +33,34 @@
<month>
<name>7</name>
<day>
<name>22</name>
<event>
<title>&os;&nbsp;9.2-BETA1 公開</title>
<p>&os;-9.2 リリースサイクルにおける最初の BETA 版が公開されました。
amd64, i386 および ia64 アーキテクチャの ISO イメージが、<a
href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
ミラーサイト</a><a
href="&lists.stable;/2013-July/074377.html">公開</a>
されています。</p>
</event>
</day>
<day>
<name>16</name>
<event>
<title>開発進捗レポート (2013 年 4 月 - 6 月) 公開</title>
<p><a
href="&enbase;/news/status/report-2013-04-2013-06.html">2013
年 4 月 から 6 月の開発進捗レポート</a> (33 エントリ)
が公開されました。</p>
</event>
</day>
<day>
<name>4</name>
<event>

View file

@ -2,66 +2,66 @@
<!--
$FreeBSD$
Original revision: r41400
Original revision: r42364
-->
<![%beta2.testing;[
<!ENTITY beta.second '
<table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
<thead>
<tr style="text-align: center;">
<td colspan="2">バージョンとプラットフォーム</td>
<td>配布元</td>
<td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<td>TODO List</td>
</tr>
<tr style="text-align: center;">
<td colspan="2">バージョンとプラットフォーム</td>
<td>配布元</td>
<td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<td>TODO List</td>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
<td colspan="2"></td>
<tr>
<td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
<td colspan="2"></td>
<td><a href="&enbase;/releases/&betarel2.current;R/todo.html">[View]</a></td>
<td><a href="&enbase;/releases/&betarel2.current;R/todo.html">[View]</a></td>
<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td>
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
<td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>i386</td>
<td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>ia64</td>
<td>a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td>
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
<td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>i386</td>
<td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>ia64</td>
<td>a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[配布元]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
</tr>
</tbody>
</table>
'>
@ -82,50 +82,68 @@
<table class="tblbasic">
<thead>
<tr style="text-align: center;">
<td colspan="2">バージョンとプラットフォーム</td>
<td>配布元</td>
<td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<tr style="text-align: center;">
<td colspan="2">バージョンとプラットフォーム</td>
<td>配布元</td>
<td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
<!--<td>ステータスページ</td>-->
</tr>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
<td colspan="2"></td>
<tr>
<td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
<td colspan="2"></td>
<!--<td rowspan="7"><a href="http://wiki.freebsd.org/Releng/&betarel.current;TODO">[View]</a></td>-->
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
<td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/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;">[配布元]</a></td>
<td><a href="&url.rel;/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;">[配布元]</a></td>
<td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
</tr>
<tr>
<td></td>
<td>amd64<br/>(x86-64, x64)</td>
<td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[配布元]</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/i386/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>ia64</td>
<td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<!--
<tr>
<td></td>
<td>sparc64</td>
<td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
<tr>
<td></td>
<td>pc98</td>
<td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
<!--
<tr>
<td></td>
<td>powerpc</td>
<td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[配布元]</a></td>
<td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
<!--
<tr>
<td></td>
<td>powerpc64</td>
<td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[配布元]</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;">[配布元]</a></td>
<td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
</tr>
-->
</tbody>
</table>

View file

@ -1226,12 +1226,7 @@ Fetching 133 new ports or files... done.</screen>
<orderedlist>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>ашиглах нь</secondary>
</indexterm>
<para>&a.current.name; болон &a.svn-src-head.name; жагсаалтуудад элсэн орно уу.
<para>&a.current.name;<indexterm><primary>-CURRENT</primary><secondary>ашиглах нь</secondary></indexterm> болон &a.svn-src-head.name; жагсаалтуудад элсэн орно уу.
Энэ нь зөвхөн сайн санаанаас гадна бас <emphasis>чухал</emphasis>
юм. Хэрэв та <emphasis>&a.current.name;</emphasis> жагсаалтад
ороогүй бол системийн одоогийн төлвийн талаар хүмүүсийн өгч байгаа санал
@ -1256,26 +1251,12 @@ Fetching 133 new ports or files... done.</screen>
эхийг авна. Та үүнийг гурван аргаар хийж болно:</para>
<orderedlist>
<indexterm>
<primary><command>svn</command></primary>
</indexterm>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary><application>CVSup</application> ашиглан сүүлийн хэлбэрт аваачих</secondary>
</indexterm>
<listitem>
<para>Хүссэн хөгжүүлэлт эсвэл салбар хувилбарыг
татаж авахдаа <link linkend="svn">svn</link> програмыг
татаж авахдаа <link linkend="svn">svn</link><indexterm><primary><command>svn</command></primary></indexterm> програмыг
ашиглах хэрэгтэй. Энэ аргыг &os;-н хөгжүүлэлтэд хандахад
зөвлөдөг. -CURRENT суурь системийн
<application>Subversion</application> татаж авах үндсэн
<application>Subversion</application><indexterm><primary>-CURRENT</primary><secondary><application>SVN</application> ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> татаж авах үндсэн
URL нь <literal>http://svn.freebsd.org/base/head/</literal> бөгөөд
репозиторын хэмжээ их тул зөвхөн хүссэн дэд модоо
татаж авахыг зөвлөдөг.
@ -1315,13 +1296,8 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary>
</indexterm>
<para><application><link
linkend="ctm">CTM</link></application> хэрэгслийг ашигла.
linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> хэрэгслийг ашигла.
Хэрэв та маш муу холболттой (өндөр үнэтэй холболтууд эсвэл
зөвхөн цахим захидлын хандалт) бол <application>CTM</application>
нь сонголт болох юм. Гэхдээ энэ нь бөөн зовлон бөгөөд та эвдэрсэн
@ -1342,11 +1318,7 @@ Fetching 133 new ports or files... done.</screen>
шинэчлэлтүүдээс хамаардаг бөгөөд зөвхөн хэсэг бүлэг эхийг хөрвүүлэхийг оролдох нь
таныг бараг л баталгаатайгаар асуудалтай учруулах болно.</para>
<indexterm>
<primary>-CURRENT</primary>
<secondary>хөрвүүлэх</secondary>
</indexterm>
<para>&os.current;-ийг хөрвүүлэхээсээ өмнө <filename>/usr/src</filename>
<para>&os.current;-ийг<indexterm><primary>-CURRENT</primary><secondary>хөрвүүлэх</secondary></indexterm> хөрвүүлэхээсээ өмнө <filename>/usr/src</filename>
дахь <filename>Makefile</filename>-г анхааралтай уншина уу.
Эхний удаа та хамгийн багаар бодоход шинэчлэлтийн процессийн хэсэг болох <link
linkend="makeworld">шинэ цөмийг суулгаж ертенцийг дахин бүтээх</link> хэсгээр
@ -1431,12 +1403,7 @@ Fetching 133 new ports or files... done.</screen>
<orderedlist>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>ашиглах нь</secondary>
</indexterm>
<para>&a.stable.name; жагсаалтад элсэн орно уу. Энэ нь
<para>&a.stable.name;<indexterm><primary>-STABLE</primary><secondary>ашиглах нь</secondary></indexterm> жагсаалтад элсэн орно уу. Энэ нь
&os.stable;-д илэрч болох бүтээлтийн хамаарлууд эсвэл
тусгайлсан анхаарал шаардлагатай өөр бусад асуудлуудын талаар
танд мэдээлж байх болно. Хөгжүүлэгчид нь зарим нэг маргаантай засвар
@ -1475,23 +1442,9 @@ Fetching 133 new ports or files... done.</screen>
хийж болно. Үүнийг гурван аргаар хийж болно:</para>
<orderedlist>
<indexterm>
<primary><command>svn</command></primary>
</indexterm>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary><application>Subversion</application> ашиглан сүүлийн хэлбэрт аваачих</secondary>
</indexterm>
<listitem>
<para>Хүссэн хөгжүүлэлт эсвэл салбар хувилбарыг
татахдаа <link linkend="svn">svn</link> програмыг ашиглах хэрэгтэй.
татахдаа <link linkend="svn">svn</link><indexterm><primary><command>svn</command></primary></indexterm> програмыг ашиглах хэрэгтэй.
Энэ аргыг &os;-н хөгжүүлэлтэд хандахад
зөвлөдөг. Салбарын нэрсэд одоогийн хөгжүүлэлтийн
толгой хувилбарын хувьд <literal>head</literal>,
@ -1500,7 +1453,7 @@ Fetching 133 new ports or files... done.</screen>
url="&url.base;/releng/">хувилбар инженерчлэлийн хуудас</ulink>
дахь салбарууд ордог. Суурь системийн
<application>Subversion</application> татаж авах үндсэн
URL нь <literal>http://svn.freebsd.org/base/</literal> бөгөөд
URL нь <literal>http://svn.freebsd.org/base/</literal><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application> ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> бөгөөд
репозиторын хэмжээ их тул зөвхөн хүссэн дэд модоо
татаж авахыг зөвлөдөг.
</para>
@ -1522,13 +1475,8 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary>
</indexterm>
<para><application><link
linkend="ctm">CTM</link></application> хэрэгслийг ашигла.
linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>CTM ашиглан сүүлийн хэлбэрт аваачих</secondary></indexterm> хэрэгслийг ашигла.
Хэрэв танд Интернэт уруу холбогдсон хурдан хямд холболт байхгүй бол
энэ аргыг та ашиглах хэрэгтэй.
</para>
@ -1544,12 +1492,7 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>хөрвүүлэх нь</secondary>
</indexterm>
<para>&os.current;-ийг хөрвүүлэхээсээ өмнө <filename>/usr/src</filename>
<para>&os.current;-ийг<indexterm><primary>-STABLE</primary><secondary>хөрвүүлэх нь</secondary></indexterm> хөрвүүлэхээсээ өмнө <filename>/usr/src</filename>
дахь <filename>Makefile</filename>-г анхааралтай уншина уу.
Эхний удаа та хамгийн багаар бодоход шинэчлэлтийн процессийн хэсэг болох <link
linkend="makeworld">шинэ цөмийг суулгаж ертенцийг дахин бүтээх</link> хэсгээр

View file

@ -431,10 +431,8 @@
zijn:</para>
<orderedlist>
<indexterm><primary>BSD-copyright</primary></indexterm>
<listitem>
<para>Het BSD-copyright. Dit copyright wordt het meeste
<para>Het BSD-copyright<indexterm><primary>BSD-copyright</primary></indexterm>. Dit copyright wordt het meeste
verkozen wegens zijn natuur van <quote>geen
voorwaarden</quote> en de algemene aantrekkelijkheid voor
commerciële ondernemingen. Ver van het ontmoedigen van
@ -445,15 +443,7 @@
</listitem>
<listitem>
<indexterm>
<primary>GPL</primary>
<see>GNU General Public License</see>
</indexterm>
<indexterm><primary>GNU General Public License</primary></indexterm>
<para>De GNU General Public License, of <quote>GPL</quote>.
<para>De GNU General Public License<indexterm><primary>GNU General Public License</primary></indexterm>, of <quote>GPL</quote><indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm>.
Deze licentie is niet zo populair bij ons wegens de extra
hoeveelheid moeite die gevraagd wordt van iedereen die de
code voor commerciële doeleinden gebruikt, maar vanwege
@ -561,11 +551,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<sect3>
<title>Hardware doneren</title>
<indexterm><primary>donaties</primary></indexterm>
<para>Het &os; Project accepteert graag hardwaredonaties die het
goed kan gebruiken. Als u geïnteresseerd bent in het
doneren van hardware, neem dan contact op met het <ulink
doneren<indexterm><primary>donaties</primary></indexterm> van hardware, neem dan contact op met het <ulink
url="&url.base;/donations/">Donations Liaison
Office</ulink>.</para>
</sect3>

View file

@ -2,7 +2,7 @@
# $FreeBSD$
#
# %SOURCE% en_US.ISO8859-1/books/handbook/Makefile
# %SRCID% 41710
# %SRCID% 42118
#
# Bouw het Nederlandse FreeBSD Handboek.
#
@ -181,13 +181,6 @@ IMAGES_EN+= security/ipsec-network.pic
IMAGES_EN+= security/ipsec-crypt-pkt.pic
IMAGES_EN+= security/ipsec-encap-pkt.pic
IMAGES_EN+= security/ipsec-out-pkt.pic
IMAGES_EN+= vinum/vinum-concat.pic
IMAGES_EN+= vinum/vinum-mirrored-vol.pic
IMAGES_EN+= vinum/vinum-raid10-vol.pic
IMAGES_EN+= vinum/vinum-raid5-org.pic
IMAGES_EN+= vinum/vinum-simple-vol.pic
IMAGES_EN+= vinum/vinum-striped-vol.pic
IMAGES_EN+= vinum/vinum-striped.pic
IMAGES_EN+= virtualization/parallels-freebsd1.png
IMAGES_EN+= virtualization/parallels-freebsd2.png
IMAGES_EN+= virtualization/parallels-freebsd3.png
@ -286,7 +279,6 @@ SRCS+= printing/chapter.xml
SRCS+= security/chapter.xml
SRCS+= serialcomms/chapter.xml
SRCS+= users/chapter.xml
SRCS+= vinum/chapter.xml
SRCS+= virtualization/chapter.xml
SRCS+= x11/chapter.xml

View file

@ -5,7 +5,7 @@
$FreeBSD$
%SOURCE% en_US.ISO8859-1/books/handbook/book.xml
%SRCID% 41824
%SRCID% 42118
-->
<!ENTITY % chapters SYSTEM "chapters.ent">
@ -240,7 +240,6 @@
&chap.disks;
&chap.geom;
&chap.filesystems;
&chap.vinum;
&chap.virtualization;
&chap.l10n;
&chap.cutting-edge;

View file

@ -11,7 +11,7 @@
$FreeBSD$
%SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent
%SRCID% 41645
%SRCID% 42118
-->
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
@ -43,7 +43,6 @@
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">

View file

@ -1390,20 +1390,9 @@ Fetching 133 new ports or files... done.</screen>
de volgende twee manieren:</para>
<orderedlist>
<indexterm><primary><command>cvsup</command></primary></indexterm>
<indexterm><primary><command>cron</command></primary></indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Synchroniseren met
<application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Gebruik het programma <link
linkend="cvsup">cvsup</link> met de
linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> met de
<filename>supfile</filename> genaamd
<filename>standard-supfile</filename> uit
<filename>/usr/share/examples/cvsup</filename>. Dit
@ -1411,10 +1400,10 @@ Fetching 133 new ports or files... done.</screen>
in één keer wordt binnengehaald en
daarna alleen hetgeen wat gewijzigd is. Veel mensen
draaien <command>cvsup</command> vanuit de
<command>cron</command> en houden daarmee hun
<command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> en houden daarmee hun
broncode automatisch bijgewerkt. De voorbeeld
<filename>supfile</filename> dient aangepast te
worden om <link linkend="cvsup">cvsup</link> in te
worden om <link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Synchroniseren met <application>CVSup</application></secondary></indexterm> in te
stellen voor uw omgeving.</para>
<note>
@ -1614,28 +1603,17 @@ Fetching 133 new ports or files... done.</screen>
manieren:</para>
<orderedlist>
<indexterm><primary><command>cvsup</command></primary></indexterm>
<indexterm><primary><command>cron</command></primary></indexterm>
<indexterm>
<primary>&os.stable;</primary>
<secondary>synchroniseren met
<application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Gebruik het programma <link
linkend="cvsup">cvsup</link> met de
linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> met de
<filename>supfile</filename>
<filename>stable-supfile</filename> uit de map
<filename>stable-supfile</filename><indexterm><primary>&os.stable;</primary><secondary>synchroniseren met <application>CVSup</application></secondary></indexterm> uit de map
<filename>/usr/share/examples/cvsup</filename>.
Dit is de aanbevolen methode omdat het hiermee
mogelijk is de volledige collectie te downloaden en
daarna alleen hetgeen wat veranderd is. Veel mensen
draaien <command>cvsup</command> vanuit de
<command>cron</command> om de broncodes automatisch
<command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> om de broncodes automatisch
bij te werken. Het voorbeeld van de
<filename>supfile</filename> dient aangepast en
ingesteld te worden voor de omgeving waarin het
@ -1643,14 +1621,8 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>&os.stable;</primary>
<secondary>synchroniseren met CTM</secondary>
</indexterm>
<para>Gebruik <application><link
linkend="ctm">CTM</link></application> als er geen
linkend="ctm">CTM</link></application><indexterm><primary>&os.stable;</primary><secondary>synchroniseren met CTM</secondary></indexterm> als er geen
snelle, goedkope verbinding is met internet. Dan is
dit de methode om te gebruiken.</para>
</listitem>
@ -1665,13 +1637,7 @@ Fetching 133 new ports or files... done.</screen>
</listitem>
<listitem>
<indexterm>
<primary>&os.stable;</primary>
<secondary>compileren</secondary>
</indexterm>
<para>Lees alvorens &os.stable; te compileren goed de
<para>Lees alvorens &os.stable; te compileren<indexterm><primary>&os.stable;</primary><secondary>compileren</secondary></indexterm> goed de
<filename>Makefile</filename> in
<filename>/usr/src</filename>. Het is handig om de
eerste keer op zijn minst <link linkend="makeworld">de
@ -1737,9 +1703,7 @@ Fetching 133 new ports or files... done.</screen>
doen, maar <application>anonieme CVS</application> is makkelijker
in het gebruik.</para>
<indexterm><primary><application>CTM</application></primary></indexterm>
<para><application>CTM</application> aan de andere kant maakt geen
<para><application>CTM</application><indexterm><primary><application>CTM</application></primary></indexterm> aan de andere kant maakt geen
vergelijking tussen de aanwezige bronnen en die op de master
server. In plaats daarvan wordt een script uitgevoerd dat
wijzigingen in bestanden ziet sinds de vorige keer dat is

View file

@ -6,7 +6,7 @@
%SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.xml
%SRCID% 40792
(+r42226)
(+42118,42226)
-->
<chapter id="disks">
@ -3978,11 +3978,6 @@ gbde_lockdir="/etc/gbde"</programlisting>
te ontkoppelen:</para>
<screen>&prompt.root; <userinput>gbde detach /dev/ad4s1c</userinput></screen>
<para><application>gbde</application> kan niet met
<application>vinum</application> volumes gebruikt worden,
omdat &man.vinum.4; geen gebruik maakt van het subsysteem
&man.geom.4;.</para>
</sect3>
</sect2>

View file

@ -409,11 +409,13 @@ pflog_flags="" # aanvullende vlaggen voor opstarten pflogd</pro
&man.pfctl.8; voor alle beschikbare opties):</para>
<informaltable frame="none" pgwide="1">
<tgroup cols="2">
<tgroup cols="4">
<thead>
<row>
<entry>Commando</entry>
<entry>Doel</entry>
<entry/>
<entry/>
</row>
</thead>
@ -422,12 +424,20 @@ pflog_flags="" # aanvullende vlaggen voor opstarten pflogd</pro
<entry><command>pfctl <option>-e</option></command></entry>
<entry>PF aanzetten</entry>
<entry/>
<entry/>
</row>
<row>
<entry><command>pfctl <option>-d</option></command></entry>
<entry>PF uitzetten</entry>
<entry/>
<entry/>
</row>
<row>
@ -448,6 +458,10 @@ pflog_flags="" # aanvullende vlaggen voor opstarten pflogd</pro
<entry>Controleer <filename>/etc/pf.conf</filename> op
fouten, maar laad de regelverzameling niet</entry>
<entry/>
<entry/>
</row>
</tbody>
</tgroup>

View file

@ -87,20 +87,16 @@
Hier zijn er enkele op een rij gezet:</para>
<itemizedlist>
<indexterm><primary>preemptive multitasking</primary></indexterm>
<listitem>
<para><emphasis>Preemptive multitasking</emphasis> zorgt
<para><emphasis>Preemptive multitasking</emphasis><indexterm><primary>preemptive multitasking</primary></indexterm> zorgt
ervoor dat meerdere programma's en gebruikers op dezelfde
computer kunnen werken, zonder dat de systeemrespons of
stabiliteit beïnvloed wordt.</para>
</listitem>
<listitem>
<indexterm><primary>Meerdere gebruikers</primary></indexterm>
<para>Ondersteuning voor <emphasis>meerdere
gebruikers</emphasis> maakt het mogelijk dat
gebruikers</emphasis><indexterm><primary>Meerdere gebruikers</primary></indexterm> maakt het mogelijk dat
verschillende mensen een &os; systeem tegelijkertijd
kunnen gebruiken voor een groot aantal taken. Dit
betekent bijvoorbeeld dat randapparaten als printers en
@ -112,10 +108,8 @@
</listitem>
<listitem>
<indexterm><primary>TCP/IP netwerken</primary></indexterm>
<para>Krachtige mogelijkheden voor <emphasis>TCP/IP
netwerken</emphasis> met ondersteuning voor
netwerken</emphasis><indexterm><primary>TCP/IP netwerken</primary></indexterm> met ondersteuning voor
industriestandaarden als SCTP, DHCP, NFS, NIS, PPP, SLIP,
IPsec en IPv6. Dit betekent dat een &os;-systeem makkelijk
kan samenwerken met andere systemen en dat het kan
@ -126,9 +120,7 @@
</listitem>
<listitem>
<indexterm><primary>Geheugenbeveiliging</primary></indexterm>
<para><emphasis>Geheugenbeveiliging</emphasis> garandeert dat
<para><emphasis>Geheugenbeveiliging</emphasis><indexterm><primary>Geheugenbeveiliging</primary></indexterm> garandeert dat
applicaties (of gebruikers) elkaar niet kunnen storen. Een
crashende applicatie heeft totaal geen effect op andere
applicaties.</para>
@ -142,49 +134,19 @@
</listitem>
<listitem>
<indexterm>
<primary>X Window systeem</primary>
</indexterm>
<para>Het <emphasis>X Window systeem</emphasis>
<para>Het <emphasis>X Window systeem</emphasis><indexterm><primary>X Window systeem</primary></indexterm>
(X11R7), een industriële standaard, biedt een
grafische gebruikersinterface (GUI) met als enige
benodigdheden een VGA-kaart en een beeldscherm.</para>
</listitem>
<listitem>
<indexterm>
<primary>binaire compatibiliteit</primary>
<secondary>Linux</secondary>
</indexterm>
<indexterm>
<primary>binaire compatibiliteit</primary>
<secondary>SCO</secondary>
</indexterm>
<indexterm>
<primary>binaire compatibiliteit</primary>
<secondary>SVR4</secondary>
</indexterm>
<indexterm>
<primary>binaire compatibiliteit</primary>
<secondary>BSD/OS</secondary>
</indexterm>
<indexterm>
<primary>binaire compatibiliteit</primary>
<secondary>NetBSD</secondary>
</indexterm>
<para>Door <emphasis>binaire compatibiliteit</emphasis> met
veel programma's voor &linux;, SCO, SVR4, BSDI en NetBSD
veel programma's voor &linux;<indexterm><primary>binaire compatibiliteit</primary><secondary>Linux</secondary></indexterm>,
SCO<indexterm><primary>binaire compatibiliteit</primary><secondary>SCO</secondary></indexterm>,
SVR4<indexterm><primary>binaire compatibiliteit</primary><secondary>SVR4</secondary></indexterm>,
BSDI<indexterm><primary>binaire compatibiliteit</primary><secondary>BSD/OS</secondary></indexterm> en
NetBSD<indexterm><primary>binaire compatibiliteit</primary><secondary>NetBSD</secondary></indexterm>
is het mogelijk om deze programma's zonder snelheidsverlies
op &os; te draaien.</para>
</listitem>
@ -206,9 +168,7 @@
</listitem>
<listitem>
<indexterm><primary>Virtueel geheugen</primary></indexterm>
<para>Het demand-paged <emphasis>virtueel geheugen</emphasis>
<para>Het demand-paged <emphasis>virtueel geheugen</emphasis><indexterm><primary>Virtueel geheugen</primary></indexterm>
en de <quote>gecombineerde VM/buffer cache</quote> van &os;
zorgen ervoor dat applicaties met grote geheugenbehoeften
niets te kort komen, terwijl de systeemrespons niet
@ -216,29 +176,13 @@
</listitem>
<listitem>
<indexterm>
<primary>Symmetric Multi-Processing (SMP)</primary>
</indexterm>
<para><emphasis>SMP</emphasis>-ondersteuning voor computers
<para><emphasis>SMP</emphasis>-ondersteuning<indexterm><primary>Symmetric Multi-Processing (SMP)</primary></indexterm> voor computers
met meerdere processoren.</para>
</listitem>
<listitem>
<indexterm>
<primary>compilers</primary>
<secondary>C</secondary>
</indexterm>
<indexterm>
<primary>compilers</primary>
<secondary>C++</secondary>
</indexterm>
<para>Een volledige <emphasis>C</emphasis> en
<emphasis>C++</emphasis>
<para>Een volledige <emphasis>C</emphasis><indexterm><primary>compilers</primary><secondary>C</secondary></indexterm> en
<emphasis>C++</emphasis><indexterm><primary>compilers</primary><secondary>C++</secondary></indexterm>
ontwikkelomgeving. Vele andere
programmeertalen, te gebruiken voor onderzoek of
@ -247,9 +191,7 @@
</listitem>
<listitem>
<indexterm><primary>broncode</primary></indexterm>
<para>De <emphasis>broncode</emphasis> van het hele
<para>De <emphasis>broncode</emphasis><indexterm><primary>broncode</primary></indexterm> van het hele
systeem is beschikbaar, zodat gebruikers de volledige
controle over het systeem in handen hebben. Waarom
genoegen nemen met alleen het erewoord van de
@ -314,15 +256,11 @@
<itemizedlist>
<listitem>
<indexterm><primary>FTP servers</primary></indexterm>
<para>FTP servers;</para>
<para>FTP servers;<indexterm><primary>FTP servers</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>webservers</primary></indexterm>
<para>World Wide Webservers (standaard of beveiligd
<para>World Wide Webservers<indexterm><primary>webservers</primary></indexterm> (standaard of beveiligd
[SSL]);</para>
</listitem>
@ -331,30 +269,16 @@
</listitem>
<listitem>
<indexterm><primary>firewall</primary></indexterm>
<indexterm><primary>NAT</primary></indexterm>
<para>Firewalls en NAT (<quote>IP-maskering</quote>)
<para>Firewalls<indexterm><primary>firewall</primary></indexterm> en NAT<indexterm><primary>NAT</primary></indexterm> (<quote>IP-maskering</quote>)
gateways;</para>
</listitem>
<listitem>
<indexterm>
<primary>elektronische mail</primary>
<see>e-mail</see>
</indexterm>
<indexterm><primary>e-mail</primary></indexterm>
<para>E-mail servers;</para>
<para>E-mail servers;<indexterm><primary>e-mail</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>USENET</primary></indexterm>
<para>USENET nieuws of Bulletin Board (BBS)
<para>USENET<indexterm><primary>USENET</primary></indexterm> nieuws of Bulletin Board (BBS)
systemen;</para>
</listitem>
@ -395,12 +319,8 @@
</listitem>
<listitem>
<indexterm><primary>router</primary></indexterm>
<indexterm><primary>DNS Server</primary></indexterm>
<para><emphasis>Netwerken:</emphasis> nieuwe router nodig?
Of een nameserver (DNS)? Een firewall om een intern netwerk
<para><emphasis>Netwerken:</emphasis> nieuwe router<indexterm><primary>router</primary></indexterm> nodig?
Of een nameserver (DNS)<indexterm><primary>DNS Server</primary></indexterm>? Een firewall om een intern netwerk
te beschermen? &os; kan die ongebruikte 486 of Pentium PC
die nog ergens in een hoekje ligt gemakkelijk omtoveren tot
een geavanceerde router met uitgebreide pakketfilter
@ -408,11 +328,7 @@
</listitem>
<listitem>
<indexterm>
<primary>X Window systeem</primary>
</indexterm>
<para><emphasis>X Window werkstation:</emphasis> &os; is een
<para><emphasis>X Window werkstation:</emphasis><indexterm><primary>X Window systeem</primary></indexterm> &os; is een
prima keuze als goedkope X terminal oplossing, door
gebruik te maken van de gratis beschikbare X11 server. In
tegenstelling tot een pure X terminal kan &os; ook
@ -434,14 +350,10 @@
</listitem>
<listitem>
<indexterm>
<primary>GNU Compiler Collection</primary>
</indexterm>
<para><emphasis>Software Ontwikkeling:</emphasis> bij het
standaard &os;-systeem zit al een volledige verzameling van
ontwikkelgereedschappen, inclusief de bekende
GNU&nbsp;C/C++ compiler en debugger.</para>
GNU&nbsp;C/C++ compiler<indexterm><primary>GNU Compiler Collection</primary></indexterm> en debugger.</para>
</listitem>
</itemizedlist>
@ -464,27 +376,19 @@
<itemizedlist>
<listitem>
<indexterm><primary>Apple</primary></indexterm>
<para><ulink url="http://www.apple.com/">Apple</ulink></para>
<para><ulink url="http://www.apple.com/">Apple</ulink><indexterm><primary>Apple</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Cisco</primary></indexterm>
<para><ulink url="http://www.cisco.com/">Cisco</ulink></para>
<para><ulink url="http://www.cisco.com/">Cisco</ulink><indexterm><primary>Cisco</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Juniper</primary></indexterm>
<para><ulink url="http://www.juniper.net/">Juniper</ulink></para>
<para><ulink url="http://www.juniper.net/">Juniper</ulink><indexterm><primary>Juniper</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>NetApp</primary></indexterm>
<para><ulink url="http://www.netapp.com/">NetApp</ulink></para>
<para><ulink url="http://www.netapp.com/">NetApp</ulink><indexterm><primary>NetApp</primary></indexterm></para>
</listitem>
</itemizedlist>
@ -493,83 +397,59 @@
<itemizedlist>
<listitem>
<indexterm><primary>Yahoo!</primary></indexterm>
<para><ulink
url="http://www.yahoo.com/">Yahoo!</ulink></para>
url="http://www.yahoo.com/">Yahoo!</ulink><indexterm><primary>Yahoo!</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Yandex</primary></indexterm>
<para><ulink url="http://www.yandex.ru/">Yandex</ulink></para>
<para><ulink url="http://www.yandex.ru/">Yandex</ulink><indexterm><primary>Yandex</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Apache</primary></indexterm>
<para><ulink
url="http://www.apache.org/">Apache</ulink></para>
url="http://www.apache.org/">Apache</ulink><indexterm><primary>Apache</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Rambler</primary></indexterm>
<para><ulink url="http://www.rambler.ru/">Rambler</ulink></para>
<para><ulink url="http://www.rambler.ru/">Rambler</ulink><indexterm><primary>Rambler</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Sina</primary></indexterm>
<para><ulink url="http://www.sina.com/">Sina</ulink></para>
<para><ulink url="http://www.sina.com/">Sina</ulink><indexterm><primary>Sina</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Pair Networks</primary></indexterm>
<para><ulink url="http://www.pair.com/">Pair
Networks</ulink></para>
Networks</ulink><indexterm><primary>Pair Networks</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Sony Japan</primary></indexterm>
<para><ulink url="http://www.sony.co.jp/">Sony
Japan</ulink></para>
Japan</ulink><indexterm><primary>Sony Japan</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Netcraft</primary></indexterm>
<para><ulink
url="http://www.netcraft.com/">Netcraft</ulink></para>
url="http://www.netcraft.com/">Netcraft</ulink><indexterm><primary>Netcraft</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>NetEase</primary></indexterm>
<para><ulink url="http://www.163.com/">NetEase</ulink></para>
<para><ulink url="http://www.163.com/">NetEase</ulink><indexterm><primary>NetEase</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Weathernews</primary></indexterm>
<para><ulink
url="http://www.wni.com/">Weathernews</ulink></para>
url="http://www.wni.com/">Weathernews</ulink><indexterm><primary>Weathernews</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>TELEHOUSE America</primary></indexterm>
<para><ulink url="http://www.telehouse.com/">TELEHOUSE
America</ulink></para>
America</ulink><indexterm><primary>TELEHOUSE America</primary></indexterm></para>
</listitem>
<listitem>
<indexterm><primary>Experts Exchange</primary></indexterm>
<para><ulink url="http://www.experts-exchange.com/">Experts
Exchange</ulink></para>
Exchange</ulink><indexterm><primary>Experts Exchange</primary></indexterm></para>
</listitem>
</itemizedlist>
@ -893,49 +773,21 @@
id="development-cvs-repository"/></term>
<listitem>
<indexterm>
<primary>CVS</primary>
</indexterm>
<indexterm>
<primary>CVS-archief</primary>
</indexterm>
<indexterm>
<primary>Concurrent Versions System</primary>
<see>CVS</see>
</indexterm>
<indexterm>
<primary>Subversion</primary>
</indexterm>
<indexterm>
<primary>Subversion-archief</primary>
</indexterm>
<indexterm>
<primary>SVN</primary>
<!--<see>Subversion</see>-->
</indexterm>
<para>Gedurende een aantal jaren werd de centrale broncode
voor &os; bijgehouden door <ulink
url="http://www.nongnu.org/cvs/">CVS</ulink>
(Concurrent Versions System), een vrij verkrijgbaar pakket
voor het onderhouden van broncode dat bij &os; zit. In
url="http://www.nongnu.org/cvs/">CVS</ulink><indexterm><primary>CVS</primary></indexterm>
(Concurrent Versions System)<indexterm><primary>Concurrent Versions System</primary><see>CVS</see></indexterm>, een vrij verkrijgbaar pakket
voor het onderhouden van broncode<indexterm><primary>CVS-archief</primary></indexterm> dat bij &os; zit. In
juni 2008 is het Project <ulink
url="http://subversion.tigris.org/">SVN</ulink>
url="http://subversion.tigris.org/">SVN</ulink><indexterm><primary>Subversion</primary></indexterm>
(Subversion) gaan gebruiken. Deze overgang werd nodig
geacht omdat de technische beperkingen die door
<application>CVS</application> worden opgelegd duidelijk
werden wegens de snelle uitbreiding van de broncode en de
werden wegens de snelle uitbreiding van de broncode<indexterm><primary>Subversion-archief</primary></indexterm> en de
hoeveelheid geschiedenis die reeds is opgeslagen. De reservoirs
van het Documentatieproject en de Portscollectie zijn ook omgezet
van <application>CVS</application> naar
<application>SVN</application>, respectievelijk in mei 2012 en
<application>SVN</application><indexterm><primary>SVN</primary></indexterm>, respectievelijk in mei 2012 en
juli 2012.</para>
<para>Hoewel de reservoirs voor <literal>src/</literal> en
@ -973,11 +825,7 @@
</term>
<listitem>
<indexterm>
<primary>committers</primary>
</indexterm>
<para>De zogenaamde <firstterm>committers</firstterm> zijn
<para>De zogenaamde <firstterm>committers</firstterm><indexterm><primary>committers</primary></indexterm> zijn
alle mensen die <emphasis>schrijf</emphasis>-rechten
hebben in het Subversion-archief van &os;. Deze mensen mogen
veranderingen maken aan de broncode van &os; (de term
@ -996,9 +844,7 @@
<term>Het &os; Core Team<anchor id="development-core"/></term>
<listitem>
<indexterm><primary>core team</primary></indexterm>
<para>Het <firstterm>&os; core team</firstterm> zou het
<para>Het <firstterm>&os; core team</firstterm><indexterm><primary>core team</primary></indexterm> zou het
equivalent zijn van een raad van bestuur als het
&os;&nbsp;Project een bedrijf zou zijn. De primaire taak
van het core team is ervoor zorg te dragen dat het
@ -1035,8 +881,6 @@
<term>Externe Bijdragen</term>
<listitem>
<indexterm><primary>externe bijdragen</primary></indexterm>
<para>De grootste groep ontwikkelaars zijn de gebruikers
zelf, die &os; continu voorzien van constructief
commentaar en oplossingen voor fouten. De handigste
@ -1049,7 +893,7 @@
<para><citetitle><ulink
url="&url.articles.contributors;/article.html">De lijst
van medewerkers</ulink></citetitle> is lang en groeit
van medewerkers</ulink></citetitle><indexterm><primary>externe bijdragen</primary></indexterm> is lang en groeit
iedere dag, dus wat let de lezer om zelf een bijdrage te
doen aan &os;?</para>

View file

@ -276,17 +276,13 @@
instellingenbestanden ingesteld worden:</para>
<itemizedlist>
<indexterm><primary>POSIX</primary></indexterm>
<listitem>
<para><envar>LANG</envar> voor de &posix; &man.setlocale.3;
<para><envar>LANG</envar> voor de &posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3;
functies.</para>
</listitem>
<listitem>
<indexterm><primary>MIME</primary></indexterm>
<para><envar>MM_CHARSET</envar> voor de MIME
<para><envar>MM_CHARSET</envar> voor de MIME<indexterm><primary>MIME</primary></indexterm>
karakters voor applicaties.</para>
</listitem>
</itemizedlist>

View file

@ -1138,10 +1138,8 @@ www.example.org</programlisting>
dingen geregeld te zijn:</para>
<itemizedlist>
<indexterm><primary>MX-regel</primary></indexterm>
<listitem>
<para>Zorg ervoor dat de (laagstgenummerde) MX-regel in het
<para>Zorg ervoor dat de (laagstgenummerde) MX-regel<indexterm><primary>MX-regel</primary></indexterm> in het
DNS naar het IP-adres van de host wijst.</para>
</listitem>

View file

@ -1384,14 +1384,8 @@ Exports list on foobar:
<title>Soorten machines</title>
<itemizedlist>
<indexterm>
<primary>NIS</primary>
<secondary>masterserver</secondary>
</indexterm>
<listitem>
<para>Een <emphasis>NIS-masterserver</emphasis>. Deze
<para>Een <emphasis>NIS-masterserver</emphasis><indexterm><primary>NIS</primary><secondary>masterserver</secondary></indexterm>. Deze
server onderhoudt, analoog aan een &windowsnt; primaire
domeincontroller, de bestanden die door alle
NIS-cliënten gebruikt worden. De bestanden
@ -1408,13 +1402,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>slaveserver</secondary>
</indexterm>
<para><emphasis>NIS-slaveservers</emphasis>. Deze zijn
<para><emphasis>NIS-slaveservers</emphasis><indexterm><primary>NIS</primary><secondary>slaveserver</secondary></indexterm>. Deze zijn
te vergelijken met &windowsnt; backup domain controllers.
NIS-slaveservers beheren een kopie van de bestanden met
gegevens op de NIS-master. NIS-slaveservers bieden
@ -1426,13 +1414,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>cliënt</secondary>
</indexterm>
<para><emphasis>NIS-cliënten</emphasis>.
<para><emphasis>NIS-cliënten</emphasis><indexterm><primary>NIS</primary><secondary>cliënt</secondary></indexterm>.
NIS-cliënten authenticeren, net als de meeste
&windowsnt; werkstations, tegen de NIS-server (of de
&windowsnt; domain controller in het geval van &windowsnt;
@ -5512,16 +5494,10 @@ $include Kexample.com.+005+nnnnn.ZSK.key ; ZSK</programlisting>
<term><literal>passdb backend</literal></term>
<listitem>
<indexterm><primary>NIS+</primary></indexterm>
<indexterm><primary>LDAP</primary></indexterm>
<indexterm><primary>SQL database</primary></indexterm>
<para><application>Samba</application> kent aan de
achterkant verschillende authenticatiemodellen.
Cliënten kunnen authenticeren met LDAP, NIS+, een
SQL-database of een aangepast wachtwoordbestand. De
Cliënten kunnen authenticeren met LDAP<indexterm><primary>LDAP</primary></indexterm>, NIS+<indexterm><primary>NIS+</primary></indexterm>, een
SQL-database<indexterm><primary>SQL database</primary></indexterm> of een aangepast wachtwoordbestand. De
standaard authenticatiemethode is
<literal>smbpasswd</literal>. Meer wordt hier niet
behandeld.</para>

View file

@ -165,18 +165,10 @@
beschikbaar heeft:</para>
<itemizedlist>
<indexterm id="ppp-isp">
<primary>ISP</primary>
</indexterm>
<indexterm id="ppp-ppp2">
<primary>PPP</primary>
</indexterm>
<listitem>
<para>Een account bij een Internet Service Provider (ISP)
<para>Een account bij een Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm>
waarmee verbinding gemaakt wordt door middel van
PPP.</para>
PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
</listitem>
<listitem>
@ -190,38 +182,15 @@
</listitem>
<listitem>
<indexterm id="ppp-pap">
<primary>PAP</primary>
</indexterm>
<indexterm id="ppp-chap">
<primary>CHAP</primary>
</indexterm>
<indexterm id="ppp-unix">
<primary>UNIX</primary>
</indexterm>
<indexterm id="ppp-login">
<primary>loginnaam</primary>
</indexterm>
<indexterm id="ppp-password">
<primary>wachtwoord</primary>
</indexterm>
<para>Uw loginnaam en wachtwoord (danwel een combinatie van een
standaard &unix;-stijl login en wachtwoord of een PAP of CHAP
<para>Uw loginnaam<indexterm id="ppp-login"><primary>loginnaam</primary></indexterm> en wachtwoord<indexterm id="ppp-password"><primary>wachtwoord</primary></indexterm> (danwel een combinatie van een
standaard &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm>-stijl
login en wachtwoord of een PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> of CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>
login en wachtwoordcombinatie).</para>
</listitem>
<listitem>
<indexterm id="ppp-nameserver">
<primary>naamserver</primary>
</indexterm>
<para>Het IP-adres van één of meerdere
naamservers. Normaal gesproken krijgt u twee IP
naamservers<indexterm id="ppp-nameserver"><primary>naamserver</primary></indexterm>. Normaal gesproken krijgt u twee IP
adressen van uw ISP om te gebruiken. Als u er echter geen
één gekregen heeft, kunt u het commando
<command>enable dns</command> gebruiken in
@ -257,11 +226,7 @@
</listitem>
<listitem>
<indexterm id="ppp-static-ip">
<primary>statisch IP-adres</primary>
</indexterm>
<para>Als uw ISP u een vast IP-adres en hostnaam levert,
<para>Als uw ISP u een vast IP-adres<indexterm id="ppp-static-ip"><primary>statisch IP-adres</primary></indexterm> en hostnaam levert,
kunt u deze invoeren. In andere gevallen bepaalt de
andere kant welk adres er uitgegeven wordt.</para>
</listitem>
@ -411,12 +376,7 @@
<term>Regels 6 &amp; 7:</term>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>gebruiker-PPP</secondary>
</indexterm>
<para>De inbelregel. Gebruiker-PPP gebruikt een
<para>De inbelregel. Gebruiker-PPP gebruikt<indexterm><primary>PPP</primary><secondary>gebruiker-PPP</secondary></indexterm> een
<quote>expect-send</quote> syntax wat vergelijkbaar is
met het &man.chat.8; programma. Bekijk de handleiding
voor meer informatie over de mogelijkheden van deze
@ -516,14 +476,10 @@
<term>Regels 15:</term>
<listitem>
<indexterm><primary>PAP</primary></indexterm>
<indexterm><primary>CHAP</primary></indexterm>
<para>Als u gebruik maakt van PPP en CHAP, zal er geen
login op dit moment zijn, en moet deze regel
uitgecommentarieërd of verwijderd worden. Zie het
<link linkend="userppp-PAPnCHAP">PAP en CHAP
<link linkend="userppp-PAPnCHAP">PAP<indexterm><primary>PAP</primary></indexterm> en CHAP<indexterm><primary>CHAP</primary></indexterm>
authenticatie</link> hoofdstuk voor meer details.</para>
<para>De login regel is hetzelfde als de chat-achtige
@ -549,9 +505,7 @@ protocol: ppp</screen>
<term>Regel 16:</term>
<listitem>
<indexterm><primary>timeout</primary></indexterm>
<para>Selt de standaard idle timeout in (in seconden)
<para>Selt de standaard idle timeout<indexterm><primary>timeout</primary></indexterm> in (in seconden)
voor de connectie. Hier wordt de connectie
automatisch afgesloten na 300 seconden van
inactiviteit. Als u nooit een timeout wilt krijgen,
@ -565,11 +519,9 @@ protocol: ppp</screen>
<term>Regel 17:</term>
<listitem>
<indexterm><primary>ISP</primary></indexterm>
<para>Stelt het interface adres in. De regel
<replaceable>x.x.x.x</replaceable> moet vervangen
worden door het IP-adres dat uw provider aan u heeft
worden door het IP-adres<indexterm><primary>ISP</primary></indexterm> dat uw provider aan u heeft
uitgegeven. De regel
<replaceable>y.y.y.y</replaceable> moet vervangen
worden door het IP-adres dat uw provider aan u
@ -1120,9 +1072,7 @@ set nbns 203.14.100.5</programlisting>
<term>Regel 14:</term>
<listitem>
<indexterm><primary>password</primary></indexterm>
<para>Deze regel geeft uw PPP/CHAP wachtwoord aan.
<para>Deze regel geeft uw PPP/CHAP wachtwoord<indexterm><primary>password</primary></indexterm> aan.
U moet de juiste waarde invullen voor
<replaceable>Mijnwachtwoord</replaceable>. Misschien
wilt u een extra regel toevoegen als:</para>
@ -1472,13 +1422,7 @@ ifconfig_tun0=</programlisting>
</listitem>
<listitem>
<indexterm>
<primary>PPP</primary>
<secondary>server</secondary>
</indexterm>
<para>Als een <quote>server</quote> &mdash; uw machine bevind
<para>Als een <quote>server</quote><indexterm><primary>PPP</primary><secondary>server</secondary></indexterm> &mdash; uw machine bevind
zich in het netwerk en wordt gebruikt om andere computers
te verbinden door middel van PPP.</para>
</listitem>
@ -2781,9 +2725,7 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
</listitem>
<listitem>
<indexterm><primary>standaard routering</primary></indexterm>
<para>Stel de standaard router in door het aanpassen
<para>Stel de standaard router<indexterm><primary>standaard routering</primary></indexterm> in door het aanpassen
van de volgende regel van:</para>
<programlisting>defaultrouter="NO"</programlisting>
@ -2804,12 +2746,8 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
nameserver 128.32.136.9
nameserver 128.32.136.12</programlisting>
<indexterm><primary>naamserver</primary></indexterm>
<indexterm><primary>domeinnaam</primary></indexterm>
<para>Zoals u kunt zien, stellen deze de naamserver hosten
in. Uiteraard is het echte domein en adres afhankelijk
<para>Zoals u kunt zien, stellen deze de naamserver<indexterm><primary>naamserver</primary></indexterm> hosten
in. Uiteraard is het echte domein<indexterm><primary>domeinnaam</primary></indexterm> en adres afhankelijk
van uw omgeving.</para>
</step>

View file

@ -6,7 +6,7 @@
Vertaald door: Remko Lodder
%SOURCE% en_US.ISO8859-1/books/handbook/preface/preface.xml
%SRCID% 41817
%SRCID% 42118
-->
<preface id="book-preface">
@ -114,14 +114,6 @@
en het netwerk en versleutelde partities op schijven.</para>
</listitem>
<listitem>
<para><xref linkend="vinum-vinum"/>, Vinum, is een nieuw
hoofdstuk in deze editie. Er wordt in beschreven hoe
Vinum gebruikt kan worden. Vinum is een logische volume
manager die apparaat onafhankelijke logische schijven kan
aanbieden en software RAID-0, RAID-1 en RAID-5.</para>
</listitem>
<listitem>
<para>Aan <xref linkend="ppp-and-slip"/>, PPP en SLIP, is een
paragraaf toegevoegd over problemen oplossen.</para>
@ -532,7 +524,7 @@
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="GEOM"/>,
<term><emphasis><xref linkend="geom-synopsis"/>,
GEOM</emphasis></term>
<listitem>
@ -552,17 +544,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="vinum-vinum"/>,
Vinum</emphasis></term>
<listitem>
<para>Beschrijft hoe Vinum gebruikt wordt, een logische
volumebeheerder die apparaatonafhankelijke logische schijven
levert, met software RAID-0, RAID-1 en RAID-5.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis><xref linkend="virtualization"/>,
Virtualisatie</emphasis></term>

View file

@ -139,11 +139,9 @@
</listitem>
<listitem>
<indexterm><primary>afdrukopdrachten</primary></indexterm>
<para>Het geeft gebruikers de mogelijkheid bestanden aan te
bieden die afgedrukt moeten worden; deze aangeboden bestanden
worden <emphasis>afdrukopdrachten</emphasis> genoemd;</para>
worden <emphasis>afdrukopdrachten</emphasis><indexterm><primary>afdrukopdrachten</primary></indexterm> genoemd;</para>
</listitem>
<listitem>
@ -203,12 +201,10 @@
</listitem>
<listitem>
<indexterm><primary>&tex;</primary></indexterm>
<para><application>LPD</application> op eenvoudige wijze een
afdrukopdracht door een filter kan afdrukken om kopteksten
met datum/tijd toe te voegen of een speciaal
bestandsformaat (zoals een &tex; DVI-bestand) om te zetten
bestandsformaat (zoals een &tex;<indexterm><primary>&tex;</primary></indexterm> DVI-bestand) om te zetten
naar een formaat dat de printer begrijpt. Deze handelingen
hoeven dan niet handmatig uitgevoerd te worden;</para>
</listitem>
@ -315,14 +311,8 @@
poorten:</para>
<itemizedlist>
<indexterm>
<primary>printers</primary>
<secondary>serieel</secondary>
</indexterm>
<listitem>
<para><emphasis>Seriële</emphasis> poort, ook
<para><emphasis>Seriële</emphasis><indexterm><primary>printers</primary><secondary>serieel</secondary></indexterm> poort, ook
bekend als RS-232- of COM-poorten, gebruiken een
seriële poort op een computer om gegevens naar een
printer te sturen. Seriële poorten zijn heel
@ -338,13 +328,7 @@
</listitem>
<listitem>
<indexterm>
<primary>printers</primary>
<secondary>parallel</secondary>
</indexterm>
<para><emphasis>Parallelle</emphasis> poorten
<para><emphasis>Parallelle</emphasis><indexterm><primary>printers</primary><secondary>parallel</secondary></indexterm> poorten
gebruiken een parallelle poort op een computer om
gegevens naar een printer te sturen. Parallelle
poorten zijn gebruikelijk in de PC-markt en zijn
@ -354,25 +338,13 @@
communicatieparameters bij parallelle poorten, wat het
instellen erg eenvoudig maakt.</para>
<indexterm>
<primary>centronics</primary>
<see>parallelle printers</see>
</indexterm>
<para>Parallelle poorten staan ook wel bekend als
<quote>Centronics</quote> poorten, genoemd naar het
<quote>Centronics</quote><indexterm><primary>centronics</primary><see>parallelle printers</see></indexterm> poorten, genoemd naar het
soort aansluiting op de printer.</para>
</listitem>
<listitem>
<indexterm>
<primary>printers</primary>
<secondary>USB</secondary>
</indexterm>
<para>USB poorten, genoemd naar de Universal Serial
<para>USB<indexterm><primary>printers</primary><secondary>USB</secondary></indexterm> poorten, genoemd naar de Universal Serial
Bus, kunnen zelfs op nog hogere snelheid werken dan
parallelle of RS-232 seriële poorten. De
kabels zijn eenvoudig en goedkoop. USB is voor
@ -465,9 +437,7 @@
</listitem>
<listitem>
<indexterm><primary>null-modem kabel</primary></indexterm>
<para>Een <emphasis>null-modem</emphasis> kabel verbindt
<para>Een <emphasis>null-modem</emphasis><indexterm><primary>null-modem kabel</primary></indexterm> kabel verbindt
enkele pinnetjes direct, verwisselt andere
(bijvoorbeeld van verstuur gegevens naar ontvang
gegevens) en sluit sommige draden kort in de stekker.
@ -997,9 +967,7 @@ showpage</programlisting>
</step>
<step>
<indexterm><primary>voorbladen</primary></indexterm>
<para>Het afdrukken van voorbladen (standaard) kan uitgezet
<para>Het afdrukken van voorbladen<indexterm><primary>voorbladen</primary></indexterm> (standaard) kan uitgezet
worden met de optie <literal>sh</literal>. In <link
linkend="printing-no-header-pages">Voorbladen
onderdrukken</link> staat meer informatie.</para>
@ -1803,13 +1771,7 @@ $%&amp;'()*+,-./01234567
</listitem>
<listitem>
<indexterm>
<primary>afdrukken</primary>
<secondary>filters</secondary>
</indexterm>
<para>Een <emphasis>conversiefilter</emphasis> converteert
<para>Een <emphasis>conversiefilter</emphasis><indexterm><primary>afdrukken</primary><secondary>filters</secondary></indexterm> converteert
een specifiek bestandsformaat naar een formaat dat een
printer begrijpt. Bijvoorbeeld: ditroff
typesettinggegevens kunnen niet direct worden afgedrukt,
@ -5006,9 +4968,7 @@ cfA013rose dequeued</screen>
<term>LPRng</term>
<listitem>
<indexterm><primary>LPRng</primary></indexterm>
<para><application>LPRng</application>, dat <quote>LPR: the
<para><application>LPRng</application><indexterm><primary>LPRng</primary></indexterm>, dat <quote>LPR: the
Next Generation</quote> betekent, is een compleet
herschreven PLP. Patrick Powell en Justin Mason (de
voornaamste beheerder van PLP) hebben samengewerkt om
@ -5022,9 +4982,7 @@ cfA013rose dequeued</screen>
<term>CUPS</term>
<listitem>
<indexterm><primary>CUPS</primary></indexterm>
<para><application>CUPS</application>, het Common UNIX
<para><application>CUPS</application><indexterm><primary>CUPS</primary></indexterm>, het Common UNIX
Printing System, voorziet in een overzetbare printlaag voor
&unix;-achtige besturingssystemen. Het is ontwikkeld door
Easy Software Product, om een standaard afdrukoplossing
@ -5051,9 +5009,7 @@ cfA013rose dequeued</screen>
<term>HPLIP</term>
<listitem>
<indexterm><primary>HPLIP</primary></indexterm>
<para><application>HPLIP</application>, het HP &linux; Imaging and
<para><application>HPLIP</application><indexterm><primary>HPLIP</primary></indexterm>, het HP &linux; Imaging and
Printing systeem, is een suite van programma's ontwikkeld door HP
dat printen, scannen en faxen voor toepassingen van HP ondersteunt.
Deze suite van programma's maakt gebruikt van het printsysteem

View file

@ -466,10 +466,9 @@ boot:</screen>
<para>Here are some practical examples of loader usage:</para>
<itemizedlist>
<indexterm><primary>single-user mode</primary></indexterm>
<listitem>
<para>To simply boot your usual kernel, but in single-user
mode:</para>
mode:<indexterm><primary>single-user mode</primary></indexterm></para>
<screen><userinput>boot -s</userinput></screen>
</listitem>
@ -477,16 +476,12 @@ boot:</screen>
<listitem>
<para>To unload your usual kernel and modules, and then
load just your old (or another) kernel:</para>
<indexterm>
<primary><filename>kernel.old</filename></primary>
</indexterm>
<screen><userinput>unload</userinput>
<userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
<para>You can use <filename>kernel.GENERIC</filename> to
refer to the generic kernel that comes on the install
disk, or <filename>kernel.old</filename> to refer to
disk, or <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> to refer to
your previously installed kernel (when you have upgraded
or configured your own kernel, for example).</para>

View file

@ -186,13 +186,9 @@
<sect3>
<title>Using &os.current;</title>
<indexterm>
<primary>-CURRENT</primary>
<secondary>using</secondary>
</indexterm>
<orderedlist>
<listitem>
<para>Join the &a.current.name; and the &a.cvsall.name; lists. This is not
<para>Join the &a.current.name;<indexterm><primary>-CURRENT</primary><secondary>using</secondary></indexterm> and the &a.cvsall.name; lists. This is not
just a good idea, it is <emphasis>essential</emphasis>. If
you are not on the <emphasis>&a.current.name;</emphasis> list,
you will not see the comments that people are
@ -217,39 +213,23 @@
site</link>. You can do this in one of two ways:</para>
<orderedlist>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with <application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Use the <link linkend="cvsup">cvsup</link> program
<para>Use the <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> program
with the <filename>supfile</filename> named <filename>standard-supfile</filename>
available from <filename>/usr/share/examples/cvsup</filename>.
This is the most recommended
method, since it allows you to grab the entire
collection once and then only what has changed from then
on. Many people run <command>cvsup</command> from
<command>cron</command> and keep their
<command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> and keep their
sources up-to-date automatically. You have to
customize the sample <filename>supfile</filename> above, and configure
<link linkend="cvsup">cvsup</link> for your environment.</para>
<link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Syncing with <application>CVSup</application></secondary></indexterm> for your environment.</para>
</listitem>
<listitem>
<indexterm>
<primary>-CURRENT</primary>
<secondary>Syncing with CTM</secondary>
</indexterm>
<para>Use the <application><link
linkend="ctm">CTM</link></application> facility. If you
linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Syncing with CTM</secondary></indexterm> facility. If you
have very bad connectivity (high price connections or
only email access) <application>CTM</application> is an option.
However, it is a lot of hassle and can give you broken files.
@ -271,11 +251,7 @@
to compile just a subset is almost guaranteed to get you
into trouble.</para>
<indexterm>
<primary>-CURRENT</primary>
<secondary>compiling</secondary>
</indexterm>
<para>Before compiling &os.current;, read the
<para>Before compiling &os.current;<indexterm><primary>-CURRENT</primary><secondary>compiling</secondary></indexterm>, read the
<filename>Makefile</filename> in <filename>/usr/src</filename>
carefully. You should at least <link
linkend="makeworld">install a new kernel and rebuild the world</link> the first time through
@ -360,12 +336,7 @@
<orderedlist>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>using</secondary>
</indexterm>
<para>Join the &a.stable.name; list. This will keep you informed of
<para>Join the &a.stable.name;<indexterm><primary>-STABLE</primary><secondary>using</secondary></indexterm> list. This will keep you informed of
build-dependencies that may appear in &os.stable;
or any other issues requiring
special attention. Developers will also make announcements
@ -402,18 +373,7 @@
<orderedlist>
<listitem>
<indexterm>
<primary><command>cvsup</command></primary>
</indexterm>
<indexterm>
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with <application>CVSup</application></secondary>
</indexterm>
<para>Use the <link linkend="cvsup">cvsup</link> program
<para>Use the <link linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> program
with the <filename>supfile</filename> named <filename>stable-supfile</filename>
from the directory
<filename>/usr/share/examples/cvsup</filename>.
@ -421,21 +381,16 @@
method, since it allows you to grab the entire
collection once and then only what has changed from then
on. Many people run <command>cvsup</command> from
<command>cron</command> to keep their
<command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> to keep their
sources up-to-date automatically. You have to
customize the sample <filename>supfile</filename> above,
and configure <link linkend="cvsup">cvsup</link> for your
and configure <link linkend="cvsup">cvsup</link><indexterm><primary>-STABLE</primary><secondary>syncing with <application>CVSup</application></secondary></indexterm> for your
environment.</para>
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with CTM</secondary>
</indexterm>
<para>Use the <application><link
linkend="ctm">CTM</link></application> facility. If
linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>syncing with CTM</secondary></indexterm> facility. If
you do not have a fast and inexpensive connection to
the Internet, this is the method you should consider
using.
@ -452,12 +407,7 @@
</listitem>
<listitem>
<indexterm>
<primary>-STABLE</primary>
<secondary>compiling</secondary>
</indexterm>
<para>Before compiling &os.stable;, read the
<para>Before compiling &os.stable;<indexterm><primary>-STABLE</primary><secondary>compiling</secondary></indexterm>, read the
<filename>Makefile</filename> in <filename>/usr/src</filename>
carefully. You should at least <link
linkend="makeworld">install a new kernel and rebuild the world</link> the first time through

View file

@ -228,16 +228,13 @@
files:</para>
<itemizedlist>
<indexterm><primary>POSIX</primary></indexterm>
<listitem>
<para><envar>LANG</envar> for &posix; &man.setlocale.3; family
<para><envar>LANG</envar> for &posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3; family
functions</para>
</listitem>
<listitem>
<indexterm><primary>MIME</primary></indexterm>
<para><envar>MM_CHARSET</envar> for applications' MIME character
<para><envar>MM_CHARSET</envar> for applications' MIME<indexterm><primary>MIME</primary></indexterm> character
set</para>
</listitem>
</itemizedlist>

View file

@ -1176,9 +1176,8 @@ www.example.org</programlisting>
things:</para>
<itemizedlist>
<indexterm><primary>MX record</primary></indexterm>
<listitem>
<para>Make sure that the (lowest-numbered) MX record in your DNS points to your
<para>Make sure that the (lowest-numbered) MX record<indexterm><primary>MX record</primary></indexterm> in your DNS points to your
host's IP address.</para>
</listitem>

View file

@ -1248,12 +1248,8 @@ Exports list on foobar:
<title>Machine Types</title>
<itemizedlist>
<indexterm>
<primary>NIS</primary>
<secondary>master server</secondary>
</indexterm>
<listitem>
<para>A <emphasis>NIS master server</emphasis>. This
<para>A <emphasis>NIS master server</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>. This
server, analogous to a &windowsnt; primary domain
controller, maintains the files used by all of the NIS
clients. The <filename>passwd</filename>,
@ -1268,12 +1264,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>slave server</secondary>
</indexterm>
<para><emphasis>NIS slave servers</emphasis>. Similar to
<para><emphasis>NIS slave servers</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>. Similar to
the &windowsnt; backup domain controllers, NIS slave
servers maintain copies of the NIS master's data files.
NIS slave servers provide the redundancy, which is
@ -1284,12 +1275,7 @@ Exports list on foobar:
</listitem>
<listitem>
<indexterm>
<primary>NIS</primary>
<secondary>client</secondary>
</indexterm>
<para><emphasis>NIS clients</emphasis>. NIS clients, like
<para><emphasis>NIS clients</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>. NIS clients, like
most &windowsnt; workstations, authenticate against the
NIS server (or the &windowsnt; domain controller in the
&windowsnt; workstations case) to log on.</para>
@ -4387,9 +4373,7 @@ DocumentRoot /www/someotherdomain.tld
<term><literal>netbios name</literal></term>
<listitem>
<indexterm><primary>NetBIOS</primary></indexterm>
<para>This sets the NetBIOS name by which a <application>Samba</application> server
<para>This sets the NetBIOS<indexterm><primary>NetBIOS</primary></indexterm> name by which a <application>Samba</application> server
is known. By default it is the same as the first
component of the host's DNS name.</para>
</listitem>
@ -4443,13 +4427,9 @@ DocumentRoot /www/someotherdomain.tld
<term><literal>passdb backend</literal></term>
<listitem>
<indexterm><primary>NIS+</primary></indexterm>
<indexterm><primary>LDAP</primary></indexterm>
<indexterm><primary>SQL database</primary></indexterm>
<para><application>Samba</application> has several
different backend authentication models. You can
authenticate clients with LDAP, NIS+, a SQL database,
authenticate clients with LDAP<indexterm><primary>LDAP</primary></indexterm>, NIS+<indexterm><primary>NIS+</primary></indexterm>, a SQL database<indexterm><primary>SQL database</primary></indexterm>,
or a modified password file. The default
authentication method is <literal>smbpasswd</literal>,
and that is all that will be covered here.</para>

View file

@ -144,15 +144,9 @@
<para>This document assumes you have the following:</para>
<itemizedlist>
<indexterm id="ppp-isp">
<primary>ISP</primary>
</indexterm>
<indexterm id="ppp-ppp2">
<primary>PPP</primary>
</indexterm>
<listitem>
<para>An account with an Internet Service Provider (ISP) which
you connect to using PPP.</para>
<para>An account with an Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm> which
you connect to using PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
</listitem>
<listitem>
@ -166,32 +160,14 @@
</listitem>
<listitem>
<indexterm id="ppp-pap">
<primary>PAP</primary>
</indexterm>
<indexterm id="ppp-chap">
<primary>CHAP</primary>
</indexterm>
<indexterm id="ppp-unix">
<primary>UNIX</primary>
</indexterm>
<indexterm id="ppp-login">
<primary>login name</primary>
</indexterm>
<indexterm id="ppp-password">
<primary>password</primary>
</indexterm>
<para>Your login name and password. (Either a
regular &unix; style login and password pair, or a PAP or CHAP
<para>Your login name<indexterm id="ppp-login"><primary>login name</primary></indexterm> and password<indexterm id="ppp-password"><primary>password</primary></indexterm>. (Either a
regular &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> style login and password pair, or a
PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> or CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>
login and password pair.)</para>
</listitem>
<listitem>
<indexterm id="ppp-nameserver">
<primary>nameserver</primary>
</indexterm>
<para>The IP address of one or more name servers.
<para>The IP address of one or more name servers<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>.
Normally, you will be given two IP addresses by your ISP to
use for this. If they have not given you at least one, then
you can use the <command>enable dns</command> command in
@ -225,11 +201,7 @@
</listitem>
<listitem>
<indexterm id="ppp-static-ip">
<primary>static IP address</primary>
</indexterm>
<para>If your ISP provides you with a static IP address and
<para>If your ISP provides you with a static IP address<indexterm id="ppp-static-ip"><primary>static IP address</primary></indexterm> and
hostname, you can enter it. Otherwise, we simply let the
peer assign whatever IP address it sees fit.</para>
</listitem>
@ -362,9 +334,7 @@
<term>Line 6 &amp; 7:</term>
<listitem>
<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>
<para>The dial string. User PPP uses an expect-send
<para>The dial string. User PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> uses an expect-send
syntax similar to the &man.chat.8; program. Refer to
the manual page for information on the features of this
language.</para>
@ -455,11 +425,9 @@
<term>Line 15:</term>
<listitem>
<indexterm><primary>PAP</primary></indexterm>
<indexterm><primary>CHAP</primary></indexterm>
<para>If you are using PAP or CHAP, there will be no login
at this point, and this line should be commented out or
removed. See <link linkend="userppp-PAPnCHAP">PAP and CHAP
removed. See <link linkend="userppp-PAPnCHAP">PAP<indexterm><primary>PAP</primary></indexterm> and CHAP<indexterm><primary>CHAP</primary></indexterm>
authentication</link> for further details.</para>
<para>The login string is of the same chat-like syntax as
@ -483,9 +451,7 @@ protocol: ppp</screen>
<term>Line 16:</term>
<listitem>
<indexterm><primary>timeout</primary></indexterm>
<para>Sets the default idle timeout (in seconds) for the
<para>Sets the default idle timeout<indexterm><primary>timeout</primary></indexterm> (in seconds) for the
connection. Here, the connection will be closed
automatically after 300 seconds of inactivity. If you
never want to timeout, set this value to zero or use
@ -496,14 +462,12 @@ protocol: ppp</screen>
<varlistentry>
<term>Line 17:</term>
<listitem>
<indexterm><primary>ISP</primary></indexterm>
<para>Sets the interface addresses. The string
<replaceable>x.x.x.x</replaceable> should be
replaced by the IP address that your provider has
allocated to you. The string
<replaceable>y.y.y.y</replaceable> should be
replaced by the IP address that your ISP indicated
replaced by the IP address that your ISP<indexterm><primary>ISP</primary></indexterm> indicated
for their gateway (the machine to which you
connect). If your ISP has not given you a gateway
address, use <hostid
@ -979,9 +943,7 @@ set nbns 203.14.100.5</programlisting>
<varlistentry>
<term>Line 14:</term>
<listitem>
<indexterm><primary>password</primary></indexterm>
<para>This line specifies your PAP/CHAP password. You
<para>This line specifies your PAP/CHAP password<indexterm><primary>password</primary></indexterm>. You
will need to insert the correct value for
<replaceable>MyPassword</replaceable>. You may want to
add an additional line, such as:</para>
@ -1288,11 +1250,9 @@ ifconfig_tun0=</programlisting>
</listitem>
<listitem>
<indexterm><primary>PPP</primary><secondary>server</secondary></indexterm>
<para>As a <quote>server</quote> &mdash; your machine is located on
the network, and is used to connect other computers using
PPP.</para>
PPP<indexterm><primary>PPP</primary><secondary>server</secondary></indexterm>.</para>
</listitem>
</orderedlist>
@ -2486,9 +2446,7 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
</listitem>
<listitem>
<indexterm><primary>default route</primary></indexterm>
<para>Designate the default router by changing the
<para>Designate the default router<indexterm><primary>default route</primary></indexterm> by changing the
line:</para>
<programlisting>defaultrouter="NO"</programlisting>
@ -2508,10 +2466,8 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
nameserver 128.32.136.9
nameserver 128.32.136.12</programlisting>
<indexterm><primary>nameserver</primary></indexterm>
<indexterm><primary>domain name</primary></indexterm>
<para>As you can see, these set up the nameserver hosts. Of
course, the actual domain names and addresses depend on your
<para>As you can see, these set up the nameserver<indexterm><primary>nameserver</primary></indexterm> hosts. Of
course, the actual domain names<indexterm><primary>domain name</primary></indexterm> and addresses depend on your
environment.</para>
</step>

Some files were not shown because too many files have changed in this diff Show more