summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-02-16 15:19:34 +0000
committerFrans Pop <elendil@planet.nl>2007-02-16 15:19:34 +0000
commit6083d0bc1a8906917ebd77f3345641555fbfabcf (patch)
treebbd9493214ea3b4ea052ddd39ebb8b50e5c7641f /en
parent3735c578baa1c678f98f631611d0c8e179dc9b83 (diff)
downloadinstallation-guide-6083d0bc1a8906917ebd77f3345641555fbfabcf.zip
Make links to FSF and GNU more consistent; with thanks to Francesco Poli
Diffstat (limited to 'en')
-rw-r--r--en/welcome/what-is-debian.xml2
-rw-r--r--en/welcome/what-is-linux.xml5
2 files changed, 4 insertions, 3 deletions
diff --git a/en/welcome/what-is-debian.xml b/en/welcome/what-is-debian.xml
index dcd384c65..6f5319ce1 100644
--- a/en/welcome/what-is-debian.xml
+++ b/en/welcome/what-is-debian.xml
@@ -12,7 +12,7 @@ invitation to software developers to contribute to a complete and
coherent software distribution based on the relatively new Linux
kernel. That relatively small band of dedicated enthusiasts,
originally funded by the
-<ulink url="&url-fsf-intro;">Free Software Foundation</ulink>
+<ulink url="&url-fsf;">Free Software Foundation</ulink>
and influenced by the
<ulink url="&url-gnu-intro;">GNU</ulink>
philosophy, has grown over the years into an organization of around
diff --git a/en/welcome/what-is-linux.xml b/en/welcome/what-is-linux.xml
index e1608c090..374266dca 100644
--- a/en/welcome/what-is-linux.xml
+++ b/en/welcome/what-is-linux.xml
@@ -34,12 +34,13 @@ Linux. Much of its development is done by unpaid volunteers.
</para><para>
Development of what later became GNU/Linux began in 1984, when the
-<ulink url="http://www.gnu.org/">Free Software Foundation</ulink>
+<ulink url="&url-fsf;">Free Software Foundation</ulink>
began development of a free Unix-like operating system called GNU.
</para><para>
-The GNU Project has developed a comprehensive set of free software
+The <ulink url="&url-gnu;">GNU Project</ulink> has developed a
+comprehensive set of free software
tools for use with Unix&trade; and Unix-like operating systems such as
Linux. These tools enable users to perform tasks ranging from the
mundane (such as copying or removing files from the system) to the