[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

tags 614233 - patch

Le 14/02/2012 05:30, Paul Wise a écrit :
> 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.

Thanks, I also took care of translations almost everywhere. I would
prefer a formal acknowledgement for the remaining bits I have not yet
committed, thus the CC to the relevant teams with the remaining parts

Is Debian-Beowulf “kFreeBSD-ready”? Maybe the official page would
deserve some update BTW.


Are the “Debian FAQ”, the “Debian Reference Card” and the “Debian and
Java FAQ” “kFreeBSD-ready”? Have the descriptions and contents been
updated in the respective packages (if not, we maybe should clone this
bug report to the respective packages, and block this one by the clones)?

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.



? english/ports/beowulf/index.en.html
Index: english/ports/beowulf/index.wml
RCS file: /cvs/webwml/webwml/english/ports/beowulf/index.wml,v
retrieving revision 1.17
diff -u -r1.17 index.wml
--- english/ports/beowulf/index.wml	9 Oct 2011 06:34:38 -0000	1.17
+++ english/ports/beowulf/index.wml	4 Apr 2012 13:58:00 -0000
@@ -44,8 +44,8 @@
 <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
     on how to build a Beowulf cluster using FAI.
? english/doc/books.data
? english/doc/books.en.html
? english/doc/cd1.en.html
? english/doc/cvs.en.html
? english/doc/ddp.en.html
? english/doc/devel-manuals.en.html
? english/doc/docpolicy.en.html
? english/doc/index.en.html
? english/doc/misc-manuals.en.html
? english/doc/obsolete.en.html
? english/doc/paste_155429
? english/doc/todo.en.html
? english/doc/topics.en.html
? english/doc/user-manuals.en.html
Index: english/doc/index.wml
RCS file: /cvs/webwml/webwml/english/doc/index.wml,v
retrieving revision 1.96
diff -u -r1.96 index.wml
--- english/doc/index.wml	2 Nov 2011 04:44:49 -0000	1.96
+++ english/doc/index.wml	4 Apr 2012 14:04:43 -0000
@@ -13,7 +13,7 @@
   <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>
 <p>Do have these at hand when you make your first Debian installation, it
@@ -30,7 +30,7 @@
 <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 @@
     <h4>Users' manuals</h4>
-      <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>
@@ -105,7 +105,7 @@
 <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 @@
         cards and collections include:</p>
           <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: english/doc/user-manuals.wml
RCS file: /cvs/webwml/webwml/english/doc/user-manuals.wml,v
retrieving revision 1.140
diff -u -r1.140 user-manuals.wml
--- english/doc/user-manuals.wml	2 Nov 2011 05:00:22 -0000	1.140
+++ english/doc/user-manuals.wml	4 Apr 2012 14:04:43 -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">
@@ -27,7 +27,7 @@
 <div class="centerblock">
-  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 @@
 <div class="centerblock">
   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.
@@ -123,7 +123,7 @@
 <div class="centerblock">
-   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 @@
 <div class="centerblock">
-   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
@@ -173,7 +173,7 @@
-<document "The Debian GNU/Linux and Java FAQ" "java-faq">
+<document "The Debian and Java FAQ" "java-faq">
 <div class="centerblock">
@@ -201,9 +201,9 @@
 <div class="centerblock">
-  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

Attachment: signature.asc
Description: OpenPGP digital signature

Reply to: