some suggestions on places to use the proper term, Debian GNU/Linux,

closes: #133953; use a new entity, debian-formal for the term

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@1438 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/common.ent b/common.ent
index fd045b2cf7bd86bdd2743e0a12fb12dd2f8c0f3a..ca9491ff8821a6b61736cba178ce923706596180 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -18,6 +18,7 @@
 <!entity fsf-addr "Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA">
 <!entity file-GPL "<file>/usr/share/common-licenses/GPL</file>">
 <!entity fsf-addr "Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA">
 <!entity file-GPL "<file>/usr/share/common-licenses/GPL</file>">

+<!entity debian-formal "Debian GNU/Linux">

 
 <!--
      URLs, Debian
 
 <!--
      URLs, Debian

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 0345fa47395d070d110fbc539e89f9da242490ee..72e4c3a1aa8083097e3289d4569e275ffcb79563 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -5,7 +5,7 @@
   <!-- common, language independant entities -->
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
   <!-- CVS revision of this document -->
   <!-- common, language independant entities -->
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
   <!-- CVS revision of this document -->

-  <!entity cvs-rev "$Revision: 1.78 $">
+  <!entity cvs-rev "$Revision: 1.79 $">

 
   <!-- if you are translating this document, please notate the RCS
        revision of the developers reference here -->
 
   <!-- if you are translating this document, please notate the RCS
        revision of the developers reference here -->


@@ -49,7 +49,7 @@ merchantability or fitness for a particular purpose.  See the GNU
 General Public License for more details.
        <p>
 A copy of the GNU General Public License is available as &file-GPL; in
 General Public License for more details.
        <p>
 A copy of the GNU General Public License is available as &file-GPL; in

-the Debian GNU/Linux distribution or on the World Wide Web at <url
+the &debian-formal; distribution or on the World Wide Web at <url

 id="&url-gpl;" name="the GNU website">.  You can also obtain it by
 writing to the &fsf-addr;.
 
 id="&url-gpl;" name="the GNU website">.  You can also obtain it by
 writing to the &fsf-addr;.
 


@@ -113,7 +113,7 @@ Linux People IRC network (e.g., <tt>irc.debian.org</tt>) can also be
 helpful.
 
        <p>
 helpful.
 
        <p>

-When you know how you want to contribute to the Debian Project, you
+When you know how you want to contribute to &debian-formal;, you

 should get in contact with existing Debian maintainers who are working
 on similar tasks.  That way, you can learn from experienced developers.
 For example, if you are interested in packaging existing software for
 should get in contact with existing Debian maintainers who are working
 on similar tasks.  That way, you can learn from experienced developers.
 For example, if you are interested in packaging existing software for


@@ -132,22 +132,23 @@ these tasks and submit patches and improvements.
 
       <sect id="registering">Registering as a Debian developer
        <p>
 
       <sect id="registering">Registering as a Debian developer
        <p>

-Before you decide to register with the Debian Project, you will need
-to read all the information available at the <url id="&url-newmaint;"
-name="New Maintainer's Corner">.  It describes exactly the preparations
-you have to do before you can register to become a Debian developer.
-
-For example, before you apply, you have to to read the
-<url id="&url-social-contract;" name="Debian Social Contract">.
-Registering as a developer means that you agree with and
-pledge to uphold the Debian Social Contract; it is very important that
-maintainers are in accord with the essential ideas behind Debian
-GNU/Linux.  Reading the <url id="&url-gnu-manifesto;" name="GNU
+Before you decide to register with &debian-formal;, you will need to
+read all the information available at the <url id="&url-newmaint;"
+name="New Maintainer's Corner">.  It describes exactly the
+preparations you have to do before you can register to become a Debian
+developer.
+
+For example, before you apply, you have to to read the <url
+id="&url-social-contract;" name="Debian Social Contract">.
+Registering as a developer means that you agree with and pledge to
+uphold the Debian Social Contract; it is very important that
+maintainers are in accord with the essential ideas behind
+&debian-formal;.  Reading the <url id="&url-gnu-manifesto;" name="GNU

 Manifesto"> would also be a good idea.
        <p>
 The process of registering as a developer is a process of verifying
 Manifesto"> would also be a good idea.
        <p>
 The process of registering as a developer is a process of verifying

-your identity and intentions, and checking your technical skills.
-As the number of people working on Debian has grown to over
+your identity and intentions, and checking your technical skills.  As
+the number of people working on &debian-formal; has grown to over

 &number-of-maintainers; people and our systems are used in several
 very important places we have to be careful about being compromised.
 Therefore, we need to verify new maintainers before we can give them
 &number-of-maintainers; people and our systems are used in several
 very important places we have to be careful about being compromised.
 Therefore, we need to verify new maintainers before we can give them


@@ -212,17 +213,17 @@ Some countries restrict the use of cryptographic software by their
 citizens.  This need not impede one's activities as a Debian package
 maintainer however, as it may be perfectly legal to use cryptographic
 products for authentication, rather than encryption purposes (as is
 citizens.  This need not impede one's activities as a Debian package
 maintainer however, as it may be perfectly legal to use cryptographic
 products for authentication, rather than encryption purposes (as is

-the case in France).  The Debian Project does not require the use of
+the case in France).  &debian-formal; does not require the use of

 cryptography <em>qua</em> cryptography in any manner.  If you live in a
 country where use of cryptography even for authentication is forbidden
 then please contact us so we can make special arrangements.
        <p>
 When you are ready to apply, you need an existing Debian maintainer
 to verify your application (an <em>advocate</em>).  After you have
 cryptography <em>qua</em> cryptography in any manner.  If you live in a
 country where use of cryptography even for authentication is forbidden
 then please contact us so we can make special arrangements.
        <p>
 When you are ready to apply, you need an existing Debian maintainer
 to verify your application (an <em>advocate</em>).  After you have

-contributed to the Project and when you want to apply to become a
+contributed to Debian for a while, and you want to apply to become a

 registered developer, an existing developer with whom you
 have worked over the past months has to express his belief that you
 registered developer, an existing developer with whom you
 have worked over the past months has to express his belief that you

-can contribute to the Project successfully.
+can contribute to Debian successfully.

        <p>
 When you have found an advocate, have your GPG key signed and have
 already contributed to Debian for a while, you're ready to apply.
        <p>
 When you have found an advocate, have your GPG key signed and have
 already contributed to Debian for a while, you're ready to apply.


@@ -568,7 +569,7 @@ id="&url-devel-machines;">.
 
       <sect>Overview
        <p>
 
       <sect>Overview
        <p>

-The Debian GNU/Linux distribution consists of a lot of Debian packages
+The &debian-formal; distribution consists of a lot of Debian packages

 (<tt>.deb</tt>'s, currently around &number-of-pkgs;) and a few
 additional files (documentation, installation disk images, etc.).
        <p>
 (<tt>.deb</tt>'s, currently around &number-of-pkgs;) and a few
 additional files (documentation, installation disk images, etc.).
        <p>


@@ -607,10 +608,11 @@ further into <em>subsections</em>.
       <sect>Sections
        <p>
 The <em>main</em> section of the Debian archive is what makes up the
       <sect>Sections
        <p>
 The <em>main</em> section of the Debian archive is what makes up the

-<strong>official Debian GNU/Linux distribution</strong>.
-The <em>main</em> section is official because it fully complies with
-all our guidelines.  The other two sections do not, to different degrees;
-as such, they are <strong>not</strong> officially part of Debian GNU/Linux.
+<strong>official &debian-formal; distribution</strong>.  The
+<em>main</em> section is official because it fully complies with all
+our guidelines.  The other two sections do not, to different degrees;
+as such, they are <strong>not</strong> officially part of
+&debian-formal;.

        <p>
 Every package in the main section must fully comply with the <url
 id="&url-dfsg;" name="Debian Free Software Guidelines"> (DFSG) and
        <p>
 Every package in the main section must fully comply with the <url
 id="&url-dfsg;" name="Debian Free Software Guidelines"> (DFSG) and


@@ -663,7 +665,7 @@ also have ports underway to non-Linux kernel.  Aside from
 <em>alpha</em>, <em>powerpc</em>, <em>sparc</em>, <em>hurd-i386</em>,
 and <em>arm</em>, as of this writing.
        <p>
 <em>alpha</em>, <em>powerpc</em>, <em>sparc</em>, <em>hurd-i386</em>,
 and <em>arm</em>, as of this writing.
        <p>

-Debian GNU/Linux 1.3 is only available as <em>i386</em>.  Debian 2.0
+&debian-formal; 1.3 is only available as <em>i386</em>.  Debian 2.0

 shipped for <em>i386</em> and <em>m68k</em> architectures.  Debian 2.1
 ships for the <em>i386</em>, <em>m68k</em>, <em>alpha</em>, and
 <em>sparc</em> architectures.  Debian 2.2 adds support for the
 shipped for <em>i386</em> and <em>m68k</em> architectures.  Debian 2.1
 ships for the <em>i386</em>, <em>m68k</em>, <em>alpha</em>, and
 <em>sparc</em> architectures.  Debian 2.2 adds support for the