[Cdd-commits] r1039 - cdd/trunk/dis/doc/en

CDD Subversion Commit noreply at alioth.debian.org
Mon Aug 18 12:38:04 UTC 2008


Author: tille
Date: Mon Aug 18 12:38:03 2008
New Revision: 1039

Modified:
   cdd/trunk/dis/doc/en/01_introduction.sgml
   cdd/trunk/dis/doc/en/02_about.sgml
   cdd/trunk/dis/doc/en/03_general_ideas.sgml
   cdd/trunk/dis/doc/en/04_existing_dishes.sgml
Log:
Rework documentation, basically the name change but other problems fixed as well.


Modified: cdd/trunk/dis/doc/en/01_introduction.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/01_introduction.sgml	(original)
+++ cdd/trunk/dis/doc/en/01_introduction.sgml	Mon Aug 18 12:38:03 2008
@@ -30,12 +30,6 @@
 create "derivative distributions".  But these are not the 
 responsibility of the Debian project.
 </p>
-<p>
-The effort might fall into the same category as the
-<url id="http://en.wikipedia.org/wiki/Progeny_Componentized_Linux"
-name="Componentized Linux"> of Progeny, but there are certain
-differences that will be outlined in this paper.
-</p>
 
 </chapt>
 

Modified: cdd/trunk/dis/doc/en/02_about.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/02_about.sgml	(original)
+++ cdd/trunk/dis/doc/en/02_about.sgml	Mon Aug 18 12:38:03 2008
@@ -1,5 +1,5 @@
 <chapt id="about">
-  <heading>What are Custom Debian Distributions?</heading>
+  <heading>What are Debian Integrated Solutions?</heading>
 
   <sect id="debian">
   <heading>What is Debian?</heading>
@@ -94,7 +94,7 @@
 </p>
 <p>
 <comment>AT: The context is somehow missing here.</comment>
- As you will see later in more detail, Custom Debian Distributions are
+ As you will see later in more detail, Debian Integrated Solutions are
  just a modified ruleset for producing a modified (specialised)
  version of Debian GNU/Linux. 
 </p>
@@ -179,11 +179,11 @@
 </p>
  </sect>
 
-<sect id="CDD">
-  <heading>Custom Debian Distributions</heading>
+<sect id="DIS">
+  <heading>Debian Integrated Solutions</heading>
 
 <p>
-Debian contains nearly 10000 binary packages, and this number is
+Debian contains nearly 22.000 binary packages, and this number is
 constantly increasing.  There is no single user who needs all these
 packages (even if conflicting packages are not considered).
 </p>
@@ -198,21 +198,22 @@
 user groups with special interests.
 </p>
 <p>
-<em>Custom Debian Distributions</em> (formerly known as Debian Internal
-Projects) try to provide a solution for <em>special groups of target
-users with different skills and interests</em>.  
-<!-- BA: Somehow this "They are" snuck in.  It is not grammatically correct.
-     I have reverted it to my wording.  If you think it still needs fixing,
-     please fix it in a way that obeys the rules of English grammar. :) -->
-Not only do
-they provide handy collections of specific program packages, but they
-also ease installation and configuration for the intended purpose.
+<em>Debian Integrated Solutions</em> in short DIS (pronounced DISh
+because it is a dish we provide a flavour of Debian) which were
+formerly known as Custom Debian Distributions (this name was confusing
+because it left to much room for speculation that this might be
+something else than Debian) try to provide a solution for <em>special
+groups of target users with different skills and interests</em>. Not
+only do they provide handy collections of specific program packages,
+but they also ease installation and configuration for the intended
+purpose.
 </p> 
 <p>
-To clarify a common misunderstanding: Custom Debian Distributions are
-<strong>not forks</strong> from Debian.  They are completely included,
-and if you obtain the complete Debian GNU/Linux distribution, you have
-all available Custom Debian Distributions included.
+Debian Integrated Solutions are <strong>not forks</strong> from
+Debian.  As the new name says clearly they are integrated into Debian
+and just provide a specific flavour.  So if you obtain the complete
+Debian GNU/Linux distribution, you have all available Debian
+Integrated Solutions included.
 </p>
 </sect>
 
