From: Nikita Karetnikov <nikita@karetnikov.org>
To: Karl Berry <karl@freefriends.org>
Cc: guix-devel@gnu.org
Subject: [PATCH] doc: Improve the copyright notice.
Date: Fri, 11 Oct 2013 20:07:03 +0400 [thread overview]
Message-ID: <8761t3vljs.fsf@karetnikov.org> (raw)
In-Reply-To: <201310102150.r9ALoa1s021107@freefriends.org> (Karl Berry's message of "Thu, 10 Oct 2013 21:50:36 GMT")
[-- Attachment #1.1: Type: text/plain, Size: 79 bytes --]
Karl, thank you so much. I hope it’s OK now.
Ludo, what do you think?
[-- Attachment #1.2: 0001-doc-Improve-the-copyright-notice.patch --]
[-- Type: text/x-diff, Size: 3488 bytes --]
From a384d93077e1dab066e0761a056b52fe1ba6dfd6 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Fri, 11 Oct 2013 15:52:27 +0000
Subject: [PATCH] doc: Improve the copyright notice.
---
doc/guix.texi | 55 +++++++++++++++----------------------------------------
1 file changed, 15 insertions(+), 40 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index ceb8046..a78000f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8,7 +8,19 @@
@c %**end of header
@include version.texi
-@set YEARS 2012, 2013
+
+@copying
+Copyright @copyright{} 2012, 2013 Ludovic Court@`es@*
+Copyright @copyright{} 2013 Andreas Enge@*
+Copyright @copyright{} 2013 Nikita Karetnikov
+
+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
+Documentation License''.
+@end copying
@dircategory Package management
@direntry
@@ -22,7 +34,7 @@
@titlepage
@title GNU Guix Reference Manual
@subtitle Using the GNU Guix Functional Package Manager
-@author Ludovic Courtès
+@author Ludovic Court@`es
@author Andreas Enge
@author Nikita Karetnikov
@@ -31,34 +43,9 @@
Edition @value{EDITION} @*
@value{UPDATED} @*
-Copyright @copyright{} @value{YEARS} Ludovic Court@`es, Andreas Enge, Nikita Karetnikov
-
-@ifinfo
-@quotation
-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
-Documentation License''.
-@end quotation
-@end ifinfo
-
+@insertcopying
@end titlepage
-@copying
-This manual documents GNU Guix version @value{VERSION}.
-
-Copyright @copyright{} @value{YEARS} Ludovic Courtès
-
-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
-Documentation License.''
-@end copying
-
@contents
@c *********************************************************************
@@ -68,18 +55,6 @@ Documentation License.''
This document describes GNU Guix version @value{VERSION}, a functional
package management tool written for the GNU system.
-
-@quotation
-Copyright @copyright{} @value{YEARS} Ludovic Courtès, Andreas Enge, Nikita Karetnikov
-
-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
-Documentation License.''
-@end quotation
-
@menu
* Introduction:: What is Guix about?
* Installation:: Installing Guix.
--
1.7.9.5
[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]
next prev parent reply other threads:[~2013-10-11 16:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 10:48 [PATCH] doc: Add 'copyrights' and 'license' macros Nikita Karetnikov
2013-10-09 21:44 ` Karl Berry
2013-10-09 22:13 ` Ludovic Courtès
2013-10-09 22:16 ` Karl Berry
2013-10-10 13:10 ` Nikita Karetnikov
2013-10-10 21:50 ` Karl Berry
2013-10-11 16:07 ` Nikita Karetnikov [this message]
2013-10-11 17:09 ` [PATCH] doc: Improve the copyright notice Ludovic Courtès
2013-10-11 23:40 ` Karl Berry
2013-10-12 13:10 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8761t3vljs.fsf@karetnikov.org \
--to=nikita@karetnikov.org \
--cc=guix-devel@gnu.org \
--cc=karl@freefriends.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).