PERFORCE change 185549 for review

[Rene Ladan]

http://p4web.freebsd.org/@@185549?ac=10

Change 185549 by rene at rene_acer on 2010/11/08 22:11:16

	Pre 7.X-cleanup up to chapter 18 (disks/"Storage")
	Leave a note in the MAC chapter that someone(tm) should write about
	the "new" way to map users to labels.

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#3 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#12 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#8 edit

Differences ...

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

@@ -581,7 +581,7 @@
 	<literal>return</literal> token indicates the successful execution, and the <literal>trailer</literal>
 	concludes the record.</para>
 
-      <para>In &os; 6.3 and later, <command>praudit</command> also supports
+      <para><command>praudit</command> also supports
 	an XML output format, which can be selected using the
 	<option>-x</option> argument.</para>
 

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

@@ -2513,7 +2513,7 @@
 
       <indexterm><primary><command>tar</command></primary></indexterm>
 
-      <para>On FreeBSD 5.3 and later, both GNU <command>tar</command>
+      <para>Both GNU <command>tar</command>
         and the default <command>bsdtar</command> are available.  The
         GNU version can be invoked with <command>gtar</command>.  It
         supports remote devices using the same syntax as
@@ -3688,7 +3688,7 @@
 
       <title>Disk Encryption with <command>geli</command></title>
 
-      <para>A new cryptographic GEOM class is available as of &os; 6.0 -
+      <para>An alternative cryptographic GEOM class is available -
 	<command>geli</command>.  It is currently being developed by
 	&a.pjd;.  The <command>geli</command> utility is different to
 	<command>gbde</command>; it offers different features and uses
@@ -3738,8 +3738,8 @@
 	<command>geli</command> in the &os; kernel and will explain how
 	to create and use a <command>geli</command> encryption provider.</para>
 
-      <para>In order to use <command>geli</command>, you must be running
-	&os; 6.0-RELEASE or later.  Super-user privileges will be
+      <para>
+	Super-user privileges will be
 	required since modifications to the kernel are necessary.</para>
 
       <procedure>
@@ -3900,13 +3900,13 @@
       <secondary>encrypting</secondary>
     </indexterm>
 
-    <para>Swap encryption in &os; is easy to configure and has been
-      available since &os; 5.3-RELEASE.  Depending on which version
+    <para>Swap encryption in &os; is easy to configure
+      .  Depending on which version
       of &os; is being used, different options are available
-      and configuration can vary slightly.  From &os; 6.0-RELEASE onwards,
-      the &man.gbde.8; or &man.geli.8; encryption systems can be used
-      for swap encryption.  With earlier versions, only &man.gbde.8; is
-      available.  Both systems use the <filename>encswap</filename>
+      and configuration can vary slightly.
+      The &man.gbde.8; or &man.geli.8; encryption systems can be used
+      for swap encryption.
+      Both systems use the <filename>encswap</filename>
       <link linkend="configtuning-rcd">rc.d</link> script.</para>
 
     <para>The previous section, <link linkend="disks-encrypting">Encrypting
@@ -3945,7 +3945,7 @@
     <sect2>
       <title>Swap Encryption with &man.gbde.8;</title>
 
-      <para>If &os; 6.0-RELEASE or newer is being used, the
+      <para>The
 	<literal>.bde</literal> suffix should be added to the device in the
 	respective <filename>/etc/fstab</filename> swap line:</para>
 
@@ -3953,11 +3953,6 @@
 # Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/ad0s1b.bde         none            swap    sw              0       0
       </programlisting>
-
-      <para>For systems prior to &os; 6.0-RELEASE, the following line
-	in <filename>/etc/rc.conf</filename> is also needed:</para>
-
-      <programlisting>gbde_swap_enable="YES"</programlisting>
     </sect2>
 
     <sect2>
@@ -3986,10 +3981,6 @@
 
       <programlisting>geli_swap_flags="-e blowfish -l 128 -s 4096 -d"</programlisting>
 
-      <para>For systems prior to &os; 6.2-RELEASE, use the following line:</para>
-
-      <programlisting>geli_swap_flags="-a blowfish -l 128 -s 4096 -d"</programlisting>
-
       <para>Please refer to the description of the <command>onetime</command> command
 	in the &man.geli.8; manual page for a list of possible options.</para>
     </sect2>

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

@@ -638,6 +638,7 @@
 	<para>Future versions of &os; will include a new way to
 	  deal with mapping users to labels; however, this will
 	  not be available until some time after &os;&nbsp;5.3.</para>
+	<!--rene@ : TODO describe this new way-->
       </sect3>
 
       <sect3>