debian-faq: Patch2 to improve wording or meaning, remove superfluous words, consistentency ...
Hi,
after patch1 for fixing typos etc. here is now patch2 to improve wording or
meaning, consistent use of terms in similar situations, etc.
Most of these changings also require translators work afterwards.
I would appreciate review and comments.
Holger
--
============================================================
Created with Sylpheed 3.5.0 under
D E B I A N L I N U X 8 . 0 " J E S S I E " .
Registered Linux User #311290 - https://linuxcounter.net/
============================================================
Index: choosing.sgml
===================================================================
--- choosing.sgml (Revision 10939)
+++ choosing.sgml (Arbeitskopie)
@@ -307,11 +307,11 @@
unstable? If so, How?
<p>If you are currently running stable, then in the <file>
-/etc/apt/sources.list</file> file the third field will be either &releasename; or
-stable. You need to change this to the distribution you want to run. If you
+/etc/apt/sources.list</file> file the third field will be either '&releasename;' or
+'stable'. You need to change this to the distribution you want to run. If you
want to run testing, then change the third field of
-<file>/etc/apt/sources.list</file> to testing. If you want to run
-unstable, then change the third field to unstable.
+<file>/etc/apt/sources.list</file> to 'testing'. If you want to run
+unstable, then change the third field to 'unstable'.
<p>Currently testing is called &testingreleasename;. So, if you change the third field of
<file>/etc/apt/sources.list</file> to &testingreleasename;, then also you will be running
@@ -318,7 +318,7 @@
testing. But when &testingreleasename; becomes stable, you will still be tracking &testingreleasename;.</p>
<p>Unstable is always called Sid. So if you change the third field of <file>
-/etc/apt/sources.list</file> to sid, then you will be tracking unstable.
+/etc/apt/sources.list</file> to 'sid', then you will be tracking unstable.
<p>Currently Debian offers security updates for testing but not for
unstable, as fixes in unstable are directly made to the main archive. So
@@ -378,7 +378,7 @@
crucial differences.</p>
<p>All these distributions have their own merits and are suited to some
-specific set of users. For more information, read the information of <url
+specific set of users. For more information, read <url
id="http://www.debian.org/misc/children-distros"; name="software
distributions based on Debian"> available at the Debian website.
Index: customizing.sgml
===================================================================
--- customizing.sgml (Revision 10939)
+++ customizing.sgml (Arbeitskopie)
@@ -1,6 +1,9 @@
<!-- retain these comments for translator revision tracking -->
<!-- Original version: $Revision: 1.14 $ -->
-<chapt id="customizing">Customizing your installation of &debian;
+<chapt id="customizing">Customizing your &debian; system
+### This chapter is about customizing the already installed Debian system,
+### not customizing the Debian installer process. But the headline says
+### "Customizing the installation".
<sect id="papersize">How can I ensure that all programs use the same
paper size?
@@ -138,7 +142,7 @@
and to stop the service in runlevels 0, 1 and 6.
(Any LSB Default-Start and Default-Stop directives in <tt>foo</tt> take
precedence when using the sysv-rc version of update-rc.d, but are
-ignored by the current (v0.8.10) file-rc version of update-rc.d.)
+ignored by file-rc's variant (v0.8.10 and higher) of update-rc.d.)
The argument `<tt>19</tt>' ensures that <tt>foo</tt> is called after all
scripts whose number is less than 19 have completed, and before all scripts
whose number is 20 or greater.
Index: faqinfo.sgml
===================================================================
--- faqinfo.sgml (Revision 10939)
+++ faqinfo.sgml (Arbeitskopie)
@@ -12,14 +12,14 @@
<p>Parts of the information came from:
<list>
- <item>The Debian-1.1 release announcement, by <url name="Bruce Perens" id="http://www.perens.com/";>.
- <item>The Linux FAQ, by <url name="Ian Jackson" id="http://www.chiark.greenend.org.uk/~ijackson/";>.
+ <item>The Debian-1.1 release announcement, by <url name="Bruce Perens" id="http://www.perens.com/";>,
+ <item>The Linux FAQ, by <url name="Ian Jackson" id="http://www.chiark.greenend.org.uk/~ijackson/";>,
<item><url name="Debian Mailing Lists Archives" id="http://lists.debian.org/";>,
<item>the dpkg programmers' manual and the Debian Policy manual
- (see <ref id="debiandocs">)
+ (see <ref id="debiandocs">),
<item>many developers, volunteers, and beta testers, and
- <item>the flaky memories of its authors. :-)
- <item>Kamaraju Kusumanchi's <url name="Choosing a Debian distribution FAQ" id="http://people.cornell.edu/pages/kk288/debian_choosing_distribution.html";>, who graciously made it GPL so I could include it as a new chapter (see <ref id="choosing">)
+ <item>the flaky memories of its authors :-)
+ <item>and Kamaraju Kusumanchi's <url name="Choosing a Debian distribution FAQ" id="http://people.cornell.edu/pages/kk288/debian_choosing_distribution.html";>, who graciously made it GPL so I could include it as a new chapter (see <ref id="choosing">).
</list>
<p>The authors would like to thank all those who helped make this
Index: ftparchives.sgml
===================================================================
--- ftparchives.sgml (Revision 10939)
+++ ftparchives.sgml (Arbeitskopie)
@@ -61,14 +61,14 @@
<item><em>sarge</em> was the sergeant of the Green Plastic Army Men,
<item><em>etch</em> was the toy blackboard (Etch-a-Sketch),
<item><em>lenny</em> was the toy binoculars,
- <item><em>squeeze</em> was the name for the three-eyed aliens,
- <item><em>wheezy</em> was the name of the rubber toy penguin with
+ <item><em>squeeze</em> was the three-eyed aliens,
+ <item><em>wheezy</em> was the rubber toy penguin with
a red bow tie,
- <item><em>jessie</em> was the name of the yodelling cowgirl,
- <item><em>stretch</em> was the name of the toy rubber octopus with suckers on her eight long arms.
+ <item><em>jessie</em> was the yodelling cowgirl,
+ <item><em>stretch</em> was the rubber toy octopus with suckers on her eight long arms.
<!-- For jessie+2
-<item><em>buster</em> was the name of the Andy's pet dog.
+<item><em>buster</em> was Andy's pet dog.
-->
<!-- SID should be the last line always -->
@@ -423,7 +423,7 @@
using the standard Debian package management tools, you can set up your own
apt-able package archive. This is also useful if you'd like to share your
Debian packages while these are not distributed by the Debian project.
-Instructions on how to do this are given in the <url name="Debian Repository
+Instructions on how to do this are given in the (obsolete) <url name="Debian Repository
HOWTO"
id="http://www.debian.org/doc/manuals/repository-howto/repository-howto";>.
Index: pkg_basics.sgml
===================================================================
--- pkg_basics.sgml (Revision 10939)
+++ pkg_basics.sgml (Arbeitskopie)
@@ -180,7 +180,7 @@
script?
<p>These files are executable scripts which are automatically run before
-or after a package is installed. Along with a file named <tt>control</tt>,
+or after a package is installed or removed. Along with a file named <tt>control</tt>,
all of these files are part of the "control" section of a Debian archive file.
<p>The individual files are:
@@ -365,8 +365,8 @@
<p>Their meanings are:
<list>
- <item>unknown - the user has never indicated whether he wants the package
- <item>install - the user wants the package installed or upgraded
+ <item>unknown - the user has never indicated whether he wants the package.
+ <item>install - the user wants the package installed or upgraded.
<item>remove - the user wants the package removed, but does not want to
remove any existing configuration files.
<item>purge - the user wants the package to be removed completely,
@@ -462,7 +462,7 @@
the source (note: there is no .diff.gz for some packages that are native
to Debian).
-<p>Once you have them (<ref id="sourcepkgs">), if you have the
+<p>Once you have them (<ref id="sourcepkgs">) and if you have the
<package/dpkg-dev/ package installed,
the following command:
<example>dpkg-source -x foo_version-revision.dsc</example>
Index: pkgtools.sgml
===================================================================
--- pkgtools.sgml (Revision 10939)
+++ pkgtools.sgml (Arbeitskopie)
@@ -64,7 +64,7 @@
<sect1 id="apt-get">APT
-<p>APT is the <em>Advanced Package Tool</em> is the advanced interface to the
+<p>APT is the <em>Advanced Package Tool</em>, an advanced interface to the
Debian packaging system and provides the <prgn/apt-get/ program.
It features complete installation ordering, multiple source capability and
several other unique features, see the User's Guide in
@@ -91,10 +91,6 @@
<example>apt-get update</example>
(you should execute this regularly to update your package lists)
+### In the following, change the examples into a senseful ordering,
+### as it is also executed by user.
- <item>To upgrade all the packages on your system (without installing
- extra packages or removing packages), run:
- <example>apt-get upgrade</example>
-
<item>To install the <var/foo/ package and all its dependencies, run:
<example>apt-get install foo</example>
@@ -103,8 +99,12 @@
<item>To remove the foo package and its configuration files from your
system, run:
- <example>apt-get --purge remove foo</example>
+ <example>apt-get purge foo</example>
+ <item>To upgrade all the packages on your system (without installing
+ extra packages or removing packages), run:
+ <example>apt-get upgrade</example>
+
<item>To upgrade all the packages on your system, and, if needed for a
package upgrade, installing extra packages or removing packages, run:
<example>apt-get dist-upgrade</example>
@@ -116,7 +116,7 @@
</list>
<p>Note that you must be logged in as root to perform any commands that
-modify the system packages.
+modify any packages.
<p>Note that <prgn/apt-get/ now installs recommended packages as default and is
the preferred program for package management from console to perform system
@@ -233,8 +233,8 @@
commonly it will be the GNOME desktop (<tt/gnome-desktop/ task). Also,
depending on your selections throughout the installation process, tasks might
be automatically installed in your system. For example, if you selected a
-language, the task associated with it will be installed automatically too and
-if you are running in a laptop system the installer recognises the <tt/laptop/
+language other than English, the task associated with it will be installed automatically too and
+if the installer recognises you are installing on a laptop system the <tt/laptop/
task will be installed too.
<sect1 id="dpkg-extra">Other package management tools
@@ -409,10 +409,10 @@
a system containing the <package/dpkg/ package), since it calls the program
<tt>dpkg-deb</tt> to parse the debian package file into its component records.
-<p>For example, to split a big .deb file into N parts,
+<p>For example, to split a big .deb file into N parts and join them together on an another machine,
<list>
<item>Execute the command <tt>dpkg-split --split foo.deb</tt>.
- This will produce N files each of approximately 460 KBytes long in the
+ This will produce N files each of approximately 460 KBytes file size in the
current directory.
<item>Copy those N files to floppy disks.
<item>Copy the contents of the floppy disks onto the hard disk of your
@@ -468,8 +468,8 @@
either:
<list>
+### In the following, use "foo" as example for filenames, like in the other
+### examples nearby.
- <item><tt>dpkg --search filename</tt>
- <p>This searches for <tt>filename</tt> in installed packages.
+ <item><tt>dpkg --search foo</tt>
+ <p>This searches for the filename <tt>foo</tt> in installed packages.
(This is (currently) equivalent to searching all of the files having the
file extension of <tt>.list</tt> in the directory
<tt>/var/lib/dpkg/info/</tt>, and adjusting the output to print the names
@@ -476,7 +476,7 @@
of all the packages containing it, and diversions.)
<p>A faster alternative to this is the <prgn>dlocate</prgn> tool.
- <example>dlocate -S filename</example>
+ <example>dlocate -S foo</example>
<item><tt>zgrep foo Contents-ARCH.gz</tt>
<p>This searches for files which contain the substring <tt>foo</tt>
Index: software.sgml
===================================================================
--- software.sgml (Revision 10939)
+++ software.sgml (Arbeitskopie)
@@ -63,7 +63,7 @@
<p>If you want to build packages in your Debian system you will need
to have a basic development environment, including a C/C++ compiler
and some other essential packages. In order to install this environment you
-just need to install the <package>build-essential</package>. This package is a
+just need to install the <package>build-essential</package> package. This package is a
meta-package or place-holder package which depends on the standard
development tools one needs to build a Debian package.
@@ -150,10 +150,10 @@
"release" contains well defined and unchanging contents. Updates are
separately available. For a one-line description of the installation status
of package <tt>foo</tt>, use the command <tt>dpkg --list foo</tt>.
+For a more verbose description, use:
+ <example>dpkg --status foo</example>
To view versions of all installed packages, run:
<example>dpkg -l</example>
-For a more verbose description, use:
- <example>dpkg --status foo</example>
<p>Note that the existence of the program <tt>dpkg</tt> shows that you should be able
to install Debian packages on your system. However, since the program has been
Index: uptodate.sgml
===================================================================
--- uptodate.sgml (Revision 10939)
+++ uptodate.sgml (Arbeitskopie)
@@ -57,7 +57,7 @@
Answer any questions that might come up, and your system will be upgraded.
<p>Note that <prgn/aptitude/ is not the recommended tool for
-doing upgrades from one &debian; release to another. For upgrades between
+doing upgrades from one &debian; release to another. Use <prgn/apt-get/ instead. For upgrades between
releases you should read the <url
id="http://www.debian.org/releases/stable/releasenotes"; name="Release
Notes">. This document describes in detail the recommended steps for upgrades
@@ -92,9 +92,8 @@
be used. The configuration file is <file>/etc/apt/sources.list</file>.
See also <ref id="dselect">.
-<p>If you want to use CDs to install packages, you can use <prgn/apt-cdrom/.
-For details, please see the Release Notes, section "Setting up for an
-upgrade from a local mirror".
+<p>If you want to use CDs/DVDs/BDs to install packages, you can use <prgn/apt-cdrom/.
+For details, please see the Release Notes, section "Adding APT sources from optical media".
<p>Please note that when you get and install the packages, you'll still have
them kept in your /var directory hierarchy. To keep your partition from
@@ -202,7 +201,7 @@
<p>Yes. You can use <prgn>cron-apt</prgn>, this tool updates the system at
regular interval by using a cron job. By default it just updates the package
-list and downloads new packages without installing.
+list and downloads new packages, but without installing.
<p>Note: Automatic upgrade of packages is <strong/NOT/ recommended
in <em>testing</em> or <em>unstable</em> systems as this might bring unexpected
Reply to: