From owner-svn-src-stable@FreeBSD.ORG  Tue Dec 18 10:34:18 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CA75B573;
 Tue, 18 Dec 2012 10:34:18 +0000 (UTC)
 (envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9541C8FC14;
 Tue, 18 Dec 2012 10:34:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBIAYIJc019206;
 Tue, 18 Dec 2012 10:34:18 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBIAYIpN019205;
 Tue, 18 Dec 2012 10:34:18 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201212181034.qBIAYIpN019205@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 18 Dec 2012 10:34:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r244393 - stable/9
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 10:34:18 -0000

Author: rwatson
Date: Tue Dec 18 10:34:18 2012
New Revision: 244393
URL: http://svnweb.freebsd.org/changeset/base/244393

Log:
  Merge r243800 from head to stable/9:
  
    Specifically point at the Handbook instructions for world updates in
    UPDATING by URL.
  
    As there has been some confusion over the need to run "mergemaster -p",
    part of our standard upgrade procedure, following the recent addition of
    an "auditdistd" user, add a note about it to UPDATING explicitly.

Modified:
  stable/9/UPDATING   (contents, props changed)
Directory Properties:
  stable/9/   (props changed)

Modified: stable/9/UPDATING
==============================================================================
--- stable/9/UPDATING	Tue Dec 18 10:29:28 2012	(r244392)
+++ stable/9/UPDATING	Tue Dec 18 10:34:18 2012	(r244393)
@@ -4,11 +4,18 @@ This file is maintained and copyrighted 
 See end of file for further details.  For commonly done items, please see the
 COMMON ITEMS: section later in the file.  These instructions assume that you
 basically know what you are doing.  If not, then please consult the FreeBSD
-handbook.
+handbook:
+
+    http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
 
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+20121218:
+	With the addition of auditdistd(8), a new auditdistd user is now
+	depended on during installworld.  "mergemaster -p" can be used to add
+	the user prior to installworld, as documented in the handbook.
+
 20121205:
 	9.1-RELEASE.