Attachment 20396 Details for Bug 36010 – file.diff

[patch] file.diff

file.diff (text/plain), 7.18 KB, created by Martin Heinen on 2002-03-17 15:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Heinen

Created: 2002-03-17 15:00:03 UTC

Size: 7.18 KB

patch

obsolete

>Index: books/handbook/install/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v
>retrieving revision 1.142
>diff -u -r1.142 chapter.sgml
>--- books/handbook/install/chapter.sgml	2 Mar 2002 06:50:36 -0000	1.142
>+++ books/handbook/install/chapter.sgml	17 Mar 2002 14:18:52 -0000
>@@ -181,7 +181,7 @@
> 
> 	      <entry>N/A</entry>
> 
>-	      <entry>3Com 56K faxmodem, on COM1:</entry>
>+	      <entry>3Com 56K faxmodem, on COM1</entry>
> 	    </row>
> 
> 	    <row>
>Index: books/handbook/serialcomms/chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v
>retrieving revision 1.53
>diff -u -r1.53 chapter.sgml
>--- books/handbook/serialcomms/chapter.sgml	28 Feb 2002 03:47:08 -0000	1.53
>+++ books/handbook/serialcomms/chapter.sgml	17 Mar 2002 14:18:53 -0000
>@@ -295,10 +295,10 @@
>       
>       <para>FreeBSD supports four serial ports by default.  In the
> 	MS-DOS world, these are known as
>-	<devicename>COM1:</devicename>,
>-	<devicename>COM2:</devicename>,
>-	<devicename>COM3:</devicename>, and 
>-	<devicename>COM4:</devicename>.  FreeBSD currently supports
>+	<devicename>COM1</devicename>,
>+	<devicename>COM2</devicename>,
>+	<devicename>COM3</devicename>, and 
>+	<devicename>COM4</devicename>.  FreeBSD currently supports
> 	<quote>dumb</quote> multiport serial interface cards, such as
> 	the BocaBoard 1008 and 2016, as well as more
> 	intelligent multi-port cards such as those made by Digiboard
>@@ -404,10 +404,10 @@
> 	<para>A shell script called <command>MAKEDEV</command> in the
> 	  <filename>/dev</filename> directory manages the device special
> 	  files.  To use <command>MAKEDEV</command> to make dial-up device
>-	  special files for <devicename>COM1:</devicename> (port 0),
>+	  special files for <devicename>COM1</devicename> (port 0),
> 	  <command>cd</command> to <filename>/dev</filename> and issue the
> 	  command <command>MAKEDEV ttyd0</command>. Likewise, to make dial-up
>-	  device special files for <devicename>COM2:</devicename> (port 1),
>+	  device special files for <devicename>COM2</devicename> (port 1),
> 	  use <command>MAKEDEV ttyd1</command>.</para>
> 	    
> 	<para><command>MAKEDEV</command> not only creates the
>@@ -1311,7 +1311,7 @@
> 	    
> 	<para>For example to set the <literal>termios</literal> flag
> 	  <varname>crtscts</varname> on serial port #1's
>-	  (<devicename>COM2:</devicename>) dial-in and dial-out initialization
>+	  (<devicename>COM2</devicename>) dial-in and dial-out initialization
> 	  devices, the following lines could be added to
> 	  <filename>/etc/rc.serial</filename>:</para>
> 	<programlisting># Serial port initial configuration
>@@ -1968,30 +1968,30 @@
> 	</step>
> 
> 	<step>
>-	  <para>Plug a dumb terminal into <devicename>COM1:</devicename>
>+	  <para>Plug a dumb terminal into <devicename>COM1</devicename>
> 	    (<devicename>sio0</devicename>).</para>
> 	  
> 	  <para>If you do not have a dumb terminal, you can use an old PC/XT
> 	    with a modem program, or the serial port on another Unix box.  If
>-	    you do not have a <devicename>COM1:</devicename>
>+	    you do not have a <devicename>COM1</devicename>
> 	    (<devicename>sio0</devicename>), get one.  At this time, there is
>-	    no way to select a port other than <devicename>COM1:</devicename>
>+	    no way to select a port other than <devicename>COM1</devicename>
> 	    for the boot blocks without recompiling the boot blocks.  If you
>-	    are already using <devicename>COM1:</devicename> for another
>+	    are already using <devicename>COM1</devicename> for another
> 	    device, you will have to temporarily remove that device and
> 	    install a new boot block and kernel once you get FreeBSD up and
>-	    running. (It is assumed that <devicename>COM1:</devicename> will
>+	    running. (It is assumed that <devicename>COM1</devicename> will
> 	    be available on a file/compute/terminal server anyway; if you
>-	    really need <devicename>COM1:</devicename> for something else
>+	    really need <devicename>COM1</devicename> for something else
> 	    (and you cannot switch that something else to
>-	    <devicename>COM2:</devicename> (<devicename>sio1</devicename>)),
>+	    <devicename>COM2</devicename> (<devicename>sio1</devicename>)),
> 	    then you probably should not even be bothering with all this in
> 	    the first place.)</para>
> 	</step>
>     
> 	<step>
> 	  <para>Make sure the configuration file of your kernel has
>-	    appropriate flags set for <devicename>COM1:</devicename>
>+	    appropriate flags set for <devicename>COM1</devicename>
> 	    (<devicename>sio0</devicename>).</para>
> 	  
> 	  <para>Relevant flags are:</para>
>@@ -2414,8 +2414,8 @@
> 	      <literal>BOOT_COMCONSOLE_PORT</literal> to the address of the
> 	      port you want to use (0x3F8, 0x2F8, 0x3E8 or 0x2E8).  Only
> 	      <devicename>sio0</devicename> through
>-	      <devicename>sio3</devicename> (<devicename>COM1:</devicename>
>-	      through <devicename>COM4:</devicename>) can be used;  multiport
>+	      <devicename>sio3</devicename> (<devicename>COM1</devicename>
>+	      through <devicename>COM4</devicename>) can be used;  multiport
> 	      serial cards will not work.  No interrupt setting is
> 	      needed.</para>
> 	  </step>
>@@ -2424,7 +2424,7 @@
> 	    <para>Create a custom kernel configuration file and add
> 	      appropriate flags for the serial port you want to use. For
> 	      example, if you want to make <devicename>sio1</devicename>
>-	      (<devicename>COM2:</devicename>) the console:</para>
>+	      (<devicename>COM2</devicename>) the console:</para>
>   
> 	    <programlisting>device sio1 at isa? port "IO_COM2" tty flags 0x10 irq 3</programlisting>
>   
>Index: books/ppp-primer/book.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/ppp-primer/book.sgml,v
>retrieving revision 1.17
>diff -u -r1.17 book.sgml
>--- books/ppp-primer/book.sgml	14 Feb 2002 23:21:41 -0000	1.17
>+++ books/ppp-primer/book.sgml	17 Mar 2002 14:18:54 -0000
>@@ -177,7 +177,7 @@
> </informaltable>
> 
> <para>This guide assumes that the modem on the FreeBSD box is connected 
>-to the first serial port ('<filename>/dev/cuaa0</filename>' or '<emphasis remap=tt>COM1:</emphasis>' in
>+to the first serial port ('<filename>/dev/cuaa0</filename>' or '<emphasis remap=tt>COM1</emphasis>' in
> DOS-terms).</para>
>   
> <para>Finally, we will also assume that your Internet Service Provider (ISP)
>@@ -863,10 +863,10 @@
> This statement informs the PPP program that it should use the first
> serial port.
> Under FreeBSD the '<filename>/dev/cuaa0</filename>' device is the same port that's
>-known as "<emphasis remap=tt>COM1:</emphasis>" under DOS, Windows, Windows 95, etc....</para>
>+known as "<emphasis remap=tt>COM1</emphasis>" under DOS, Windows, Windows 95, etc....</para>
>   
>-<para>If your modem is on <emphasis remap=tt>COM2:</emphasis> you should specify
>-'<filename>/dev/cuaa1</filename>; <emphasis remap=tt>COM3:</emphasis> would be '<filename>/dev/cuaa2</filename>'.</para>
>+<para>If your modem is on <emphasis remap=tt>COM2</emphasis> you should specify
>+'<filename>/dev/cuaa1</filename>; <emphasis remap=tt>COM3</emphasis> would be '<filename>/dev/cuaa2</filename>'.</para>
>   
> <para>
> <informalexample>

Actions: View | Diff

Attachments on bug 36010: 20396