summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-02-22 15:26:47 +0000
committerFrans Pop <elendil@planet.nl>2007-02-22 15:26:47 +0000
commit5f74dcc0c3b8bf90ac3727751317eae99e1d031f (patch)
treeffea418c9bf5952db60b9bd7526b5c24fb9d14c8
parent02d19672a465669fcb29e2c5a984da46ce77f0fe (diff)
downloadinstallation-guide-5f74dcc0c3b8bf90ac3727751317eae99e1d031f.zip
Debian does not necessarily share the ideals of the FSF
-rw-r--r--debian/changelog6
-rw-r--r--en/welcome/what-is-debian.xml2
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 81794d2cf..ceabfdf86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
translations. Closes: #408408
[ Frans Pop ]
- * welcome: make links to FSF and GNU more consistent.
- Thanks to Francesco Poli for suggesting the changes. Closes: #410317.
+ * welcome:
+ - make links to FSF and GNU more consistent (closes: #410317)
+ - we do not necessarily share the ideals of the FSF (closes: #410129)
+ Thanks to Francesco Poli for suggesting these changes.
* using-d-i: guided partitioning now creates swap inside LVM.
Thanks to Francesco Poli. Closes: #411399.
* Document installs over PPPoE. Based on a text proposed by Eddy Petrisor.
diff --git a/en/welcome/what-is-debian.xml b/en/welcome/what-is-debian.xml
index 6f5319ce1..5ff808781 100644
--- a/en/welcome/what-is-debian.xml
+++ b/en/welcome/what-is-debian.xml
@@ -6,7 +6,7 @@
<para>
Debian is an all-volunteer organization dedicated to developing free
-software and promoting the ideals of the Free Software Foundation.
+software and promoting the ideals of the Free Software community.
The Debian Project began in 1993, when Ian Murdock issued an open
invitation to software developers to contribute to a complete and
coherent software distribution based on the relatively new Linux