PERFORCE change 183438 for review
Rene Ladan
rene at FreeBSD.org
Mon Sep 6 17:34:36 UTC 2010
http://p4web.freebsd.org/@@183438?ac=10
Change 183438 by rene at rene_acer on 2010/09/06 17:34:15
IFC (resolve conflicts due to direct cvs commit)
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#69 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#50 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#15 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#87 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#43 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#49 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#36 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#35 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#23 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#30 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/dim.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/gjb.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#44 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#41 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/swills.key#1 branch
.. //depot/projects/docproj_nl/share/sgml/mirrors.xml#21 integrate
.. //depot/projects/docproj_nl/www/en/cgi/mirror.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/url.cgi#2 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#41 integrate
.. //depot/projects/docproj_nl/www/en/docproj/translations.sgml#9 integrate
.. //depot/projects/docproj_nl/www/en/docs/webresources.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/internal/Makefile#3 integrate
.. //depot/projects/docproj_nl/www/en/internal/internal.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/internal/photos.sgml#2 delete
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#31 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#88 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#15 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#69 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.944 2010/08/22 02:19:14 bf Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.954 2010/09/02 08:48:46 gjb Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -364,6 +364,11 @@
</listitem>
<listitem>
+ <para>Alexander Best
+ <email>arundel at FreeBSD.org</email></para>
+ </listitem>
+
+ <listitem>
<para>Alexander B. Povolotsky
<email>tarkhil at mgt.msk.ru</email></para>
</listitem>
@@ -2701,6 +2706,11 @@
</listitem>
<listitem>
+ <para>Eijiro Shibusawa
+ <email>ej-sib at ice.uec.ac.jp</email></para>
+ </listitem>
+
+ <listitem>
<para>Eike Bernhardt
<email>eike.bernhardt at gmx.de</email></para>
</listitem>
@@ -3131,6 +3141,11 @@
</listitem>
<listitem>
+ <para>Fraser Tweedale
+ <email>frase at frase.id.au</email></para>
+ </listitem>
+
+ <listitem>
<para>Fred Cawthorne
<email>fcawth at jjarray.umn.edu</email></para>
</listitem>
@@ -3350,11 +3365,6 @@
</listitem>
<listitem>
- <para>Glen Barber
- <email>glen.j.barber at gmail.com</email></para>
- </listitem>
-
- <listitem>
<para>Glen Foster
<email>gfoster at gfoster.com</email></para>
</listitem>
@@ -4387,6 +4397,11 @@
</listitem>
<listitem>
+ <para>Jesse Kempf
+ <email>jessekempf at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Jesse McConnell
<email>jesse at cylant.com</email></para>
</listitem>
@@ -5888,6 +5903,11 @@
</listitem>
<listitem>
+ <para>Marius Nünnerich
+ <email>marius at nuenneri.ch</email></para>
+ </listitem>
+
+ <listitem>
<para>Mark A. Wicks
<email>mwicks at kettering.edu</email></para>
</listitem>
@@ -8467,6 +8487,11 @@
</listitem>
<listitem>
+ <para>Ross West
+ <email>freebsd at linepoint.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Rostislav Krasny
<email>rosti.bsd at gmail.com</email></para>
</listitem>
@@ -8812,6 +8837,11 @@
</listitem>
<listitem>
+ <para>Sergey Kandaurov
+ <email>pluknet at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Sergey Kosyakov
<email>ks at itp.ac.ru</email></para>
</listitem>
@@ -9027,6 +9057,11 @@
</listitem>
<listitem>
+ <para>Stan Barber
+ <email>sob at academ.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Stanislav A. Svirid
<email>count at riss-telecom.ru</email></para>
</listitem>
@@ -10174,6 +10209,11 @@
</listitem>
<listitem>
+ <para>Volodymyr Kostyrko
+ <email>c.kworr at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Vsevolod Lobko
<email>seva at ip.net.ua</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#50 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.305 2010/08/01 22:19:34 ohauer Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.308 2010/09/03 20:57:12 swills Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -43,6 +43,10 @@
</listitem>
<listitem>
+ <para>&a.dim;</para>
+ </listitem>
+
+ <listitem>
<para>&a.anholt;</para>
</listitem>
@@ -83,6 +87,10 @@
</listitem>
<listitem>
+ <para>&a.gjb;</para>
+ </listitem>
+
+ <listitem>
<para>&a.dmlb;</para>
</listitem>
@@ -1691,6 +1699,10 @@
</listitem>
<listitem>
+ <para>&a.swills;</para>
+ </listitem>
+
+ <listitem>
<para>&a.twinterg;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#4 (text+ko) ====
@@ -7,7 +7,7 @@
<article>
<articleinfo>
<title>CUPS on FreeBSD</title>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/cups/article.sgml,v 1.4 2010/07/31 11:06:17 pgj Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/cups/article.sgml,v 1.5 2010/08/29 11:48:32 pgj Exp $</pubdate>
<authorgroup>
<author>
<firstname>Chess</firstname>
@@ -95,7 +95,21 @@
<programlisting>[system=10]
add path 'unlpt*' mode 0660 group cups
add path 'ulpt*' mode 0660 group cups
-add path 'lpt*' mode 0660 group cups</programlisting>
+add path 'lpt*' mode 0660 group cups
+add path 'usb/<replaceable>X</replaceable>.<replaceable>Y</replaceable>.<replaceable>Z</replaceable>' mode 0660 group cups</programlisting>
+
+ <note>
+ <para>Note that <replaceable>X</replaceable>,
+ <replaceable>Y</replaceable>, and <replaceable>Z</replaceable>
+ should be replaced with the target USB device listed in the
+ <filename class="directory">/dev/usb</filename> directory that
+ corresponds to the printer. To find the correct device, examine
+ the output of &man.dmesg.8;, where
+ <filename>ugen<replaceable>X</replaceable>.<replaceable>Y</replaceable></filename>
+ lists the printer device, which is a symbolic link to a USB
+ device in <filename
+ class="directory">/dev/usb</filename>.</para>
+ </note>
<para>Next, add two lines to <filename>/etc/rc.conf</filename> as
follows:</para>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#24 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.431 2010/08/21 12:34:10 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.433 2010/09/05 11:02:14 remko Exp $
-->
<chapter id="advanced-networking">
@@ -908,9 +908,9 @@
about the wireless device in the boot messages, like
this:</para>
- <screen>ath0: <Atheros 5212> mem 0xff9f0000-0xff9fffff irq 17 at device 2.0 on pci2
-ath0: Ethernet address: 00:11:95:d5:43:62
-ath0: mac 7.9 phy 4.5 radio 5.6</screen>
+ <screen>ath0: <Atheros 5212> mem 0x88000000-0x8800ffff irq 11 at device 0.0 on cardbus1
+ath0: [ITHREAD]
+ath0: AR2413 mac 7.9 RF2413 phy 4.5</screen>
</sect3>
</sect2>
@@ -939,7 +939,7 @@
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
-SSID BSSID CHAN RATE S:N INT CAPS
+SSID/MESH ID BSSID CHAN RATE S:N INT CAPS
dlinkap 00:13:46:49:41:76 11 54M -90:96 100 EPS WPA WME
freebsdap 00:11:95:c3:0d:ac 1 54M -83:96 100 EPS WPA</screen>
@@ -1211,7 +1211,7 @@
point:</para>
<programlisting>wlans_ath0="wlan0"
-ifconfig_wlan0="ssid <replaceable>your_ssid_here</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
+ifconfig_wlan0="inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>your_ssid_here</replaceable>"</programlisting>
</sect5>
</sect4>
@@ -1716,8 +1716,8 @@
<command>ifconfig</command>:</para>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \
- inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput></screen>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable> \
+ ssid <replaceable>my_net</replaceable> wepmode on weptxkey <replaceable>3</replaceable> wepkey <replaceable>3:0x3456789012</replaceable></userinput></screen>
<itemizedlist>
<listitem>
@@ -1782,16 +1782,17 @@
<para>On the box <hostid>A</hostid>:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode adhoc</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable></userinput>
&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
- wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
ether 00:11:95:c3:0d:ac
inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
- media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>)
- status: associated
- ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
- authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100</screen>
+ media: IEEE 802.11 Wireless Ethernet autoselect mode 11g <adhoc>
+ status: running
+ ssid freebsdap channel 2 (2417 Mhz 11g) bssid 02:11:95:c3:0d:ac
+ country US ecm authmode OPEN privacy OFF txpower 21.5 scanvalid 60
+ protmode CTS wme burst</screen>
<para>The <literal>adhoc</literal> parameter indicates the
interface is running in the IBSS mode.</para>
@@ -1799,25 +1800,26 @@
<para>On <hostid>B</hostid>, we should be able to detect
<hostid>A</hostid>:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
- SSID BSSID CHAN RATE S:N INT CAPS
- freebsdap 02:11:95:c3:0d:ac 2 54M -90:-96 100 IS</screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode adhoc</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
+ SSID/MESH ID BSSID CHAN RATE S:N INT CAPS
+ freebsdap 02:11:95:c3:0d:ac 2 54M -64:-96 100 IS WME</screen>
<para>The <literal>I</literal> in the output confirms the
machine <hostid>A</hostid> is in ad-hoc mode. We just have to
configure <hostid>B</hostid> with a different IP
address:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> ssid <replaceable>freebsdap</replaceable> mediaopt adhoc inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable></userinput>
&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
- wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
ether 00:11:95:d5:43:62
inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
- media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>)
- status: associated
- ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac
- authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100</screen>
+ media: IEEE 802.11 Wireless Ethernet autoselect mode 11g <adhoc>
+ status: running
+ ssid freebsdap channel 2 (2417 Mhz 11g) bssid 02:11:95:c3:0d:ac
+ country US ecm authmode OPEN privacy OFF txpower 21.5 scanvalid 60
+ protmode CTS wme burst</screen>
<para>Both <hostid>A</hostid> and <hostid>B</hostid> are now
ready to exchange informations.</para>
@@ -1851,43 +1853,54 @@
check if your wireless device supports the host-based access
point mode (also know as hostap mode):</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> list caps</userinput>
-ath0=783ed0f<WEP,TKIP,AES,AES_CCM,IBSS,HOSTAP,AHDEMO,TXPMGT,SHSLOT,SHPREAMBLE,MONITOR,TKIPMIC,WPA1,WPA2,BURST,WME></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> list caps</userinput>
+drivercaps=6f85edc1<STA,FF,TURBOP,IBSS,HOSTAP,AHDEMO,TXPMGT,SHSLOT,SHPREAMBLE,MONITOR,MBSS,WPA1,WPA2,BURST,WME,WDS,BGSCAN,TXFRAG>
+cryptocaps=1f<WEP,TKIP,AES,AES_CCM,TKIPMIC></screen>
<para>This output displays the card capabilities; the
<literal>HOSTAP</literal> word confirms this wireless card
can act as an Access Point. Various supported ciphers are
- also mentioned: WEP, TKIP, WPA2, etc., these informations
+ also mentioned: WEP, TKIP, AES, etc., these informations
are important to know what security protocols could be set
on the Access Point.</para>
- <para>The wireless device can now be put into hostap mode and
- configured with the correct SSID and IP address:</para>
+ <para>The wireless device can only be put into hostap mode
+ during the creation of the network pseudo-device, so a
+ previously created device must be destroyed first:</para>
+
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> destroy</userinput></screen>
+
+ <para>then regenerated with the correct option before setting
+ the other parameters:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> mode 11g mediaopt hostap</userinput> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode hostap</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable> mode 11g channel 1</userinput></screen>
<para>Use again <command>ifconfig</command> to see the status
- of the <devicename>ath0</devicename> interface:</para>
+ of the <devicename>wlan0</devicename> interface:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
- ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ ether 00:11:95:c3:0d:ac
inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
- inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
- ether 00:11:95:c3:0d:ac
media: IEEE 802.11 Wireless Ethernet autoselect mode 11g <hostap>
- status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode OPEN privacy OFF txpowmax 38 bmiss 7 protmode CTS burst dtimperiod 1 bintval 100</screen>
+ status: running
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode OPEN privacy OFF txpower 21.5 scanvalid 60
+ protmode CTS wme burst dtimperiod 1 -dfs</screen>
<para>The <literal>hostap</literal> parameter indicates the
interface is running in the host-based access point
mode.</para>
<para>The interface configuration can be done automatically at
- boot time by adding the following line to
+ boot time by adding the following lines to
<filename>/etc/rc.conf</filename>:</para>
- <programlisting>ifconfig_ath0="ssid <replaceable>freebsdap</replaceable> mode 11g mediaopt hostap inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable>"</programlisting>
+ <programlisting>wlans_ath0="wlan0"
+create_args_wlan0="wlanmode hostap"
+ifconfig_wlan0="inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable> mode 11g channel <replaceable>1</replaceable>"</programlisting>
</sect3>
<sect3>
@@ -1903,23 +1916,25 @@
possible from another wireless machine to initiate a scan to
find the AP:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
-SSID BSSID CHAN RATE S:N INT CAPS
-freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 ES</screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
+SSID/MESH ID BSSID CHAN RATE S:N INT CAPS
+freebsdap 00:11:95:c3:0d:ac 1 54M -66:-96 100 ES WME</screen>
<para>The client machine found the Access Point and can be
associated with it:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
-&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
- ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
- inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ ether 00:11:95:d5:43:62
inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
- ether 00:11:95:d5:43:62
- media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps)
+ media: IEEE 802.11 Wireless Ethernet OFDM/54Mbps mode 11g
status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100</screen>
+ ssid freebsdap channel 1 (2412 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode OPEN privacy OFF txpower 21.5 bmiss 7
+ scanvalid 60 bgscan bgscanintvl 300 bgscanidle 250 roam:rssi 7
+ roam:rate 5 protmode CTS wme burst</screen>
</sect3>
<sect3>
@@ -1957,7 +1972,7 @@
<para>The configuration is done in the
<filename>/etc/hostapd.conf</filename> file:</para>
- <programlisting>interface=ath0 <co id="co-ap-wpapsk-iface">
+ <programlisting>interface=wlan0 <co id="co-ap-wpapsk-iface">
debug=1 <co id="co-ap-wpapsk-dbug">
ctrl_interface=/var/run/hostapd <co id="co-ap-wpapsk-ciface">
ctrl_interface_group=wheel <co id="co-ap-wpapsk-cifacegrp">
@@ -2041,8 +2056,8 @@
<screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
- ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290
inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
ether 00:11:95:c3:0d:ac
@@ -2055,7 +2070,7 @@
associated with it, see <xref
linkend="network-wireless-wpa"> for more details. It is
possible to see the stations associated with the AP using
- the <command>ifconfig <replaceable>ath0</replaceable> list
+ the <command>ifconfig <replaceable>wlan0</replaceable> list
sta</command> command.</para>
</sect4>
</sect3>
@@ -2073,8 +2088,9 @@
<para>The wireless device can now be put into hostap mode and
configured with the correct SSID and IP address:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> ssid <replaceable>freebsdap</replaceable> wepmode on weptxkey 3 wepkey 3:0x3456789012 mode 11g mediaopt hostap \
- inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode hostap</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> \
+ ssid <replaceable>freebsdap</replaceable> wepmode on weptxkey <replaceable>3</replaceable> wepkey <replaceable>3:0x3456789012</replaceable> mode 11g</userinput></screen>
<itemizedlist>
<listitem>
@@ -2096,22 +2112,23 @@
</itemizedlist>
<para>Use again <command>ifconfig</command> to see the status
- of the <devicename>ath0</devicename> interface:</para>
+ of the <devicename>wlan0</devicename> interface:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
- ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
+ wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ ether 00:11:95:c3:0d:ac
inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
- inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
- ether 00:11:95:c3:0d:ac
media: IEEE 802.11 Wireless Ethernet autoselect mode 11g <hostap>
- status: associated
- ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac
- authmode OPEN privacy ON deftxkey 3 wepkey 3:40-bit txpowmax 36 protmode CTS dtimperiod 1 bintval 100</screen>
+ status: running
+ ssid freebsdap channel 4 (2427 Mhz 11g) bssid 00:11:95:c3:0d:ac
+ country US ecm authmode OPEN privacy ON deftxkey 3 wepkey 3:40-bit
+ txpower 21.5 scanvalid 60 protmode CTS wme burst dtimperiod 1 -dfs</screen>
<para>From another wireless machine, it is possible to initiate
a scan to find the AP:</para>
- <screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable> up scan</userinput>
+ <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
SSID BSSID CHAN RATE S:N INT CAPS
freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS</screen>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#11 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.241 2010/07/29 14:44:44 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.244 2010/09/06 07:37:59 remko Exp $
-->
<chapter id="config-tuning">
@@ -828,16 +828,18 @@
<screen>dc0: <82c169 PNIC 10/100BaseTX> port 0xa000-0xa0ff mem 0xd3800000-0xd38
000ff irq 15 at device 11.0 on pci0
+miibus0: <MII bus> on dc0
+bmtphy0: <BCM5201 10/100baseTX PHY> PHY 1 on miibus0
+bmtphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
dc0: Ethernet address: 00:a0:cc:da:da:da
-miibus0: <MII bus> on dc0
-ukphy0: <Generic IEEE 802.3u media interface> on miibus0
-ukphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
+dc0: [ITHREAD]
dc1: <82c169 PNIC 10/100BaseTX> port 0x9800-0x98ff mem 0xd3000000-0xd30
000ff irq 11 at device 12.0 on pci0
+miibus1: <MII bus> on dc1
+bmtphy1: <BCM5201 10/100baseTX PHY> PHY 1 on miibus1
+bmtphy1: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
dc1: Ethernet address: 00:a0:cc:da:da:db
-miibus1: <MII bus> on dc1
-ukphy1: <Generic IEEE 802.3u media interface> on miibus1
-ukphy1: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto</screen>
+dc1: [ITHREAD]</screen>
<para>In this example, we see that two cards using the &man.dc.4;
driver are present on the system.</para>
@@ -950,7 +952,7 @@
produce a kernel module in the current directory which can
be loaded as follows:</para>
- <screen>&prompt.root; <userinput>kldload <replaceable>./W32DRIVER.ko</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>kldload <replaceable>./W32DRIVER_SYS.ko</replaceable></userinput></screen>
<para>In addition to the generated kernel module, you must
load the <filename>ndis.ko</filename> and
@@ -983,12 +985,12 @@
<para>You can configure the system to load the NDIS modules at
boot time in the same way as with any other module. First,
copy the generated module,
- <filename>W32DRIVER.ko</filename>, to the <filename
+ <filename>W32DRIVER_SYS.ko</filename>, to the <filename
class="directory">/boot/modules</filename> directory. Then,
add the following line to
<filename>/boot/loader.conf</filename>:</para>
- <programlisting>W32DRIVER_load="YES"</programlisting>
+ <programlisting>W32DRIVER_SYS_load="YES"</programlisting>
</sect3>
</sect2>
@@ -1009,30 +1011,26 @@
your system, enter the following command:</para>
<screen>&prompt.user; <userinput>ifconfig</userinput>
-dc0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+dc0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ options=80008<VLAN_MTU,LINKSTATE>
+ ether 00:a0:cc:da:da:da
inet 192.168.1.3 netmask 0xffffff00 broadcast 192.168.1.255
- ether 00:a0:cc:da:da:da
media: Ethernet autoselect (100baseTX <full-duplex>)
status: active
-dc1: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500
+dc1: flags=8802<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ options=80008<VLAN_MTU,LINKSTATE>
+ ether 00:a0:cc:da:da:db
inet 10.0.0.1 netmask 0xffffff00 broadcast 10.0.0.255
- ether 00:a0:cc:da:da:db
media: Ethernet 10baseT/UTP
status: no carrier
-lp0: flags=8810<POINTOPOINT,SIMPLEX,MULTICAST> mtu 1500
-lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> mtu 16384
+plip0: flags=8810<POINTOPOINT,SIMPLEX,MULTICAST> metric 0 mtu 1500
+lo0: flags=8049<UP,LOOPBACK,RUNNING,MULTICAST> metric 0 mtu 16384
+ options=3<RXCSUM,TXCSUM>
+ inet6 fe80::1%lo0 prefixlen 64 scopeid 0x4
+ inet6 ::1 prefixlen 128
inet 127.0.0.1 netmask 0xff000000
-tun0: flags=8010<POINTOPOINT,MULTICAST> mtu 1500</screen>
+ nd6 options=3<PERFORMNUD,ACCEPT_RTADV></screen>
- <note>
- <para>Old versions of &os; may require the <option>-a</option>
- option following &man.ifconfig.8;, for more details about the
- correct syntax of &man.ifconfig.8;, please refer to the manual
- page. Note also that entries concerning IPv6
- (<literal>inet6</literal> etc.) were omitted in this
- example.</para>
- </note>
-
<para>In this example, the following devices were
displayed:</para>
@@ -1048,18 +1046,14 @@
</listitem>
<listitem>
- <para><devicename>lp0</devicename>: The parallel port
- interface</para>
+ <para><devicename>plip0</devicename>: The parallel port
+ interface (if a parallel port is present on the
+ machine)</para>
</listitem>
<listitem>
<para><devicename>lo0</devicename>: The loopback device</para>
</listitem>
-
- <listitem>
- <para><devicename>tun0</devicename>: The tunnel device used by
- <application>ppp</application></para>
- </listitem>
</itemizedlist>
<para>&os; uses the driver name followed by the order in
@@ -1121,8 +1115,11 @@
<para>If the &man.ifconfig.8; output had shown something similar
to:</para>
-<screen>dc0: flags=8843<BROADCAST,SIMPLEX,MULTICAST> mtu 1500
- ether 00:a0:cc:da:da:da</screen>
+<screen>dc0: flags=8843<BROADCAST,SIMPLEX,MULTICAST> metric 0 mtu 1500
+ options=80008<VLAN_MTU,LINKSTATE>
+ ether 00:a0:cc:da:da:da
+ media: Ethernet autoselect (100baseTX <full-duplex>)
+ status: active</screen>
<para>it would indicate the card has not been configured.</para>
@@ -1159,6 +1156,15 @@
addresses of various machines of the LAN, if they are not already
there. For more information please refer to &man.hosts.5;
and to <filename>/usr/share/examples/etc/hosts</filename>.</para>
+
+ <note>
+ <para>If access to the Internet is planned with the
+ machine, you also have to manually set up the default
+ gateway and the nameserver:</para>
+
+ <screen>&prompt.root; <userinput>echo 'defaultrouter="<replaceable>your_default_router</replaceable>"' >> /etc/rc.conf</userinput>
+&prompt.root; <userinput>echo 'nameserver <replaceable>your_DNS_server</replaceable>' >> /etc/resolv.conf</userinput></screen>
+ </note>
</sect2>
<sect2>
@@ -1168,9 +1174,20 @@
<filename>/etc/rc.conf</filename>, you should reboot your
system. This will allow the change(s) to the interface(s) to
be applied, and verify that the system restarts without any
- configuration errors.</para>
+ configuration errors. Alternatively you can just relaunch the
+ networking system:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/netif restart</userinput></screen>
+
+ <note>
+ <para>If a default gateway has been set in
+ <filename>/etc/rc.conf</filename>, use also this
+ command:</para>
+
+ <screen>&prompt.root; <userinput>/etc/rc.d/routing restart</userinput></screen>
+ </note>
- <para>Once the system has been rebooted, you should test the
+ <para>Once the networking system has been relaunched, you should test the
network interfaces.</para>
<sect3>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#20 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.248 2010/07/07 15:23:31 jkois Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.249 2010/08/29 13:42:49 jkois Exp $
-->
<chapter id="updating-upgrading">
@@ -683,7 +683,8 @@
a <command>fetch</command> operation, the Ports Collection and
subsequent patches exist on the local system that have passed
verification. The first time <command>portsnap</command> is executed,
- use <literal>extract</literal> to install the updated files:</para>
+ you have to use <literal>extract</literal> to install the
+ downloaded files:</para>
<screen>&prompt.root; <userinput>portsnap extract</userinput>
/usr/ports/.cvsignore
@@ -699,8 +700,8 @@
/usr/ports/Mk/bsd.cmake.mk
<replaceable>...</replaceable></screen>
- <para>For subsequent runs of <command>portsnap fetch</command>,
- <literal>update</literal> should be used instead:</para>
+ <para>To update an already installed Ports Collection use the command
+ <command>portsnap update</command>:</para>
<screen>&prompt.root; <userinput>portsnap update</userinput></screen>
@@ -712,6 +713,10 @@
shown in the following example:</para>
<screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
+
+ <para>This command will download the latest version of the
+ Ports Collection and update your local version under
+ <filename class="directory">/usr/ports</filename>.</para>
</sect1>
<sect1 id="updating-upgrading-documentation">
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#15 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.96 2010/06/17 18:11:37 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.97 2010/08/24 13:18:01 manolis Exp $
-->
<chapter id="desktop">
@@ -225,6 +225,25 @@
url="http://www.freebsdfoundation.org/downloads/java.shtml"></ulink>,
and install it with &man.pkg.add.1;.</para>
+ <note>
+ <para>The above site does not provide binary packages for
+ &os; 8.<replaceable>X</replaceable>. It is however possible
+ to use the packages for &os; 7.<replaceable>X</replaceable>
+ on an 8.<replaceable>X</replaceable> system. Simply install the
+ <filename role="package">misc/compat7x</filename> port before
+ installing the package.</para>
+ <para>Alternatively, <application>Diablo &jre;</application>
+ (as well as <application>Diablo &jdk;</application>) may be
+ installed using the Ports Collection (the relevant ports are
+ <filename role="package">java/diablo-jre16</filename> and
+ <filename role="package">java/diablo-jdk16</filename>).
+ Installing from the Ports Collection requires the source files
+ (distfiles) to be downloaded manually due to licensing issues.
+ Specific download instructions are provided when the
+ <command>make <maketarget>install</maketarget></command> command
+ is invoked.</para>
+ </note>
+
<para>Start your browser, enter
<literal>about:plugins</literal> in the location bar and press
<keycap>Enter</keycap>. A page listing the installed plugins
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#9 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.49 2010/08/14 01:27:23 obrien Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.50 2010/09/06 03:36:08 brd Exp $
-->
@@ -706,11 +706,10 @@
<primary>Journaling</primary>
</indexterm>
- <para>With the release of &os; 7.0, the long awaited feature
- of <acronym>UFS</acronym> journals has been implemented. The
- implementation itself is provided through the
- <acronym>GEOM</acronym> subsystem and is easily configured
- via the &man.gjournal.8; utility.</para>
+ <para>With the release of &os; 7.0, the long awaited feature
+ of journals has been implemented. The implementation itself is
+ provided through the <acronym>GEOM</acronym> subsystem and is
+ easily configured via the &man.gjournal.8; utility.</para>
<para>What is journaling? Journaling capability stores a log of
file system transactions, i.e.: changes that make up a complete
@@ -733,7 +732,7 @@
<para>To enable support for <command>gjournal</command>, the
&os; kernel must have the following option - which is the
- default on 7.X systems:</para>
+ default on &os; 7.0 and later systems:</para>
<programlisting>options UFS_GJOURNAL</programlisting>
@@ -756,7 +755,7 @@
disk:</para>
<screen>&prompt.root; <userinput>gjournal load</userinput>
- &prompt.root; <userinput>gjournal label /dev/da4</userinput></screen>
+&prompt.root; <userinput>gjournal label /dev/da4</userinput></screen>
<para>At this point, there should be a
<devicename>/dev/da4</devicename> device node and a
@@ -766,8 +765,7 @@
<screen>&prompt.root; <userinput>newfs -O 2 -J /dev/da4.journal</userinput></screen>
<para>The previously issued command will create a
- <acronym>UFS</acronym>2 file system with journaling being made
- active.</para>
+ <acronym>UFS</acronym>2 file system on the journaled device.</para>
<para>Effectively <command>mount</command> the device at the
desired point with:</para>
@@ -780,11 +778,10 @@
<devicename>ad4s1</devicename> and <devicename>ad4s2</devicename>
are both slices, then <command>gjournal</command> will create
<devicename>ad4s1.journal</devicename> and
- <devicename>ad4s2.journal</devicename>. In the case of the command
- being run twice, the result will be <quote>journals</quote>.</para>
+ <devicename>ad4s2.journal</devicename>.</para>
</note>
- <para>Under some circumstances, keeping the journal on another disk
+ <para>For better performance, keeping the journal on another disk
may be desired. For these cases, the journal provider or storage
device should be listed after the device to enable journaling
on. Journaling may also be enabled on current file systems by
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#10 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.410 2010/08/20 10:09:42 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.412 2010/08/23 08:34:46 manolis Exp $
-->
<chapter id="install">
@@ -4318,7 +4318,7 @@
<para>To modify these media to boot into a serial console, follow
- these steps (If you wan to use a CDROM you can skip the first
+ these steps (If you want to use a CDROM you can skip the first
step):</para>
<procedure>
@@ -4627,7 +4627,7 @@
<xref linkend="ports">) as
necessary.</para>
- <para>Use the image of <literal>disc1</literal> if you want to
+ <para>Use the image of <literal>dvd1</literal> if you want to
install a &os;
release and want a reasonable selection of third-party packages
on the disc as well.</para>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#7 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.20 2009/11/28 11:11:43 danger Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.21 2010/09/04 20:19:26 gjb Exp $
-->
<chapter id="jails">
<chapterinfo>
@@ -320,6 +320,11 @@
<programlisting>jail_enable="YES" # Set to NO to disable starting of any jails
jail_list="<replaceable>www</replaceable>" # Space separated list of names of jails</programlisting>
+
+ <note>
+ <para>Jail names in <varname>jail_list</varname> should
+ contain alphanumeric characters only.</para>
+ </note>
</step>
<step>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#20 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.124 2010/07/23 12:48:36 jkois Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.125 2010/08/26 16:58:02 pgj Exp $
-->
<chapter id="network-servers">
@@ -196,12 +196,12 @@
single IP address from requesting any service more than 60 times
in any given minute.</para>
- <para>Novice users may be pleased to note that
- these parameters usually do not need to be modified,
- although we mention the rate-limiting options below as
- they be useful should you find that you are receiving an
- excessive amount of connections. A full list of options
- can be found in the &man.inetd.8; manual.</para>
+ <para>Although we mention rate-limiting options below, novice
+ users may be pleased to note that these parameters usually do
+ not need to be modified. These options may be useful should you
+ find that you are receiving an excessive amount of connections.
+ A full list of options can be found in the &man.inetd.8;
+ manual.</para>
<variablelist>
<varlistentry>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#87 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1072 2010/08/15 15:58:46 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1075 2010/09/06 08:42:23 kib Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -662,7 +662,13 @@
To make fixes and upgrades easier, you should avoid having more than
one patch fix the same file (e.g., <filename>patch-file</filename> and
<filename>patch-file2</filename> both changing
- <filename><makevar>WRKSRC</makevar>/foobar.c</filename>).</para>
+ <filename><makevar>WRKSRC</makevar>/foobar.c</filename>).
+ Note that if the path of a patched file contains an underscore
+ (<literal>_</literal>) character, the patch needs to have two
+ underscores instead in its name. For example, to patch a file
+ named <filename>src/freeglut_joystick.c</filename>, the
+ corresponding patch should be named
+ <filename>patch-src-freeglut__joystick.c</filename>.</para>
<para>Please only use characters <literal>[-+._a-zA-Z0-9]</literal> for
naming your patches. Do not use any other characters besides them.
@@ -735,6 +741,14 @@
<programlisting>USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(c|cpp|h)</programlisting>
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list