[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#614233: www.debian.org: patch replacing Debian GNU/Linux where relevant


Holger Wansing <linux@wansing-online.de> wrote:
> David Prévot <taffit@debian.org> wrote:
> > Note: I focused on Paul's patch, and didn't check if there were other
> > parts of the website to be addressed, if someone else could verify, that
> > would be much appreciated.
> I volunteer for this, if that's ok for you.
> I would provide a patch for reviewing first.

Patch attached.
Please note, that this patch only includes the english directory.
If the patch is considered ok, I would prepare a new one, including
all translations.


= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
Powered by Sylpheed 3.0.2 under
Debian GNU    / /     _  _  _  _  _ __  __
             / /__  / / / \// //_// \ \/ /
            /____/ /_/ /_/\/ /___/  /_/\_\    6.0 / Squeeze.
Registered LinuxUser #311290 - http://counter.li.org/
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
Index: CD/faq/index.wml
RCS file: /cvs/webwml/webwml/english/CD/faq/index.wml,v
retrieving revision 1.110
diff -u -u -5 -r1.110 index.wml
--- CD/faq/index.wml	16 Jan 2012 17:35:43 -0000	1.110
+++ CD/faq/index.wml	9 Apr 2012 15:03:31 -0000
@@ -68,11 +68,11 @@
   A list for the Debian Live project, focused on development of the software
   that is used to build Debian Live images, but also appropriate
   for discussion particular to using those images.</li>
   <li><a href="http://lists.debian.org/debian-user/";>debian-user</a>:
-  General support list for users of Debian GNU/Linux. Focus is
+  General support list for users of Debian. Focus is
   more on problems encountered after a successful installation,
   when using the system. There are also several lists for
   non-English speakers, in <a href="http://lists.debian.org/debian-user-catalan/";>Catal&agrave;</a>,
   <a href="http://lists.debian.org/debian-chinese-big5/";>Chinese</a>,
   <a href="http://lists.debian.org/debian-user-danish/";>Dansk</a>,
@@ -751,11 +751,11 @@
 <p>There is no obligatory way of labeling. However, we suggest you
 use the following scheme to ensure interchangeability:</p>
 <div class="cdflash">
-      <p>Debian GNU/{Linux|Hurd}
+      <p>Debian GNU/{Linux|Hurd|kFreeBSD}
       &lt;version&gt;[&lt;revision&gt;]<br />Official
       {&lt;architecture&gt;} {CD|DVD|BD}-&lt;number&gt;</p>
 <p>For example:</p>
@@ -773,10 +773,15 @@
 <div class="cdflash">
       <p>Debian GNU/Linux 6.0.3<br />Official
       source BD-1</p>
+<div class="cdflash">
+      <p>Debian GNU/kFreeBSD 6.0.3<br />Official i386
+      Netinst CD</p>
 <p>If you have enough space, you can also add the codename to the
 first line, as in: <i>Debian GNU/Linux 6.0.3 <q>Squeeze</q></i>.</p>
 <p>Note that you are allowed to use the <em>Official</em>
 designation <strong>only</strong> on CDs the image of which has a
Index: international/Italian.wml
RCS file: /cvs/webwml/webwml/english/international/Italian.wml,v
retrieving revision 1.22
diff -u -u -5 -r1.22 Italian.wml
--- international/Italian.wml	30 Oct 2011 02:03:53 -0000	1.22
+++ international/Italian.wml	9 Apr 2012 15:03:32 -0000
@@ -7,11 +7,11 @@
 <li>Mailing lists
 	<li><a href="http://lists.debian.org/debian-italian/";>
 	    debian-italian</a> (support for native Italian speaking users
-	    of Debian GNU/Linux)</li>
+	    of Debian)</li>
         <li><a href="http://lists.debian.org/debian-l10n-italian/";>
 	    debian-l10n-italian</a> (devoted to Italian
 	    and localization effort as regards the Debian project)</li>
Index: international/Portuguese.wml
RCS file: /cvs/webwml/webwml/english/international/Portuguese.wml,v
retrieving revision 1.15
diff -u -u -5 -r1.15 Portuguese.wml
--- international/Portuguese.wml	9 Jul 2011 23:08:57 -0000	1.15
+++ international/Portuguese.wml	9 Apr 2012 15:03:32 -0000
@@ -32,11 +32,11 @@
 and register yourself in our Brazilian Debian User's Counter, visit the
 <a href="http://debian-br.alioth.debian.org/index.php?id=Comunidade";>Community section</a>
 of the page.
 <P>If you <strong>really</strong> want to help develop even further
-Debian GNU/Linux, by helping on it's localization and
+Debian, by helping on it's localization and
 internationalization to Portuguese, have a look at the other info on
 our project page, or send a <a href="mailto:debian-br@listas.cipsga.org.br";>
 <P>Even though we have "-BR" in our Project's name, we have several
Index: intro/why_debian.wml
RCS file: /cvs/webwml/webwml/english/intro/why_debian.wml,v
retrieving revision 1.62
diff -u -u -5 -r1.62 why_debian.wml
--- intro/why_debian.wml	4 Apr 2012 16:23:34 -0000	1.62
+++ intro/why_debian.wml	9 Apr 2012 15:03:33 -0000
@@ -1,9 +1,9 @@
 #use wml::debian::template title="Reasons to Choose Debian"
 #include "$(ENGLISHDIR)/releases/info"
-<p>Thank you for considering using Debian GNU/Linux to run your machine.
+<p>Thank you for considering using Debian to run your machine.
 If you aren't quite convinced why you should try Debian, consider the following:
 <dt><strong>It is maintained by its users.</strong></dt>
@@ -33,20 +33,20 @@
     system to crash because of software conflicts? Dpkg, Debian's endured
     packaging system, takes care of these issues for you.</dd>
 <dt><strong>Easy installation</strong></dt>
-    <dd>If you have heard that GNU/Linux is difficult to install, then you
+    <dd>If you have heard that Debian is difficult to install, then you
     haven't tried Debian lately. We are constantly improving the
     installation process. You can do the installation directly from CD, DOS,
     floppies or even over the network.</dd>
 <dt><strong>Incredible amounts of software</strong></dt>
     <dd>Debian comes with over <a href="$(HOME)/distrib/packages"><packages_in_stable> different
     pieces of software</a>. Every bit of it is <a href="free">free</a>. If
-    you have proprietary software that runs under GNU/Linux, you can still use it
+    you have proprietary software that runs under GNU/Linux or GNU/kFreeBSD, you can still use it
     - in fact, there may even be an installer in Debian that will
     automatically install and set up everything for you.</dd>
 <dt><strong>Packages well integrated</strong></dt>
@@ -95,11 +95,11 @@
     bug reports and are notified when and why the bug was closed. This
     system allows Debian to respond to problems quickly and honestly.</dd>
-<p>If you are not already a GNU/Linux user, you may also enjoy the following
+<p>If you are not already a Debian user, you may also enjoy the following
@@ -111,15 +111,15 @@
     times a day.</dd>
 <dt><strong>Fast and easy on memory</strong></dt>
     <dd>Other operating systems may be as fast in one or two areas, but
-    being based on GNU/Linux, Debian is lean and mean. Windows software run
+    being based on GNU/Linux or GNU/kFreeBSD, Debian is lean and mean. Windows software run
     from GNU/Linux using an emulator sometimes runs <strong>faster</strong> than when
     run in the native environment.</dd>
-<dt><strong>Drivers for most hardware is written by GNU/Linux users, not the manufacturer.</strong></dt>
+<dt><strong>Drivers for most hardware are written by GNU/Linux / GNU/kFreeBSD users, not by the manufacturer.</strong></dt>
     <dd>While this can mean delays before new hardware is supported and no
     support for some hardware, it enables support for hardware long after
     the manufacturer has stopped producing it or gone out of business.
     Experience has shown that Open Source drivers are usually much better
@@ -153,11 +153,11 @@
 <dt><em><q>Lack of popular commercial software.</q></em></dt>
     <dd><p>It is quite true that some popular software is not available for
-    GNU/Linux. There are, however, replacement programs for most of those,
+    Debian. There are, however, replacement programs for most of those,
     designed to mimic the best features of the proprietary programs, with
     the added value of being <a href="free">free software</a>.</p>
     <p>Lack of office programs such as Word or Excel should no longer be
     a problem, because Debian includes three office suites composed entirely
@@ -184,19 +184,19 @@
     and others are also available for GNU/Linux.
 # This figures need to be updated:
     <p>Various other proprietary software is coming out in greater
-    numbers, too, as more companies discover the power of GNU/Linux and
+    numbers, too, as more companies discover the power of GNU/Linux / GNU/kFreeBSD and
     its largely untapped market with a rapidly growing user base
-    (Since GNU/Linux is freely distributable, sales figures can't be used for
+    (since GNU/Linux and GNU/kFreeBSD are freely distributable, sales figures can't be used for
     user estimates. Best estimates are that GNU/Linux has 5% of the market,
     giving 15 million users as of early 2001).
-<dt><em><q>GNU/Linux is hard to configure.</q></em></dt>
+<dt><em><q>Debian is hard to configure.</q></em></dt>
     <dd>Note that this says configure, not install, as some people find the
     initial installation of Debian easier than Windows. A lot of hardware
     (printers for example) could be made easier to set up, though. Also,
     some software could have a script that would walk the user through the
@@ -209,11 +209,11 @@
     <dd>Particularly, really new, really old, or really rare hardware. Also
     hardware that is dependent on complex <q>driver</q> software that the
     manufacturer only supplies for Windows platforms (software modems or some
     laptop wifi devices for
     example). However, in most cases, equivalent hardware is available that
-    does work with GNU/Linux. Some hardware is not supported because the vendor
+    does work with Debian. Some hardware is not supported because the vendor
     chooses not to make the hardware specifications available. This is also
     an area that is being worked on.</dd>

Reply to: