From df2129f7e181418e2e2c922d873ee8bbacfe11c5 Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Tue, 2 Jan 2007 01:59:52 +0000 Subject: [PATCH] * Cleanup of Etch version of REAMDE.html.in - use "disc" or "CD/DVD" rather than "CD" in many places. --- data/etch/README.html.in | 76 ++++++++++++++++++---------------------- debian/changelog | 2 ++ 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/data/etch/README.html.in b/data/etch/README.html.in index 4ba9b013..f9b19cd0 100644 --- a/data/etch/README.html.in +++ b/data/etch/README.html.in @@ -70,10 +70,7 @@
   -#if 0 - Debian GNU/Linux 2.2 "Potato" - Official i386 Binary-1 CD -#endif - DISKNAME CD + DISKNAME   
@@ -145,7 +142,7 @@ CONTENTS:
  • #endif -About This CD +About This Disc

    #if OUTPUTtext @@ -169,7 +166,7 @@ CONTENTS: #endif #if TYPEbinary - Using CDs with apt + Using CDs/DVDs with apt

    #if OUTPUTtext @@ -178,7 +175,7 @@ CONTENTS: #endif #ifndef UNOFFEXTRAS -CD Manufacturers +CD/DVD Manufacturers

    #if OUTPUTtext @@ -192,7 +189,7 @@ CONTENTS: #if OUTPUThtml  

    -Browse this CD-ROM

    +Browse This Disc

                   

    @@ -232,7 +229,7 @@ Intro

    -This is one of the CD-ROMs of the +This is one disc in a set containing the the Debian GNU/Linux distribution. Debian is a very extensive collection of software. But it is more. It is a complete @@ -277,12 +274,12 @@ Read more at

    #endif #if OUTPUTtext -

     

    +

     

    #endif #if OUTPUThtml -

    +

    #endif -About This CD +About This Disc #if OUTPUTtext
    ============= @@ -290,20 +287,20 @@ About This CD

    -This CD-ROM is labeled +This disc is labeled

      DISKNAME

    #ifndef UNOFFEXTRAS -which means that this CD is number DISKNUM of TOTALNUM CDs containing +which means that this disc is number DISKNUM of a set of TOTALNUM discs. #if TYPEbinary -programs ("binaries") for `ARCH' computers. +It contains programs ("binaries") for `ARCH' computers.

    -The programs on the Binary CDs are ordered by popularity. The Binary-1 CD +The programs on the Binary discs are ordered by popularity. The Binary-1 disc contains the most popular programs and the installation tools; it is possible -to install and run Debian with only the Binary-1 CD. The other CDs, up to +to install and run Debian with only the Binary-1 disc. The other discs, up to Binary-TOTALNUM, contain mostly special-interest programs.

    #if OMIT_RELEASE_NOTES @@ -312,24 +309,19 @@ href="http://www.debian.org/releases/etch/releasenotes">Debian web site. #else #if DISKNUM == 1 -The Release Notes for Debian GNU/Linux "etch" are included on this CD +The Release Notes for Debian GNU/Linux "etch" are included on this disc in /doc/release-notes/, in several languages. Additional translations and updated versions for the Release Notes may be available from the Debian web site. else -See the first CD in this set for the "etch" Release Notes. +See the first disc in this set for the "etch" Release Notes. #endif #endif #endif #if TYPEsource -the source code of programs in the Debian OS. -

    -The source packages on the Source CDs are ordered by popularity, like -the programs on the Binary CDs. This means that the source code of the -programs on the Binary-DISKNUM CD can most likely be found on this CD -(though there may be some variation due to size issues). +This set includes the source code of programs in the Debian OS. #endif #else #include @@ -357,16 +349,16 @@ Installing alongside your current OS, or as the only OS on your computer. #if OMIT_MANUAL

    - An Installation Guide for this CD is available from + An Installation Guide for this disc is available from the Debian web site. #else

    - An Installation Guide is included on this CD at + An Installation Guide is included on this disc at

      doc/manual/en/index.html     (English version)

    - Several translations of the Installation Guide are included on this CD in + Several translations of the Installation Guide are included on this disc in the doc/ directory, along with various other documents.
    Note: additional translations, other formats (like PDF and TXT) and updated @@ -375,7 +367,7 @@ Installing #endif

    Programs and other files that are needed for the installation can be found on - this CD under + this disc under

      /tools/ @@ -390,8 +382,8 @@ Installing For the impatient ones: #endif -#if ARCHi386 || ARCHalpha || ARCHsparc - you can start the installation program easily by booting off this CD-ROM. +#if ARCHi386 || ARCHamd64 || ARCHalpha || ARCHsparc + you can start the installation program easily by booting off this disc. Note that not all (esp. older) systems support this.

    #endif @@ -414,8 +406,8 @@ Installing #else The installation tools of the Debian Operating System are located on the - Binary-1 CD. - See the README on that CD for more info. + Binary-1 disc. + See the README on that disc for more info. #endif #ifndef UNOFFEXTRAS @@ -437,13 +429,13 @@ Last-Minute Notes

  • #if OFFICIAL_VAL == 0 -You should keep in mind that this is an unofficial CD of the Debian +You should keep in mind that this is an unofficial disc of the Debian system. This means that all sorts of bugs may be present anywhere in the system. Please report any bugs you find to the person that gave -you this CD, not Debian. +you this disc, not Debian. #endif #if OFFICIAL_VAL == 1 -You should keep in mind that this is a beta CD of the current +You should keep in mind that this is a beta disc of the current development version of the Debian system. This means that all sorts of bugs may be present anywhere in the system. #endif @@ -474,7 +466,7 @@ HREF="http://bugs.debian.org/">bugs.debian.org.

    • - After installing or upgrading, Debian's packaging system can use CD-ROMs, + After installing or upgrading, Debian's packaging system can use CDs, DVDs, local collections, or networked servers (FTP, HTTP) to automatically install software from (.deb packages). This is done preferably with the `apt' and `aptitude' programs. @@ -505,7 +497,7 @@ HREF="http://bugs.debian.org/">bugs.debian.org. #if OUTPUThtml

    #endif -CD Manufacturers +CD/DVD Manufacturers #if OUTPUTtext
    ================ @@ -513,7 +505,7 @@ CD Manufacturers

    -You are completely free to manufacture and re-distribute CD-ROMs of the +You are completely free to manufacture and re-distribute CDs/DVDs of the Debian GNU/Linux Operating System, like this one. There is no charge from us (but of course donations are always welcome). @@ -542,7 +534,7 @@ More Information

    #if DISKNUM1 && TYPEbinary -There is much more information present on this CD. Besides the already +There is much more information present on this disc. Besides the already mentioned installation and upgrading procedures, this is the most interesting:

    @@ -596,9 +588,9 @@ interesting:

    #else -The Binary-1 CD contains much more information about various aspects +The Binary-1 disc contains much more information about various aspects of the Debian Operating System and the Debian organization. - See the README on that CD for more info. + See the README on that disc for more info. #endif diff --git a/debian/changelog b/debian/changelog index e20bdcf3..b0ca2433 100644 --- a/debian/changelog +++ b/debian/changelog @@ -219,6 +219,8 @@ debian-cd (3.0.0) UNRELEASED; urgency=low to produce more then one type of multi-arch disc * In start_new_disc, make sure that we call the (badly-named) add-bin-doc so that we get README.html and README.txt created even for source discs. + * Cleanup of Etch version of REAMDE.html.in - use "disc" or "CD/DVD" rather + than "CD" in many places. [ Joey Hess ] * Added an update-tasks target to the Makefile and moved the code out of