From owner-freebsd-doc@FreeBSD.ORG Mon Jan 23 07:23:13 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 4C557106566C; Mon, 23 Jan 2012 07:23:13 +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 84EF98FC08; Mon, 23 Jan 2012 07:23:12 +0000 (UTC) Received: by eaai10 with SMTP id i10so1140193eaa.13 for ; Sun, 22 Jan 2012 23:23:11 -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 :cc:subject:references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=AMDdwlR41cwfj7pSQkR6zUbggwi8sxcOlTRulCwN/Mc=; b=TE1M/mcz78lWTasxjtEXzSNzjOvNl10GXvwv2bRNirLjHsb/lOtlvYfxVSq6dpvNuS VVW99T5dqisQwnKZBp8azDxHaiEvq/NnqEa6IPUDpsb9u31jxZgUJuIVLzHEPzYza4/a KSoEHcKFoxZ1UGbVQk9e9nSzWKIEFuTyV2Kmk= Received: by 10.213.28.205 with SMTP id n13mr1359040ebc.97.1327303391109; Sun, 22 Jan 2012 23:23:11 -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 t59sm50351497eeh.10.2012.01.22.23.23.09 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jan 2012 23:23:10 -0800 (PST) Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= Message-ID: <4F1D0ADC.30904@freebsd.org> Date: Mon, 23 Jan 2012 08:23:08 +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: Doug Barton References: <4F1C3BF9.5050107@freebsd.org> <4F1C9B37.3050506@FreeBSD.org> In-Reply-To: <4F1C9B37.3050506@FreeBSD.org> X-Enigmail-Version: 1.3.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Cc: Rene Ladan , "doc@FreeBSD.org" Subject: Re: 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: Mon, 23 Jan 2012 07:23:13 -0000 On 23-01-2012 00:26, Doug Barton wrote: > On 01/22/2012 08:40, Rene Ladan wrote: >> 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 > > When I click that link all I see is the log. > http://p4web.freebsd.org/@md=d&cd=//&cdf=//depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml&c=noF@//depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml?ac=19&rev1=29&rev2=30 >> Is this OK to commit? > > It's safe to remove the instructions for no -p option, yes. > OK, committed. René -- http://www.rene-ladan.nl:8080/ GPG fingerprint = ADBC ECCD EB5F A6B4 549F 600D 8C9E 647A E564 2BFC (subkeys.pgp.net)