From owner-cvs-doc@FreeBSD.ORG  Sun Jan 22 23:42:59 2012
Return-Path: <owner-cvs-doc@FreeBSD.ORG>
Delivered-To: cvs-doc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E143A106566B;
	Sun, 22 Jan 2012 23:42:59 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B30F28FC0C;
	Sun, 22 Jan 2012 23:42:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q0MNgxil075741;
	Sun, 22 Jan 2012 23:42:59 GMT
	(envelope-from rene@repoman.freebsd.org)
Received: (from rene@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q0MNgxd3075740;
	Sun, 22 Jan 2012 23:42:59 GMT (envelope-from rene)
Message-Id: <201201222342.q0MNgxd3075740@repoman.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 22 Jan 2012 23:42:59 +0000 (UTC)
To: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: doc/en_US.ISO8859-1/books/handbook/cutting-edge
	chapter.sgml
X-BeenThere: cvs-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the doc and www trees <cvs-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-doc>,
	<mailto:cvs-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-doc>
List-Post: <mailto:cvs-doc@freebsd.org>
List-Help: <mailto:cvs-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-doc>,
	<mailto:cvs-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jan 2012 23:43:00 -0000

rene        2012-01-22 23:42:59 UTC

  FreeBSD doc repository

  Modified files:
    en_US.ISO8859-1/books/handbook/cutting-edge chapter.sgml 
  Log:
  Remove instructions in case the -p option of mergemaster(8) is not present,
  it is in all supported releases.
  
  Idea taken from http://wiki.freebsd.org/DocIdeaList
  
  Reviewed by:    bcr
  Approved by:    dougb
  
  Revision  Changes    Path
  1.257     +1 -7      doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml