From: Lucas Nussbaum <lucas@debian.org>
Date: Wed, 30 Jul 2014 15:36:28 +0000 (+0200)
Subject: Replace 'Debian GNU/Linux' with 'Debian' (except at one place). Thanks to 'victory... 
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=38462ee9b698e53a137e2de9d894d2f92562762e;p=developers-reference.git

Replace 'Debian GNU/Linux' with 'Debian' (except at one place). Thanks to 'victory' for the patch. Closes: #708665
---

diff --git a/common.ent b/common.ent
index d82c6d9..64cd4fc 100644
--- a/common.ent
+++ b/common.ent
@@ -19,7 +19,7 @@
 <!ENTITY fsf-addr "Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA">
 <!ENTITY file-GPL "<filename>/usr/share/common-licenses/GPL-2</filename>">
-<!ENTITY debian-formal "Debian GNU/Linux">
+<!ENTITY debian-formal "Debian">
 
 <!--
      URLs, Debian
diff --git a/resources.dbk b/resources.dbk
index 1d165c2..0ca7bd1 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -530,7 +530,7 @@ Debian decided to build some ports based on other Unix kernels, like
 <literal>hurd</literal> and <literal>kfreebsd</literal>.
 </para>
 <para>
-&debian-formal; 1.3 was only available as <literal>i386</literal>.  Debian
+Debian GNU/Linux 1.3 was only available as <literal>i386</literal>.  Debian
 2.0 shipped for <literal>i386</literal> and <literal>m68k</literal>
 architectures.  Debian 2.1 shipped for the <literal>i386</literal>,
 <literal>m68k</literal>, <literal>alpha</literal>, and