From owner-freebsd-doc@FreeBSD.ORG Sun Jan 22 17:09:01 2012 Return-Path: Delivered-To: doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD3651065672; Sun, 22 Jan 2012 17:09:01 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 2479A8FC13; Sun, 22 Jan 2012 17:09:00 +0000 (UTC) Received: by eaai10 with SMTP id i10so925867eaa.13 for ; Sun, 22 Jan 2012 09:09:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:message-id:date:from:organization:user-agent:mime-version:to :subject:x-enigmail-version:content-type:content-transfer-encoding; bh=WMbGQ1jLHTIGz0UVZQMuZav706zp0VLF77i1tOnPpBk=; b=vz+4JRsN/qLJAzqeYTesnbIFMF6r8WUTCgXmTvtcKkxn96mpBrQHuD8sPxbSiDBOqK 0oOITJo+scUkbAaaz8X+OSMepDNKbMBlj2NRlUj1Bn3JYps98lBsZ6GQb7IJ9GYP9hU3 4NT2zlvaIlX9bc9VOfonVabEKHWnrhdNgeIN8= Received: by 10.213.8.19 with SMTP id f19mr312188ebf.62.1327250427167; Sun, 22 Jan 2012 08:40:27 -0800 (PST) Received: from [192.168.1.12] (ip18-43-209-87.adsl2.static.versatel.nl. [87.209.43.18]) by mx.google.com with ESMTPS id x4sm41918154eeb.4.2012.01.22.08.40.26 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jan 2012 08:40:26 -0800 (PST) Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= Message-ID: <4F1C3BF9.5050107@freebsd.org> Date: Sun, 22 Jan 2012 17:40:25 +0100 From: Rene Ladan Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20120117 Thunderbird/9.0 MIME-Version: 1.0 To: "doc@FreeBSD.org" , Doug Barton X-Enigmail-Version: 1.3.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Cc: Subject: Handbook patch for mergemaster(8) without -p X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2012 17:09:01 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, the DocIdeaList on the wiki (http://wiki.freebsd.org/DocIdeaList) contains an item about removing instructions on what to do when mergemaster(8) does not contain the -p option. According to svnweb, it has supported this option since at least 2000, so all supported releases (7.3, 7.4, 8.1, 8.2, 9.0) should have it. The patch is available at http://p4web.freebsd.org/@@205007?ac=10 Is this OK to commit? Regards, René - -- http://www.rene-ladan.nl:8080/ GPG fingerprint = ADBC ECCD EB5F A6B4 549F 600D 8C9E 647A E564 2BFC (subkeys.pgp.net) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk8cO/kACgkQjJ5keuVkK/yu9ACfeJRf+WH+bfc+v0gTcjH6/57n ug0AnRydwhrZaNknwLQGhsL9hduMAJDf =6/2E -----END PGP SIGNATURE-----