Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Feb 2012 19:58:33 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 205757 for review
Message-ID:  <201202051958.q15JwXGQ033016@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@205757?ac=10

Change 205757 by rene@rene_acer on 2012/02/05 19:58:29

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#25 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#128 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#22 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#22 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#21 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#22 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#20 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#76 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/audit/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#21 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bsdinstall/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/colophon.sgml#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#34 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#50 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#54 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#53 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#31 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#34 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#33 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#27 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#17 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#71 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#52 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#27 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#31 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#19 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#11 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#31 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#15 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/users/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml#12 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#29 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#40 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/bibliography.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#14 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/trademarks.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/ipv6/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/ipv6/ipv6.ent#2 integrate
.. //depot/projects/docproj_nl/www/en/ipv6/w6l.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/releases/8.3R/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/releases/8.3R/docbook.css#1 branch
.. //depot/projects/docproj_nl/www/en/releases/8.3R/schedule.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/releases/Makefile#9 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#48 integrate
.. //depot/projects/docproj_nl/www/nl/index.xsl#23 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#26 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#11 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.51 2011/11/21 18:11:25 manolis Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.54 2012/02/05 06:49:25 wblock Exp $
 
 -->
 
@@ -44,18 +44,19 @@
 
     <itemizedlist>
       <listitem>
-	<para>What type of <acronym>RAID</acronym> support is available
-	  through GEOM.</para>
+	<para>What type of <acronym>RAID</acronym> support is
+	  available through GEOM.</para>
       </listitem>
 
       <listitem>
 	<para>How to use the base utilities to configure, maintain,
-	  and manipulate the various <acronym>RAID</acronym> levels.</para>
+	  and manipulate the various <acronym>RAID</acronym>
+	  levels.</para>
       </listitem>
 
       <listitem>
-	<para>How to mirror, stripe, encrypt, and remotely connect disk
-	  devices through GEOM.</para>
+	<para>How to mirror, stripe, encrypt, and remotely connect
+	  disk devices through GEOM.</para>
       </listitem>
 
       <listitem>
@@ -82,9 +83,9 @@
   <sect1 id="GEOM-intro">
     <title>GEOM Introduction</title>
 
-    <para>GEOM permits access and control to classes &mdash; Master Boot
-      Records, <acronym>BSD</acronym> labels, etc &mdash; through the
-      use of providers, or the special files in
+    <para>GEOM permits access and control to classes &mdash; Master
+      Boot Records, <acronym>BSD</acronym> labels, etc &mdash; through
+      the use of providers, or the special files in
       <filename class="directory">/dev</filename>.  Supporting various
       software <acronym>RAID</acronym> configurations, GEOM will
       transparently provide access to the operating system and
@@ -115,9 +116,9 @@
       <primary>Striping</primary>
     </indexterm>
 
-    <para>Striping is a method used to combine several disk drives into
-      a single volume.  In many cases, this is done through the use of
-      hardware controllers.  The GEOM disk subsystem provides
+    <para>Striping is a method used to combine several disk drives
+      into a single volume.  In many cases, this is done through the
+      use of hardware controllers.  The GEOM disk subsystem provides
       software support for <acronym>RAID</acronym>0, also known as
       disk striping.</para>
 
@@ -144,7 +145,7 @@
     </mediaobject>
 
     <procedure>
-      <title>Creating a stripe of unformatted ATA disks</title>
+      <title>Creating a Stripe of Unformatted ATA Disks</title>
 
       <step>
 	<para>Load the <filename>geom_stripe.ko</filename>
@@ -165,8 +166,9 @@
       <step>
 	<para>Determine the device names for the disks which will
 	  be striped, and create the new stripe device.  For example,
-	  to stripe two unused and unpartitioned <acronym>ATA</acronym> disks,
-	  for example <filename>/dev/ad2</filename> and
+	  to stripe two unused and unpartitioned
+	  <acronym>ATA</acronym> disks, for example
+	  <filename>/dev/ad2</filename> and
 	  <filename>/dev/ad3</filename>:</para>
 
 	<screen>&prompt.root; <userinput>gstripe label -v st0 /dev/ad2 /dev/ad3</userinput>
@@ -186,17 +188,17 @@
       <step>
 	<para>This process should have created two other devices
 	  in the <filename class="directory">/dev/stripe</filename>
-	  directory in addition to the <devicename>st0</devicename> device.
-	  Those include <devicename>st0a</devicename> and
-	  <devicename>st0c</devicename>.  At this point a file system may be
-	  created on the <devicename>st0a</devicename> device with the
-	  <command>newfs</command> utility:</para>
+	  directory in addition to the <devicename>st0</devicename>
+	  device.  Those include <devicename>st0a</devicename> and
+	  <devicename>st0c</devicename>.  At this point a file system
+	  may be created on the <devicename>st0a</devicename> device
+	  with the <command>newfs</command> utility:</para>
 
 	<screen>&prompt.root; <userinput>newfs -U /dev/stripe/st0a</userinput></screen>
 
-	<para>Many numbers will glide across the screen, and after a few
-	  seconds, the process will be complete.  The volume has been
-	  created and is ready to be mounted.</para>
+	<para>Many numbers will glide across the screen, and after a
+	  few seconds, the process will be complete.  The volume has
+	  been created and is ready to be mounted.</para>
       </step>
     </procedure>
 
@@ -204,10 +206,11 @@
 
     <screen>&prompt.root; <userinput>mount /dev/stripe/st0a /mnt</userinput></screen>
 
-    <para>To mount this striped file system automatically during the boot
-      process, place the volume information in
-      <filename>/etc/fstab</filename> file.  For this purpose, a permanent
-      mount point, named <filename class="directory">stripe</filename>, is
+    <para>To mount this striped file system automatically during the
+      boot process, place the volume information in
+      <filename>/etc/fstab</filename> file.  For this purpose, a
+      permanent mount point, named
+      <filename class="directory">stripe</filename>, is
       created:</para>
 
     <screen>&prompt.root; <userinput>mkdir /stripe</userinput>
@@ -215,8 +218,8 @@
     <userinput>&gt;&gt; /etc/fstab</userinput></screen>
 
     <para>The <filename>geom_stripe.ko</filename> module must also be
-      automatically loaded during system initialization, by adding a line to
-      <filename>/boot/loader.conf</filename>:</para>
+      automatically loaded during system initialization, by adding a
+      line to <filename>/boot/loader.conf</filename>:</para>
 
     <screen>&prompt.root; <userinput>echo 'geom_stripe_load="YES"' &gt;&gt; /boot/loader.conf</userinput></screen>
   </sect1>
@@ -232,16 +235,17 @@
     </indexterm>
 
     <para>Mirroring is a technology used by many corporations and home
-      users to back up data without interruption.  When a mirror exists,
-      it simply means that diskB replicates diskA.  Or, perhaps diskC+D
-      replicates diskA+B.  Regardless of the disk configuration, the
-      important aspect is that information on one disk or partition is
-      being replicated.  Later, that information could be more easily
-      restored, backed up without causing service or access
-      interruption, and even be physically stored in a data safe.</para>
+      users to back up data without interruption.  When a mirror
+      exists, it simply means that diskB replicates diskA.  Or,
+      perhaps diskC+D replicates diskA+B.  Regardless of the disk
+      configuration, the important aspect is that information on one
+      disk or partition is being replicated.  Later, that information
+      could be more easily restored, backed up without causing service
+      or access interruption, and even be physically stored in a data
+      safe.</para>
 
-    <para>To begin, ensure the system has two disk drives of equal size,
-      these exercises assume they are direct access (&man.da.4;)
+    <para>To begin, ensure the system has two disk drives of equal
+      size, these exercises assume they are direct access (&man.da.4;)
       <acronym>SCSI</acronym> disks.</para>
 
     <sect2>
@@ -317,7 +321,7 @@
 	  <userinput>:w /etc/fstab.bak</userinput>.  Then
 	  replace all old <devicename>da0</devicename> references
 	  with <devicename>gm0</devicename> by typing
-	  <userinput>:%s/da/mirror\/gm/g</userinput>.<para>
+	  <userinput>:%s/da/mirror\/gm/g</userinput>.</para>
       </note>
 
       <para>The resulting <filename>fstab</filename> file should look
@@ -326,14 +330,14 @@
 	the <acronym>RAID</acronym> device will be
 	<devicename>gm</devicename> regardless.</para>
 
-      <programlisting># Device                Mountpoint      FStype  Options         Dump    Pass#
-/dev/mirror/gm0s1b     			         none            swap    sw              0       0
-/dev/mirror/gm0s1a              		/               ufs     rw              1       1
-/dev/mirror/gm0s1d				/usr		ufs	rw		0	0
-/dev/mirror/gm0s1f				/home		ufs	rw		2	2
-#/dev/mirror/gm0s2d             		/store          ufs     rw              2       2
-/dev/mirror/gm0s1e              		/var            ufs     rw              2       2
-/dev/acd0               /cdrom          cd9660  ro,noauto       0       0</programlisting>
+      <programlisting># Device		Mountpoint	FStype	Options		Dump	Pass#
+/dev/mirror/gm0s1b	none		swap	sw		0	0
+/dev/mirror/gm0s1a	/		ufs	rw		1	1
+/dev/mirror/gm0s1d	/usr		ufs	rw		0	0
+/dev/mirror/gm0s1f	/home		ufs	rw		2	2
+#/dev/mirror/gm0s2d	/store		ufs	rw		2	2
+/dev/mirror/gm0s1e	/var		ufs	rw		2       2
+/dev/acd0		/cdrom		cd9660	ro,noauto	0	0</programlisting>
 
       <para>Reboot the system:</para>
 