@@ -229,7 +230,7 @@
 sgml-always-quote-attributes:t
 sgml-indent-step:2
 sgml-indent-data:t
-sgml-parent-document:("../debian-cdd.en.sgml" "book" "chapt")
+sgml-parent-document:("../debian-dis.en.sgml" "book" "chapt")
 sgml-exposed-tags:nil
 sgml-local-catalogs:nil
 sgml-local-ecat-files:nil

Modified: cdd/trunk/dis/doc/en/03_general_ideas.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/03_general_ideas.sgml	(original)
+++ cdd/trunk/dis/doc/en/03_general_ideas.sgml	Mon Aug 18 12:38:03 2008
@@ -45,7 +45,7 @@
 </p>
 <p>
 Debian solves this problem with
-<strong>Custom Debian Distributions</strong>.
+<strong>Debian Integrated Solutions</strong>.
 </p>
 
  </sect>
@@ -57,30 +57,31 @@
    <heading>Profile of target users</heading>
 
 <p>
-The target user of a Custom Debian Distribution may be a specialist
-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 where users have needs
-that differ from Debian as a whole.
+The target user of a Debian Integrated Solution may be a specialist 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 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
-competent than the stereotypical Linux user.  These people are 
-often not interested in the computer for its own sake, but just
-want it to work for them.  Imagine the frustration of a doctor who
-has to move the focus of interest from the patient to his stupid
-computer that does not work as expected.
+competent than the stereotypical Linux user.  These people are often
+not interested in the computer for its own sake, but just want it to
+work for them.  Imagine the frustration of a doctor who has to move
+the focus of interest from the patient to his stupid computer that
+does not work as expected.
 </p>
 <p>
-Because of limited knowledge or time, the target user is usually unable to
-install upstream programs.  This means that in the first place, they must find
-out which software packages in their distribution might serve for a certain
-problem.  The next step would be to download and install the packages they
-choose, perhaps requiring a certain amount of configuration effort.  This
-problem is nearly impossible for a user with limited technical competence
-and perhaps poor English language comprehension, which prevents the user from
+Because of limited knowledge or time, the target user is usually
+unable to install upstream programs.  This means that in the first
+place, they must find out which software packages in their
+distribution might serve for a certain problem.  The next step would
+be to download and install the packages they choose, perhaps requiring
+a certain amount of configuration effort.  This problem is nearly
+impossible for a user with limited technical competence and perhaps
+poor English language comprehension, which prevents the user from
 understanding the installation manual.
 </p>
 <p>
@@ -94,7 +95,8 @@
 Furthermore, most target users have no or little interest in
 administration of their computer.  In short, the optimal situation
 would be that he would not even notice the existence of the computer,
-but just focus on using the application to accomplish the task at hand.
+but just focus on using the application to accomplish the task at
+hand.
 </p>
 <p>
 Common to all groups of target users is their interest in a defined
@@ -118,18 +120,19 @@
 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
+requirements.  One task for Debian Integrated Solutions is to bring
 programmers and experts who will use those special programs together.
 </p>
 <p>
-Last, but not least, we find certain requirements beyond just which packages
-are provided in each target user group.  These may differ between different
-Custom Debian Distributions.  For instance, while a doctor has to protect his
-database against snooping by outside attackers, the privacy risk for a child's
-system are of lesser importance.  Thus, the Debian Junior project cares more
-for ensuring that the user himself does not damage the desktop environment
-while playing around with it than about remote attacks.  So we find a "defined
-security profile" for each single Custom Debian Distribution.
+Last, but not least, we find certain requirements beyond just which
+packages are provided in each target user group.  These may differ
+between different Debian Integrated Solutions.  For instance, while a
+doctor has to protect his database against snooping by outside
+attackers, the privacy risk for a child's system are of lesser
+importance.  Thus, the Debian Junior project cares more for ensuring
+that the user himself does not damage the desktop environment while
+playing around with it than about remote attacks.  So we find a
+"defined security profile" for each single Debian Integrated Solution.
 </p>
 </sect1>
 
@@ -137,7 +140,7 @@
    <heading>Profile of target administrators</heading>
 
 <p>
-In the field that should be covered by Custom Debian Distributions, we
+In the field that should be covered by Debian Integrated Solutions, 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
@@ -148,7 +151,7 @@
 So, administrators are looking for timesaving in repetitive
 tasks.  While this is a common issue for each general GNU/Linux
 distribution, this could have certain consequences in the special
-fields Custom Debian Distributions want to address.
+fields Debian Integrated Solutions want to address.
 </p>
 <p>
 Another problem administrators face is that they are often not experts in
@@ -172,54 +175,56 @@
 that have a wide use.  This is different for specialised software.
 </p>
 <p>
-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
+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.
+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 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.
-This happens because the developers did not really care about a robust
-installation process that works outside their special environment.  As well,
-installation instructions are often badly written, if they exist at all. But
-these problem can be easily solved by shipping the software as policy-compliant
-binary packages, which not only ease installation, but also require
-documentation to be included.  Thus, mere inclusion in Debian benefits the whole
-user base of any specialised software.
+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.  This happens
+because the developers did not really care about a robust installation
+process that works outside their special environment.  As well,
+installation instructions are often badly written, if they exist at
+all. But these problem can be easily solved by shipping the software
+as policy-compliant binary packages, which not only ease installation,
+but also require documentation to be included.  Thus, mere inclusion
+in Debian benefits the whole user base of any specialised software.
 </item>
 <item>
-The trouble often continues in the maintenance of the installed software.
+The trouble often continues in the maintenance of the installed
+software.
 </item>
 <item>
-When it comes to the usage of the specialist software, it often happens that it
-perfectly fits the needs of the developer who wrote it for his own purposes,
-and who is familiar with its quirks, but in many cases such software does not
-comply with ergonomic standards of user interfaces.
+When it comes to the usage of the specialist software, it often
+happens that it perfectly fits the needs of the developer who wrote it
+for his own purposes, and who is familiar with its quirks, but in many
+cases such software does not comply with ergonomic standards of user
+interfaces.
 </item>
 <item>
-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 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.
+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 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.
 </item>
 <item>
-A certain number of programs are developed at universities by
-students or graduates. Once these people leave the university, the programs
-they developed might be orphaned; <em>i.e.</em>, not actively maintained
-anymore.  If their licenses are too restrictive, it may be impossible
-for anyone else to take over; sticking to
+A certain number of programs are developed at universities by students
+or graduates. Once these people leave the university, the programs
+they developed might be orphaned; <em>i.e.</em>, not actively
+maintained anymore.  If their licenses are too restrictive, it may be
+impossible for anyone else to take over; sticking to
 <comment>AT: We should find a way to avoid printing the URL in PDF output.</comment>
 <url id="http://www.debian.org/social_contract#guidelines"
 name="DFSG">-free licenses avoids that problem.
@@ -228,22 +233,22 @@
 In special fields, often "typical" (not necessarily Intel-based)
 hardware architectures are used.  Debian currently runs on 11
 different architectures, and automatic build servers normally compile
-software packages as necessary.  If auto-builders for other 
-architectures show problems, Debian maintainers will normally fix them,
-and send the original authors a patch.  Moreover, users can report
-run-time problems via the 
+software packages as necessary.  If auto-builders for other
+architectures show problems, Debian maintainers will normally fix
+them, and send the original authors a patch.  Moreover, users can
+report run-time problems via the
 <url id="http://www.debian.org/Bugs/" name="Debian Bug Tracking System">.
 </item>
 <item>
-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.
+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 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
+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
 problem of medical practice management.  Normally, all these programs
 take very interesting approaches but all of them have certain
 drawbacks.  So, joining programmers' forces might make sense here.
@@ -281,7 +286,7 @@
 </sect>
 
   <sect id="philosophy">
-   <heading>Custom Debian Distributions from philosophical point of view</heading>
+   <heading>Debian Integrated Solutions from philosophical point of view</heading>
 <p>
 Debian currently grows in several directions:
 
@@ -334,7 +339,7 @@
 sgml-always-quote-attributes:t
 sgml-indent-step:2
 sgml-indent-data:t
