PERFORCE change 185943 for review
Rene Ladan
rene at FreeBSD.org
Thu Nov 18 00:26:48 UTC 2010
http://p4web.freebsd.org/@@185943?ac=10
Change 185943 by rene at rene_acer on 2010/11/18 00:26:03
Pre-7.X cleanup of the Handbook:
- fix printing chapter, <title> must be the first element in a section
- mail/pine has evolved into mail/alpine
(security warning and pictures left untouched)
- remove some pre-7.0 text from the firewalls chapter
- no more ISC DHCP client in the base system
- net/samba3 is no more, simplify instructions
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#13 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#21 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#7 edit
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#13 (text+ko) ====
@@ -256,14 +256,10 @@
<programlisting>pf_rules="<replaceable>/path/to/pf.conf</replaceable>"</programlisting>
- <note>
- <para>As of &os; 7.0 the sample <filename>pf.conf</filename>
- that was in <filename class="directory">/etc/</filename> has been
- moved to <filename
- class="directory">/usr/share/examples/pf/</filename>. For &os;
- versions prior to 7.0 there is an <filename>/etc/pf.conf</filename>
- by default.</para>
- </note>
+ <para>The sample <filename>pf.conf</filename>
+ can be found in <filename
+ class="directory">/usr/share/examples/pf/</filename>.
+ </para>
<para>The <acronym>PF</acronym> module can also be loaded manually
from the command line:</para>
@@ -374,7 +370,7 @@
url="http://www.openbsd.org/faq/pf/">PF FAQ</ulink>,
please keep in mind that different versions of &os; can
contain different versions of PF. Currently,
- &os; 7.<replaceable>X</replaceable> and later are
+ &os; is
using the same version of <acronym>PF</acronym> as
OpenBSD 4.1.</para>
</warning>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 (text+ko) ====
@@ -140,7 +140,7 @@
<para>This includes command line programs such as
<application>mutt</application>,
- <application>pine</application>, <application>elm</application>,
+ <application>alpine</application>, <application>elm</application>,
and <command>mail</command>, and <acronym>GUI</acronym> programs such as
<application>balsa</application>,
<application>xfmail</application> to name a few, and something
@@ -1700,7 +1700,7 @@
Users may choose between graphical email clients such as
<application>evolution</application> or
<application>balsa</application>, console based clients such as
- <application>mutt</application>, <application>pine</application>
+ <application>mutt</application>, <application>alpine</application>
or <command>mail</command>, or the web interfaces used by some
large organizations.</para>
@@ -1933,35 +1933,37 @@
</sect2>
- <sect2 id="pine-command">
- <title>pine</title>
+ <sect2 id="alpine-command">
+ <title>alpine</title>
- <para><application>pine</application> is aimed at a beginner
+ <para><application>alpine</application> is aimed at a beginner
user, but also includes some advanced features.</para>
<warning>
- <para>The <application>pine</application> software has had several remote vulnerabilities
+ <!--rene: is this only for the original pine (dead) or also for its
+ descendent alpine?-->
+ <para>The <application>alpine</application> software has had several remote vulnerabilities
discovered in the past, which allowed remote attackers to
execute arbitrary code as users on the local system, by the
action of sending a specially-prepared email. All such
<emphasis>known</emphasis> problems have been fixed, but the
- <application>pine</application> code is written in a very insecure style and the &os;
+ <application>alpine</application> code is written in a very insecure style and the &os;
Security Officer believes there are likely to be other
undiscovered vulnerabilities. You install
- <application>pine</application> at your own risk.</para>
+ <application>alpine</application> at your own risk.</para>
</warning>
<para>The current version of <application>pine</application> may
be installed using the <filename
- role="package">mail/pine4</filename> port. Once the port has
- installed, <application>pine</application> can be started by
+ role="package">mail/alpine</filename> port. Once the port has
+ installed, <application>alpine</application> can be started by
issuing the following command:</para>
- <screen>&prompt.user; <userinput>pine</userinput></screen>
+ <screen>&prompt.user; <userinput>alpine</userinput></screen>
- <para>The first time that <application>pine</application> is run
+ <para>The first time that <application>alpine</application> is run
it displays a greeting page with a brief introduction, as well
- as a request from the <application>pine</application>
+ as a request from the <application>alpine</application>
development team to send an anonymous email message allowing
them to judge how many users are using their client. To send
this anonymous message, press <keycap>Enter</keycap>, or
@@ -1972,6 +1974,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="mail/pine1" format="PNG">
+ <!--rene: someone(tm) with alpine installed should update this-->
</imageobject>
</mediaobject>
@@ -1982,7 +1985,7 @@
main menu, relevant keyboard shortcuts to perform functions
specific to the task at hand are shown.</para>
- <para>The default directory opened by <application>pine</application>
+ <para>The default directory opened by <application>alpine</application>
is the <filename class="directory">inbox</filename>. To view the message index, press
<keycap>I</keycap>, or select the <guimenuitem>MESSAGE INDEX</guimenuitem>
option as seen below:</para>
@@ -1990,6 +1993,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="mail/pine2" format="PNG">
+ <!--rene: and this-->
</imageobject>
</mediaobject>
@@ -2001,11 +2005,12 @@
<mediaobject>
<imageobject>
<imagedata fileref="mail/pine3" format="PNG">
+ <!--rene: and this-->
</imageobject>
</mediaobject>
<para>In the screenshot below, a sample message is displayed by
- <application>pine</application>. Keyboard shortcuts are
+ <application>alpine</application>. Keyboard shortcuts are
displayed as a reference at the bottom of the screen. An
example of one of these shortcuts is the <keycap>r</keycap> key,
which tells the <acronym>MUA</acronym> to reply to the current
@@ -2014,29 +2019,31 @@
<mediaobject>
<imageobject>
<imagedata fileref="mail/pine4" format="PNG">
+ <!--rene: and this-->
</imageobject>
</mediaobject>
- <para>Replying to an email in <application>pine</application> is
+ <para>Replying to an email in <application>alpine</application> is
done using the <application>pico</application> editor, which is
- installed by default with <application>pine</application>.
+ installed by default with <application>alpine</application>.
The <application>pico</application> utility makes it easy to
navigate around the message and is slightly more forgiving on
novice users than &man.vi.1; or &man.mail.1;. Once the reply
is complete, the message can be sent by pressing
<keycombo action="simul"><keycap>Ctrl</keycap><keycap>X</keycap>
- </keycombo>. The <application>pine</application> application
+ </keycombo>. The <application>alpine</application> application
will ask for confirmation.</para>
<mediaobject>
<imageobject>
<imagedata fileref="mail/pine5" format="PNG">
+ <!--rene: and this-->
</imageobject>
</mediaobject>
- <para>The <application>pine</application> application can be
+ <para>The <application>alpine</application> application can be
customized using the <guimenuitem>SETUP</guimenuitem> option from the main
- menu. Consult <ulink url="http://www.washington.edu/pine/"></ulink>
+ menu. Consult <ulink url="http://www.washington.edu/alpine/"></ulink>
for more information.</para>
</sect2>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#21 (text+ko) ====
@@ -110,7 +110,7 @@
</authorgroup>
<authorgroup>
<author>
- <contrib>Updated for &os; 6.1-RELEASE by </contrib>
+ <contrib>Updated by </contrib>
<othername>The &os; Documentation Project</othername>
</author>
</authorgroup>
@@ -2549,9 +2549,7 @@
<para>DHCP, the Dynamic Host Configuration Protocol, describes
the means by which a system can connect to a network and obtain the
necessary information for communication upon that network. FreeBSD
- versions prior to 6.0 use the ISC (Internet Systems
- Consortium) DHCP client (&man.dhclient.8;) implementation.
- Later versions use the OpenBSD <command>dhclient</command>
+ uses the OpenBSD <command>dhclient</command>
taken from OpenBSD 3.7. All
information here regarding <command>dhclient</command> is for
use with either of the ISC or OpenBSD DHCP clients. The DHCP
@@ -2595,12 +2593,11 @@
<sect2>
<title>FreeBSD Integration</title>
- <para>&os; fully integrates the ISC or OpenBSD DHCP client,
- <command>dhclient</command> (according to the &os; version you run). DHCP client support is provided
+ <para>&os; fully integrates the OpenBSD DHCP client,
+ <command>dhclient</command>. DHCP client support is provided
within both the installer and the base system, obviating the need
for detailed knowledge of network configurations on any network
- that runs a DHCP server. <command>dhclient</command> has been
- included in all FreeBSD distributions since 3.2.</para>
+ that runs a DHCP server.</para>
<indexterm>
<primary><application>sysinstall</application></primary>
</indexterm>
@@ -4601,7 +4598,7 @@
be included on your FreeBSD installation media. If you did
not install <application>Samba</application> when you first
installed FreeBSD, then you can install it from the <filename
- role="package">net/samba3</filename> port or package.</para>
+ role="package">net/samba34</filename> port or package.</para>
<!-- mention LDAP, Active Directory, WinBIND, ACL, Quotas, PAM, .. -->
@@ -4612,7 +4609,7 @@
<para>A default <application>Samba</application> configuration
file is installed as
- <filename>/usr/local/share/examples/samba/smb.conf.default</filename>. This
+ <filename>/usr/local/share/examples/samba34/smb.conf.default</filename>. This
file must be copied to
<filename>/usr/local/etc/smb.conf</filename> and customized
before <application>Samba</application> can be used.</para>
@@ -4744,27 +4741,23 @@
authenticate clients with LDAP, NIS+, a SQL database,
or a modified password file. The default
authentication method is <literal>smbpasswd</literal>,
- and that is all that will be covered here.</para>
+ and that is all that will be covered here.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Assuming that the default <literal>smbpasswd</literal>
backend is used, the
- <filename>/usr/local/private/smbpasswd</filename> file must
+ <filename>/usr/local/etc/samba/smbpasswd</filename> file must
be created to allow <application>Samba</application> to
authenticate clients. If you would like to give
your &unix; user accounts access from &windows; clients, use the
following command:</para>
<screen>&prompt.root; <userinput>smbpasswd -a username</userinput></screen>
-
<note>
- <para>Since <application>Samba</application> 3.0.23c, the actual
- directory for authentication files is
- <filename class="directory">/usr/local/etc/samba</filename>. The
- recommended backend is now <literal>tdbsam</literal>, and the
- following command should be used to add user accounts:</para>
+ <para>The recommended backend is now <literal>tdbsam</literal>, and
+ the following command should be used to add user accounts:</para>
<screen>&prompt.root; <userinput><command>pdbedit <option>-a</option> <option>-u</option> <replaceable>username</replaceable></command></userinput></screen>
</note>
@@ -4782,7 +4775,7 @@
<sect2>
<title>Starting <application>Samba</application></title>
- <para>The <filename role="package">net/samba3</filename> port adds
+ <para>The <filename role="package">net/samba34</filename> port adds
a new startup script, which can be used to control
<application>Samba</application>. To enable this script, so
that it can be used for example to start, stop or restart
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#7 (text+ko) ====
@@ -202,6 +202,7 @@
</sect1>
<sect1 id="printing-intro-setup">
+ <title>Basic Setup</title>
<warning>
<para>As of &os; 8.0, device nodes for serial ports have been
@@ -212,8 +213,6 @@
documentation according to these changes.</para>
</warning>
- <title>Basic Setup</title>
-
<para>To use printers with the <application>LPD</application> spooling
system, you will need to set up both your printer hardware and the
<application>LPD</application> software. This document describes two
@@ -1405,6 +1404,8 @@
</sect1>
<sect1 id="printing-advanced">
+ <title>Advanced Printer Setup</title>
+
<warning>
<para>As of &os; 8.0, device nodes for serial ports have been
renamed from
@@ -1414,8 +1415,6 @@
documentation according to these changes.</para>
</warning>
- <title>Advanced Printer Setup</title>
-
<para>This section describes filters for printing specially formatted
files, header pages, printing across networks, and restricting and
accounting for printer usage.</para>
More information about the p4-projects
mailing list