PERFORCE change 185992 for review

Rene Ladan rene at FreeBSD.org
Fri Nov 19 15:26:26 UTC 2010 

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

Change 185992 by rene at rene_acer on 2010/11/19 15:25:43

	Pre 7.X-cleanup, Handbook should be done now :)
	- add ctm-src-[5-8] to mailing-lists.ent. These mailing lists are
	  browseable by http://lists.freebsd.org/mailmain/listinfo/ctm-src-[5-8]
	- mrouted(8) is now Ports-only
	- convert a table describing STP implementations into a single line,
	  as all other entries are pre-7.X
	- net/isc-dhcp30-server upgraded to net/isc-dhcp31-server
	- isdn4bsd examples not in base any more
	- csup is now only and always in base
	- bump OS versions in examples
	- some text simplifications

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#25 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#34 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#16 edit

Differences ...

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

@@ -659,13 +659,13 @@
 	&man.mrouted.8;.</para>
 
       <note>
-	<para>As of &os;&nbsp;7.0 the &man.mrouted.8; multicast routing daemon
-	  has been removed from the base system.  It implements the
+	<para>The &man.mrouted.8; multicast routing daemon
+	  implements the
 	  <acronym>DVMRP</acronym> multicast routing protocol, which has
 	  largely been replaced by &man.pim.4; in many multicast
-	  installations.  The related &man.map-mbone.8; and
-	  &man.mrinfo.8; utilities have also been removed.  These programs
-	  are now available in the &os; Ports&nbsp;Collection as
+	  installations.  &man.mrouted.8; and the related &man.map-mbone.8; and
+	  &man.mrinfo.8; utilities
+	  are available in the &os; Ports&nbsp;Collection as
 	  <filename role="package">net/mrouted</filename>.</para>
       </note>
     </sect2>
@@ -774,7 +774,7 @@
 	implementation of these protocols enable high speed bursting
 	of data and prioritized traffic flow.</para>
 
-      <para>Since the 6.0 version, &os; supports networks that operate
+      <para>&os; supports networks that operate
 	using 802.11a, 802.11b, and 802.11g.  The WPA and 802.11i
 	security protocols are likewise supported (in conjunction with
 	any of 11a, 11b, and 11g) and QoS and traffic prioritization
@@ -2528,7 +2528,7 @@
         device are paired. Alternatively, you can initiate pairing on the remote
         device.</para>
 
-      <para>On &os; 5.5, 6.1 and newer, the following line can be added to the
+      <para>The following line can be added to the
 	<filename>/etc/rc.conf</filename> file to have
 	<application>hcsecd</application> started automatically on system
 	start:</para>
@@ -2612,7 +2612,7 @@
       <screen>&prompt.user; <userinput>sdpcontrol -a 00:01:03:fc:6e:ec search OPUSH</userinput></screen>
 
       <para>Offering services on &os; to Bluetooth clients is done with the
-	&man.sdpd.8; server. On &os; 5.5, 6.1 and newer, the following line can
+	&man.sdpd.8; server.  The following line can
 	be added to the <filename>/etc/rc.conf</filename> file:</para>
 
       <programlisting>sdpd_enable="YES"</programlisting>
@@ -3001,43 +3001,10 @@
 	provides faster Spanning Tree convergence than legacy STP, the
 	protocol will exchange information with neighbouring switches
 	to quickly transition to forwarding without creating
-	loops.</para>
+	loops.
+	&os; supports RTSP and STP as operating modes, with RTSP
+	being the default mode.</para>
 
-      <para>The following table shows the supported operating
-	modes:</para>
-
-      <informaltable frame="none" pgwide="1">
-	<tgroup cols="3">
-	  <thead>
-	    <row>
-	      <entry>OS Version</entry>
-	      <entry>STP Modes</entry>
-	      <entry>Default Mode</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry>&os; 5.4&mdash;&os; 6.2</entry>
-	      <entry>STP</entry>
-	      <entry>STP</entry>
-	    </row>
-
-	    <row>
-	      <entry>&os; 6.3+</entry>
-	      <entry>RSTP or STP</entry>
-	      <entry>STP</entry>
-	    </row>
-
-	    <row>
-	      <entry>&os; 7.0+</entry>
-	      <entry>RSTP or STP</entry>
-	      <entry>RSTP</entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </informaltable>
-
       <para>Spanning Tree can be enabled on member interfaces using
 	the <literal>stp</literal> command.  For a bridge with
 	<devicename>fxp0</devicename> and
@@ -3782,9 +3749,9 @@
 	    both BOOTP and <acronym>DHCP</acronym> requests.</para>
 
 	  <para><application>ISC DHCP
-  	    3.0</application> is not part of the base
+  	    3.1</application> is not part of the base
 	    system.  You will first need to install the
-	    <filename role="package">net/isc-dhcp30-server</filename> port or the
+	    <filename role="package">net/isc-dhcp31-server</filename> port or the
 	    corresponding package.</para>
 
 	  <para>Once <application>ISC DHCP</application> is installed, it
@@ -4290,8 +4257,8 @@
 	(ISA and PCI) BRI cards and the AVM T1 PCI PRI cards.</para>
 
       <para>For documentation on <application>isdn4bsd</application>,
-	have a look at <filename>/usr/share/examples/isdn/</filename>
-	directory on your FreeBSD system or at the <ulink
+	have a look at
+	the <ulink
 	  url="http://www.freebsd-support.de/i4b/">homepage of
 	  isdn4bsd</ulink> which also has pointers to hints, erratas and
 	much more documentation such as the <ulink

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

@@ -438,13 +438,13 @@
 	</example>
 
 	<example>