-sgml-parent-document:("../debian-cdd.en.sgml" "book" "chapt")
+sgml-parent-document:("../debian-dis.en.sgml" "book" "chapt")
 sgml-exposed-tags:nil
 sgml-local-catalogs:nil
 sgml-local-ecat-files:nil

Modified: cdd/trunk/dis/doc/en/04_existing_dishes.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/04_existing_dishes.sgml	(original)
+++ cdd/trunk/dis/doc/en/04_existing_dishes.sgml	Mon Aug 18 12:38:03 2008
@@ -1,5 +1,5 @@
 <chapt id="existing">
-  <heading>Existing Custom Debian Distributions</heading>
+  <heading>Existing Debian Integrated Solutions</heading>
 
   <sect id="debian-jr">
   <heading>Debian Junior: Debian for children from 1 to 99</heading>
@@ -33,8 +33,8 @@
 should be comfortable with using Debian without any special modifications.
 </p>
 <p>
-Debian Jr. was the first Custom Debian Distribution.  In fact, at the time this
-project was created, the idea of Custom Debian Distributions was born, although then,
+Debian Jr. was the first Debian Integrated Solution.  In fact, at the time this
+project was created, the idea of Debian Integrated Solutions was born, although then,
 we used the term "internal project".  Over time, this name was changed because
 it was too broad, as it was equally descriptive of a number of quite different
 projects, such as IPv6 and QA.
@@ -51,14 +51,14 @@
 
 
   <sect id="debian-med">
-  <heading>Debian-Med: Debian in Health Care</heading>
+  <heading>Debian Med: Debian in Health Care</heading>
 
 <p>
 <taglist>
   <tag>Start</tag>
    <item><url name="beginning of 2002" id="http://lists.debian.org/debian-devel/2002/01/msg01730.html"></item>
   <tag>URL</tag>
-   <item><url name="Debian-Med" id="http://www.debian.org/devel/debian-med"></item>
+   <item><url name="Debian Med" id="http://www.debian.org/devel/debian-med"></item>
   <tag>Mailing list</tag>
    <item><url name=" debian-med at lists.debian.org" id="http://lists.debian.org/debian-med/"></item>
   <tag>Initiator</tag>
@@ -138,18 +138,21 @@
     <tag><url id="http://www.linex.org/" name="LinEX"></tag>
      <item><p>A Debian derivative distribution used in all schools in
            Extremadura.</p>
-           <p>Currently a fruitful cooperation between Debian Edu and
-           LinEX is established. 
+           <p>Currently they are joining Debian Edu and by doing so
+           becoming fully integrated into Debian.  This is a really
+           important move because it brings a lot of good software and
+           experience back into Debian.
            </p>
      </item>
+<!-- Just learned that they are using Ubuntu now
     <tag><url id="http://www.lliurex.net/" name="LliureX"></tag>
      <item>A Debian derivative distribution in development to be used in
            schools in Valencia. The goal is to integrate as much as
-    <!-- [BA] This is a difficult passage to interpret.  What does "integrate
-         as much as possible as a CDD" mean?  Does it mean they mean to literally
-	 produce a CDD (impossible if they remain a derivative)?  Or does it mean
+    !--  [BA] This is a difficult passage to interpret.  What does "integrate
+         as much as possible as a DIS" mean?  Does it mean they mean to literally
+	 produce a DIS (impossible if they remain a derivative)?  Or does it mean
 	 they are going to "give back" their work into Debian so it could be
-	 incorporated into a CDD (debian-edu itself?)  Or something else?
+	 incorporated into a DIS (debian-edu itself?)  Or something else?
          [AT] More or less something else.  They have not really
          settled down what to do and how to proceed which I wanted to 
          say by "in development".  I hope they will follow the
@@ -158,8 +161,10 @@
          issues and perhaps need some stuff which can not be
          integrated. We have to wait a little bit until they have
          found a decision.
+      --
+	   possible as a Debian Integrated Solution.</item>
       -->
-	   possible as a Custom Debian Distribution.</item>
+<!-- FIXME: Aren't they using Ubuntu as well? -->
     <tag><url id="http://www.guadalinex.org/" name="Guadalinex"></tag>
      <item>This distribution is not only related to education, but might
            try also to integrate what they have produced back into Debian.</item>
