- Make 6.X device naming scheme leading and specify the old one in parenthesis

in each case [1]
- Use groupname to mark up the network group instead of username [2]
- Use replaceable element to mark up replaceable parts [3]

PR:		docs/123471 (based on) [1],
		docs/123472 [2],
		docs/123473 [3]
Submitted by:	pgj

en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml

@@ -281,7 +281,7 @@
 	  <programlisting>1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
 3       ident user-ppp VERSION (built COMPILATIONDATE)
-4       set device /dev/cuaa0
+4       set device /dev/cuad0
 5       set speed 115200
 6       set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
 7                 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
@@ -339,9 +339,9 @@
 	      <listitem>
 		<para>Identifies the device to which the modem is
 		  connected.  <devicename>COM1</devicename> is
-		  <filename>/dev/cuaa0</filename> and
+		  <filename>/dev/cuad0</filename> (or <filename>/dev/cuaa0</filename> under &os;&nbsp;5.X) and
 		  <devicename>COM2</devicename> is
-		  <filename>/dev/cuaa1</filename>.</para>
+		  <filename>/dev/cuad1</filename> (or <filename>/dev/cuaa1</filename>).</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -688,7 +688,7 @@ protocol: ppp</screen>
 	      server mode as a normal user by executing
 	      <command>ppp</command> as described below, that user
 	      must be given permission to run <command>ppp</command>
-	      by adding them to the <username>network</username> group
+	      by adding them to the <groupname>network</groupname> group
 	      in <filename>/etc/group</filename>.</para>
 
 	    <para>You will also need to give them access to one or more
@@ -1324,10 +1324,10 @@ noipdefault     # remote PPP server must supply your IP address
 passive         # wait for LCP packets
 domain ppp.foo.com      # put your domain name here
 
-:&lt;remote_ip&gt;    # put the IP of remote PPP host here
+:<replaceable>remote_ip</replaceable>    # put the IP of remote PPP host here
                 # it will be used to route packets via PPP link
                 # if you didn't specified the noipdefault option
-                # change this line to &lt;local_ip&gt;:&lt;remote_ip&gt;
+                # change this line to <replaceable>local_ip</replaceable>:<replaceable>remote_ip</replaceable>
 
 defaultroute    # put this if you want that PPP server will be your
                 # default router</programlisting>
@@ -1459,7 +1459,7 @@ exit</programlisting>
 
       <para><filename>/etc/ppp/options</filename>:</para>
 
-      <programlisting>/dev/cuaa1 115200
+      <programlisting>/dev/cuad1 115200
 
 crtscts		# enable hardware flow control
 modem		# modem control line
@@ -1468,12 +1468,12 @@ noipdefault	# remote PPP serve must supply your IP address
 	        # if the remote host doesn't send your IP during
                 # IPCP negotiation, remove this option
 passive         # wait for LCP packets
-domain &lt;your.domain&gt;	# put your domain name here
+domain <replaceable>your.domain</replaceable>	# put your domain name here
 
 :		# put the IP of remote PPP host here
 	        # it will be used to route packets via PPP link
                 # if you didn't specified the noipdefault option
-                # change this line to &lt;local_ip&gt;:&lt;remote_ip&gt;
+                # change this line to <replaceable>local_ip</replaceable>:<replaceable>remote_ip</replaceable>
 
 defaultroute	# put this if you want that PPP server will be
 	        # your default router</programlisting>
@@ -1484,9 +1484,9 @@ defaultroute	# put this if you want that PPP server will be
 	<para>The following should go on a single line.</para>
       </note>
 
-      <programlisting>ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT&lt;phone.number&gt;
+      <programlisting>ABORT BUSY ABORT 'NO CARRIER' "" AT OK ATDT<replaceable>phone.number</replaceable>
-  CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: &lt;login-id&gt;
+  CONNECT "" TIMEOUT 10 ogin:-\\r-ogin: <replaceable>login-id</replaceable>
-  TIMEOUT 5 sword: &lt;password&gt;</programlisting>
+  TIMEOUT 5 sword: <replaceable>password</replaceable></programlisting>
 
       <para>Once these are installed and modified correctly, all you need
 	to do is run <command>pppd</command>, like so:</para>
@@ -1758,7 +1758,7 @@ exit 1
 	  required to rebuild the kernel.
 	  When matching up sio modem is on <devicename>sio1</devicename> or
           <devicename>COM2</devicename> if you are in DOS, then your
-	  modem device would be <filename>/dev/cuaa1</filename>.</para>
+	  modem device would be <filename>/dev/cuad1</filename> (or <filename>/dev/cuaa1</filename> under &os;&nbsp;5.X).</para>
     </sect2>
 
     <sect2>
@@ -1779,10 +1779,10 @@ exit 1
 
       <para>We have now started <command>ppp</command>.</para>
 
-      <screen>ppp ON example&gt; <userinput>set device <filename>/dev/cuaa1</filename></userinput></screen>
+      <screen>ppp ON example&gt; <userinput>set device <filename>/dev/cuad1</filename></userinput></screen>
 
       <para>We set our modem device, in this case it is
-	<devicename>cuaa1</devicename>.</para>
+	<devicename>cuad1</devicename> (or <filename>/dev/cuaa1</filename> under &os;&nbsp;5.X).</para>
 
       <screen>ppp ON example&gt; <userinput>set speed 115200</userinput></screen>
 
@@ -1801,7 +1801,7 @@ exit 1
       <para>Switch to <quote>terminal</quote> mode so that we can manually
 	control the modem.</para>
 
-      <programlisting>deflink: Entering terminal mode on <filename>/dev/cuaa1</filename>
+      <programlisting>deflink: Entering terminal mode on <filename>/dev/cuad1</filename>
 type '~h' for help</programlisting>
 
       <screen><userinput>at</userinput>
@@ -2415,15 +2415,15 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
       <para>First, determine which serial port your modem is connected to.
 	Many people set up a symbolic link, such as
 	<filename>/dev/modem</filename>, to point to the real device name,
-	<filename>/dev/cuaaN</filename> (or <filename>/dev/cuadN</filename> under &os;&nbsp;6.X).  This allows you to
+	<filename>/dev/cuadN</filename> (or <filename>/dev/cuaaN</filename> under &os;&nbsp;5.X).  This allows you to
 	abstract the actual device name should you ever need to move
 	the modem to a different port.  It can become quite cumbersome when you
 	need to fix a bunch of files in <filename>/etc</filename> and
 	<filename>.kermrc</filename> files all over the system!</para>
 
       <note>
-	<para><filename>/dev/cuaa0</filename> (or <filename>/dev/cuad0</filename> under &os;&nbsp;6.X) is
+	<para><filename>/dev/cuad0</filename> (or <filename>/dev/cuaa0</filename> under &os;&nbsp;5.X) is
-	  <devicename>COM1</devicename>, <filename>cuaa1</filename> (or <filename>/dev/cuad1</filename>) is
+	  <devicename>COM1</devicename>, <filename>cuad1</filename> (or <filename>/dev/cuaa1</filename>) is
 	  <devicename>COM2</devicename>, etc.</para>
       </note>