@@ -383,7 +387,7 @@
       <title>Troubleshooting</title>
 
       <sect3>
-	<title>System refuses to boot</title>
+	<title>System Refuses to Boot</title>
 
 	<para>If the system boots up to a prompt similar to:</para>
 
@@ -399,10 +403,10 @@
 	<screen>OK? <userinput>load geom_mirror</userinput>
 OK? <userinput>boot</userinput></screen>
 
-	<para>If this works then for whatever reason the module was not
-	  being loaded properly.  Check whether the relevant entry in
-	  <filename>/boot/loader.conf</filename> is correct.  If the problem
-	  persists, place:</para>
+	<para>If this works then for whatever reason the module was
+	  not being loaded properly.  Check whether the relevant entry
+	  in <filename>/boot/loader.conf</filename> is correct.  If
+	  the problem persists, place:</para>
 
 	<programlisting>options	GEOM_MIRROR</programlisting>
 
@@ -412,7 +416,7 @@
     </sect2>
 
     <sect2>
-      <title>Recovering From Disk Failure</title>
+      <title>Recovering from Disk Failure</title>
 
       <para>The wonderful part about disk mirroring is that when a
 	disk fails, it may be replaced, presumably, without losing
@@ -505,14 +509,14 @@
       prevent the system from booting.</para>
 
     <para>One solution to this issue is to chain the
-      <acronym>SCSI</acronym> devices in order so a new device added to
-      the <acronym>SCSI</acronym> card will be issued unused device
-      numbers.  But what about <acronym>USB</acronym> devices which may
-      replace the primary <acronym>SCSI</acronym> disk?  This happens
-      because <acronym>USB</acronym> devices are usually
-      probed before the <acronym>SCSI</acronym> card.  One solution
-      is to only insert these devices after the system has been
-      booted.  Another method could be to use only a single
+      <acronym>SCSI</acronym> devices in order so a new device added
+      to the <acronym>SCSI</acronym> card will be issued unused device
+      numbers.  But what about <acronym>USB</acronym> devices which
+      may replace the primary <acronym>SCSI</acronym> disk?  This
+      happens because <acronym>USB</acronym> devices are usually
+      probed before the <acronym>SCSI</acronym> card.  One solution is
+      to only insert these devices after the system has been booted.
+      Another method could be to use only a single
       <acronym>ATA</acronym> drive and never list the
       <acronym>SCSI</acronym> devices in
       <filename>/etc/fstab</filename>.</para>
@@ -522,9 +526,9 @@
       label their disk devices and use these labels in
       <filename>/etc/fstab</filename>.  Because
       <command>glabel</command> stores the label in the last sector of
-      a given provider, the label will remain persistent across reboots.
-      By using this label as a device, the file system may always be
-      mounted regardless of what device node it is accessed
+      a given provider, the label will remain persistent across
+      reboots.  By using this label as a device, the file system may
+      always be mounted regardless of what device node it is accessed
       through.</para>
 
     <note>
@@ -544,24 +548,26 @@
 	Permanent labels can be created with the &man.tunefs.8;
 	or &man.newfs.8; commands.  They will then be created
 	in a sub-directory of
-	<filename class="directory">/dev</filename>, which will be named
-	according to their file system type.  For example,
+	<filename class="directory">/dev</filename>, which will be
+	named according to their file system type.  For example,
 	<acronym>UFS</acronym>2 file system labels will be created in
-	the <filename class="directory">/dev/ufs</filename>
-	directory.  Permanent labels can also be created with the
-	<command>glabel label</command> command.  These are not file system
-	specific, and will be created in the <filename
-	  class="directory">/dev/label</filename> directory.</para>
+	the <filename class="directory">/dev/ufs</filename> directory.
+	Permanent labels can also be created with the <command>glabel
+	label</command> command.  These are not file system specific,
+	and will be created in the
+	<filename class="directory">/dev/label</filename>
+	directory.</para>
 
-      <para>A temporary label will go away with the next reboot.  These
-	labels will be created in the
-	<filename class="directory">/dev/label</filename> directory and
-	are perfect for experimentation.  A temporary label can be
-	created using the <command>glabel create</command> command.  For more
-	information, please read the manual page of &man.glabel.8;.</para>
+      <para>A temporary label will go away with the next reboot.
+	These labels will be created in the
+	<filename class="directory">/dev/label</filename> directory
+	and are perfect for experimentation.  A temporary label can be
+	created using the <command>glabel create</command> command.
+	For more information, please read the manual page of
+	&man.glabel.8;.</para>
 
 <!-- XXXTR: How do you create a file system label without running newfs