@@ -173,10 +178,12 @@
 <p>
 <taglist>
   <tag>Start</tag>
-   <item>Currently not announced as an official Custom Debian
-         Distribution, but intends to integrate back.  DeMuDi is part of the
+   <item>In 2004 there was and effort by DeMuDi to become a Debian
+         Integrated Solution but this effort seems to have stalled.
+         DeMuDi was part of the
 	 <url name="Agnula" id="http://www.agnula.org/"> project (founded by European
-         Community) (since 2000).</item>
+         Community) and the work somehow was taken over by the
+         ... FIXME ... project.</item>
   <tag>URL</tag>
    <item><url name="Demudi"
    id="http://www.agnula.org/"></item>
@@ -205,7 +212,7 @@
 </sect>
 
 <sect id="debian-gis">
-  <heading>Debian-GIS: Geographical Information Systems</heading>
+  <heading>Debian GIS: Geographical Information Systems</heading>
 <p>
 <taglist>
   <tag>Start</tag>
@@ -241,14 +248,14 @@
 </sect>
 
 <sect id="debian-science">
-  <heading>Debian-Science: Debian for science</heading>
+  <heading>Debian Science: Debian for science</heading>
 
 <p>
 <taglist>
   <tag>Start</tag>
    <item><url name="July 2005" id="http://lists.debian.org/debian-devel/2005/07/msg01555.html"></item>
   <tag>URL</tag>
-   <item><url name="Debian-Science Wiki"
+   <item><url name="Debian Science Wiki"
    id="http://wiki.debian.org/DebianScience"></item>
   <tag>Mailing list</tag>
    <item><url name="debian-science at lists.debian.org" id="http://lists.debian.org/debian-science/"></item>
@@ -258,22 +265,22 @@
 </p>
 
 <p>
-  While there are Custom Debian Distributions that care for certain
-  sciences (Debian-Med deals in a main part with Biology, DebiChem for
-  Chemistry and Debian-GIS for geography) not all sciences are covered
-  by a specific CDD.  The main reason is that at the moment not enough
+  While there are Debian Integrated Solutions that care for certain
+  sciences (Debian Med deals in a main part with Biology, DebiChem for
+  Chemistry and Debian GIS for geography) not all sciences are covered
+  by a specific DIS.  The main reason is that at the moment not enough
   people support such an effort for every science.  The temporary
-  solution was to build a general Debian-Science CDD that makes use of
-  the work of other CDDs in case it exists.
+  solution was to build a general Debian Science DIS that makes use of
+  the work of other DIShes in case it exists.
 </p>
 </sect>
 
 
-<sect id="stalled-cdds">
-  <heading>CDDs that were announced but development is stalled</heading>
+<sect id="stalled-dishes">
+  <heading>DIShes that were announced but development is stalled</heading>
 
   <sect1 id="debian-desktop">
-  <heading>Debian-Desktop: Debian GNU/Linux for everybody</heading>
+  <heading>Debian Desktop: Debian GNU/Linux for everybody</heading>
 
 <p>
 Motto: "Software that Just Works".
@@ -282,7 +289,7 @@
   <tag>Start</tag>
    <item>October 2002</item>
   <tag>URL</tag>
-   <item><url name="Debian-Desktop" id="http://www.debian.org/devel/debian-desktop"></item>
+   <item><url name="Debian Desktop" id="http://www.debian.org/devel/debian-desktop"></item>
   <tag>Mailing list</tag>
    <item><url name=" debian-desktop at lists.debian.org" id="http://lists.debian.org/debian-desktop/"></item>
   <tag>Initiator</tag>
@@ -302,23 +309,23 @@
    </item>
 </taglist>
 
-This Custom Debian Distribution has many common issues with other
-Custom Distributions. The latest move of Debian-Desktop was to care
+This Debian Integrated Solution has many common issues with other
+DIShes. The latest move of Debian Desktop was to care
 about more up to date software that can be used as common base for
-all Custom Debian Distributions.  The common interest is described in
+all Debian Integrated Solutions.  The common interest is described in
 detail in <ref id="new_ways_of_distribution">.
 </p>
 </sect1>
 
   <sect1 id="debian-lex">
