From nobody@FreeBSD.org  Fri Jan 30 03:51:34 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C110016A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 30 Jan 2004 03:51:34 -0800 (PST)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 910A143D45
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 30 Jan 2004 03:51:33 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.10/8.12.10) with ESMTP id i0UBpXdL064141
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 30 Jan 2004 03:51:33 -0800 (PST)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.10/8.12.10/Submit) id i0UBpXbp064140;
	Fri, 30 Jan 2004 03:51:33 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200401301151.i0UBpXbp064140@www.freebsd.org>
Date: Fri, 30 Jan 2004 03:51:33 -0800 (PST)
From: Eric Masson <e-masson@kisoft-services.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Documentation change request
X-Send-Pr-Version: www-2.0

>Number:         62109
>Category:       docs
>Synopsis:       Documentation change request
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    blackend
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 30 04:00:34 PST 2004
>Closed-Date:    Wed Feb 04 10:36:06 PST 2004
>Last-Modified:  Wed Feb 04 10:36:06 PST 2004
>Originator:     Eric Masson
>Release:        4.9-RELEASE
>Organization:
>Environment:
FreeBSD t39bsdems.interne.kisoft-services.com 4.9-STABLE FreeBSD 4.9-STABLE #0: Sat Nov 15 21:13:58 CET 2003     emss@t39bsdems.interne.kisoft-services.com:/usr/obj/usr/src/sys/TP390PNP  i386     
>Description:
It seems that section "Using make world" of chapter "The Cutting Edge" of the handbook is	a little confusing for new readers about the way to update the system, this patch tries to solve the issue.
>How-To-Repeat:
      
>Fix:
--- /usr/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml.old       Mon Dec 29 14:52:26 2003
+++ /usr/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml   Fri Jan 30 12:07:20 2004
@@ -587,6 +587,27 @@
        asking for trouble.</para>
     </warning>
 
+    <para>The canonical way to update your system is the following :
+    </para>
+
+    <itemizedlist>
+      <listitem><para>make buildworld</para></listitem>
+      <listitem><para>make buildkernel</para></listitem>
+      <listitem><para>make installkernel</para></listitem>
+      <listitem><para>reboot in single user mode</para></listitem>
+      <listitem><para>make installworld</para></listitem>
+      <listitem><para>mergemaster</para></listitem>
+      <listitem><para>reboot</para></listitem>
+    </itemizedlist>
+
+    <warning>
+      <title>Read further explanations</title>
+
+      <para>The sequence described above is only a short resume to
+        help you getting started. You should however read the following
+        sections to clearly understand each step.</para>
+    </warning>
+
     <sect2>
       <title>Read <filename>/usr/src/UPDATING</filename></title>
 
      
>Release-Note:
>Audit-Trail:

From: Eric Masson <e-masson@kisoft-services.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: docs/62109: Documentation change request
Date: Fri, 30 Jan 2004 16:10:39 +0100

 --=-=-=
 
 
 New version of the diff after review by Thomas Pornin (pornin@nerim.net)
 on news:fr.comp.os.bsd
 
 
 --=-=-=
 Content-Type: text/x-patch
 Content-Disposition: inline; filename=chapter.diff
 
 --- /usr/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml.old	Mon Dec 29 14:52:26 2003
 +++ /usr/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml	Fri Jan 30 12:07:20 2004
 @@ -587,6 +587,29 @@
  	asking for trouble.</para>
      </warning>
  
 +    <para>The canonical way to update your system is the following :
 +    </para>
 +
 +    <itemizedlist>
 +      <listitem><para>make buildworld</para></listitem>
 +      <listitem><para>make buildkernel</para></listitem>
 +      <listitem><para>make installkernel</para></listitem>
 +      <listitem><para>reboot (in single user mode : boot -s from loader prompt)</para></listitem>
 +      <listitem><para>mergemaster -p</para></listitem>
 +      <listitem><para>make installworld</para></listitem>
 +      <listitem><para>mergemaster</para></listitem>
 +      <listitem><para>reboot</para></listitem>
 +    </itemizedlist>
 +
 +    <warning>
 +      <title>Read further explanations</title>
 +
 +      <para>The sequence described above is only a short resume to
 +        help you getting started. You should however read the following
 +        sections to clearly understand each step, especially if you want
 +        to use a custom kernel configuration.</para>
 +    </warning>
 +
      <sect2>
        <title>Read <filename>/usr/src/UPDATING</filename></title>
  
 
 --=-=-=--
Responsible-Changed-From-To: freebsd-doc->blackend 
Responsible-Changed-By: blackend 
Responsible-Changed-When: Wed Feb 4 01:30:20 PST 2004 
Responsible-Changed-Why:  
I'll take this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62109 
State-Changed-From-To: open->closed 
State-Changed-By: blackend 
State-Changed-When: Wed Feb 4 10:34:49 PST 2004 
State-Changed-Why:  
I committed a slightly different version of your patch (mostly SGML 
changes).  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62109 
>Unformatted:
