diff options
| -rw-r--r-- | build/entities/urls.ent | 3 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | en/welcome/what-is-debian.xml | 2 | ||||
| -rw-r--r-- | en/welcome/what-is-linux.xml | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/build/entities/urls.ent b/build/entities/urls.ent index ec2a88b12..8183d7913 100644 --- a/build/entities/urls.ent +++ b/build/entities/urls.ent @@ -162,7 +162,10 @@ <!ENTITY url-linux-history "http://www.li.org/linuxhistory.php"> <!-- Introductions to the FSF and GNU Project --> +<!ENTITY url-fsf "http://www.fsf.org/"> +<!-- This second entity is being phased out --> <!ENTITY url-fsf-intro "http://www.fsf.org/"> +<!ENTITY url-gnu "http://www.gnu.org/"> <!ENTITY url-gnu-intro "http://www.gnu.org/gnu/the-gnu-project.html"> <!-- Kernel archives --> diff --git a/debian/changelog b/debian/changelog index 88d7b0161..5784bf99c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,11 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low * Fix package name for installation-reports, and manual unfuzzy of all translations. Closes: #408408 - -- Frans Pop <fjp@debian.org> Fri, 2 Feb 2007 16:24:07 +0100 + [ Frans Pop ] + * welcome: make links to FSF and GNU more consistent. + Thanks to Francesco Poli for suggesting the changes. Closes: #410317. + + -- Frans Pop <fjp@debian.org> Fri, 16 Feb 2007 16:17:29 +0100 installation-guide (20070122) unstable; urgency=low 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™ 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 |