-  <heading>Debian-Lex: Debian GNU/Linux for Lawyers</heading>
+  <heading>Debian Lex: Debian GNU/Linux for Lawyers</heading>
 
 <p>
 <taglist>
   <tag>Start</tag>
    <item>April 2003</item>
   <tag>URL</tag>
-   <item><url name="Debian-Lex" id="http://www.debian.org/devel/debian-lex"></item>
+   <item><url name="Debian Lex" id="http://www.debian.org/devel/debian-lex"></item>
   <tag>Mailing list</tag>
    <item><url name=" debian-lex at lists.debian.org" id="http://lists.debian.org/debian-lex/"></item>
   <tag>Initiator</tag>
@@ -351,7 +358,7 @@
   <tag>Mailing list</tag>
    <item><url name=" debian-accessibility at lists.debian.org" id="http://lists.debian.org/debian-accessibility/"></item>
   <tag>URL</tag>
-   <item><url name="Debian-Accessibility" id="http://www.debian.org/devel/debian-accessibility/"></item>
+   <item><url name="Debian Accessibility" id="http://www.debian.org/devel/debian-accessibility/"></item>
   <tag>Initiator</tag>
    <item>Mario Lang <email>mlang at debian.org</email></item>
   <tag>Goals</tag>
@@ -383,13 +390,13 @@
   <tag>Start</tag>
    <item>End of 2003</item>
   <tag>URL</tag>
-   <item>Debian-Enterprise</item>
+   <item>Debian Enterprise</item>
   <tag>Initiator</tag>
    <item>Zenaan Harkness <email>zen at iptaustralia.net</email></item>
   <tag>Goals</tag>
    <item>
     <list>
-     <!-- [BA] The following are stated on the web site as what Debian-Enterprise
+     <!-- [BA] The following are stated on the web site as what Debian Enterprise
           does, and not as goals.  But the goals section on the web site is hard
 	  to reduce to specific goals point-by-point.  I believe this needs fixing,
 	  and perhaps could be improved by talking it over with Zenaan. -->
@@ -417,7 +424,7 @@
            can be run behind Apache using some rewriting rules but
            this is poorly documented and a working example or
            something else could help here.  It was discussed via
-           E-Mail that Debian-Enterprise could provide such
+           E-Mail that Debian Enterprise could provide such
            "inter-package-connection" configurations as examples.
            This was badly worded above and not officially stated at
            their web site, but should not be lost out of focus and
@@ -432,12 +439,12 @@
 </sect1>
 
   <sect1 id="other">
-   <heading>Other possible Custom Debian Distributions</heading>
+   <heading>Other possible Debian Integrated Solutions</heading>
 <p>
   There are fields that could be served nicely by not yet existing
-  Custom Debian Distributions:  
+  Debian Integrated Solutions:  
   <taglist>
-      <tag>Debian-eGov</tag>
+      <tag>Debian eGov</tag>
        <item>Could address government issues, administration, offices of authorities,
              accounting.</item>
       <tag>Office</tag>
@@ -445,13 +452,13 @@
       <tag>Accounting</tag>
        <item>Could integrate accounting systems into Debian.</item>
       <tag>Biology</tag>
-       <item>Could perhaps take over some stuff from Debian-Med.</item>
+       <item>Could perhaps take over some stuff from Debian Med.</item>
       <tag>Physics</tag>
        <item>Might look after simulation software.</item>
       <tag>Mathematics</tag>
        <item>There is even already a live CD - see Quantian in <ref id="liveCD"></item>
       <tag>???</tag>
-       <item>There are a lot more potential Custom Debian Distributions.</item>
+       <item>There are a lot more potential Debian Integrated Solutions.</item>
    </taglist>
 </p>
 </sect1>
@@ -471,7 +478,7 @@
 sgml-always-quote-attributes:t
 sgml-indent-step:2
 sgml-indent-data:t
-sgml-parent-document:("../debian-cdd.en.sgml" "book" "chapt")
+sgml-parent-document:("../debian-dis.en.sgml" "book" "chapt")
 sgml-exposed-tags:nil
 sgml-local-catalogs:nil
 sgml-local-ecat-files:nil



More information about the Cdd-commits mailing list