-            or when there is no newfs (e.g.: cd9660)? -->
+	    or when there is no newfs (e.g.: cd9660)? -->
 
       <para>To create a permanent label for a
 	<acronym>UFS</acronym>2 file system without destroying any
@@ -608,28 +614,29 @@
 
       <screen>&prompt.root; <userinput>glabel destroy home</userinput></screen>
 
-      <para>The following example shows how to label the partitions of a
-	boot disk.</para>
+      <para>The following example shows how to label the partitions of
+	a boot disk.</para>
 
       <example>
 	<title>Labeling Partitions on the Boot Disk</title>
 
 	<para>By permanently labeling the partitions on the boot disk,
 	  the system should be able to continue to boot normally, even
-	  if the disk is moved to another controller or transferred
-	  to a different system.  For this example, it is assumed that a
-	  single <acronym>ATA</acronym> disk is used, which is currently
-	  recognized by the system as <devicename>ad0</devicename>.  It is
-	  also assumed that the standard &os; partition scheme is used, with
+	  if the disk is moved to another controller or transferred to
+	  a different system.  For this example, it is assumed that a
+	  single <acronym>ATA</acronym> disk is used, which is
+	  currently recognized by the system as
+	  <devicename>ad0</devicename>.  It is also assumed that the
+	  standard &os; partition scheme is used, with
 	  <filename class="directory">/</filename>,
 	  <filename class="directory">/var</filename>,
 	  <filename class="directory">/usr</filename> and
-	  <filename class="directory">/tmp</filename> file systems, as well
-	  as a swap partition.</para>
+	  <filename class="directory">/tmp</filename> file systems, as
+	  well as a swap partition.</para>
 
-	<para>Reboot the system, and at the &man.loader.8; prompt, press
-	  <keycap>4</keycap> to boot into single user mode.  Then enter the
-	  following commands:</para>
+	<para>Reboot the system, and at the &man.loader.8; prompt,
+	  press <keycap>4</keycap> to boot into single user mode.
+	  Then enter the following commands:</para>
 
 	<screen>&prompt.root; <userinput>glabel label rootfs /dev/ad0s1a</userinput>
 GEOM_LABEL: Label for provider /dev/ad0s1a is label/rootfs
@@ -643,11 +650,11 @@
 GEOM_LABEL: Label for provider /dev/ad0s1b is label/swap
 &prompt.root; <userinput>exit</userinput></screen>
 
-	<para>The system will continue with multi-user boot.  After the boot
-	  completes, edit <filename>/etc/fstab</filename> and replace the
-	  conventional device names, with their respective labels.  The
-	  final <filename>/etc/fstab</filename> file will look like the
-	  following:</para>
+	<para>The system will continue with multi-user boot.  After
+	  the boot completes, edit <filename>/etc/fstab</filename> and
+	  replace the conventional device names, with their respective
+	  labels.  The final <filename>/etc/fstab</filename> file will
+	  look like the following:</para>
 
 	<programlisting># Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/label/swap         none            swap    sw              0       0
@@ -656,8 +663,9 @@
 /dev/label/usr          /usr            ufs     rw              2       2
 /dev/label/var          /var            ufs     rw              2       2</programlisting>
 
-	<para>The system can now be rebooted.  If everything went well, it
-	  will come up normally and <command>mount</command> will show:</para>
+	<para>The system can now be rebooted.  If everything went
+	  well, it will come up normally and <command>mount</command>
+	  will show:</para>
 
 	<screen>&prompt.root; <userinput>mount</userinput>
 /dev/label/rootfs on / (ufs, local)
@@ -667,16 +675,17 @@
 /dev/label/var on /var (ufs, local, soft-updates)</screen>
       </example>
 
-      <para>Starting with &os;&nbsp;7.2, the &man.glabel.8; class supports
-	a new label type for <acronym>UFS</acronym> file systems, based on
-	the unique file system id, <literal>ufsid</literal>.  These labels may
-	be found in the <filename class="directory">/dev/ufsid</filename>
-	directory and are created automatically during system startup.  It is
-	possible to use <literal>ufsid</literal> labels to mount partitions
-	using the <filename>/etc/fstab</filename> facility.  Use the
-	<command>glabel status</command> command to receive a list of
-	file systems and their corresponding <literal>ufsid</literal>
-	labels:</para>
+      <para>Starting with &os;&nbsp;7.2, the &man.glabel.8; class
+	supports a new label type for <acronym>UFS</acronym> file
+	systems, based on the unique file system id,
+	<literal>ufsid</literal>.  These labels may be found in the
+	<filename class="directory">/dev/ufsid</filename> directory
+	and are created automatically during system startup.  It is
+	possible to use <literal>ufsid</literal> labels to mount
+	partitions using the <filename>/etc/fstab</filename> facility.
+	Use the <command>glabel status</command> command to receive a
+	list of file systems and their corresponding
+	<literal>ufsid</literal> labels:</para>
 
       <screen>&prompt.user; <userinput>glabel status</userinput>
                   Name  Status  Components
@@ -685,10 +694,10 @@
 
       <para>In the above example <devicename>ad4s1d</devicename>
 	represents the <filename class="directory">/var</filename>
-	file system, while <devicename>ad4s1f</devicename> represents the
-	<filename class="directory">/usr</filename> file system.  Using the
-	<literal>ufsid</literal> values shown, these partitions
-	may now be mounted with the following entries in
+	file system, while <devicename>ad4s1f</devicename> represents
+	the <filename class="directory">/usr</filename> file system.
+	Using the <literal>ufsid</literal> values shown, these
+	partitions may now be mounted with the following entries in
 	<filename>/etc/fstab</filename>:</para>
 
       <programlisting>/dev/ufsid/486b6fc38d330916        /var        ufs        rw        2      2
@@ -724,11 +733,11 @@
       system inconsistencies.</para>
 
     <para>This method is yet another mechanism to protect against data
-      loss and inconsistencies of the file system.  Unlike Soft Updates
-      which tracks and enforces meta-data updates and Snapshots which
-      is an image of the file system, an actual log is stored in disk
-      space specifically reserved for this task, and in some cases may be
-      stored on another disk entirely.</para>
+      loss and inconsistencies of the file system.  Unlike Soft
+      Updates which tracks and enforces meta-data updates and
+      Snapshots which is an image of the file system, an actual log is
+      stored in disk space specifically reserved for this task, and in
+      some cases may be stored on another disk entirely.</para>
 
     <para>Unlike other file system journaling implementations, the
       <command>gjournal</command> method is block based and not
@@ -742,8 +751,8 @@
     <programlisting>options	UFS_GJOURNAL</programlisting>
 
     <para>If journaled volumes need to be mounted during startup, the
-      <filename>geom_journal.ko</filename> kernel module will also have to be
-      loaded, by adding the following line in
+      <filename>geom_journal.ko</filename> kernel module will also
+      have to be loaded, by adding the following line in
       <filename>/boot/loader.conf</filename>:</para>
 
     <programlisting>geom_journal_load="YES"</programlisting>
@@ -770,7 +779,8 @@
     <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 on the journaled device.</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,26 +790,29 @@
     <note>
       <para>In the case of several slices, a journal will be created
 	for each individual slice.  For instance, if
-	<devicename>ad4s1</devicename> and <devicename>ad4s2</devicename>
-	are both slices, then <command>gjournal</command> will create
+	<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>.</para>
     </note>
 
     <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
-      using <command>tunefs</command>; however, always make a backup
-      before attempting to alter a file system.  In most cases, the
-      <command>gjournal</command> will fail if it is unable to create
-      the actual journal but this does not protect against data loss
-      incurred as a result of misusing <command>tunefs</command>.</para>
+      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 using <command>tunefs</command>; however, always make
+      a backup before attempting to alter a file system.  In most
+      cases, the <command>gjournal</command> will fail if it is unable
+      to create the actual journal but this does not protect against
+      data loss incurred as a result of misusing
+      <command>tunefs</command>.</para>
 
-    <para>It is also possible to journal the boot disk of a &os; system.
-      Please refer to the article <ulink
-	url="&url.articles.gjournal-desktop;">Implementing UFS Journaling on
-	a Desktop PC</ulink> for detailed instructions on this task.</para>
+    <para>It is also possible to journal the boot disk of a &os;
+      system.  Please refer to the article <ulink
+	url="&url.articles.gjournal-desktop;">Implementing UFS
+	Journaling on a Desktop PC</ulink> for detailed instructions
+      on this task.</para>
   </sect1>
 </chapter>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#25 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.434 2011/12/19 12:41:12 ryusuke Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.436 2012/02/05 13:09:13 ryusuke Exp $
 -->
 
 <chapter id="install">
@@ -618,9 +618,9 @@
 	    <replaceable>version</replaceable> with the
 	    architecture and the version number which you want to
 	    install, respectively.  For example, the memory stick
-	    images for &os;/&arch.i386;&nbsp;&rel.current;-RELEASE are
+	    images for &os;/&arch.i386;&nbsp;&rel2.current;-RELEASE are
 	    available from <ulink
-	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img"></ulink>.</para>;
+	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img"></ulink>.</para>;
 
 	  <para>The memory stick image has a <filename>.img</filename>
 	    extension.  The <filename
@@ -661,7 +661,7 @@
 		copy files from one disk to another.  Instead, you must use
 		&man.dd.1; to write the image directly to the disk:</para>
 
-	      <screen>&prompt.root; <userinput>dd if=&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
+	      <screen>&prompt.root; <userinput>dd if=&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
 
 	      <para>If an
 		<computeroutput>Operation not permitted</computeroutput>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#33 (text+ko) ====

