aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-07-07 23:26:31 +0200
committerLudovic Courtès <ludo@gnu.org>2013-07-07 23:26:31 +0200
commitb208a005015e9a243695146c21317b8f0d48809e (patch)
treed55802fdb4ea315b9e015a3bb9795c08433e9c30
parent8b315a6dd5f1b32d1a8a84c0f525dc4850b1e889 (diff)
downloadpatches-b208a005015e9a243695146c21317b8f0d48809e.tar
patches-b208a005015e9a243695146c21317b8f0d48809e.tar.gz
doc: Move the packaging guidelines to the manual.
* HACKING (Packaging Guidelines): Remove. * doc/guix.texi (Packaging Guidelines): New node.
-rw-r--r--HACKING10
-rw-r--r--doc/guix.texi21
2 files changed, 21 insertions, 10 deletions
diff --git a/HACKING b/HACKING
index 60851e1f2f..9d8960c1ab 100644
--- a/HACKING
+++ b/HACKING
@@ -40,16 +40,6 @@ addition to that, you must not miss [[http://www.emacswiki.org/emacs/ParEdit][Pa
directly operate on the syntax tree, such as raising an s-expression or
wrapping it, swallowing or rejecting the following s-expression, etc.
-* Packaging Guidelines
-
-The GNU distribution is about respecting the freedom of users. Consequently,
-it contains only free software as defined at
-http://www.gnu.org/philosophy/free-sw.html .
-
-In addition, we follow the [[http://www.gnu.org/distros/free-system-distribution-guidelines.html][free software distribution guidelines]]. Among other
-things, this means that the distribution tries hard not to steer users towards
-obtaining information about non-free software.
-
* Adding new packages
Package recipes in Guix look like this:
diff --git a/doc/guix.texi b/doc/guix.texi
index c217416b0a..d1c9056b54 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1432,6 +1432,7 @@ tight integration of GNU components, and an emphasis on programs and
tools that help users exert that freedom.
@menu
+* Packaging Guidelines:: What goes into the distribution.
* Package Modules:: Packages from the programmer's viewpoint.
* Bootstrapping:: GNU/Linux built from scratch.
* Porting:: Targeting another platform or kernel.
@@ -1440,6 +1441,26 @@ tools that help users exert that freedom.
Building this distribution is a cooperative effort, and you are invited
to join! @ref{Contributing}, for information about how you can help.
+@node Packaging Guidelines
+@section Packaging Guidelines
+
+@c Adapted from http://www.gnu.org/philosophy/philosophy.html.
+
+The GNU operating system has been developed so that users can have
+freedom in their computing. GNU is @dfn{free software}, meaning that
+users have the @url{http://www.gnu.org/philosophy/free-sw.html,four
+essential freedoms}: to run the program, to study and change the program
+in source code form, to redistribute exact copies, and to distribute
+modified versions. Packages found in the GNU distribution provide only
+software that conveys these four freedoms.
+
+In addition, the GNU distribution follow the
+@url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,free
+software distribution guidelines}. Among other things, these guidelines
+reject non-free firmware, recommendations of non-free software, and
+discuss ways to deal with trademarks and patents.
+
+
@node Package Modules
@section Package Modules