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

CDD Subversion Commit noreply at alioth.debian.org
Mon Aug 18 22:15:27 UTC 2008


Author: tille
Date: Mon Aug 18 22:15:26 2008
New Revision: 1041

Modified:
   cdd/trunk/dis/doc/en/05_inside.sgml
   cdd/trunk/dis/doc/en/06_technology.sgml
Log:
More renaming fixing of the docs


Modified: cdd/trunk/dis/doc/en/05_inside.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/05_inside.sgml	(original)
+++ cdd/trunk/dis/doc/en/05_inside.sgml	Mon Aug 18 22:15:26 2008
@@ -20,13 +20,13 @@
 like 
   <url id="http://www.linspire.com/" name="Linspire"> (formerly Lindows),
   <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 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
-into Debian, and thus integration into Debian is impossible.
+  <url id="http://www.xandros.com/" name="Xandros">, there is no other
+choice than forking because these companies normally add some stuff
+that is non-free.  While Debian Integrated Solutions 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 into Debian, and thus
+integration into Debian is impossible.
 </p>
   </sect1>
 
@@ -34,24 +34,25 @@
   <heading>Non-commercial forks</heading>
 
 <p>
-Custom Debian Distributions are a solution for derivatives from Debian
-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 that are probably now able to integrate back into Debian are:
+Debian Integrated Solutions are a solution for derivatives from Debian
+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 Debian Integrated Solutions approach was invented.
+Some examples of forks from Debian that are probably now able to
+integrate back into Debian are:
 
 <taglist>
  <tag><url id="http://www.skolelinux.org" name="SkoleLinux"></tag>
   <item>Mentioning SkoleLinux in the category of forks is more or less
-        history.  The merge back into Debian started with the SkoleLinux
-	people really doing a great job to enhance Debian for their own
-	purposes in the form of their work on debian-installer, and
-	culminated with the formal merging of the Custom Debian Distribution
-	Debian-Edu and SkoleLinux, so that they are now virtually equivalent.
-	This is the recommended way for forked distributions, and the
-	reasons for this recommendation are given below.
+        history.  The merge back into Debian started with the
+        SkoleLinux people really doing a great job to enhance Debian
+        for their own purposes in the form of their work on
+        debian-installer, and culminated with the formal merging of
+        the Debian Integrated Solution Debian Edu and SkoleLinux, so
+        that they are now virtually equivalent.  This is the
+        recommended way for forked distributions, and the reasons for
+        this recommendation are given below.
   </item>
  <tag>DeMuDi</tag>
   <item>The <url name="Agnula"
@@ -70,14 +71,14 @@
         <tag>Organisational</tag>
          <item>Because of the founded status of the project, an extra
 	 distribution had to be developed.  To accomplish this
-	 requirement, Custom Debian Distributions plan to build common
-	 tools to facilitate building separate CDs with the
-	 contents of only a single distribution.</item>
+	 requirement, Debian Integrated Solutions plan to build common
+	 tools to facilitate building separate CDs with the contents
+	 of only a single distribution.</item>
        </taglist>
         This shows that there is no longer a real need for a fork, and
 	in fact, the organiser of the DeMuDi project is in contact to
 	start bringing DeMuDi back into Debian.  (That is why DeMuDi is
-	mentioned in the list of Custom Debian Distributions above.)
+	mentioned in the list of Debian Integrated Solutions above.)
   </item>
  <tag>LinEx</tag>
   <item>LinEx is the very successful Distribution for schools in the
@@ -97,14 +98,14 @@
 </p>
 <p>
 If developers of a non-commercial fork consider integrating back into
-Debian in the form of a Custom Debian Distribution, it might happen
-that their field is covered already by a Custom Debian Distribution.  For
-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 that might be necessary
-would be called <strong>flavours</strong> of a Custom Debian
-Distribution.
+Debian in the form of a Debian Integrated Solution, it might happen
+that their field is covered already by a Debian Integrated Solution.
+For 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 that might be
+necessary would be called <strong>flavours</strong> of a Debian
+Integrated Solution.
 </p>
   </sect1>
 
@@ -153,7 +154,7 @@
 enables them to solve their problems.  So there is no
 need for extra research on the side of the users, and no need for
 advertising for a special distribution.  This fact has been
-observed in the Debian-Med project, which is well known for many
+observed in the Debian Med project, which is well known for many
 people in medical care.  It would not have gained this popularity if
 it had been separated from Debian.
 </p>
@@ -220,8 +221,8 @@
 For instance, developers may have children, or may work in some
 special fields of work, and so they try to make the best system for
 their own needs.  For children, they contribute to Debian Jr. or
-Debian-Edu.  For their field of work, they contribute to the appropriate
-CDD: Debian-Med, Debian-Lex, and so forth.
+Debian Edu.  For their field of work, they contribute to the
+appropriate DIS: Debian Med, Debian Lex, and so forth.
 </p>
 <p>
 In contrast to employees of companies, every single Debian developer
@@ -229,7 +230,7 @@
 decisions of the management of his company.  Commercial distributors
 have to aim their distributions at gaining a big market share.  The
 commercial possibilities in targeting children's PCs at home are
-slight, so distributions comparable to Debian-Junior are not attractive
+slight, so distributions comparable to Debian Junior are not attractive
 for commercial distributors to make.
 </p>
 <p>
@@ -255,7 +256,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/06_technology.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/06_technology.sgml	(original)
+++ cdd/trunk/dis/doc/en/06_technology.sgml	Mon Aug 18 22:15:26 2008
@@ -68,10 +68,10 @@
 feature of this type of package is its dependencies on other
 packages.  The naming of metapackages follows the pattern
 <var>&lt;cdd&gt;</var>-<var>&lt;task&gt;</var> where <var>&lt;cdd&gt;</var> stands for the
-short name of a Custom Debian Distribution,
+short name of a Debian Integrated Solution,
 e.g. <package>junior</package> for Debian Jr. or <package>med</package>
 for Debian-Med, and <var>&lt;task&gt;</var> means the certain task inside the
-Custom Debian Distribution, e.g. puzzle or bio.
+Debian Integrated Solution, e.g. puzzle or bio.
 </p>
 <p>
 Examples:
@@ -148,11 +148,11 @@
 
 <p>
 A "traditional" weakness of Free Software projects is missing
-documentation.  To fix this, Custom Debian Distributions try to provide
+documentation.  To fix this, Debian Integrated Solutions try to provide
 relevant documentation to help users to solve their problems.  This
 can be done by building <package>*-doc</package> packages of existing
 documentation, and by writing extra documentation, like manpages, etc.  By
-supplying documentation, Custom Debian Distributions fulfil
+supplying documentation, Debian Integrated Solutions fulfil
 their role in addressing the needs of specialised users, who have a great
 need for good documentation in their native language.
 </p>
@@ -162,8 +162,8 @@
 id="http://ddtp.debian.net/" name="Debian Description Translation
 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.
+documentation, which might be a great help for Debian Integrated
+Solutions.
 </p>
 
    </sect1>
@@ -325,9 +325,9 @@
 </taglist>
 
 The short conclusion here is: <strong>There are no sophisticated tools
-that might be helpful to handle metapackages as they are used in Custom
-Debian Distributions - just some hacks using the powerful tools inside
-Debian.</strong>
+that might be helpful to handle metapackages as they are used in
+Debian Integrated Solutions - just some hacks using the powerful tools
+inside Debian.</strong>
 </p>
 
    </sect1>
@@ -346,7 +346,7 @@
     The Debian task installer <prgn>Tasksel</prgn> is the first
     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
+    should contain an entry for each Debian Integrated Solution.  This
     is currently the case for Debian-Jr.
     <example>
 Debian Task Installer v1.43 - (c) 1999-2003 SPI and others
@@ -376,22 +376,22 @@
 
 
     </example>
