[Cdd-commits] r221 - cdd/trunk/doc/en

Ben Armstrong debian-custom@lists.debian.org
Sun, 04 Jul 2004 06:45:34 -0600


Author: synrg
Date: Sun Jul  4 06:45:34 2004
New Revision: 221

Modified:
   cdd/trunk/doc/en/00_titletoc.sgml
   cdd/trunk/doc/en/01_introduction.sgml
   cdd/trunk/doc/en/02_about.sgml
   cdd/trunk/doc/en/03_general_ideas.sgml
   cdd/trunk/doc/en/04_existing_cdds.sgml
   cdd/trunk/doc/en/05_inside.sgml
   cdd/trunk/doc/en/06_technology.sgml
Log:
Mostly usage fixes, focusing on "that" vs. "which".  For a helpful
reference sorting out which word to use, please see:
http://www.english-usage.com/faq.html#fxthatvs

I have not yet forged ahead into 07 and following chapters, as those
chapters have not yet even had a first editing pass.



Modified: cdd/trunk/doc/en/00_titletoc.sgml
==============================================================================
--- cdd/trunk/doc/en/00_titletoc.sgml	(original)
+++ cdd/trunk/doc/en/00_titletoc.sgml	Sun Jul  4 06:45:34 2004
@@ -13,7 +13,7 @@
 
 <abstract>
 This paper is intended for people who are interested in the philosophy
-of Custom Debian Distributions, and the technique which is used to
+of Custom Debian Distributions, and the technique that is used to
 manage those projects.
 It is explained in detail why these are not forks from Debian, but reside
 completely inside the Debian GNU/Linux distribution, and which

Modified: cdd/trunk/doc/en/01_introduction.sgml
==============================================================================
--- cdd/trunk/doc/en/01_introduction.sgml	(original)
+++ cdd/trunk/doc/en/01_introduction.sgml	Sun Jul  4 06:45:34 2004
@@ -11,7 +11,7 @@
 <p>
 Custom Debian Distributions (formerly merged together with Debian Internal
 Projects) provide support for special user interests.  They implement a new
-approach to cover interests of specialised users which might be
+approach to cover interests of specialised users, who might be
 children, lawyers, medical staff, visually impaired people, etc.  Of late,
 several Custom Debian Distributions have evolved.  The common goal of those is
 to make installation and administration of computers for their target users as
@@ -20,7 +20,7 @@
 </p>
 <p>
 Using the object oriented approach as an analogy, if Debian as a whole is an
-object, a Custom Debian Distribution is an instance of this object which
+object, a Custom Debian Distribution is an instance of this object that
 inherits all features while providing certain properties.
 </p>
 <p>
@@ -34,7 +34,7 @@
 The effort might fall into the same category as the
 <url id="http://platform.progeny.com/componentized-linux/"
 name="Componentized Linux"> of Progeny, but there are certain
-differences which will be outlined in this paper.
+differences that will be outlined in this paper.
 </p>
 
 </chapt>

Modified: cdd/trunk/doc/en/02_about.sgml
==============================================================================
--- cdd/trunk/doc/en/02_about.sgml	(original)
+++ cdd/trunk/doc/en/02_about.sgml	Sun Jul  4 06:45:34 2004
@@ -5,11 +5,11 @@
   <heading>What is Debian?</heading>
 
 <p>
- The core of an operating system is a piece of software which
+ The core of an operating system is a piece of software that
  interacts with the hardware of the computer, and provides basic
- functionality for several applications.  On Linux based systems the
- so called kernel provides this functionality, and the term Linux just
- means this core without those applications which provide the
+ functionality for several applications.  On Linux based systems, the
+ so-called kernel provides this functionality, and the term Linux just
+ means this core without those applications that provide the
  functionality for users.  Other examples are the Hurd, or the flavours
  of the BSD kernel.
 </p>
@@ -23,20 +23,20 @@
  Users do not need only an operating system.  They also need certain
  applications like web servers, or office suites.  A
  <em>distribution</em> is a collection of software packages around the
- GNU/Linux operating system which satisfies the needs of the target user
- group.  There are general distributions which try to support all
- users, and there are several specialised distributions that each
+ GNU/Linux operating system that satisfies the needs of the target user
+ group.  There are general distributions, which try to support all
+ users, and there are several specialised distributions, which each
  target a special group of users.
 </p>
 <p>
  <em>Distributors</em> are those companies that are building these
  collections of software around the GNU/Linux operating system.
  Because it is Free Software, the user who buys a distribution pays for
- the service which the distributor is providing.  These services might
+ the service that the distributor is providing.  These services might
  be:
  <list>
  <item>Preparing a useful collection of software around GNU/Linux.</item>
- <item>Caring for smooth installation which the target user is able to
+ <item>Caring for smooth installation that the target user is able to
        manage.</item>
  <item>Providing software updates and security fixes.</item>
  <item>Writing documentation and translations to enable the user to use
@@ -76,13 +76,13 @@
 </p>
 <p>
  The policy statements are followed by the tool-chains and
- libraries used to build the software, and the lists of dependencies which
+ libraries used to build the software, and the lists of dependencies, which
  dictate the prerequisites and order in which the software has to be
  built and installed. (It's easier to ride a bicycle if you put the wheels
  on first. ;-) )
 </p>
 <p>
- It is this <em>adherence to policy</em> which causes a distribution
+ It is this <em>adherence to policy</em> that causes a distribution
  to remain consistent within its own bounds. At the same time, this is
  the reason why packages can not always be safely installed across
  distribution boundaries. A SuSE <file>package.rpm</file> might not
@@ -139,11 +139,11 @@
 </p>
 <p>
 All members of the Debian project are connected in a <url name ="web of