-	  <title>Checking Out the Version of &man.ls.1; in the 6-STABLE
+	  <title>Checking Out the Version of &man.ls.1; in the 8-STABLE
 	    Branch:</title>
 
 	  <screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs at anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
 &prompt.user; <userinput>cvs login</userinput>
 <emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs co -rRELENG_6 ls</userinput>
+&prompt.user; <userinput>cvs co -rRELENG_8 ls</userinput>
 	  </screen>
 	</example>
 
@@ -454,7 +454,7 @@
 	  <screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs at anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
 &prompt.user; <userinput>cvs login</userinput>
 <emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs rdiff -u -rRELENG_5_3_0_RELEASE -rRELENG_5_4_0_RELEASE ls</userinput>
+&prompt.user; <userinput>cvs rdiff -u -rRELENG_8_0_0_RELEASE -rRELENG_8_1_0_RELEASE ls</userinput>
 	  </screen>
 	</example>
 
@@ -574,7 +574,7 @@
 	  <application>CTM</application> distribution lists.
 	  &a.ctm-cvs-cur.name; supports the entire CVS tree.
 	  &a.ctm-src-cur.name; supports the head of the development
-	  branch.  &a.ctm-src-4.name; supports the 4.X release
+	  branch.  &a.ctm-src-7.name; supports the 7.X release
 	  branch, etc..  (If you do not know how to subscribe yourself
 	  to a list, click on the list name above or go to
 	  &a.mailman.lists.link; and click on the list that you
@@ -882,12 +882,10 @@
 	  <application>CVSup</application> software in C.  Its biggest
 	  advantage is, that it is faster and does not depend on the
 	  Modula-3 language, thus you do not need to install it as a
-	  requirement.  Moreover, if you are using &os; 6.2 or later,
+	  requirement.  Moreover
 	  you can use it out-of-the-box, since it is included in the base
-	  system.  Older &os; versions do not have &man.csup.1; in their
-	  base system but you can easily install the
-	  <filename role="package">net/csup</filename> port, or a precompiled
-	  package.  If you decided to use
+	  system.
+	  If you decided to use
 	  <application>csup</application>, just skip the steps on the
 	  installation of <application>CVSup</application> and
 	  substitute the references of <application>CVSup</application> with
@@ -917,14 +915,6 @@
 	  <application>CVSup</application> <acronym>GUI</acronym>,
 	  <filename role="package">net/cvsup-without-gui</filename>.</para>
 	</note>
-
-      <para>If you want to install <application>csup</application> on
-	&os; 6.1 or earlier, you can use the precompiled
-	<filename role="package">net/csup</filename> package
-	from the &os; <link linkend="ports">packages collection</link>.
-	If you prefer to build <application>csup</application> from source,
-	you can use the <filename role="package">net/csup</filename>
-	port instead.</para>
     </sect2>
 
     <sect2 id="cvsup-config">
@@ -1072,8 +1062,8 @@
 	    users might be interested in.  When specifying a tag in
 	    <application>CVSup</application>'s configuration file, it
 	    must be preceded with <literal>tag=</literal>
-	    (<literal>RELENG_4</literal> will become
-	    <literal>tag=RELENG_4</literal>).
+	    (<literal>RELENG_8</literal> will become
+	    <literal>tag=RELENG_8</literal>).
 	    Keep in mind that only the <literal>tag=.</literal> is
 	    relevant for the Ports Collection.</para>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#16 (text+ko) ====

@@ -102,6 +102,22 @@
 <!ENTITY a.ctm-src-4 "<ulink url='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution mailing list</ulink>">
 <!ENTITY a.ctm-src-4.name "<ulink url='&a.ctm-src-4.url;'>ctm-src-4</ulink>">
 
+<!ENTITY a.ctm-src-5.url "&a.mailman.listinfo;/ctm-src-5">
+<!ENTITY a.ctm-src-5 "<ulink url='&a.ctm-src-5.url;'>CTM 5-STABLE src branch distribution mailing list</ulink>">
+<!ENTITY a.ctm-src-5.name "<ulink url='&a.ctm-src-5.url;'>ctm-src-5</ulink>">
+
+<!ENTITY a.ctm-src-6.url "&a.mailman.listinfo;/ctm-src-6">
+<!ENTITY a.ctm-src-6 "<ulink url='&a.ctm-src-6.url;'>CTM 6-STABLE src branch distribution mailing list</ulink>">
+<!ENTITY a.ctm-src-6.name "<ulink url='&a.ctm-src-6.url;'>ctm-src-6</ulink>">
+
+<!ENTITY a.ctm-src-7.url "&a.mailman.listinfo;/ctm-src-7">
+<!ENTITY a.ctm-src-7 "<ulink url='&a.ctm-src-7.url;'>CTM 7-STABLE src branch distribution mailing list</ulink>">
+<!ENTITY a.ctm-src-7.name "<ulink url='&a.ctm-src-7.url;'>ctm-src-7</ulink>">
+
+<!ENTITY a.ctm-src-8.url "&a.mailman.listinfo;/ctm-src-8">
+<!ENTITY a.ctm-src-8 "<ulink url='&a.ctm-src-8.url;'>CTM 8-STABLE src branch distribution mailing list</ulink>">
+<!ENTITY a.ctm-src-8.name "<ulink url='&a.ctm-src-8.url;'>ctm-src-8</ulink>">
+
 <!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
 <!ENTITY a.ctm-src-cur "<ulink url='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution mailing list</ulink>">
 <!ENTITY a.ctm-src-cur.name "<ulink url='&a.ctm-src-cur.url;'>ctm-src-cur</ulink>">

More information about the p4-projects mailing list