From owner-svn-doc-projects@FreeBSD.ORG Wed Jan 30 20:54:15 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 05127D58; Wed, 30 Jan 2013 20:54:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from onyx.glenbarber.us (onyx.glenbarber.us [IPv6:2607:fc50:1000:c200::face]) by mx1.freebsd.org (Postfix) with ESMTP id AE4EF67E; Wed, 30 Jan 2013 20:54:14 +0000 (UTC) Received: from glenbarber.us (75-146-225-65-Philadelphia.hfc.comcastbusiness.net [75.146.225.65]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: gjb) by onyx.glenbarber.us (Postfix) with ESMTPSA id 131CE23F654; Wed, 30 Jan 2013 15:54:12 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us 131CE23F654 Authentication-Results: onyx.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none (insecure policy) Date: Wed, 30 Jan 2013 15:54:09 -0500 From: Glen Barber To: Gabor Kovesdan Subject: Re: svn commit: r40831 - in projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: . preface Message-ID: <20130130205409.GK1402@glenbarber.us> References: <201301301901.r0UJ1YY6051367@svn.freebsd.org> <51096FC6.2000205@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ai3I8gwHc37+ASRI" Content-Disposition: inline In-Reply-To: <51096FC6.2000205@FreeBSD.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-doc-projects@freebsd.org, Benedict Reuschling , doc-committers@freebsd.org X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 20:54:15 -0000 --ai3I8gwHc37+ASRI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 30, 2013 at 08:08:54PM +0100, Gabor Kovesdan wrote: > Em 30-01-2013 20:01, Benedict Reuschling escreveu: > > Author: bcr > > Date: Wed Jan 30 19:01:33 2013 > > New Revision: 40831 > > URL:http://svnweb.freebsd.org/changeset/doc/40831 > > > > Log: > > Deactivate the build of the PGP Keys section from the appendix. > > This will not be part of the print edition, but will still be > > kept in the online version. > Are you sure that this is the best way of doing this? This will make=20 > merges more difficult. I don't know if it has been discussed somewhere=20 > but I'd prefer a single-source solution. We could add a custom profiling= =20 > attribute for online or print-only chunks. >=20 As a more immediate solution, what if we use something like this for changes that should not be merged back to head/ ? MFC after: none Glen --ai3I8gwHc37+ASRI Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJRCYhxAAoJEFJPDDeguUaju7cH/2EpoHzeRO8Clp0k8hLeGSvr orzBoS1RWLaJTVny4lSgH/H+7PuHh1/aTeSTM3RXBtN/VNGv1cM0PXE3WwJpq6Lm 2f6kYnmoJ3XN7/qGuxK/Tx5Lq1evp//rPL8O25NWl+HBWLF+DLeiK2ez5zJcfzq0 n0hfhtDHrSz1gyvCvocFdD44Y5xlr0tj91/1Ahh4rgS3t299uxwUjZW4qQ8e1JHV 0k2zToyyGh9/mA00LAaGTyQpFjC5UZIGvRBIYL1HwINDkt2vNbnn+XYg/aPY0wE2 6bqhrBQYqpNXUHu8Wd5Wek1H2nfdPj0DCR1hVQXclOqyjTOo0BUqTZkIvNLx06A= =t+N+ -----END PGP SIGNATURE----- --ai3I8gwHc37+ASRI--