From owner-svn-src-all@FreeBSD.ORG  Sun Nov  6 08:01:17 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A513F106564A;
	Sun,  6 Nov 2011 08:01:17 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 93A048FC13;
	Sun,  6 Nov 2011 08:01:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA681HkQ007282;
	Sun, 6 Nov 2011 08:01:17 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA681HG4007280;
	Sun, 6 Nov 2011 08:01:17 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201111060801.pA681HG4007280@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 6 Nov 2011 08:01:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227149 - stable/7/usr.sbin/mergemaster
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2011 08:01:17 -0000

Author: dougb
Date: Sun Nov  6 08:01:17 2011
New Revision: 227149
URL: http://svn.freebsd.org/changeset/base/227149

Log:
  MFC r213573:
  
  mdoc: drop redundant .Pp and .LP calls
  
  They have no effect when coming in pairs, or before .Bl/.Bd

Modified:
  stable/7/usr.sbin/mergemaster/mergemaster.8
Directory Properties:
  stable/7/usr.sbin/mergemaster/   (props changed)

Modified: stable/7/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.8	Sun Nov  6 07:59:34 2011	(r227148)
+++ stable/7/usr.sbin/mergemaster/mergemaster.8	Sun Nov  6 08:01:17 2011	(r227149)
@@ -330,7 +330,6 @@ overrides
 .Pa /etc/mergemaster.rc .
 Here is an example
 with all values commented out:
-.Pp
 .Bd -literal
 # These are options for mergemaster, with their default values listed
 # The following options have command line overrides