tags 614233 + patch usertags 614233 + sentpatch thanks The attached patch replaces Debian GNU/Linux with Debian where relevant and makes other changes needed to fix #614233. I would like some review here, especially on stuff that isn't strictly in the realm of the website team. I also changed "Debian developer" to "Debian member" where that intersected with my patch, I can split that out from this patch if that is wanted though. -- bye, pabs http://wiki.debian.org/PaulWise
Index: debhome.css
===================================================================
RCS file: /cvs/webwml/webwml/english/debhome.css,v
retrieving revision 1.11
diff -p -u -r1.11 debhome.css
--- debhome.css 18 Jan 2012 12:53:37 -0000 1.11
+++ debhome.css 14 Feb 2012 09:26:21 -0000
@@ -16,7 +16,7 @@
Street, Fifth Floor, Boston, MA 02110-1301 USA.
The license text can also be found at http://www.gnu.org/copyleft/gpl.html and
- /usr/share/common-licenses/GPL-2 on Debian GNU/Linux.
+ /usr/share/common-licenses/GPL-2 on Debian.
*/
@import url("debian.css");
Index: debian.css
===================================================================
RCS file: /cvs/webwml/webwml/english/debian.css,v
retrieving revision 1.98
diff -p -u -r1.98 debian.css
--- debian.css 14 Feb 2012 09:23:17 -0000 1.98
+++ debian.css 14 Feb 2012 09:26:22 -0000
@@ -16,7 +16,7 @@
Street, Fifth Floor, Boston, MA 02110-1301 USA.
The license text can also be found at http://www.gnu.org/copyleft/gpl.html and
- /usr/share/common-licenses/GPL-2 on Debian GNU/Linux.
+ /usr/share/common-licenses/GPL-2 on Debian.
*/
/*
Index: donations.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/donations.wml,v
retrieving revision 1.64
diff -p -u -r1.64 donations.wml
--- donations.wml 26 May 2011 10:04:13 -0000 1.64
+++ donations.wml 14 Feb 2012 09:26:22 -0000
@@ -7,7 +7,7 @@
<h2 id="money_donations">Donations of money</h2>
-<p>Debian is the name of the project, and Debian GNU/Linux is how the
+<p>Debian is the name of the project, and Debian is how the
distribution we create is called. In order to handle money donations,
we set up a non-profit corporation,
<a href="http://www.spi-inc.org/";>Software in the Public Interest</a>.</p>
@@ -24,7 +24,7 @@ While all donations are welcome, it is e
businesses that make money through Debian (CD manufacturers,
support companies, or even businesses that rely on Debian
for day to day operations) will contribute a percentage
-of their profit to help make Debian GNU/Linux the best OS
+of their profit to help make Debian the best OS
it can be.</p>
<p>If you would like to make a monetary donation to Debian, see the
Index: index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/index.wml,v
retrieving revision 1.88
diff -p -u -r1.88 index.wml
--- index.wml 16 Aug 2011 11:17:56 -0000 1.88
+++ index.wml 14 Feb 2012 09:26:22 -0000
@@ -9,19 +9,16 @@
</if-stable-release>
<div id="splash">
- <h1>Debian GNU/Linux</h1>
+ <h1>Debian</h1>
</div>
<div id="intro">
<p><a href="http://www.debian.org/";>Debian</a> is a
<a href="intro/free">free</a> operating system (OS) for your computer.
An operating system is the set of basic programs and utilities that make
-your computer run. Debian uses the <a href="http://www.kernel.org/";>Linux</a>
-kernel (the core of an operating system), but most of the basic OS tools
-come from the <a href="http://www.gnu.org/";>GNU project</a>; hence the name
-GNU/Linux.</p>
+your computer run.</p>
-<p>Debian GNU/Linux provides more than a pure OS: it comes with over
+<p>Debian provides more than a pure OS: it comes with over
<packages_in_stable> <a href="distrib/packages">packages</a>, precompiled software bundled
up in a nice format for easy installation on your machine. <a href="intro/about">Read more...</a></p>
</div>
Index: social_contract.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/social_contract.wml,v
retrieving revision 1.24
diff -p -u -r1.24 social_contract.wml
--- social_contract.wml 22 Jul 2010 15:02:17 -0000 1.24
+++ social_contract.wml 14 Feb 2012 09:26:22 -0000
@@ -9,7 +9,7 @@
<a href="social_contract.1.0">Version 1.0</a> ratified on July 5, 1997.
</p>
-<p>Debian, the producers of the Debian GNU/Linux system, have created the
+<p>Debian, the producers of the Debian system, have created the
<strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
Guidelines (DFSG)</a> part of the contract, initially designed
as a set of commitments that we agree to abide by, has been adopted by
Index: support.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/support.wml,v
retrieving revision 1.65
diff -p -u -r1.65 support.wml
--- support.wml 4 Feb 2011 17:53:33 -0000 1.65
+++ support.wml 14 Feb 2012 09:26:22 -0000
@@ -35,7 +35,7 @@ all wikis, this wiki is constantly chang
<toc-add-entry name="mail_lists" href="MailingLists/">Mailing lists</toc-add-entry>
-<p>Debian GNU/Linux is developed through distributed development all around
+<p>Debian is developed through distributed development all around
the world. Therefore e-mail is a preferred way to discuss various items.
Much of the conversation between Debian developers and users is managed
through several mailing lists.</p>
@@ -168,7 +168,7 @@ maintainer responsible for that package.
<toc-add-entry name="bts" href="Bugs/">The Bug Tracking System</toc-add-entry>
-<p>The Debian GNU/Linux distribution has a bug tracking system which
+<p>The Debian distribution has a bug tracking system which
details bugs reported by users and developers. Each bug is given a
number, and is kept on file until it is marked as having been dealt
with.</p>
Index: trademark.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/trademark.wml,v
retrieving revision 1.18
diff -p -u -r1.18 trademark.wml
--- trademark.wml 5 Jan 2012 17:05:25 -0000 1.18
+++ trademark.wml 14 Feb 2012 09:26:23 -0000
@@ -26,7 +26,7 @@ href="http://lists.debian.org/debian-ann
by Bruce Perens, Debian Project Leader, in 1998:</p>
<p><q>We allow all businesses to make reasonable use of the <q>Debian</q> trademark.
-For example, if you make a CD of our Debian GNU/Linux distribution, you can
+For example, if you make a CD of our Debian distribution, you can
call that product <q>Debian</q>. If you want to use the name in some other way, you
should ask us <strong>first</strong>.</q><br />
<q>To be fair to all businesses, we insist that no business use the name
Index: CD/releases/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/CD/releases/index.wml,v
retrieving revision 1.31
diff -p -u -r1.31 index.wml
--- CD/releases/index.wml 22 Jan 2008 06:13:24 -0000 1.31
+++ CD/releases/index.wml 14 Feb 2012 09:26:23 -0000
@@ -1,4 +1,4 @@
-#use wml::debian::cdimage title="Release information about Debian GNU/Linux CD images" BARETITLE=true
+#use wml::debian::cdimage title="Release information about Debian CD images" BARETITLE=true
<p>This page contains historic last-minute information regarding official
Debian CD images.</p>
Index: MailingLists/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/MailingLists/index.wml,v
retrieving revision 1.46
diff -p -u -r1.46 index.wml
--- MailingLists/index.wml 12 Mar 2011 12:25:48 -0000 1.46
+++ MailingLists/index.wml 14 Feb 2012 09:26:23 -0000
@@ -5,7 +5,7 @@
<toc-add-entry name="intro">Introduction</toc-add-entry>
-<p>Debian GNU/Linux is developed through distributed development all around
+<p>Debian is developed through distributed development all around
the world. Therefore, e-mail is the preferred way to discuss various items.
Much of the conversation between Debian developers and users is managed
through several
Index: MailingLists/mklist
===================================================================
RCS file: /cvs/webwml/webwml/english/MailingLists/mklist,v
retrieving revision 1.39
diff -p -u -r1.39 mklist
--- MailingLists/mklist 5 Apr 2011 15:55:43 -0000 1.39
+++ MailingLists/mklist 14 Feb 2012 09:26:24 -0000
@@ -222,7 +222,7 @@ sub write_mailing_lists_html
print OUT <<"EOF";
wm::destination=~/public_html/Linux/Debian/master/mailing-lists.html
wm::template=debian.wmt
-meta::description=Mailing lists served by Debian GNU/Linux, the universal operating system.
+meta::description=Mailing lists served by Debian, the universal operating system.
meta::keywords=Debian, Linux, GNU, Mailing list
link::US=http://www.debian.org/~joey/
link::Europe=http://www.infodrom.north.de/~joey/Linux/Debian/master/
Index: MailingLists/desc/introduction
===================================================================
RCS file: /cvs/webwml/webwml/english/MailingLists/desc/introduction,v
retrieving revision 1.3
diff -p -u -r1.3 introduction
--- MailingLists/desc/introduction 20 Dec 2001 18:01:00 -0000 1.3
+++ MailingLists/desc/introduction 14 Feb 2012 09:26:24 -0000
@@ -1,5 +1,5 @@
Introduction to the Debian mailing lists
-Debian GNU/Linux is developed through distributed development all
+Debian is developed through distributed development all
around the world. Therefore, email is the preferred way to discuss
various items. Much of the conversation between Debian developers
and users is managed through several mailing lists.
Index: MailingLists/desc/devel/deity
===================================================================
RCS file: /cvs/webwml/webwml/english/MailingLists/desc/devel/deity,v
retrieving revision 1.4
diff -p -u -r1.4 deity
--- MailingLists/desc/devel/deity 15 Feb 2003 11:16:08 -0000 1.4
+++ MailingLists/desc/devel/deity 14 Feb 2012 09:26:24 -0000
@@ -1,4 +1,4 @@
-Debian GNU/Linux will get a new, friendly frontend to
+Debian has a friendly frontend to
its package maintenance system. Its codename is deity
(now known as APT) and its development is discussed
here. The -digest is open to everyone.
Index: devel/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/index.wml,v
retrieving revision 1.229
diff -p -u -r1.229 index.wml
--- devel/index.wml 29 Oct 2011 15:46:40 -0000 1.229
+++ devel/index.wml 14 Feb 2012 09:26:26 -0000
@@ -120,7 +120,7 @@ to Debian developers.</p>
<dl>
<dt><a href="$(DOC)/debian-policy/">Debian Policy Manual</a></dt>
<dd>
- This manual describes the policy requirements for the Debian GNU/Linux
+ This manual describes the policy requirements for the Debian
distribution. This includes the structure and contents of the Debian
archive, several design issues of the operating system, as well as
technical requirements that each package must satisfy to be included in
@@ -328,7 +328,7 @@ to Debian developers.</p>
Force</a></li>
<li>The <a href="http://qa.debian.org/";>Quality Assurance</a>
group</li>
- <li><a href="$(HOME)/CD/">Debian GNU/Linux CD images</a></li>
+ <li><a href="$(HOME)/CD/">Debian CD images</a></li>
<li>The <a href="http://nm.debian.org/gpg.php";>key signing
coordination page</a></li>
<li><a href="http://wiki.debian.org/DebianIPv6";>Debian IPv6
Index: devel/misc/card.tex
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/misc/card.tex,v
retrieving revision 1.2
diff -p -u -r1.2 card.tex
--- devel/misc/card.tex 17 Oct 2004 22:59:28 -0000 1.2
+++ devel/misc/card.tex 14 Feb 2012 09:26:27 -0000
@@ -1,6 +1,6 @@
%
% Originally in http://www.debian.org/~jgg/card.tex
-% Debian GNU/Linux developer business card template
+% Debian member business card template
%
% This template is vaguely based on several similar ones I have
% found elsewhere on the web; it uses a LaTeX ``picture'' environment
@@ -66,7 +66,7 @@
% rendered, see below.
%
\newcommand{\xname}{Tux T. Penguin}
-\newcommand{\xtitle}{Debian GNU/Linux Developer}
+\newcommand{\xtitle}{Debian Member}
\newcommand{\xaddress}{42 Alpha Lane}
\newcommand{\xaddressb}{Sparc, CA 90000-1234}
\newcommand{\xphone}{(213) 555-5469}
Index: devel/website/working.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/website/working.wml,v
retrieving revision 1.39
diff -p -u -r1.39 working.wml
--- devel/website/working.wml 20 Sep 2011 02:07:39 -0000 1.39
+++ devel/website/working.wml 14 Feb 2012 09:26:27 -0000
@@ -230,7 +230,7 @@ implement. The variables currently avail
<dl>
<dt>BARETITLE="true"</dt>
- <dd>Removes the "Debian GNU/Linux --" part that is usually prepended
+ <dd>Removes the "Debian --" part that is usually prepended
to all the <title> tags.</dd>
<dt>NOHEADER="true"</dt>
<dd>Removes the initial header from the page. A custom header
Index: distrib/cd.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/cd.wml,v
retrieving revision 1.10
diff -p -u -r1.10 cd.wml
--- distrib/cd.wml 21 Nov 2005 21:59:31 -0000 1.10
+++ distrib/cd.wml 14 Feb 2012 09:26:27 -0000
@@ -9,7 +9,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
# You should never use something like this, unless very needed.
<meta http-equiv="Refresh" content="0;URL=../CD/">
- <title>Installing Debian GNU/Linux via CD images</title>
+ <title>Installing Debian via CD images</title>
</head>
<body>
<p>
Index: distrib/ftplist.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/ftplist.wml,v
retrieving revision 1.31
diff -p -u -r1.31 ftplist.wml
--- distrib/ftplist.wml 23 May 2007 16:43:38 -0000 1.31
+++ distrib/ftplist.wml 14 Feb 2012 09:26:27 -0000
@@ -1,6 +1,6 @@
#use wml::debian::template title="Getting Debian from the Internet" BARETITLE=true
-<p>Debian GNU/Linux is available for download over the Internet.</p>
+<p>Debian is available for download over the Internet.</p>
<p>If you simply want to install Debian using the Internet, please see
the <a href="netinst">network installation page</a>.</p>
Index: distrib/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/index.wml,v
retrieving revision 1.52
diff -p -u -r1.52 index.wml
--- distrib/index.wml 20 Mar 2011 18:06:22 -0000 1.52
+++ distrib/index.wml 14 Feb 2012 09:26:27 -0000
@@ -1,7 +1,7 @@
#use wml::debian::template title="Getting Debian"
#include "$(ENGLISHDIR)/releases/images.data"
-<p>Debian GNU/Linux is distributed <a href="../intro/free">freely</a>
+<p>Debian is distributed <a href="../intro/free">freely</a>
over Internet. You can download all of it from any of our
<a href="ftplist">mirrors</a>.
The <a href="../releases/stable/installmanual">Installation Manual</a>
Index: distrib/netboot.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/netboot.wml,v
retrieving revision 1.3
diff -p -u -r1.3 netboot.wml
--- distrib/netboot.wml 10 Nov 2007 12:51:15 -0000 1.3
+++ distrib/netboot.wml 14 Feb 2012 09:26:27 -0000
@@ -9,7 +9,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
# You should never use something like this, unless very needed.
<meta http-equiv="Refresh" content="0;URL=netinst">
- <title>Installing Debian GNU/Linux via a network boot</title>
+ <title>Installing Debian via a network boot</title>
</head>
<body>
<p>
Index: distrib/netinst.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/netinst.wml,v
retrieving revision 1.23
diff -p -u -r1.23 netinst.wml
--- distrib/netinst.wml 21 Apr 2011 20:17:24 -0000 1.23
+++ distrib/netinst.wml 14 Feb 2012 09:26:27 -0000
@@ -1,4 +1,4 @@
-#use wml::debian::template title="Installing Debian GNU/Linux via the Internet" BARETITLE=true
+#use wml::debian::template title="Installing Debian via the Internet" BARETITLE=true
#use wml::debian::toc
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/images.data"
Index: distrib/packages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/packages.wml,v
retrieving revision 1.68
diff -p -u -r1.68 packages.wml
--- distrib/packages.wml 13 Feb 2012 23:53:36 -0000 1.68
+++ distrib/packages.wml 14 Feb 2012 09:26:27 -0000
@@ -49,7 +49,7 @@ different version numbers.
<strong>stable</strong> distribution</a></dt>
<dd>
<p>
- This is the latest official release of the Debian GNU/Linux
+ This is the latest official release of the Debian
distribution. This is stable and well tested software, which changes
only if major security or usability fixes are incorporated.
</p>
Index: doc/cd1.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/doc/cd1.wml,v
retrieving revision 1.12
diff -p -u -r1.12 cd1.wml
--- doc/cd1.wml 14 Nov 2002 09:21:03 -0000 1.12
+++ doc/cd1.wml 14 Feb 2012 09:26:27 -0000
@@ -14,10 +14,10 @@
# and other languages differ from English, translated index files
# are available at <a href="../install/doc/xx/index.xx.html">
-<p>These are the manuals that describe how to install Debian GNU/Linux.
+<p>These are the manuals that describe how to install Debian.
They are designed to get you started quickly by
explaining things you could not possibly already know without previous
-experience with Linux and with the Debian GNU/Linux distribution. It
+experience with Linux and with the Debian distribution. It
will save you hours of frustration if you begin here and patiently read
the fine manual from cover to cover.</p>
-->
Index: doc/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/doc/index.wml,v
retrieving revision 1.96
diff -p -u -r1.96 index.wml
--- doc/index.wml 2 Nov 2011 04:44:49 -0000 1.96
+++ doc/index.wml 14 Feb 2012 09:26:27 -0000
@@ -13,7 +13,7 @@ reading:</p>
<ul>
<li><a href="$(HOME)/releases/stable/installmanual">Installation Guide</a></li>
- <li><a href="manuals/debian-faq/">Debian GNU/Linux FAQ</a></li>
+ <li><a href="manuals/debian-faq/">Debian FAQ</a></li>
</ul>
<p>Do have these at hand when you make your first Debian installation, it
@@ -30,7 +30,7 @@ system. Later you might want to go throu
<p>Finally, make sure you print out and have at hand the <a
-href="http://www.debian.org/doc/manuals/refcard/refcard";>Debian GNU/Linux Reference
+href="http://www.debian.org/doc/manuals/refcard/refcard";>Debian Reference
Card</a>, a listing of the most important commands for Debian systems.</p>
<p>If you want to start developing packages for Debian we recommend
@@ -68,12 +68,12 @@ topics.</p>
<h4>Users' manuals</h4>
<ul>
- <li><a href="user-manuals#faq">Debian GNU/Linux FAQ</a></li>
+ <li><a href="user-manuals#faq">Debian FAQ</a></li>
<li><a href="user-manuals#install">Debian Installation Guide</a></li>
<li><a href="user-manuals#relnotes">Debian Release Notes</a></li>
<li><a href="user-manuals#quick-reference">Debian Reference</a></li>
<li><a href="user-manuals#securing">Securing Debian Manual</a></li>
- <li><a href="user-manuals#java-faq">Debian GNU/Linux and Java FAQ</a></li>
+ <li><a href="user-manuals#java-faq">Debian and Java FAQ</a></li>
</ul>
</div>
@@ -105,7 +105,7 @@ topics.</p>
<p class="clr">The complete list of Debian manuals and other documentation can be found
at the <a href="ddp">Debian Documentation Project</a> web pages.</p>
-<p>There are also several user-oriented manuals written for Debian GNU/Linux,
+<p>There are also several user-oriented manuals written for Debian,
available as <a href="books">printed books</a>.</p>
<h3>Manuals for GNU/Linux in general</h3>
@@ -221,7 +221,7 @@ index</a> for more information.</p>
cards and collections include:</p>
<dl>
<dt><a href="http://www.debian.org/doc/manuals/refcard/refcard";>Debian
- GNU/Linux Reference Card</a></dt>
+ Reference Card</a></dt>
<dd>This card, that can be printed out in a single paper,
provides a list of the most important commands and is
a good reference for new users of Debian that want to
Index: doc/user-manuals.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/doc/user-manuals.wml,v
retrieving revision 1.140
diff -p -u -r1.140 user-manuals.wml
--- doc/user-manuals.wml 2 Nov 2011 05:00:22 -0000 1.140
+++ doc/user-manuals.wml 14 Feb 2012 09:26:28 -0000
@@ -2,7 +2,7 @@
#include "$(ENGLISHDIR)/doc/manuals.defs"
#include "$(ENGLISHDIR)/doc/user-manuals.defs"
-<document "Debian GNU/Linux FAQ" "faq">
+<document "Debian FAQ" "faq">
<div class="centerblock">
<p>
@@ -27,7 +27,7 @@
<div class="centerblock">
<p>
- Installation instructions for the Debian GNU/Linux distribution.
+ Installation instructions for the Debian distribution.
The manual describes the installation process using the Debian Installer,
the installation system for Debian that was first released with
<a href="$(HOME)/releases/sarge/">Sarge</A> (Debian GNU/Linux 3.1).<br>
@@ -87,7 +87,7 @@ page</a> for those releases.
<div class="centerblock">
<p>
This document contains information on what's new in the current Debian
- GNU/Linux distribution and complete upgrading information for users of
+ distribution and complete upgrading information for users of
older Debian releases.
<doctable>
@@ -123,7 +123,7 @@ page</a> for those releases.
<div class="centerblock">
<p>
- This Debian GNU/Linux reference covers many aspects of system
+ This Debian reference covers many aspects of system
administration through shell-command examples. Basic tutorials, tips, and
other information are provided for topics including system installation,
Debian package management, the Linux kernel under Debian, system tuning,
@@ -151,9 +151,9 @@ page</a> for those releases.
<div class="centerblock">
<p>
- This card provides new users of Debian GNU/Linux with the most
+ This card provides new users of Debian with the most
important commands in a single page to be used as a reference
- when working with Debian GNU/Linux systems. Basic (or better)
+ when working with Debian systems. Basic (or better)
knowledge of computers, files, directories and the command line is
required.
@@ -173,7 +173,7 @@ page</a> for those releases.
<hr>
-<document "The Debian GNU/Linux and Java FAQ" "java-faq">
+<document "The Debian and Java FAQ" "java-faq">
<div class="centerblock">
<p>
@@ -201,9 +201,9 @@ and programs related to building a Free
<div class="centerblock">
<p>
- This manual describes the security of the Debian GNU/Linux
+ This manual describes the security of the Debian
operating system and within the Debian project. It starts
- with the process of securing and hardening the default Debian GNU/Linux
+ with the process of securing and hardening the default Debian
installation (both manually and automatically), covers some of the
common tasks involved in setting up a secure user and network environment,
gives information on the security tools available, steps to take
Index: intro/about.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/about.wml,v
retrieving revision 1.66
diff -p -u -r1.66 about.wml
--- intro/about.wml 29 Oct 2011 16:11:35 -0000 1.66
+++ intro/about.wml 14 Feb 2012 09:26:28 -0000
@@ -24,8 +24,7 @@
<p>The <a href="$(HOME)/">Debian Project</a> is an association of
individuals who have made common cause to create a <a href="free">free</a>
operating system. This operating system that we have created is called
-<strong>Debian GNU/Linux</strong>, or simply <strong>Debian</strong> for
-short.
+<strong>Debian</strong>.
<p>An operating system is the set of basic programs and utilities that make
your computer run.
@@ -34,9 +33,11 @@ The kernel is the most fundamental progr
housekeeping and lets you start other programs.
<p>Debian systems currently use the <a href="http://www.kernel.org/";>Linux</a>
-kernel. Linux is a piece of software started by
+kernel or the <a href="http://www.freebsd.org/";>FreeBSD</a> kernel.
+Linux is a piece of software started by
<a href="http://www.cs.helsinki.fi/u/torvalds/";>Linus Torvalds</a>
and supported by thousands of programmers worldwide.
+FreeBSD is an operating system including a kernel and other software.
<p>However, work is in progress to provide Debian for other kernels,
primarily for
@@ -47,7 +48,7 @@ Mach) to implement different features. T
<p>A large part of the basic tools that fill out the operating system come
from the <a href="http://www.gnu.org/";>GNU project</a>; hence the names:
-GNU/Linux and GNU/Hurd.
+GNU/Linux, GNU/kFreeBSD and GNU/Hurd.
These tools are also free.
<p>Of course, the thing that people want is application software: programs
Index: intro/help.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/help.wml,v
retrieving revision 1.11
diff -p -u -r1.11 help.wml
--- intro/help.wml 11 Apr 2010 13:38:53 -0000 1.11
+++ intro/help.wml 14 Feb 2012 09:26:28 -0000
@@ -1,6 +1,6 @@
#use wml::debian::template title="How can you help Debian?"
-<p>If you are considering helping in the development of Debian GNU/Linux
+<p>If you are considering helping in the development of Debian
there are many areas in which both experienced and inexperienced users can assist:</p>
# TBD - Describe requirements per task?
@@ -34,7 +34,7 @@ language. For more information read the
href="$(HOME)/international/">Internationalisation pages</a>.</li>
<li>You can help maintain applications that are already available in the Debian
-GNU/Linux operating system, specially those you use much and know about, by
+operating system, specially those you use much and know about, by
contributing fixes (patches) or additional information in the <a
href="http://bugs.debian.org/";>Bug Tracking System</a> for those packages. You
can also get involved directly in package maintenance by becoming a member of a
Index: misc/related_links.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/misc/related_links.wml,v
retrieving revision 1.29
diff -p -u -r1.29 related_links.wml
--- misc/related_links.wml 24 May 2011 15:35:17 -0000 1.29
+++ misc/related_links.wml 14 Feb 2012 09:26:28 -0000
@@ -6,7 +6,7 @@ to Debian users.</p>
<ul>
<li><a href="../support#web">Support web sites</a></li>
<li><a href="#dfsgsw">Software that is DFSG compliant</a></li>
- <li><a href="../users/">Organizations using Debian GNU/Linux</a></li>
+ <li><a href="../users/">Organizations using Debian</a></li>
<li><a href="children-distros">Other software distributions based upon Debian</a></li>
<li><a href="#misclinux">Miscellaneous GNU/Linux links</a></li>
<li><a href="#usergroups">User groups</a></li>
Index: ports/beowulf/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/ports/beowulf/index.wml,v
retrieving revision 1.17
diff -p -u -r1.17 index.wml
--- ports/beowulf/index.wml 9 Oct 2011 06:34:38 -0000 1.17
+++ ports/beowulf/index.wml 14 Feb 2012 09:26:29 -0000
@@ -44,8 +44,8 @@ The list is archived at the
<li><a href="http://www.beowulf-underground.org/doc_project/BIAA-HOWTO/Beowulf-Installation-and-Administration-HOWTO.html";>
Installation and Administration HOWTO</a>
<li><a href="http://fai-project.org/";>FAI</a> is an
- automated system to install a Debian GNU/Linux operating system on
- a Linux Cluster. The manual of FAI includes a <a
+ automated system to install a Debian operating system on
+ a machine cluster. The manual of FAI includes a <a
href="http://fai-project.org/fai-guide/ar01s08.html";>chapter</a>
on how to build a Beowulf cluster using FAI.
</ul>
Index: security/parse-advisory.pl
===================================================================
RCS file: /cvs/webwml/webwml/english/security/parse-advisory.pl,v
retrieving revision 1.82
diff -p -u -r1.82 parse-advisory.pl
--- security/parse-advisory.pl 24 Dec 2011 17:40:47 -0000 1.82
+++ security/parse-advisory.pl 14 Feb 2012 09:26:30 -0000
@@ -150,7 +150,7 @@ $files =~ s/HP Precision architecture/HP
$files =~ s/(?: )?(\w+) architecture \(([\w -()\/]+)\)/<dt>$arch{$1}:/sg;
$files =~ s/(?: )?([\w -\/]+) architecture:/<dt>$1:/sg;
$files =~ s/(?: )? (http:\S+)/ <dd><fileurl $1 \/>/sg;
-$files =~ s,[\n]?Debian (GNU/Linux )?(\S+) (alias |\()([a-z]+)\)?,</dl>\n\n<h3>Debian GNU/Linux $2 ($4)</h3>\n\n<dl>,sg;
+$files =~ s,[\n]?Debian (GNU/Linux )?(\S+) (alias |\()([a-z]+)\)?,</dl>\n\n<h3>Debian $2 ($4)</h3>\n\n<dl>,sg;
my @f = ();
my $ign = 0;
Index: security/parse-wml-oval.pl
===================================================================
RCS file: /cvs/webwml/webwml/english/security/parse-wml-oval.pl,v
retrieving revision 1.5
diff -p -u -r1.5 parse-wml-oval.pl
--- security/parse-wml-oval.pl 12 Oct 2011 22:37:29 -0000 1.5
+++ security/parse-wml-oval.pl 14 Feb 2012 09:26:30 -0000
@@ -66,7 +66,7 @@ sub printdsas {
# XML entries
print "<definition id=\"OVAL-DSA-$dsa\">\n";
print "\t<affected family=\"debian\">\n";
- print "\t\t<debian:platform>Debian GNU/Linux $debian_version</debian:platform>\n";
+ print "\t\t<debian:platform>Debian $debian_version</debian:platform>\n";
print "\t\t<product>$dsaref{$dsa}{'package'}</product>\n";
print "\t</affected>\n";
# Print CVE entries
Index: template/debian/common_translation.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/common_translation.wml,v
retrieving revision 1.164
diff -p -u -r1.164 common_translation.wml
--- template/debian/common_translation.wml 8 Jan 2012 19:16:37 -0000 1.164
+++ template/debian/common_translation.wml 14 Feb 2012 09:26:33 -0000
@@ -10,7 +10,7 @@
<gettext>Debian Project</gettext>
</define-tag>
<define-tag blurb whitespace=delete>
- <gettext>Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.</gettext>
+ <gettext>Debian is an operating system and a distribution of Free Software. It is maintained and updated through the work of many users who volunteer their time and effort.</gettext>
</define-tag>
<define-tag keywords whitespace=delete>
<gettext>debian, GNU, linux, unix, open source, free, DFSG</gettext>
Attachment:
signature.asc
Description: This is a digitally signed message part