-    Unfortunately, there are some
-    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
-    Debian Distributions were added, and so a different solution has to
-    be found here. (See <url id="http://bugs.debian.org/186085"
+    Unfortunately, there are some issues that prevent further Debian
+    Integrated Solutions 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 Debian Integrated Solutions
+    were added, and so a different solution has to be found
+    here. (See <url id="http://bugs.debian.org/186085"
     name="#186085">.)  In principle, <prgn>tasksel</prgn> is a good
-    tool for easy installation of Custom Debian Distributions.
+    tool for easy installation of Debian Integrated Solutions.
    </item>
   <tag><prgn>aptitude</prgn></tag>
    <item>
     This is a better replacement for <prgn>dselect</prgn>, and has some
     useful support for searching for and grouping of packages.  While
     this is not bad, it was not intended for the purpose of handling
-    Custom Debian Distributions, and thus there could be some better support
+    Debian Integrated Solutions, and thus there could be some better support
     to handle metapackages more cleverly.
    </item>
 </taglist>
@@ -422,7 +422,7 @@
    </item>
   <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
+         of Debian Integrated Solutions.  <prgn>Synaptic</prgn> has a
 	 nice filter feature, which makes it a great tool here.
 	 Moreover <prgn>synaptic</prgn> is currently the only user
 	 interface that supports Debian Package Tags (see <ref
@@ -436,7 +436,7 @@
 </taglist>
 Short conclusion: <strong>As well as the text based user interfaces
 these tools are quite usable but need enhancements to be regarded as
-powerful tools for Custom Debian Distributions.</strong>
+powerful tools for Debian Integrated Solutions.</strong>
 </p>
    </sect1>
          
@@ -463,7 +463,7 @@
    <item><p>
          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 Integrated Solutions it can help if you know the
 	 Debian user name of the developer who is responsible for the
 	 metapackages:
          <taglist>
@@ -506,20 +506,20 @@
          than it would be useful for a good overview.
          </p><p>
          So the conclusion is - we just need better support here for
-         Custom Debian Distributions.
+         Debian Integrated Solutions.
          </p>
   <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>
-         that checks for the installed packages of a Custom Debian
-         Distribution and builds a simple web page describing these
+         that checks for the installed packages of a Debian Integrated
+         Solution 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.)
+         also for other Debian Integrated Solutions.)
    </item>
 </taglist>
 Short conclusion: <strong>Some very basic things can be done with the
 web interfaces described above but techniques have to be developed to
-provide useful information about each Custom Debian Distribution.</strong>
+provide useful information about each Debian Integrated Solution.</strong>
 </p>
    </sect1>
          
@@ -591,7 +591,7 @@
 groups is that there is a defined set of tools provided to handle user
 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.
+may belong for the existing Debian Integrated Solutions at this time.
 </p>
 <p>
 In the long run, this role system might even be enhanced to
@@ -634,7 +634,7 @@
 <prgn>update-menu</prgn> script for every single user of a Custom
 Debian Distribution is necessary if this is not done by the
 <file>postinst</file> script of a metapackage.  This can easily been
-done if the configuration file of a Custom Debian Distribution
+done if the configuration file of a Debian Integrated Solution
 <file>/etc/cdd/<var>&lt;cdd&gt;</var>/<var>&lt;cdd&gt;</var>.conf</file> contains the
 line
 <example>
@@ -644,7 +644,7 @@
 </p>
 <p>
 It is strongly suggested to use the package <package>cdd-dev</package>
-to build metapackages of a Custom Debian Distribution that will move
+to build metapackages of a Debian Integrated Solution that will move
 all necessary files right into place if there exists a
 <file>menu</file> directory with the menu entries.  Note, that the users
 <file>${HOME}/.menu</file> directory remains untouched.
@@ -652,13 +652,13 @@
      </sect2>
 
      <sect2 id="user-debconf">
-     <heading>Managing Custom Debian Distribution users with <prgn>debconf</prgn></heading>
+     <heading>Managing Debian Integrated Solution users with <prgn>debconf</prgn></heading>
  
 <p>
 Using <package>cdd-dev</package> it is very easy to build a
 <var>cdd</var><package>-config</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>.
+belong to the group of users of the Debian Integrated Solution <var>cdd</var>.
 For example see the <package>med-common</package> package.
 
     <example>
@@ -716,7 +716,7 @@
 	 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
+	 Debian Integrated Solution.  The user menu approach is
 	 explained in detail in <ref id="userroles">.</p>
 	 <p>This package is described in detail in appendix <ref
          id="cdd-common">.</p>
@@ -742,7 +742,7 @@
 with language and country settings pre-configured, or to use a 2.6
 kernel by default.
 </p><p>
-This can be used to create a crude "Custom Debian Distribution" using
+This can be used to create a crude "Debian Integrated Solution" using
 packages from debian, with pre-configuration of packages that use
 <prgn>debconf</prgn>.  Custom configuration scripts can be specified
 to handle packages that don't support <prgn>debconf</prgn>



More information about the Cdd-commits mailing list