Date: Tue, 21 May 2002 23:53:01 -0400 (EDT) From: Chris Pepper <pepper@rockefeller.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: pepper@rockefeller.edu Subject: docs/38398: Typo fixes in doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml Message-ID: <200205220353.g4M3r1Z04334@guest.reppep.com>
index | next in thread | raw e-mail
>Number: 38398
>Category: docs
>Synopsis: Typo fixes in doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-doc
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: doc-bug
>Submitter-Id: current-users
>Arrival-Date: Tue May 21 21:00:05 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Chris Pepper
>Release: FreeBSD 4.5-RELEASE i386
>Organization:
>Environment:
System: FreeBSD guest.reppep.com 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan 28 14:31:56 GMT 2002 murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC i386
>Description:
Pre-4.0 kernel build procedure referred to pre-4.0 as 'standard' -- changed to 'old'.
Various misc clarifications, rewordings, & typo fixes.
>How-To-Repeat:
>Fix:
Patch attached.
--- chapter.sgml.diff begins here ---
Index: chapter.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
retrieving revision 1.124
diff -u -r1.124 chapter.sgml
--- chapter.sgml 2002/05/14 20:49:07 1.124
+++ chapter.sgml 2002/05/22 03:44:05
@@ -1003,7 +1003,7 @@
can then build a new kernel based on your normal kernel configuration
file.</para>
- <para>If you are upgrading to &os; 4.0 or above then the standard
+ <para>If you are upgrading to &os; 4.0 or above then the old
kernel build procedure (as described in <xref linkend="kernelconfig">)
is deprecated. Instead, you should run these commands
<emphasis>after</emphasis> you have <link
@@ -1015,7 +1015,7 @@
&prompt.root; <userinput>make installkernel</userinput></screen>
<para>If you are upgrading to a version of &os; below 4.0 you should
- use the standard kernel build procedure. However, it is recommended
+ use the old kernel build procedure. However, it is recommended
that you use the new version of &man.config.8;, using a command line
like this.</para>
@@ -1101,23 +1101,23 @@
to the ones currently installed in your system. At this point, files that
differ will be shown in &man.diff.1; format, with the <option>+</option> sign
representing added or modified lines, and <option>-</option> representing
- lines that will be removed either completely, or replaced with a new line.
+ lines that will be either removed completely, or replaced with a new line.
See the &man.diff.1; manual page for more information about the &man.diff.1;
syntax and how file differences are shown.</para>
<para>&man.mergemaster.8; will then show you each file that displays variances,
and at this point you will have the option of either deleting the new file (referred
- to as the temporary file), install the temporary file in its unmodified state,
- merge the temporary file with the currently installed file, or view the
+ to as the temporary file), installing the temporary file in its unmodified state,
+ merging the temporary file with the currently installed file, or viewing the
&man.diff.1; results again.</para>
<para>Choosing to delete the temporary file will tell &man.mergemaster.8; that we
- wish to keep our current file unchanged, and to delete the one that is
- new. This option is not the most recommended one, unless you see no
+ wish to keep our current file unchanged, and to delete the new version.
+ This option is not recommended, unless you see no
reason to change the current file. You can get help at any time by
- typing <option>?</option> at the mergemaster prompt. If the user should
- choose to skip a file, it will be presented again after all other files
- have been worked with.</para>
+ typing <option>?</option> at the mergemaster prompt. If the user
+ chooses to skip a file, it will be presented again after all other files
+ have been dealt with.</para>
<para>Choosing to install the unmodified temporary file will replace the
current file with the new one. For most unmodified files, this is the best
@@ -1133,13 +1133,13 @@
installed. This option is customarily used for files where settings have been
modified by the user.</para>
- <para>Choosing to view the diff results again, will show you the file differences
+ <para>Choosing to view the diff results again will show you the file differences
just like &man.mergemaster.8; did before prompting you for an option.</para>
- <para>After &man.mergemaster.8; is complete with the system files you will be
- prompted for other options. &man.mergemaster.8; will ask if you want to rebuild
- the password file, run <filename>MAKEDEV</filename> and finishing up with a
- removal of the left over temporary files.</para>
+ <para>After &man.mergemaster.8; is done with the system files you will be
+ prompted for other options. &man.mergemaster.8; may ask if you want to rebuild
+ the password file and/or run <filename>MAKEDEV</filename>, and will finish up with an option to
+ remove left-over temporary files.</para>
</sect3>
<sect3>
--- chapter.sgml.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205220353.g4M3r1Z04334>