@@ -1,14 +1,14 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.140 2012/02/03 05:33:42 gjb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.143 2012/02/05 06:40:54 gjb Exp $
 -->
 
 <chapter id="network-servers">
   <chapterinfo>
     <authorgroup>
       <author>
-        <firstname>Murray</firstname>
+	<firstname>Murray</firstname>
 	<surname>Stokely</surname>
 	<contrib>Reorganized by </contrib>
       </author>
@@ -46,7 +46,8 @@
       </listitem>
 
       <listitem>
-	<para>How to set up automatic network settings using DHCP.</para>
+	<para>How to set up automatic network settings using
+	  DHCP.</para>
       </listitem>
 
       <listitem>
@@ -54,11 +55,13 @@
       </listitem>
 
       <listitem>
-	<para>How to set up the <application>Apache</application> HTTP Server.</para>
+	<para>How to set up the <application>Apache</application>
+	  HTTP Server.</para>
       </listitem>
 
       <listitem>
-	<para>How to set up a File Transfer Protocol (FTP) Server.</para>
+	<para>How to set up a File Transfer Protocol (FTP)
+	  Server.</para>
       </listitem>
 
       <listitem>
@@ -92,8 +95,8 @@
       </listitem>
 
       <listitem>
-      <para>Know how to install additional third-party
-        software (<xref linkend="ports">).</para>
+	<para>Know how to install additional third-party
+	  software (<xref linkend="ports">).</para>
       </listitem>
 
     </itemizedlist>
@@ -102,11 +105,11 @@
   <sect1 id="network-inetd">
     <sect1info>
       <authorgroup>
-        <author>
-          <firstname>Chern</firstname>
-          <surname>Lee</surname>
-          <contrib>Contributed by </contrib>
-        </author>
+	<author>
+	  <firstname>Chern</firstname>
+	  <surname>Lee</surname>
+	  <contrib>Contributed by </contrib>
+	</author>
       </authorgroup>
       <authorgroup>
 	<author>
@@ -116,22 +119,24 @@
       </authorgroup>
     </sect1info>
 
-    <title>The <application>inetd</application> <quote>Super-Server</quote></title>
+    <title>The <application>inetd</application>
+      <quote>Super-Server</quote></title>
 
     <sect2 id="network-inetd-overview">
       <title>Overview</title>
 
-      <para>&man.inetd.8; is sometimes referred to as the <quote>Internet
-	Super-Server</quote> because it manages connections for
-	several services.  When a
-	connection is received by <application>inetd</application>, it
-	determines which program the connection is destined for, spawns
-	the particular process and delegates the socket to it (the program
-	is invoked with the service socket as its standard input, output
-	and error descriptors).  Running
-	<application>inetd</application> for servers that are not heavily used can reduce the
-	overall system load, when compared to running each daemon
-	individually in stand-alone mode.</para>
+      <para>&man.inetd.8; is sometimes referred to as the
+	<quote>Internet Super-Server</quote> because it manages
+	connections for several services.  When a connection is
+	received by <application>inetd</application>, it determines
+	which program the connection is destined for, spawns the
+	particular process and delegates the socket to it (the program
+	is invoked with the service socket as its standard input,
+	output and error descriptors).  Running
+	<application>inetd</application> for servers that are not
+	heavily used can reduce the overall system load, when compared
+	to running each daemon individually in stand-alone
+	mode.</para>
 
       <para>Primarily, <application>inetd</application> is used to
 	spawn other daemons, but several trivial protocols are handled
@@ -156,11 +161,11 @@
 	depending on the configuration chosen by the user.
 	Placing:</para>
 
-	<programlisting>inetd_enable="YES"</programlisting>
+      <programlisting>inetd_enable="YES"</programlisting>
 
       <para>or</para>
 
-	<programlisting>inetd_enable="NO"</programlisting>
+      <programlisting>inetd_enable="NO"</programlisting>
 
       <para>into
 	<filename>/etc/rc.conf</filename> will enable or disable
@@ -182,26 +187,24 @@
 
       <para>Like most server daemons, <application>inetd</application>
 	has a number of options that it can be passed in order to
-	modify its behaviour.  The full list of options reads:</para>
+	modify its behaviour.  See the &man.inetd.8; manual page for
+	the full list of options.</para>
 
-      <para><command>inetd</command> <option>[-d] [-l] [-w] [-W] [-c maximum] [-C rate] [-a address | hostname]
-           [-p filename] [-R rate] [-s maximum] [configuration file]</option></para>
-
-      <para>Options can be passed to <application>inetd</application> using the
-	<literal>inetd_flags</literal> option in
+      <para>Options can be passed to <application>inetd</application>
+	using the <literal>inetd_flags</literal> option in
 	<filename>/etc/rc.conf</filename>.  By default,
 	<literal>inetd_flags</literal> is set to
 	<literal>-wW -C 60</literal>, which turns on TCP wrapping for
 	<application>inetd</application>'s services, and prevents any
