From owner-freebsd-doc@FreeBSD.ORG Fri Jun 18 06:57:17 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9614816A4CE; Fri, 18 Jun 2004 06:57:17 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB12C43D39; Fri, 18 Jun 2004 06:57:16 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i5I72u04096549 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Jun 2004 10:02:58 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.12.11/8.12.11) id i5I6uJ7a008551; Fri, 18 Jun 2004 09:56:19 +0300 (EEST) (envelope-from ru) Date: Fri, 18 Jun 2004 09:56:19 +0300 From: Ruslan Ermilov To: Kirill Ponomarew Message-ID: <20040618065619.GD8235@ip.net.ua> References: <200406180609.i5I69TCn035700@repoman.freebsd.org> <20040618061114.0E1B916A506@hub.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="d01dLTUuW90fS44H" Content-Disposition: inline In-Reply-To: <20040618061114.0E1B916A506@hub.freebsd.org> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: doc@FreeBSD.org Subject: Bumping .Dd when merging manpage revisions X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2004 06:57:17 -0000 --d01dLTUuW90fS44H Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable [ Picking up a random example. ] On Fri, Jun 18, 2004 at 06:11:14AM +0000, Kirill Ponomarew wrote: > krion 2004-06-18 06:09:29 UTC >=20 > FreeBSD src repository (doc,ports committer) >=20 > Modified files: (Branch: RELENG_4) > share/man/man7 ports.7=20 > Log: > MFC: rev. 1.45 (new descriptions for path, info, maint, cat, > bdeps, and rdeps. Some new examples for "search" target. > =20 > Revision Changes Path > 1.17.2.14 +48 -5 src/share/man/man7/ports.7 >=20 >=20 > Index: src/share/man/man7/ports.7 > diff -u src/share/man/man7/ports.7:1.17.2.13 src/share/man/man7/ports.7:1= =2E17.2.14 > --- src/share/man/man7/ports.7:1.17.2.13 Wed Jun 2 20:21:51 2004 > +++ src/share/man/man7/ports.7 Fri Jun 18 06:09:29 2004 > @@ -23,9 +23,9 @@ > .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE US= E OF > .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > .\" > -.\" $FreeBSD: /repoman/r/ncvs/src/share/man/man7/ports.7,v 1.17.2.13 200= 4/06/02 20:21:51 krion Exp $ > +.\" $FreeBSD: /repoman/r/ncvs/src/share/man/man7/ports.7,v 1.17.2.14 200= 4/06/18 06:09:29 krion Exp $ > .\" > -.Dd June 2, 2004 > +.Dd June 18, 2004 > .Dt PORTS 7 > .Os > .Sh NAME >=20 It's not good to set the document date ahead of what's in the corresponding revision in HEAD when merging. This makes things inconsistent when comparing RELENG_4 and HEAD revisions. I'd recommend setting the date in RELENG_4 ahead of what's in HEAD only when documenting truly 4.x-only things. But certainly not when pure MFC'ing. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --d01dLTUuW90fS44H Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFA0pITqRfpzJluFF4RArs9AJ9SjmqPWfzRO4i6Zc2bqCwxnmrX9wCeIq/Y wo/XD5Zik8brLSpKeFczP5I= =w2Yt -----END PGP SIGNATURE----- --d01dLTUuW90fS44H--