From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikita Karetnikov Subject: [PATCH] doc: Add 'copyrights' and 'license' macros. Date: Wed, 09 Oct 2013 14:48:34 +0400 Message-ID: <87a9iiwwhp.fsf@karetnikov.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTrF9-0006vU-Su for guix-devel@gnu.org; Wed, 09 Oct 2013 06:43:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTrF5-0004FW-13 for guix-devel@gnu.org; Wed, 09 Oct 2013 06:43:51 -0400 Received: from [2a01:7e00::f03c:91ff:fedf:181] (port=50974 helo=cooksoni.karetnikov.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTrF4-0004FM-OA for guix-devel@gnu.org; Wed, 09 Oct 2013 06:43:46 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: Karl Berry --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable What do you think about this change? I used =E2=80=98itemize=E2=80=99 to a= void extraneous blank lines. The only downside is that the indentation of the =E2=80=98copyrights=E2=80=99 macro slightly differs from the surroundin= g text. Karl, do you know a better way? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-doc-Add-copyrights-and-license-macros.patch Content-Transfer-Encoding: quoted-printable From=20b8867a4956af60065200c3b89604108cd7e46e83 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 9 Oct 2013 10:37:34 +0000 Subject: [PATCH] doc: Add 'copyrights' and 'license' macros. * doc/guix.texi (YEARS): Remove it. (copyrights, license): Add these macros and use them. =2D-- doc/guix.texi | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ceb8046..7408be0 100644 =2D-- a/doc/guix.texi +++ b/doc/guix.texi @@ -8,7 +8,6 @@ @c %**end of header =20 @include version.texi =2D@set YEARS 2012, 2013 =20 @dircategory Package management @direntry @@ -31,16 +30,28 @@ Edition @value{EDITION} @* @value{UPDATED} @* =20 =2DCopyright @copyright{} @value{YEARS} Ludovic Court@`es, Andreas Enge, Ni= kita Karetnikov +@macro copyrights +@itemize @w{} +@item Copyright @copyright{} 2012, 2013 Ludovic Court@`es +@item Copyright @copyright{} 2013 Andreas Enge +@item Copyright @copyright{} 2013 Nikita Karetnikov +@end itemize +@end macro =20 =2D@ifinfo =2D@quotation +@macro license Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free =2DDocumentation License''. +Documentation License.'' +@end macro + +@copyrights + +@ifinfo +@quotation +@license @end quotation @end ifinfo =20 @@ -49,14 +60,9 @@ Documentation License''. @copying This manual documents GNU Guix version @value{VERSION}. =20 =2DCopyright @copyright{} @value{YEARS} Ludovic Court=C3=A8s +@copyrights =20 =2DPermission is granted to copy, distribute and/or modify this document =2Dunder the terms of the GNU Free Documentation License, Version 1.3 or =2Dany later version published by the Free Software Foundation; with no =2DInvariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A =2Dcopy of the license is included in the section entitled ``GNU Free =2DDocumentation License.'' +@license @end copying =20 @contents @@ -70,14 +76,9 @@ package management tool written for the GNU system. =20 =20 @quotation =2DCopyright @copyright{} @value{YEARS} Ludovic Court=C3=A8s, Andreas Enge,= Nikita Karetnikov +@copyrights =20 =2DPermission is granted to copy, distribute and/or modify this document =2Dunder the terms of the GNU Free Documentation License, Version 1.3 or =2Dany later version published by the Free Software Foundation; with no =2DInvariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A =2Dcopy of the license is included in the section entitled ``GNU Free =2DDocumentation License.'' +@license @end quotation =20 @menu =2D-=20 1.7.9.5 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJSVTSFAAoJEM+IQzI9IQ38QCQP/Ay9d6pSOFcFJAoLqCXo+tIW O8rx7oB/Nk8RLeYDlxaTBezMCXWh1fDvRzbWacRSAyVU+IueI6c5gHRF51HJaHgg 2g1aUzkBfCqtVyxnLHOCGD+EE8fAYsAs6qD22IDf7Zxh6s5mOhMbUHmtltRT3qHL fSrygbkDjoNzduxcRQx/qOPBG251WvqMeeIusuN5nWXy/0NLDLfzOl8qeghN/O85 B+1Jc5+zW33goiHMQRTWwEeIxw9zE2zIX7xNLnrZQNMKImeMDffYuQAr0F66lPrD 2mOmskp2mB3dvQnfXqqcLqKR3pYkWYS6Krcslh+HhXvIi5tk2oNiEZKb1Imok23j zvAhM9o/f42JCb9x0g1wdCKHoFU3Af88JWm8mGcgkIuOgI3qAkTFrPJcNceRxGkc nWshRZ0cF87lQu5xI4USuEkRtxzs+S233z9DnJkuVi3rTU4i85qnELojB7+NxcgD OiWbTrSMa8Epc9L4lMZJy7qIFdLZY+VzhDeELVI6HWlXS01u/vzEvL+m9UivEQ8N hml1Ddr8MAVAnrYMhyFuR2nFYER5RudVz++omliRi7mFh60RcOG2DTy2yxG4aOb6 bg3fdeLN+TgqNu8ZCvtGxlZYEq9evHayPwF+Z504WMAPoteNANCTxDRzCu20hglH rzo/KKpZYPguPlpi0czZ =BECz -----END PGP SIGNATURE----- --==-=-=--