-	single IP address from requesting any service more than 60 times
-	in any given minute.</para>
+	single IP address from requesting any service more than 60
+	times in any given minute.</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>
+	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>
@@ -221,8 +224,8 @@
 	  <listitem>
 	    <para>Specify the default maximum number of times a
 	      service can be invoked from a single IP address in one
-	      minute; the default is unlimited.  May be overridden on a
-	      per-service basis with the
+	      minute; the default is unlimited.  May be overridden on
+	      a per-service basis with the
 	      <option>max-connections-per-ip-per-minute</option>
 	      parameter.</para>
 	  </listitem>
@@ -244,9 +247,9 @@
 	  <listitem>
 	    <para>Specify the maximum number of times a service can be
 	      invoked from a single IP address at any one time; the
-	      default is unlimited.  May be overridden on a per-service
-	      basis with the <option>max-child-per-ip</option>
-	      parameter.</para>
+	      default is unlimited.  May be overridden on a
+	      per-service basis with the
+	      <option>max-child-per-ip</option> parameter.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
@@ -266,7 +269,7 @@
 
       <example id="network-inetd-reread">
 	<title>Reloading the <application>inetd</application>
-	  configuration file</title>
+	  Configuration File</title>
 
 	<screen>&prompt.root; <userinput>/etc/rc.d/inetd reload</userinput></screen>
       </example>
@@ -382,22 +385,24 @@
 	      using the <option>max-child</option> option.  If a limit
 	      of ten instances of a particular daemon is needed, a
 	      <literal>/10</literal> would be placed after
-	      <option>nowait</option>.  Specifying <literal>/0</literal>
-	      allows an unlimited number of children</para>
+	      <option>nowait</option>.  Specifying
+	      <literal>/0</literal> allows an unlimited number of
+	      children</para>
 
 	    <para>In addition to <option>max-child</option>, two other
-	      options which limit the maximum connections from a single
-	      place to a particular daemon can be enabled.
-	      <option>max-connections-per-ip-per-minute</option> limits
-	      the number of connections from any particular IP address
-	      per minutes, e.g. a value of ten would limit any particular
-	      IP address connecting to a particular service to ten
-	      attempts per minute.  <option>max-child-per-ip</option>
-	      limits the number of children that can be started on
-	      behalf on any single IP address at any moment. These
-	      options are useful to prevent intentional or unintentional
- 	      excessive resource consumption and Denial of Service (DoS)
-	      attacks to a machine.</para>
+	      options which limit the maximum connections from a
+	      single place to a particular daemon can be enabled.
+	      <option>max-connections-per-ip-per-minute</option>
+	      limits the number of connections from any particular IP
+	      address per minutes, e.g., a value of ten would limit
+	      any particular IP address connecting to a particular
+	      service to ten attempts per minute.
+	      <option>max-child-per-ip</option> limits the number of
+	      children that can be started on behalf on any single IP
+	      address at any moment.  These options are useful to
+	      prevent intentional or unintentional excessive resource
+	      consumption and Denial of Service (DoS) attacks to a
+	      machine.</para>
 
 	    <para>In this field, either of <option>wait</option> or
 	      <option>nowait</option> is mandatory.
@@ -439,10 +444,10 @@
 	  <listitem>
 	    <para>This is the username that the particular daemon
 	      should run as.  Most commonly, daemons run as the
-	      <username>root</username> user.  For security purposes, it is
-	      common to find some servers running as the
-	      <username>daemon</username> user, or the least privileged
-	      <username>nobody</username> user.</para>
+	      <username>root</username> user.  For security purposes,
+	      it is common to find some servers running as the
+	      <username>daemon</username> user, or the least
+	      privileged <username>nobody</username> user.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -482,26 +487,28 @@
       <para>Depending on the choices made at install time, many
 	of <application>inetd</application>'s services may be enabled
 	by default.  If there is no apparent need for a particular
-	daemon, consider disabling it.  Place a <quote>#</quote> in front of the
-	daemon in question in <filename>/etc/inetd.conf</filename>,
-	and then <link linkend="network-inetd-reread">reload the
+	daemon, consider disabling it.  Place a <quote>#</quote> in
+	front of the daemon in question in
+	<filename>/etc/inetd.conf</filename>, and then <link
+	  linkend="network-inetd-reread">reload the
 	inetd configuration</link>.  Some daemons, such as
 	<application>fingerd</application>, may not be desired at all
 	because they provide
 	information that may be useful to an attacker.</para>
 
       <para>Some daemons are not security-conscious and have long, or