-trust" id="http://people.debian.org/~edward/globe/earthkeyring/">
+trust" id="http://people.debian.org/~edward/globe/earthkeyring/">,
 which is woven by signing GPG keys.  One requirement to become a
 member of the Debian project is to have a GPG key signed by a Debian
-developer.  Every time one Debian developer meets an other developer
-for the first time they sign each other's keys.  In this way the web
+developer.  Every time one Debian developer meets another developer
+for the first time, they sign each other's keys.  In this way, the web
 of trust is woven.
 </p>
 </sect>
@@ -172,7 +172,7 @@
     <item>Download Debian from the web for free.</item>
    </enumlist>
      The latter is the common way, and there are really great tools
-     to do it this way.  For sure it is always possible to copy Debian
+     to do it this way.  Certainly it is always possible to copy Debian
      from a friend.
   </item>
 </list>
@@ -192,7 +192,7 @@
 </p>
 <p>
 One solution is provided by the <package>tasksel</package> package.  It
-provides a reasonable selection of quite general tasks which can be
+provides a reasonable selection of quite general tasks that can be
 accomplished using a set of packages installed on a Debian GNU/Linux system.
 But this is not really fine grained, and does not address all of the needs of
 user groups with special interests.

Modified: cdd/trunk/doc/en/03_general_ideas.sgml
==============================================================================
--- cdd/trunk/doc/en/03_general_ideas.sgml	(original)
+++ cdd/trunk/doc/en/03_general_ideas.sgml	Sun Jul  4 06:45:34 2004
@@ -6,7 +6,7 @@
  <heading>Looking beyond</heading>
 
  <p>
- Commercial Linux distributors sell certain products which try to
+ Commercial Linux distributors sell certain products that try to
  address special user needs.
 
  <taglist>
@@ -61,9 +61,9 @@
 of a certain profession, (e.g. a doctor or lawyer,) a
 person who has not (yet) gathered a certain amount of computer
 knowledge, (e.g. a child,) or a person with disabilities (e.g.
-a visually or hearing impaired person.)  Moreover the customisation
-might deal with peculiarities of certain regions were users have needs
-which differ from default Debian.
+a visually or hearing impaired person.)  Moreover, the customisation
+might deal with peculiarities of certain regions where users have needs
+that differ from Debian as a whole.
 </p>
 <p>
 It is not unusual for these target users to be less technically
@@ -99,7 +99,7 @@
 <p>
 Common to all groups of target users is their interest in a defined
 subset of available Free Software.  None of them would like to spend
-much time searching for the package which fits his interest.
+much time searching for the package that fits his interest.
 Instead, the target user would prefer to immediately and effortlessly
 locate and access all material relevant to solving his own problems.
 </p>
@@ -115,7 +115,7 @@
 </p>
 <p>
 The more important part of the request for easy usage is a
-professional design which is functional and effective.  To accomplish
+professional design that is functional and effective.  To accomplish
 this, the programmers need expert knowledge, or at least a quick
 communication channel to experts to learn more about their
 requirements.  One task for Custom Debian Distributions is to bring
@@ -137,7 +137,7 @@
    <heading>Profile of target administrators</heading>
 
 <p>
-In the field which should be covered by Custom Debian Distributions, we
+In the field that should be covered by Custom Debian Distributions, we
 have to face also some common problems for system administrators.  Often
 they have limited time in which they must serve quite a number of computers,
 and thus they are happy about each simplification of the administration
@@ -169,21 +169,22 @@
 different users.  That is why many gifted programmers feel obliged for
 this kind of Free Software - they just need it for their own.  So you
 normally find a fast, growing community around Free Software packages
-which have a wide use.  This is different for specialised software.
+that have a wide use.  This is different for specialised software.
 </p>
 <p>
-In this context the term "specialised software" summarises such kind
-of software which is needed by some experts for their job.  This might
-be a practice management system which is used by doctors, a graphical
-information system (GIS) which is used by geographers, a screen reader
-which helps blind people to work with the computer etc.  The
-difference to widely used software like office suites is that the user
-base is reduced to very view people.  This is also true for certain
-software which supports special localisation issues.
+In this context, the term "specialised software" refers to the kind
+of software that is needed by some experts for their job.  This might
+be a practice management system that is used by doctors, a graphical
+information system (GIS) that is used by geographers, a screen reader
+that helps blind people to work with the computer, etc.  The
+difference between such software and widely used software like office
+suites is that the user base is relatively small.  This is
+also true for certain software that supports special localisation
+issues.
 <list>
  <item>
 Specialist software is used only by a limited set of users (i.e. the
-specialists).  There exists a set of software tools which work perfectly in the
+specialists).  There exists a set of software tools that work perfectly in the
 environment where they were developed.  If the developers catch the idea of
 Free Software, and just release this software as-is, people in the new, broader
 user community often run into trouble getting it to work in their environment.
@@ -205,10 +206,10 @@
 comply with ergonomic standards of user interfaces.
 </item>
 <item>
-Several existing programs which might be useful for specialists are
+Several existing programs that might be useful for specialists are
 not really free in the sense of the <url
 id="http://www.debian.org/social_contract#guidelines" name="Debian
-Free Software Guidelines (DFSG)">. Programs which are incompatible
+Free Software Guidelines (DFSG)">. Programs that are incompatible
 with the DFSG cannot be included in Debian.  This is possibly a
 drawback for those programs, because they could profit by spreading
 widely on the back of Debian over the whole world.
@@ -234,12 +235,12 @@
 <url id="http://www.debian.org/Bugs/" name="Debian Bug Tracking System">.
 </item>
 <item>
-Many programs which are written from scratch use their own
+Many programs that are written from scratch use their own
 non-standard file formats.  However, it is often important for
 programs to be able to share data with each other.
 </item>
 <item>
