Attachment 9974 Details for Bug 20183 – file.diff

[patch] file.diff

file.diff (text/plain), 16.34 KB, created by ue on 2000-07-25 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ue

Created: 2000-07-25 23:50:01 UTC

Size: 16.34 KB

patch

obsolete

>Index: article.sgml
>===================================================================
>RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/new-users/article.sgml,v
>retrieving revision 1.13
>diff -u -r1.13 article.sgml
>--- article.sgml	2000/06/27 02:48:51	1.13
>+++ article.sgml	2000/07/25 21:44:49
>@@ -565,7 +565,7 @@
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><keycombo><keycap>Ctrl</><keycap>L</></keycombo></term>
>+	<term><keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo></term>
> 
> 	<listitem>
> 	  <para>to redraw the screen</para>
>@@ -573,36 +573,36 @@
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><keycombo><keycap>Ctrl</><keycap>b</></> and
>-	  <keycombo><keycap>Ctrl</><keycap>f</></></term>
>+	<term><keycombo><keycap>Ctrl</keycap><keycap>b</keycap></keycombo> and
>+	  <keycombo><keycap>Ctrl</keycap><keycap>f</keycap></keycombo></term>
> 
> 	<listitem>
> 	  <para>go back and forward a screen, as they do with
>-	    <command>more</> and <command>view</>.</para>
>+	    <command>more</command> and <command>view</command>.</para>
> 	</listitem>
>       </varlistentry>
>     </variablelist>
> 
>-    <para>Practice with <command>vi</> in your home directory by
>-      creating a new file with <command>vi <replaceable>filename</></>
>+    <para>Practice with <command>vi</command> in your home directory by
>+      creating a new file with <command>vi <replaceable>filename</replaceable></command>
>       and adding and deleting text, saving the file, and calling it up
>-      again.  <command>vi</> delivers some surprises because it's
>+      again.  <command>vi</command> delivers some surprises because it's
>       really quite complex, and sometimes you'll inadvertently issue a
>       command that will do something you don't expect.  (Some people
>-      actually like <command>vi</>&mdash;it's more powerful than DOS
>-      EDIT&mdash;find out about the <command>:r</> command.) Use
>-      <keycap>Esc</> one or more times to be sure you're in command
>+      actually like <command>vi</command>&mdash;it's more powerful than DOS
>+      EDIT&mdash;find out about the <command>:r</command> command.) Use
>+      <keycap>Esc</keycap> one or more times to be sure you're in command
>       mode and proceed from there when it gives you trouble, save
>-      often with <command>:w</>, and use <command>:q!</> to get out
>-      and start over (from your last <command>:w</>) when you need
>+      often with <command>:w</command>, and use <command>:q!</command> to get out
>+      and start over (from your last <command>:w</command>) when you need
>       to.</para>
> 
>-    <para>Now you can <command>cd</> to <filename>/etc</filename>,
>-      <command>su</> to root, use <command>vi</> to edit the file
>+    <para>Now you can <command>cd</command> to <filename>/etc</filename>,
>+      <command>su</command> to root, use <command>vi</command> to edit the file
>       <filename>/etc/group</filename>, and add a user to wheel so the
>       user has root privileges.  Just add a comma and the user's login
>       name to the end of the first line in the file, press
>-      <keycap>Esc</>, and use <command>:wq</> to write the file to
>+      <keycap>Esc</keycap>, and use <command>:wq</command> to write the file to
>       disk and quit.  Instantly effective.  (You didn't put a space
>       after the comma, did you?)</para>
>   </sect1>
>@@ -625,7 +625,7 @@
>     <para>will remove formatting codes and send the man page to the
>       <filename>chmod.txt</filename> file instead of showing it on
>       your screen.  Now put a dos-formatted diskette in your floppy
>-      drive a, <command>su</> to root, and type</para>
>+      drive a, <command>su</command> to root, and type</para>
> 
>     <informalexample>
>       <screen>&prompt.root; <userinput>/sbin/mount -t msdos /dev/fd0 /mnt</>
>@@ -636,7 +636,7 @@
>       <filename>/mnt</filename>.</para>
> 
>     <para>Now (you no longer need to be root, and you can type
>-      <command>exit</> to get back to being user jack) you can go to
>+      <command>exit</command> to get back to being user jack) you can go to
>       the directory where you created chmod.txt and copy the file to
>       the floppy with:</para>
> 
>@@ -661,10 +661,10 @@
>       <command>/sbin/dmesg</command> is the boot log record, and it's
>       useful to understand it because it shows what FreeBSD found when
>       it booted up.  If you ask questions on
>-      <email>freebsd-questions@FreeBSD.org</> or on a USENET
>+      <email>freebsd-questions@FreeBSD.org</email> or on a USENET
>       group&mdash;like <quote>FreeBSD isn't finding my tape drive,
> 	what do I do?</quote>&mdash;people will want to know what
>-      <command>dmesg</> has to say.</para>
>+      <command>dmesg</command> has to say.</para>
> 
>     <para>You can now dismount the floppy drive (as root) to get the
>       disk out with</para>
>@@ -679,7 +679,7 @@
>       Wordpad, or a word processor, make a minor change so the file
>       has to be saved, and print as you normally would from DOS or
>       Windows.  Hope it works!  man pages come out best if printed
>-      with the dos <command>print</> command.  (Copying files from
>+      with the dos <command>print</command> command.  (Copying files from
>       FreeBSD to a mounted dos partition is in some cases still a
>       little risky.)</para>
> 
>@@ -687,15 +687,15 @@
>       an appropriate entry in <filename>/etc/printcap</filename> and
>       creating a matching spool directory in
>       <filename>/var/spool/output</filename>.  If your printer is on
>-      <hardware>lpt0</> (what dos calls <hardware>LPT1</>), you may
>+      <hardware>lpt0</hardware> (what dos calls <hardware>LPT1</hardware>), you may
>       only need to go to <filename>/var/spool/output</filename> and
>-      (as root) create the directory <filename>lpd</> by typing:
>+      (as root) create the directory <filename>lpd</filename> by typing:
>       <command> mkdir lpd</command>, if it doesn't already exist.
>       Then the printer should respond if it's turned on when the
>       system is booted, and lp or lpr should send a file to the
>       printer.  Whether or not the file actually prints depends on
>       configuring it, which is covered in the <ulink
>-	URL="../../handbook/handbook.html">FreeBSD handbook.</></para>
>+	URL="../../handbook/handbook.html">FreeBSD handbook.</ulink></para>
>   </sect1>
> 
>   <sect1>
>@@ -703,7 +703,7 @@
> 
>     <variablelist>
>       <varlistentry>
>-	<term><command>df</></term>
>+	<term><command>df</command></term>
> 
> 	<listitem>
> 	  <para>shows file space and mounted systems.</para>
>@@ -711,27 +711,27 @@
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><command>ps aux</></term>
>+	<term><command>ps aux</command></term>
> 
> 	<listitem>
>-	  <para>shows processes running.  <command>ps ax</> is a
>+	  <para>shows processes running.  <command>ps ax</command> is a
> 	    narrower form.</para>
> 	</listitem>
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><command>rm <replaceable>filename</></></term>
>+	<term><command>rm <replaceable>filename</replaceable></command></term>
> 
> 	<listitem>
>-	  <para>remove <replaceable>filename</>.</para>
>+	  <para>remove <replaceable>filename</replaceable>.</para>
> 	</listitem>
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><command>rm -R <replaceable>dir</></></term>
>+	<term><command>rm -R <replaceable>dir</replaceable></command></term>
> 
> 	<listitem>
>-	  <para>removes a directory <replaceable>dir</> and all
>+	  <para>removes a directory <replaceable>dir</replaceable> and all
> 	    subdirectories&mdash;careful!</para>
> 	</listitem>
>       </varlistentry>
>@@ -750,7 +750,7 @@
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><command>passwd</></term>
>+	<term><command>passwd</command></term>
> 
> 	<listitem>
> 	  <para>to change user's password (or root's password)</para>
>@@ -758,7 +758,7 @@
>       </varlistentry>
> 
>       <varlistentry>
>-	<term><command>man hier</></term>
>+	<term><command>man hier</command></term>
> 
> 	<listitem>
> 	  <para>man page on the Unix file system</para>
>@@ -766,7 +766,7 @@
>       </varlistentry>
>     </variablelist>
> 
>-    <para>Use <command>find</> to locate filename in
>+    <para>Use <command>find</command> to locate filename in
>       <filename>/usr</filename> or any of its subdirectories
>       with</para>
> 
>@@ -776,7 +776,7 @@
>     </informalexample>
> 
>     <para>You can use <literal>*</literal> as a wildcard in
>-      <parameter>"<replaceable>filename</>"</> (which should be in
>+      <parameter>"<replaceable>filename</replaceable>"</parameter> (which should be in
>       quotes).  If you tell find to search in <filename>/</filename>
>       instead of <filename>/usr</filename> it will look for the
>       file(s) on all mounted file systems, including the CDROM and the
>@@ -802,7 +802,7 @@
> 	URL="http://www.cdrom.com/">Walnut Creek</ulink> CDROM as well
>       as the web site.  The handbook tells you more about how to use
>       them (get the package if it exists, with <command>pkg_add
>-      /cdrom/packages/All/<replaceable>packagename</></>, where
>+      /cdrom/packages/All/<replaceable>packagename</replaceable></command>, where
>       <replaceable>packagename</replaceable> is the filename of the
>       package).  The cdrom has lists of the packages and ports with
>       brief descriptions in <filename>cdrom/packages/index</filename>,
>@@ -813,10 +813,10 @@
>       programs and program names respectively.</para>
> 
>     <para>If you find the handbook too sophisticated (what with
>-      <command>lndir</> and all) on installing ports from the cdrom,
>+      <command>lndir</command> and all) on installing ports from the cdrom,
>       here's what usually works:</para>
> 
>-    <para>Find the port you want, say <command>kermit</>.  There will
>+    <para>Find the port you want, say <command>kermit</command>.  There will
>       be a directory for it on the cdrom.  Copy the subdirectory to
>       <filename>/usr/local</filename> (a good place for software you
>       add that should be available to all users) with:</para>
>@@ -833,16 +833,16 @@
> 
>     <para>Next, create the directory
>       <filename>/usr/ports/distfiles</filename> if it doesn't already
>-      exist using <command>mkdir</>.  Now check check
>+      exist using <command>mkdir</command>.  Now check check
>       <filename>/cdrom/ports/distfiles</filename> for a file with a
>       name that indicates it's the port you want.  Copy that file to
>       <filename>/usr/ports/distfiles</filename>; in recent versions
>       you can skip this step, as FreeBSD will do it for you.  In the
>-      case of <command>kermit</>, there is no distfile.</para>
>+      case of <command>kermit</command>, there is no distfile.</para>
> 
>-    <para>Then <command>cd</> to the subdirectory of
>+    <para>Then <command>cd</command> to the subdirectory of
>       <filename>/usr/local/kermit</filename> that has the file
>-      <filename>Makefile</>.  Type</para>
>+      <filename>Makefile</filename>.  Type</para>
> 
>     <informalexample>
>       <screen>&prompt.root; <userinput>make all install</>
>@@ -856,17 +856,17 @@
>       <filename>/cdrom/ports/distfiles</filename>, you will have to
>       get the distfile using another machine and copy it to
>       <filename>/usr/ports/distfiles</filename> from a floppy or your
>-      dos partition.  Read <filename>Makefile</> (with <command>cat</>
>-      or <command>more</> or <command>view</>) to find out where to go
>+      dos partition.  Read <filename>Makefile</filename> (with <command>cat</command>
>+      or <command>more</command> or <command>view</command>) to find out where to go
>       (the master distribution site) to get the file and what its name
>       is.  Its name will be truncated when downloaded to DOS, and
>       after you get it into <filename>/usr/ports/distfiles</filename>
>-      you'll have to rename it (with the <command>mv</> command) to
>+      you'll have to rename it (with the <command>mv</command> command) to
>       its original name so it can be found.  (Use binary file
>       transfers!)  Then go back to
>       <filename>/usr/local/kermit</filename>, find the directory with
>-      <filename>Makefile</>, and type <command>make all
>-	install</>.</para>
>+      <filename>Makefile</filename>, and type <command>make all
>+	install</command>.</para>
> 
>     <para>The other thing that happens when installing ports or
>       packages is that some other program is needed.  If the
>@@ -874,10 +874,10 @@
> 	unzip</errorname> or whatever, you might need to install the
>       package or port for unzip before you continue.</para>
> 
>-    <para>Once it's installed type <command>rehash</> to make FreeBSD
>+    <para>Once it's installed type <command>rehash</command> to make FreeBSD
>       reread the files in the path so it knows what's there.  (If you
>-      get a lot of <errorname>path not found</> messages when you use
>-      <command>whereis</> or which, you might want to make additions
>+      get a lot of <errorname>path not found</errorname> messages when you use
>+      <command>whereis</command> or which, you might want to make additions
>       to the list of directories in the path statement in
>       <filename>.cshrc</filename> in your home directory.  The path
>       statement in Unix does the same kind of work it does in DOS,
>@@ -890,10 +890,10 @@
>       from their <ulink URL="ftp://ftp.netscape.com">ftp site</ulink>.
>       (Netscape requires the X Window System.) There's now a FreeBSD
>       version, so look around carefully.  Just use <command>gunzip
>-	<replaceable>filename</></> and <command>tar xvf
>-	<replaceable>filename</></> on it, move the binary to
>+	<replaceable>filename</replaceable></command> and <command>tar xvf
>+	<replaceable>filename</replaceable></command> on it, move the binary to
>       <filename>/usr/local/bin</filename> or some other place binaries
>-      are kept, <command>rehash</>, and then put the following lines
>+      are kept, <command>rehash</command>, and then put the following lines
>       in <filename>.cshrc</filename> in each user's home directory or
>       (easier) in <filename>/etc/csh.cshrc</filename>, the
>       system-wide csh start-up file:</para>
>@@ -901,11 +901,11 @@
>     <informalexample>
>       <programlisting>setenv XKEYSYMDB /usr/X11R6/lib/X11/XKeysymDB
> setenv XNLSPATH /usr/X11R6/lib/X11/nls
>-      </>
>+      </programlisting>
>     </informalexample>
> 
>-    <para>This assumes that the file <filename>XKeysymDB</> and the
>-      directory <filename>nls</> are in
>+    <para>This assumes that the file <filename>XKeysymDB</filename> and the
>+      directory <filename>nls</filename> are in
>       <filename>/usr/X11R6/lib/X11</filename>; if they're not, find
>       them and put them there.</para>
> 
>@@ -977,7 +977,7 @@
> 	you the tcsh as root, because the shell is part of the
> 	environment.  You can make this permanent by adding it to your
> 	<filename>.tcshrc</filename> file as an alias with
>-	<programlisting>alias su su -m.</></para>
>+	<programlisting>alias su su -m.</programlisting></para>
>     </note>
> 
>     <para>When tcsh starts up, it will read the
>@@ -1020,10 +1020,10 @@
>     <title>Other</title>
> 
>     <para>As root, you can dismount the CDROM with
>-      <command>/sbin/umount /cdrom</>, take it out of the drive,
>+      <command>/sbin/umount /cdrom</command>, take it out of the drive,
>       insert another one, and mount it with
>-      <command>/sbin/mount_cd9660 /dev/cd0a /cdrom</> assuming
>-      <hardware>cd0a</> is the device name for your CDROM drive.  The
>+      <command>/sbin/mount_cd9660 /dev/cd0a /cdrom</command> assuming
>+      <hardware>cd0a</hardware> is the device name for your CDROM drive.  The
>       most recent versions of FreeBSD let you mount the cdrom with
>       just <command>/sbin/mount /cdrom</command>.</para>
> 
>@@ -1031,12 +1031,12 @@
>       CDROM disks&mdash;is useful if you've got limited space.  What
>       is on the live file system varies from release to release.  You
>       might try playing games from the cdrom.  This involves using
>-      <command>lndir</>, which gets installed with the X Window
>+      <command>lndir</command>, which gets installed with the X Window
>       System, to tell the program(s) where to find the necessary
>       files, because they're in the <filename>/cdrom</filename> file
>       system instead of in <filename>/usr</filename> and its
>       subdirectories, which is where they're expected to be.  Read
>-      <command>man lndir</>.</para>
>+      <command>man lndir</command>.</para>
>   </sect1>
> 
>   <sect1>
>@@ -1049,6 +1049,6 @@
>       Fieber for helpful comments.</para>
> 
>     <para>Annelise Anderson,
>-	<email>andrsn@andrsn.stanford.edu</></para>
>+	<email>andrsn@andrsn.stanford.edu</email></para>
>   </sect1>
> </article>

Actions: View | Diff

Attachments on bug 20183: 9970 | 9971 | 9972 | 9973 | 9974 | 9975