summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-11-13 23:30:03 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-13 23:30:03 +0100
commit4c7ac9aa7f5a39df7000ccf80ec1bec5af14f64e (patch)
tree4c8fc9b9cb80dc32a17144173dc4be92fa8d57ca
parentc29b69be2d4633b9f8ff88b53247132337d3df47 (diff)
doc: Improve acknowledgments.
* doc/guix.texi (Acknowledgments): Expound a bit. * THANKS: Mention artwork; thank Felipe & Nikita.
-rw-r--r--THANKS7
-rw-r--r--doc/guix.texi10
2 files changed, 15 insertions, 2 deletions
diff --git a/THANKS b/THANKS
index 840dfe9ffb4..a29b1a0b2d1 100644
--- a/THANKS
+++ b/THANKS
@@ -23,7 +23,6 @@ infrastructure help:
23 Kete <kete@ninthfloor.org> 23 Kete <kete@ninthfloor.org>
24 Alex Kost <alezost@gmail.com> 24 Alex Kost <alezost@gmail.com>
25 Matthew Lien <bluet@bluet.org> 25 Matthew Lien <bluet@bluet.org>
26 Felipe López <felipe.lopez@openmailbox.org>
27 Niels Möller <nisse@lysator.liu.se> 26 Niels Möller <nisse@lysator.liu.se>
28 Yutaka Niibe <gniibe@fsij.org> 27 Yutaka Niibe <gniibe@fsij.org>
29 Adam Pribyl <pribyl@lowlevel.cz> 28 Adam Pribyl <pribyl@lowlevel.cz>
@@ -32,3 +31,9 @@ infrastructure help:
32 Alen Skondro <askondro@gmail.com> 31 Alen Skondro <askondro@gmail.com>
33 Matthias Wachs <wachs@net.in.tum.de> 32 Matthias Wachs <wachs@net.in.tum.de>
34 Philip Woods <elzairthesorcerer@gmail.com> 33 Philip Woods <elzairthesorcerer@gmail.com>
34
35GNU Guix also includes non-software works. Thanks to the following
36people who contributed the logo and general artwork and themes:
37
38 Nikita Karetnikov <nikita@karetnikov.org>
39 Felipe López <felipe.lopez@openmailbox.org>
diff --git a/doc/guix.texi b/doc/guix.texi
index 3a5e4be8377..2a33cb50a2c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4923,7 +4923,8 @@ details about contributions.
4923@chapter Acknowledgments 4923@chapter Acknowledgments
4924 4924
4925Guix is based on the Nix package manager, which was designed and 4925Guix is based on the Nix package manager, which was designed and
4926implemented by Eelco Dolstra. Nix pioneered functional package 4926implemented by Eelco Dolstra, with contributions from other people (see
4927the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package
4927management, and promoted unprecedented features, such as transactional 4928management, and promoted unprecedented features, such as transactional
4928package upgrades and rollbacks, per-user profiles, and referentially 4929package upgrades and rollbacks, per-user profiles, and referentially
4929transparent build processes. Without this work, Guix would not exist. 4930transparent build processes. Without this work, Guix would not exist.
@@ -4931,6 +4932,13 @@ transparent build processes. Without this work, Guix would not exist.
4931The Nix-based software distributions, Nixpkgs and NixOS, have also been 4932The Nix-based software distributions, Nixpkgs and NixOS, have also been
4932an inspiration for Guix. 4933an inspiration for Guix.
4933 4934
4935GNU@tie{}Guix itself is a collective work with contributions from a
4936number of people. See the @file{AUTHORS} file in Guix for more
4937information on these fine people. The @file{THANKS} file lists people
4938who have helped by reporting bugs, taking care of the infrastructure,
4939providing artwork and themes, making suggestions, and more---thank you!
4940
4941
4934@c ********************************************************************* 4942@c *********************************************************************
4935@node GNU Free Documentation License 4943@node GNU Free Documentation License
4936@appendix GNU Free Documentation License 4944@appendix GNU Free Documentation License