-Often there are several programs which try to solve identical or similar
+Often there are several programs that try to solve identical or similar
 problems. The <url
 id="http://people.debian.org/~tille/debian-med/talks/paper/debian-med.html"
 name="paper about Debian-Med"> illustrates this in detail for the
@@ -250,7 +251,7 @@
 <item>
 Sometimes the tools or back-ends used in Free Software are not
 appropriate for such applications.  For instance, sometimes
-database servers which do not use transactions are used to store
+database servers that do not use transactions are used to store
 medical records, which is completely unacceptable.  Other programs use web
 clients as their front-end, which is not really good for quick (mouse-less)
 usage, a great shortcoming for repetitive tasks.
@@ -263,7 +264,7 @@
    <heading>General problem</heading>
 <p>
 Free Software development is a kind of evolutionary process. It needs a
-critical mass of supporters which are:
+critical mass of supporters, who are:
 <list>
   <item>programmers <em>and</em></item>
   <item>users</item>

Modified: cdd/trunk/doc/en/04_existing_cdds.sgml
==============================================================================
--- cdd/trunk/doc/en/04_existing_cdds.sgml	(original)
+++ cdd/trunk/doc/en/04_existing_cdds.sgml	Sun Jul  4 06:45:34 2004
@@ -70,8 +70,8 @@
     <list>
      <item>To build an integrated software environment for all medical tasks.</item>
      <item>To care especially for the quality of program packages in the field of medicine 
-           which are already integrated within Debian.</item>
-     <item>To build and include in Debian packages of medical software which are missing
+           that are already integrated within Debian.</item>
+     <item>To build and include in Debian packages of medical software that are missing
            in Debian.</item>
      <item>To care for a general infrastructure for medical users.</item>
      <item>To make efforts to increase the quality of third party Free Software
@@ -88,8 +88,8 @@
 <p>
 <taglist>
   <tag>Start</tag>
-   <item>Summer of 2002, since 2003 merged with SkoleLinux which is now
-   synonym with Debian-Edu</item>
+   <item>Summer of 2002, since 2003 merged with SkoleLinux, which is now
+   synonymous with Debian-Edu</item>
   <tag>URL</tag>
    <item><url name="Debian-Edu Wiki"
    id="http://wiki.debian.net/?DebianEdu"></item>
@@ -110,8 +110,8 @@
            educational software.  An automatically installed server 
            provides net-boot services for disk-less thin clients and
            all necessary applications for educational use.</item>
-     <item>To federate many initiatives around education (which are
-           partly based on forks of Debian).</item>
+     <item>To federate many initiatives around education, which are
+           partly based on forks of Debian.</item>
      <item>To continue the internationalisation efforts of SkoleLinux.
            </item> 
      <item>To focus on easy installation in schools.</item>
@@ -124,15 +124,15 @@
 </taglist>
 
 This project started with the intention to bring back into Debian a fork from
-Debian which was started by some people in France.  Because they had some
+Debian that was started by some people in France.  Because they had some
 time constraints, the people who initially started this effort
 handed over responsibility to the Norwegian <url name="Skolelinux"
-id="http://www.skolelinux.org"> which is currently more or less
+id="http://www.skolelinux.org">, which is currently more or less
 identical to Debian-Edu.
 </p>
 <p>
 The Debian-Edu project gathered special interest in Spain because
-there are derived Debian distributions from this country which are
+there are derived Debian distributions from this country that are
 intended to be used in schools.  For instance there are: 
   <taglist>
     <tag><url id="http://www.linex.org/" name="LinEX"></tag>
@@ -233,7 +233,7 @@
 
 This Custom Debian Distribution has many common issues with other
 Custom Distributions. The latest move of Debian-Desktop was to care
-about more up to date software which can be used as common base for
+about more up to date software that can be used as common base for
 all Custom Debian Distributions.  The common interest is described in
 detail in <ref id="new_ways_of_distribution">.
 </p>
@@ -286,7 +286,7 @@
     <list>
      <item>To address requirements of small non-profit organisations.</item>
      <item>To prepare Debian for desktop use in non-profit organisations.</item>
-     <item>To provide software which solves non-profit tasks such as fund raising,
+     <item>To provide software that solves non-profit tasks such as fund raising,
            membership lists, and conference organisation.</item>
    </list>
   </item>
@@ -397,7 +397,7 @@
   <sect id="other">
    <heading>Other possible Custom Debian Distributions</heading>
 <p>
-  There are fields which could be served nicely by not yet existing
+  There are fields that could be served nicely by not yet existing
   Custom Debian Distributions:  
   <taglist>
       <tag>Debian-eGov</tag>

Modified: cdd/trunk/doc/en/05_inside.sgml
==============================================================================
--- cdd/trunk/doc/en/05_inside.sgml	(original)
+++ cdd/trunk/doc/en/05_inside.sgml	Sun Jul  4 06:45:34 2004
@@ -5,7 +5,7 @@
   <heading>To fork or not to fork</heading>
 
 <p>
-There are many distributions which decided to fork from a certain
+There are many distributions that decided to fork from a certain
 state of Debian.  This is perfectly all right because Debian is
 completely free and everybody is allowed to do this.  People who
 built those derived distributions had certain reasons to proceed
@@ -22,7 +22,7 @@
   <url id="http://www.libranet.com/" name="Libranet"> or
   <url id="http://www.xandros.com/" name="Xandros">,
 there is no other choice than forking because these companies
-normally add some stuff which is non-free.  While Custom Debian
+normally add some stuff that is non-free.  While Custom Debian
 Distributions might be interesting in technical terms for those
 commercial distributions by making it easier to build a separate
 distribution, these non-free additions are not allowed to be integrated
@@ -35,12 +35,12 @@
 
 <p>
 Custom Debian Distributions are a solution for derivatives from Debian
-which are as free as Debian but had certain reasons to fork.
+that are as free as Debian but had certain reasons to fork.
 Most of these reasons existed in the past but have now vanished because
 Debian is becoming easier to adapt for special
 purposes.  To increase this flexibility, the Custom Debian
 Distributions approach was invented.  Some examples of forks from
-Debian which are probably now able to integrate back into Debian are:
+Debian that are probably now able to integrate back into Debian are:
 
 <taglist>
  <tag><url id="http://www.skolelinux.org" name="SkoleLinux"></tag>
@@ -57,7 +57,7 @@
   <item>The <url name="Agnula"
         id="http://www.agnula.org/"> project, which is founded by the
 	European Community, (and in fact is the first Free Software project
-	which was founded by the EU at all,) forked for the
+	that was founded by the EU at all,) forked for the
 	following reasons:
        <taglist>
         <tag>Technical</tag>
@@ -86,7 +86,7 @@
 	The project was founded by the local government of Extremadura,
 	and each school in this region is running this distribution.
 	While this is a great success, the further development of LinEx
-	has to face the problems which will be explained below.  So it
+	has to face the problems that will be explained below.  So it
 	might be worth considering following the path of SkoleLinux to
 	integrate the needed stuff back into Debian.  The LinEx people
 	just did the first step, for instance, to try to get a free
@@ -102,7 +102,7 @@
 instance, this would be the case for LinEx, which has exactly the
 same group of target users as Debian-Edu.  On the other hand, some special
 adaptations might be necessary to fit the requirements of the local
-educational system.  The specific changes which might be necessary
+educational system.  The specific changes that might be necessary
 would be called <strong>flavours</strong> of a Custom Debian
 Distribution.
 </p>
@@ -117,7 +117,7 @@
 work of many volunteer Debian developers, this would be a bad idea for
 economical reasons.  These people would have to deal with continuous
 changes to keep the base system, installer, etc. up to date with the
-current Debian development.  It would be more sane to send patches which
+current Debian development.  It would be more sane to send patches that
 address their special requirements to Debian instead of
 maintaining a complete Debian tree containing these patches.
 </p>
@@ -130,13 +130,13 @@
 <p>
 New projects with special intentions often have trouble to become
 popular to the user group they want to address.  This is a matter of
-attaining the critical mass which was explained in <ref id="general_problem">.
+attaining the critical mass that was explained in <ref id="general_problem">.
 </p>
 <p>
 Larger Free Software projects need certain infrastructure like
 web servers, ftp servers, (both with mirrors,) a bug tracking system,
 etc.  It takes a fair amount of extra effort to build an entire infrastructure
-which is already available for free in Debian.
+that is already available for free in Debian.
 </p>
 <p>
 <strong>Forking would be a bad idea.</strong>
@@ -147,7 +147,7 @@
   <heading>Advantages of integration into Debian</heading>
 
 <p>
-Debian has a huge user base all over the world.  Any project which is
+Debian has a huge user base all over the world.  Any project that is
 integrated within Debian has a good chance to become popular on the back
 of Debian if the target users of the project just notice that it
 enables them to solve their problems.  So there is no
@@ -236,7 +236,7 @@
 Thus, single developers have influence on development - they just have
 to <strong>do</strong> it, which is a very different position compared
 with employees of a commercial distributor.  This is the reason for the
-flexibility of Debian which makes it adaptable for any purpose.  In
+flexibility of Debian that makes it adaptable for any purpose.  In
 the Debian world, this kind of community is called
 "<em><strong>Do</strong>ocracy</em>" - the one who does, rules.
 </p> 

Modified: cdd/trunk/doc/en/06_technology.sgml
==============================================================================
--- cdd/trunk/doc/en/06_technology.sgml	(original)
+++ cdd/trunk/doc/en/06_technology.sgml	Sun Jul  4 06:45:34 2004
@@ -8,7 +8,7 @@
   <heading>Meta package definition</heading>
 
 <p>
-A meta package, as used by CDDs, is a Debian package which contains:
+A meta package, as used by CDDs, is a Debian package that contains:
 <list>
   <item>Dependencies on other Debian packages (essential)
       <list>
@@ -82,14 +82,14 @@
 </p>
 <p>
 Moreover, the installation of a meta package ensures that no package
-which is necessary for the intended task can be removed without
+that is necessary for the intended task can be removed without
 explicit notice that also the meta package has to be removed.  This
 helps non specialist administrators to keep the installation fit for
 the specialized users.
 </p>
 <p>
 By defining conflicts with some other packages inside the meta package,
-it is possible to ensure that a package which might conflict for some
+it is possible to ensure that a package that might conflict for some
 reasons for the intended task can not be installed at the same time as
 the meta package is installed.
 </p>
@@ -108,7 +108,7 @@
 configuration for the intended task.  This might either be
 accomplished by pre-seeding <prgn>debconf</prgn> questions, or by
 modifying configuration files in a <prgn>postinst</prgn> script.  It
-has to be ensured that no changes which have been done manually by the
+has to be ensured that no changes that have been done manually by the
 administrator will be changed by this procedure.  So to speak, the
 <prgn>postinst</prgn> script takes over the role of a local
 administrator.
@@ -139,7 +139,7 @@
 Thus, translation is a very important thing to make programs more
 useful for the target user group.  Debian has established a <url
 id="http://ddtp.debian.org/" name="Debian Description Translation
-Project"> which has the goal to translate package descriptions.  There
+Project">, which has the goal to translate package descriptions.  There
 is a good chance this system could also be used for other types of
 documentation, which might be a great help for Custom Debian
 Distributions.
@@ -163,7 +163,7 @@
      this into good English??? 
   -->
 In short, there are no special tools available to handle meta packages
-nicely. But there are some tricks which might help, for the moment.
+nicely. But there are some tricks that might help, for the moment.
 </p>
 
    <sect1 id="cmdline">
@@ -248,7 +248,7 @@
   <tag><prgn>auto-apt</prgn></tag>
    <item>
     The program <prgn>auto-apt</prgn> is really cool if you are
-    running a computer which was installed from scratch in a hurry, and
+    running a computer that was installed from scratch in a hurry, and
     are sitting at a tradeshow booth preparing to do a demo.  If you had
     no time to figure out which packages you needed for the demo were missing
     so you could install all of them in advance, you could use
@@ -304,7 +304,7 @@
 </taglist>
 
 The short conclusion here is: <strong>There are no sophisticated tools
-which might be helpful to handle meta packages as they are used in Custom
+that might be helpful to handle meta packages as they are used in Custom
 Debian Distributions - just some hacks using the powerful tools inside
 Debian.</strong>
 </p>
@@ -323,7 +323,7 @@
   <tag><prgn>tasksel</prgn></tag>
    <item>
     The Debian task installer <prgn>Tasksel</prgn> is the first
-    interface for package selection which is presented to the user
+    interface for package selection that is presented to the user
     when installing a new computer.  The <tt>End-user</tt> section
     should contain an entry for each Custom Debian Distribution.  This
     is currently the case for Debian-Jr.
@@ -356,7 +356,7 @@
 
     </example>
     Unfortunately, there are some
-    issues which prevent further Custom Debian Distributions from
+    issues that prevent further Custom Debian Distributions from
     being included in the <prgn>tasksel</prgn> list, because the
     dependencies of this task can affect what appears on the first
     installation CD.  This problem would be even greater if all Custom
@@ -391,7 +391,7 @@
 <taglist>
   <tag><prgn>gnome-apt</prgn></tag>
    <item>This is the native GNOME flavour of graphical user interfaces
-         to apt.  It has a nice <tt>Search</tt> feature which can be
+         to apt.  It has a nice <tt>Search</tt> feature that can be
 	 found in the <tt>Package</tt> menu section.  If for
 	 instance the packages of the Debian Jr. project come into the
 	 focus of interest a search for "<tt>junior-*</tt>" will show
@@ -402,9 +402,9 @@
   <tag><prgn>synaptic</prgn></tag>
    <item>Even more sophisticated and perhaps the best choice for users
          of Custom Debian Distributions.  <prgn>Synaptic</prgn> has a
-	 nice filter feature which makes it a great tool here.
+	 nice filter feature, which makes it a great tool here.
 	 Moreover <prgn>synaptic</prgn> is currently the only user
-	 interface which supports Debian Package Tags (see <ref
+	 interface that supports Debian Package Tags (see <ref
 	 id="debtags">).
    </item>
   <tag><prgn>kpackage</prgn></tag>
@@ -425,7 +425,7 @@
 <p>
 <taglist>
   <tag><url id="http://packages.debian.org/" name="Web search"></tag>
-   <item><p>Debian has a web interface which can be used to search for certain substrings
+   <item><p>Debian has a web interface that can be used to search for certain substrings
          in package names.  For instance if you are searching the meta
          packages of Debian-Med you could point your favourite Browser
          to</p>
@@ -440,7 +440,7 @@
    </item>
   <tag><url id="http://qa.debian.org/developer.php" name="Package Tracking System"></tag>
    <item><p>
-         The Package Tracking System is a really great tool which
+         The Package Tracking System is a really great tool that
          provides essential information about packages.  Regarding
 	 Custom Debian Distributions it can help if you know the
 	 Debian user name of the developer who is responsible for the
@@ -481,7 +481,7 @@
             <url id="http://packages.qa.debian.org/m">
            </item>
          </taglist>
-         But the list which is obtained by this method is much larger
+         But the list that is obtained by this method is much larger
          than it would be useful for a good overview.
          </p><p>
          So the conclusion is - we just need better support here for
@@ -490,7 +490,7 @@
   <tag><prgn>list-junior.sh</prgn></tag>
    <item>The package <package>junior-doc</package> contains a script
          <file>/usr/share/doc/junior-doc/examples/scripts/list-junior.sh</file>
-         which checks for the installed packages of a Custom Debian
+         that checks for the installed packages of a Custom Debian
          Distribution and builds a simple web page describing these
          packages.  (The BTS contains a patch to let this script work
          also for other Custom Debian Distributions.)
@@ -519,7 +519,7 @@
     <item>Enhancing tools like <prgn>aptitude</prgn>,
           <prgn>synaptic</prgn>, etc.</item>
     <item>Special <prgn>tasksel</prgn> section</item> 
-    <item>Web tools which keep meta package information up to
+    <item>Web tools that keep meta package information up to
           date</item>
 </list>
 </p>
@@ -527,10 +527,10 @@
 Furthermore it is necessary to find a set of keywords for each Custom
 Debian Distribution and write a tool to search these keywords
 comfortable.  The best way to accomplish this might be to make use of
-Debian Package Tags which is a quite promising technique.
+Debian Package Tags, which is a quite promising technique.
 </p>
 <p>
-Tools which grep the apt cache directly for meta packages have to be
+Tools that grep the apt cache directly for meta packages have to be
 written or rather the available tools for this should be patched for
 this actual functionality.
 </p>
@@ -542,38 +542,38 @@
 
 <p>
 As stated above specialists have only interest in a subset of the
-available software on the system they are using.  In an ideal world this software
-would be the only one which is presented in the menu.  This would
+available software on the system they are using.  In an ideal world, this
+would be the only software that is presented in the menu.  This would
 allow the user to concentrate on his real world tasks instead of
 browsing large menu trees with entries he does not understand.
 </p>
 <p>
-To accomplish this a technique has to be implemented which allows to
+To accomplish this, a technique has to be implemented that allows to
 define a set of users who get a task-specific menu while getting rid
 of the part of software they are not interested in.  Moreover this has
 to be implemented for certain groups of users of one Custom Debian
-Distribution which are called "roles".  There are several techniques
+Distribution, which are called "roles".  There are several techniques
 available to manage user roles.  Currently in the field of Custom
 Debian Distributions a UNIX group based role system is implemented.
 This means, that a user who belongs to a certain group of a Custom
 Debian Distribution is mentioned in the <file>/etc/group</file> file
-in the appropriate group and gets a special user menu which is
+in the appropriate group and gets a special user menu that is
 provided for exactly this group.
 </p>
 <p>
 Strictly speaking it is not the best solution to conflate a
-configuration mechanism (which users see with menus) with access
-control (unix groups).  It might be confusing and wastes the limited
+configuration mechanism, which users see with menus, with access
+control, i.e. unix groups.  It might be confusing, and wastes the limited
 number of groups to which a user can belong.  On the other hand this
-is a solution which works for the moment and has no real negative
-impact on the general use of the system. The benefit of using unix
+is a solution that works for the moment, and has no real negative
+impact on the general use of the system.  The benefit of using unix
 groups is that there is a defined set of tools provided to handle user
-groups.  This makes life much easier and there is no
-<em>practical</em>  limit of the number of groups which a user
-can belong for the existing Custom Debian Distributions at the time
-beeing.
+groups.  This makes life much easier; there is no
+<em>practical</em> limit to the number of groups to which a user
+may belong for the existing Custom Debian Distributions at this time.
+</p>
 <p>
-For the long run this role system might even be enhanced to
+In the long run, this role system might even be enhanced to
 certain "<em>levels</em>" a user can have and here the UNIX groups
 approach will definitely fail and has to be replaced by other
 mechanisms.  This will include the possibility to enable the user
@@ -583,7 +583,7 @@
 Debian Distributions but might be interesting for Debian in general.
 </p>
 <p>
-Another point which speaks against using UNIX groups for role
+Another point that speaks against using UNIX groups for role
 administration is the fact that local administrators are not in all
 cases competent enough to understand the UNIX role concept as a
 security feature and thus a real role concept including tools to
@@ -623,7 +623,7 @@
 </p>
 <p>
 It is strongly suggested to use the package <package>cdd-dev</package>
-to build meta packages of a Custom Debian Distribution which will move
+to build meta packages of a Custom Debian Distribution that will move
 all necessary files right into place if there exists a
 <file>menu</file> directory with the menu entries as described in <ref
 id="cdd-install-helper">.  Note, that the users
@@ -637,7 +637,7 @@
 <p>
 Using <manref name="cdd-install-helper" section="8"> (see <ref
 id="cdd-install-helper">) it is very easy to build a
-<var>cdd</var><package>-common</package> package which contains
+<var>cdd</var><package>-common</package> package that contains
 <prgn>debconf</prgn> scripts to configure system users who should
 belong to the group of users of the Custom Debian Distribution <var>cdd</var>.
 For example see the <package>med-common</package> package.
@@ -680,7 +680,7 @@
 <p>
 Building a meta package is more or less equal for each meta
 package. This was the reason to build a common source package
-<package>cdd</package> which builds into two binary packages
+<package>cdd</package> that builds into two binary packages
 <taglist>
   <tag><package>cdd-dev</package></tag>
    <item>Helpful tools to build meta packages from a set of template
@@ -690,16 +690,16 @@
 	 make maintenance of meta packages as easy as possible.
    </item>
   <tag><package>cdd-common</package></tag>
-   <item>This package provides some files which are common to meta
+   <item>This package provides some files that are common to meta
          packages of Common Debian Distributions especially those
-	 which were builded using the tools of the package
+	 that were built using the tools of the package
 	 <package>cdd-dev</package>. It introduces a method to handle 
          system users in a group named according to the name of the
 	 Custom Debian Distribution.  The user menu approach is
 	 explained in detail in <ref id="userroles">.
    </item>
 </taglist>
-The usage of the tools which are contained in these packages are
+The usage of the tools that are contained in these packages are
 described now in detail.
 </p>
 
@@ -746,7 +746,7 @@
    </item>
   <tag>DESCRIPTION</tag>
    <item>The script <prgn>cdd-gen-control</prgn> parses the
-   <file>tasks</file> directory for text files which have a similar
+   <file>tasks</file> directory for text files that have a similar
    syntax to <file>debian/control</file> files.  Each text file is
    used as template for a
    <var>cdd</var><file>-</file><var>textfile_name</var> meta package
@@ -787,12 +787,12 @@
 the resulting meta package can be installed in the target
 distribution.  For instance it might be possible that for certain
 reasons a meta package should work together with the current Debian
-<tt>stable</tt> distribution.  If the package is builded against a sources.list
-package which contains entries for <tt>stable</tt> and some newer packages are
-not yet available, these ones are not listed as dependencies but only
-as suggested packages.  That way it is possible to provide meta
-packages for using a <tt>stable</tt> distribution using the same package source
-as for <tt>testing</tt> or <tt>unstable</tt> where new packages
+<tt>stable</tt> distribution.  If the package is built against a sources.list
+package that contains entries for <tt>stable</tt> and some newer packages are
+not yet available, those packages are not listed as dependencies but only
+as suggested packages.  That way, it is possible to provide meta
+packages for a <tt>stable</tt> distribution using the same package source
+as for <tt>testing</tt> or <tt>unstable</tt>, where new packages
 normally go.
 </p>
 
@@ -836,12 +836,12 @@
     </p><p>
     A check will be performed whether there are text files named
     <file>docs/</file><var>&lt;pkg_without_cdd-prefix&gt;</var><file>/</file><var>&lt;dependency&gt;</var><file>.txt</file>
-    where <var>&lt;dependency&gt;</var> is a package which is listed in the
-    dependencies of the meta-package. These text files should provide
-    reasonable information how to use this program in text form which
-    can be viewed by a <prgn>pager</prgn> which is better than having
-    no menu entry at all.  A menu entry will be created which call the
-    <prgn>pager</prgn> to this text file after checking whether this
+    where <var>&lt;dependency&gt;</var> is a package that is listed in the
+    dependencies of the meta-package. These files should provide
+    reasonable information how to use this program in text form that
+    can be viewed by a <prgn>pager</prgn>, which is better than having
+    no menu entry at all.  A menu entry will be created that calls the
+    <prgn>pager</prgn> to view this text file after checking whether this
     package is really listed in the dependencies.
     </p>
      </item>
@@ -855,18 +855,19 @@
      </item>
      <tag><file>docs</file></tag>
      <item>
-    The files which reside in the optional directory
+    The files that reside in the optional directory
      <file>docs/</file><var>&lt;pkg_without_cdd-prefix&gt;</var><file>/</file> 
     will be copied to the appropriate doc directory of the meta-package.
      </item>
      <tag><file>conf</file></tag>
      <item>
      If there exists a file <file>common/conf</file> and has a size
-     greater than 0 this is used as special configuration file
-     <file>/etc/cdd/<var>&lt;cdd&gt;</var>/<var>&lt;cdd&gt;</var>.conf</file> which
+     greater than 0 this is used as that special configuration file
+     <file>/etc/cdd/<var>&lt;cdd&gt;</var>/<var>&lt;cdd&gt;</var>.conf</file>,
+     which
      can override variables from the general configuration file
      <file>/etc/cdd/cdd.conf</file> or add further variables. Because
-     it is sourced from shell it has to follow shell syntax.
+     it is sourced from shell, it has to follow shell syntax.
      </item>
     </taglist>
     </p>
@@ -885,10 +886,10 @@
   <heading>Apt <file>sources.list</file> files in <file>/etc/cdd/</file></heading>
 <p>
 These files are used by <manref name="cdd-gen-control" section="1"> to
-build valid <file>debian/control</file> files which contain only
+build valid <file>debian/control</file> files that contain only
 available packages in their dependencies.  This enables building meta
 packages for <tt>stable</tt>, <tt>testing</tt>, <tt>unstable</tt> or
-even a completely different distribution which has valid
+even a completely different distribution that has valid
 <file>sources.list</file> entries.  The file
 <file>/etc/cdd/control.list</file> is used as default for <manref
 name="cdd-gen-control" section="1"> and usually is a symbolic link
@@ -908,9 +909,9 @@
   <heading>Templates in <file>/usr/share/cdd/templates</file></heading>
 <p>
 The directory <file>/usr/share/cdd/templates</file> contains templates
-which can be used to build a <var>&lt;cdd&gt;</var><package>-common</package>
-which uses the tools which are contained in the
-<package>cdd-common</package> package and are useful to manage
+that can be used to build a <var>&lt;cdd&gt;</var><package>-common</package>,
+which uses the tools that are contained in the
+<package>cdd-common</package> package, and are useful to manage
 <var>&lt;cdd&gt;</var> user groups (see <ref id="userroles">).
 </p>
 </sect2>
@@ -921,10 +922,10 @@
 
 <p>
 This package creates a common registry for all CDDs in
-<file>/etc/cdd</file>.  Each CDD should put the files which are used
+<file>/etc/cdd</file>.  Each CDD should put the files that are used
 into a subdirectory named like the CDD of <file>/etc/cdd</file>.  The
 <package>cdd-common</package> package installs a common configuration
-file <file>/etc/cdd/cdd.conf</file> which can be used to influence the
+file <file>/etc/cdd/cdd.conf</file>, which can be used to influence the
 behaviour of the tools described below.  
 </p>
 
@@ -987,15 +988,15 @@
    </p>
 
    <p>
-   If it's called by a user, it addds and keeps updated menu
+   If it is called by a user, it adds, and keeps updated, menu
    entries for the user who runs it.
    </p>
 
    <p>
-   If it's called by root, it adds and keeps updated user's menu entries
+   If it is called by root, it adds and keeps updated user's menu entries
    (see menu package for users' menus) for all users who belong to the
    group of the specified Custom Debian Distribution, or only for a
-   specified user, depending on which parameted is passed to the script.
+   specified user, depending on which parameter is passed to the script.
    </p>
    </item>
    
@@ -1072,7 +1073,7 @@
   <tag>DESCRIPTION</tag>
    <item>This file is sourced from shell scripts inside the Custom
          Debian Distribution package <package>cdd-common</package> and
-   thus it has to follow shell syntax.  The variables which are set
+   thus it has to follow shell syntax.  The variables that are set
    inside this configuration file can be overriden by special CDD
    configration files
    <file>/etc/cdd/<var>&lt>cdd&gt;</var>/<var>&lt>cdd&gt;</var>.conf</file>
@@ -1087,12 +1088,12 @@
              later.  Unsetting this variable leads to use no roles at all.
        </item>
       <tag><tt>UPDATEUSERMENU</tt></tag>
-       <item>If this is set to <tt>yes</tt> the user menus of meta
+       <item>If this is set to <tt>yes</tt>, the user menus of meta
              packages can be created automatically at install time of
              the package if the postinst script of the package allows
              this.  It is suggested to use this option in the specific
              configuration files of a special Custom Debian
-             Distribution which overrides the settings of the general
+             Distribution that override the settings of the general
              configuration file. 
        </item>
       <tag><tt>SHAREDIR</tt></tag>
@@ -1175,9 +1176,9 @@
 
 <p>
 To build any Debian package you always need a directory named
-<file>debian</file> which contains a certain set of files.  The
+<file>debian</file>, which contains a certain set of files.  The
 package <package>cdd-dev</package> provides a complete set of example
-files which only have to be copied and after editing some place
+files that only have to be copied and after editing some place
 holders are ready to use.
 <example>
 ~> cp -a /usr/share/doc/cdd-dev/examples/debian .
@@ -1227,11 +1228,11 @@
    <heading>The common meta package</heading>
 
 <p>
-The creation of a common package is optional but suggested because it
-adds some special features like menus, user groups and probably more
+The creation of a common package is optional, but suggested, because it
+adds some special features like menus, user groups, and probably more
 in the future.  It is automatically built by
-<file>cdd-install-helper</file> (which is called in
-<file>debian/rules</file>) the <file>common</file> directory exists.
+<file>cdd-install-helper</file>, which is called in
+<file>debian/rules</file>, if the <file>common</file> directory exists.
 The easiest way to create this is as follows:
 <example>
 ~> cp -a /usr/share/doc/cdd-dev/examples/common .
@@ -1248,12 +1249,12 @@
 If the meta package <package><var>cdd</var>-common</package> will be
 created according to these rules all other meta packages will depend
 automatically from this common package.  For the friends of
-<prgn>auto-apt</prgn> a helper
+<prgn>auto-apt</prgn>, a helper
 <file>/usr/bin/<var>&lt;meta-package-name&gt;</var></file> will be
-installed as well which just prints some information about the meta
-package.  All in all the usage of the common package is strongly
+installed as well, which just prints some information about the meta
+package.  All in all, the usage of the common package is strongly
 suggested to have a common registry for stuff like user roles and
-possibly other things which will be implementd in the future.
+possibly other things that will be implementd in the future.
 </p>
    </sect1>
    <sect1 id="meta-package-menus">
@@ -1275,32 +1276,32 @@
 
 A menu file for each task should be created containing valid menu
 entries for each dependant package.  The easiest way to obtain those
-menu entries is to simply copy the original menu entry files which are
-contained in the packages which the meta package will depend from.
-The only thing which has to be changed in these menu entries is the
-<tt>package</tt> field which has to be changed from
-<package>&lt;dependant package&gt;</package> to
+menu entries is to simply copy the original menu entry files that are
+contained in the packages on which the meta package will depend.
+The only thing that has to be changed in these menu entries is the
+<tt>package</tt> field, which has to be changed from
+<package>&lt;dependent package&gt;</package> to
 <package><var>cdd</var>-<var>task</var></package>.  All other entries
 might remain unchanged.  This is a good point to check whether the
 menu entries of the packages you depend from are formated nicely and
 print the necessary information (for instance make use of "hints").
 Here the meta package maintainer has a good chance for quality
-assurance work which is also part of the Custom Debian Distributions
+assurance work, which is also part of the Custom Debian Distributions
 issue.
 </p>
 <p>
 In principle these menu items could be created automatically either at
 meta package build time or even better in the <file>postinst</file>
 script of the meta package because it is granted that the needed menu
-files are installed on the system (which is not really necessary on
-the meta package build machine).  This might be implemented in later
+files are installed on the system, which is not really necessary on
+the meta package build machine.  This might be implemented in later
 versions of <package>cdd-dev</package>.  Currently the policy is that
 we like to have a little bit of control about the menu entries for the
-quality assurance issue mentioned above.  Last but not least there are
-packages which do not provide a menu entry.  If this is the case
+quality assurance issue mentioned above.  Last, but not least, there are
+packages that do not provide a menu entry.  If this is the case
 because the package maintainer just forgot it a bug report should be
-filed.  On the other hand there are packages with programs which
-provide a command line interface which does not allow a reasonable
+filed.  On the other hand, there are packages with programs that
+provide a command line interface that does not allow a reasonable
 menu entry.  A solution for this case is provided in the next
 paragraph.
 </p>
@@ -1311,8 +1312,8 @@
 
 <p>
 The idea of the meta package menu is to provide the user with easily
-viewable traces of any installed package which helps solving every day
-tasks.  So if there are packages which do not contain a menu a screen
+viewable traces of any installed package that helps solving everyday
+tasks.  So if there are packages that do not contain a menu, a screen
 with relevant documentation should be provided in a viewer by the
 creator of the meta package.  Such documentation can be created using
 the following templates:
@@ -1321,16 +1322,16 @@
 ~> cp -a /usr/share/doc/cdd-dev/examples/docs .
 ~> cat docs/README
 ~> edit docs/task1/dep1
- <var>Provide information about package &lt;dep1&gt; which
- depends from meta package &lt;task1&gt; but does not
- contain a useful menu entry</var>
+ <var>Provide information about a package &lt;dep1&gt; that is
+ a dependency of the meta package &lt;task1&gt;, but does not
+ contain a useful menu entry.</var>
 ~> cp docs/task1/dep1 docs/task1/<var>&lt;dependent pkg&gt;</var>
 ~> cp -a docs/task1 docs/<var>&lt;meta package name&gt;</var>
 </example>
 
 This ensures that our users become aware of all interesting packages
 on their system.  The documentation files should contain hints to man
-pages to read, URLs which should be visited to learn more about the
+pages to read, URLs that should be visited to learn more about the
 package or some short introduction how to get started.
 </p>
    </sect1>