Attachment 21695 Details for Bug 37925 – file.diff

[patch] file.diff

file.diff (text/plain), 2.66 KB, created by Martin Heinen on 2002-05-10 15:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Heinen

Created: 2002-05-10 15:40:01 UTC

Size: 2.66 KB

patch

obsolete

>Index: chapter.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v
>retrieving revision 1.120
>diff -u -r1.120 chapter.sgml
>--- chapter.sgml	4 May 2002 14:22:34 -0000	1.120
>+++ chapter.sgml	10 May 2002 13:59:41 -0000
>@@ -1060,16 +1060,16 @@
>       <para>Remaking the world will not update certain directories (in
> 	particular, <filename>/etc</filename>, <filename>/var</filename> and
> 	<filename>/usr</filename>) with new or changed configuration files.</para>
>-      <indexterm><primary><command>mergemaster</command></primary></indexterm>
> 
>       <para>The simplest way to update these files is to use
>         &man.mergemaster.8;, though it is possible to do it manually
>-        if you would prefer to do that.  We strongly recommend you
>-        use &man.mergemaster.8;, however, and if you do then you
>-        can skip forward to the <link linkend="update-dev">next
>-        section</link>, since &man.mergemaster.8; is described below.
>-        Be sure to make a backup of
>-        <filename>/etc</filename> in case anything goes wrong.</para>
>+        if you would prefer to do that.  Regardless of which way you
>+	choose, be sure to make a backup of <filename>/etc</filename> in
>+	case anything goes wrong.</para>
>+
>+      <sect3>
>+	<title><command>mergemaster</command></title>
>+        <indexterm><primary><command>mergemaster</command></primary></indexterm>
> 
>       <para>The &man.mergemaster.8; utility is a Bourne script that will
>         aid you in determining the differences between your configuration files
>@@ -1128,6 +1128,10 @@
>         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>
>+      </sect3>
>+
>+      <sect3>
>+	<title>Manual Update</title>
> 
>       <para>If you wish to do the update manually, however,
>         you cannot just copy over the files from
>@@ -1139,6 +1143,10 @@
> 	there  are files that should be in <filename>/etc</filename> that are
> 	not in <filename>/usr/src/etc</filename>.</para>
> 
>+      <para>If you are using &man.mergemaster.8; (as recommended),
>+        you can skip forward to the <link linkend="update-dev">next
>+	section</link>.</para>
>+
>       <para>The simplest way to do this by hand is to install the
> 	files into a new directory, and then work through them looking
> 	for differences.</para>
>@@ -1281,6 +1289,7 @@
> 	  
> 	<screen>&prompt.root; <userinput>mkdir /var/tmp/root-`date "+%Y%m%d"`</userinput></screen>
>       </tip>
>+      </sect3>
>     </sect2>
>   
>     <sect2 id="update-dev">

Actions: View | Diff

Attachments on bug 37925: 21695