-	non-existent, timeouts for connection attempts.  This allows an
-	attacker to slowly send connections to a particular daemon,
+	non-existent, timeouts for connection attempts.  This allows
+	an attacker to slowly send connections to a particular daemon,
 	thus saturating available resources.  It may be a good idea to
 	place <option>max-connections-per-ip-per-minute</option>,
-	<option>max-child</option> or <option>max-child-per-ip</option> limitations on certain
+	<option>max-child</option> or
+	<option>max-child-per-ip</option> limitations on certain
 	daemons if you find that you have too many connections.</para>
 
       <para>By default, TCP wrapping is turned on.  Consult the
-	&man.hosts.access.5; manual page for more information on placing
-	TCP restrictions on various <application>inetd</application>
-	invoked daemons.</para>
+	&man.hosts.access.5; manual page for more information on
+	placing TCP restrictions on various
+	<application>inetd</application> invoked daemons.</para>
     </sect2>
 
     <sect2 id="network-inetd-misc">
@@ -518,7 +525,8 @@
       <para>The <application>auth</application> service provides
 	identity
 	network services, and is
-	configurable to a certain degree, whilst the others are simply on or off.</para>
+	configurable to a certain degree, whilst the others are simply
+	on or off.</para>
 
       <para>Consult the &man.inetd.8; manual page for more in-depth
 	information.</para>
@@ -528,18 +536,18 @@
   <sect1 id="network-nfs">
     <sect1info>
       <authorgroup>
-        <author>
-          <firstname>Tom</firstname>
-          <surname>Rhodes</surname>
-          <contrib>Reorganized and enhanced by </contrib>
-        </author>
+	<author>
+	  <firstname>Tom</firstname>
+	  <surname>Rhodes</surname>
+	  <contrib>Reorganized and enhanced by </contrib>
+	</author>
       </authorgroup>
       <authorgroup>
-        <author>
-          <firstname>Bill</firstname>
-      	  <surname>Swingle</surname>
+	<author>
+	  <firstname>Bill</firstname>
+	  <surname>Swingle</surname>
 	  <contrib>Written by </contrib>
-        </author>
+	</author>
       </authorgroup>
     </sect1info>
     <title>Network File System (NFS)</title>
@@ -573,9 +581,9 @@
 
       <listitem>
 	<para>Storage devices such as floppy disks, CDROM drives, and
-	  &iomegazip; drives can be used by other machines on the network.
-	  This may reduce the number of removable media drives
-	  throughout the network.</para>
+	  &iomegazip; drives can be used by other machines on the
+	  network.  This may reduce the number of removable media
+	  drives throughout the network.</para>
       </listitem>
     </itemizedlist>
 
@@ -583,29 +591,29 @@
       <title>How <acronym>NFS</acronym> Works</title>
 
       <para><acronym>NFS</acronym> consists of at least two main
-        parts: a server and one or more clients.  The client remotely
-        accesses the data that is stored on the server machine.  In
-        order for this to function properly a few processes have to be
-        configured and running.</para>
+	parts: a server and one or more clients.  The client remotely
+	accesses the data that is stored on the server machine.  In
+	order for this to function properly a few processes have to be
+	configured and running.</para>
 
       <para>The server has to be running the following daemons:</para>
       <indexterm>
-        <primary>NFS</primary>
-        <secondary>server</secondary>
+	<primary>NFS</primary>
+	<secondary>server</secondary>
       </indexterm>
       <indexterm>
-        <primary>file server</primary>
-        <secondary>UNIX clients</secondary>
+	<primary>file server</primary>
+	<secondary>UNIX clients</secondary>
       </indexterm>
 
       <indexterm>
 	<primary><application>rpcbind</application></primary>
       </indexterm>
       <indexterm>
-        <primary><application>mountd</application></primary>
+	<primary><application>mountd</application></primary>
       </indexterm>
       <indexterm>
-        <primary><application>nfsd</application></primary>
+	<primary><application>nfsd</application></primary>
       </indexterm>
 
       <informaltable frame="none" pgwide="1">
@@ -623,91 +631,91 @@
 	    <row>
 	      <entry><application>nfsd</application></entry>
 	      <entry>The <acronym>NFS</acronym> daemon which services
-	      requests from the <acronym>NFS</acronym>
-	      clients.</entry>
+		requests from the <acronym>NFS</acronym>
+		clients.</entry>
 	    </row>
 	    <row>
 	      <entry><application>mountd</application></entry>
-	      <entry>The <acronym>NFS</acronym> mount daemon which carries out
-		the requests that &man.nfsd.8; passes on to it.</entry>
+	      <entry>The <acronym>NFS</acronym> mount daemon which
+		carries out the requests that &man.nfsd.8; passes on
+		to it.</entry>
 	    </row>
 	    <row>
 	      <entry><application>rpcbind</application></entry>
 	      <entry> This daemon allows

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202051958.q15JwXGQ033016>