[Cdd-commits] r1043 - in cdd/trunk/dis: debian doc/en

CDD Subversion Commit noreply at alioth.debian.org
Fri Aug 22 16:36:38 UTC 2008


Author: tille
Date: Fri Aug 22 16:36:35 2008
New Revision: 1043

Added:
   cdd/trunk/dis/debian/dis-common.preinst
   cdd/trunk/dis/debian/dis-dev.preinst
Modified:
   cdd/trunk/dis/doc/en/06_technology.sgml
   cdd/trunk/dis/doc/en/07_starting.sgml
   cdd/trunk/dis/doc/en/08_websentinel.sgml
   cdd/trunk/dis/doc/en/09_todo.sgml
   cdd/trunk/dis/doc/en/A_devel.sgml
   cdd/trunk/dis/doc/en/B_quickintro.sgml
   cdd/trunk/dis/doc/en/C_bts.sgml
Log:
Committing work done when traveling back from debconf ...


Added: cdd/trunk/dis/debian/dis-common.preinst
==============================================================================
--- (empty file)
+++ cdd/trunk/dis/debian/dis-common.preinst	Fri Aug 22 16:36:35 2008
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+# In the process of renaming former Custom Debian Distributions to
+# Debian Integrated Solutions we have to care for configuration files
+
+if [ -d /etc/cdd ] ; then
+    mkdir -p /etc/dis
+    cd /etc/cdd
+    tar -cf - --exclude menu --exclude sources.* . | \
+            (cd /etc/dis; tar --keep-old-files -xBpf - 2> /dev/null || true)
+    # cp -u -a /etc/cdd/* /etc/dis
+    for dis in `find /etc/dis -maxdepth 1 -mindepth 1 -type d` ; do
+	cd $dis
+	sed -i~ -e 's/CDD/DIS/g' \
+		-e 's/cdd/dis/g' \
+	        -e 's/Custom Debian Distribution/Debian Internal Solution/g' \
+	        `find . -type f -name "*[a-z]"`
+    done
+    if [ -e /etc/dis/cdd.conf ] ; then
+	if [ /etc/dis/dis.conf ] ; then
+	    mv /etc/dis/cdd.conf /etc/dis/cdd.conf~
+	else
+	    mv /etc/dis/cdd.conf /etc/dis/dis.conf
+            sed -i~ -e 's/CDD/DIS/g' \
+    		    -e 's/cdd/dis/g' \
+	    	    -e 's/Custom Debian Distribution/Debian Internal Solution/g' \
+	    	    /etc/dis/dis.conf
+	fi
+    fi
+fi
+
+#DEBHELPER#

Added: cdd/trunk/dis/debian/dis-dev.preinst
==============================================================================
--- (empty file)
+++ cdd/trunk/dis/debian/dis-dev.preinst	Fri Aug 22 16:36:35 2008
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# In the process of renaming former Custom Debian Distributions to
+# Debian Integrated Solutions we have to care for configuration files
+
+if [ -d /etc/cdd ] ; then
+    mkdir -p /etc/dis
+    cp -u -a /etc/cdd/sources* /etc/dis
+fi
+
+#DEBHELPER#

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	Fri Aug 22 16:36:35 2008
@@ -43,7 +43,7 @@
    </item>
    <item>Menu entries (recommended)
       <list>
-        <item>Place these in <file>/etc/cdd/<var>&lt;cdd&gt;</var>/menu/<var>&lt;pkg-name&gt;</var></file>
+        <item>Place these in <file>/etc/dis/<var>&lt;dis&gt;</var>/menu/<var>&lt;pkg-name&gt;</var></file>
         <item>Maintain these via role based tools</item>
       </list>
    </item>
@@ -55,9 +55,9 @@
    </item>
    <item>Special metapackages:
       <list>
-         <item><package><var>&lt;cdd&gt;</var>-tasks</package>:
+         <item><package><var>&lt;dis&gt;</var>-tasks</package>:
                Contains information for <prgn>tasksel</prgn></item>
-         <item><package><var>&lt;cdd&gt;</var>-config</package>:
+         <item><package><var>&lt;dis&gt;</var>-config</package>:
                Special configurations, basic stuff for user menus</item>
       </list>
    </item>
@@ -67,7 +67,7 @@
 Metapackages are small packages with nearly no contents.  The main
 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
+<var>&lt;dis&gt;</var>-<var>&lt;task&gt;</var> where <var>&lt;dis&gt;</var> stands for the
 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
@@ -626,16 +626,16 @@
 installation.  To enable compliance with the <em>role</em> based menu
 approach it is necessary to rebuild the user menu after each package
 installation or after adding new users to the intended role.  This can
-be done by using the <manref name="cdd-update-menus" section="8"> (see
-<ref id="cdd-update-menus">) script from
-<package>cdd-common</package>.  It has to be said that using
-<prgn>cdd-update-menus</prgn> is not enough to change the menu of a
+be done by using the <manref name="dis-update-menus" section="8"> (see
+<ref id="dis-update-menus">) script from
+<package>dis-common</package>.  It has to be said that using
+<prgn>dis-update-menus</prgn> is not enough to change the menu of a
 user.  To accomplish this a call of the general
 <prgn>update-menu</prgn> script for every single user of a
 Debian Integrated Solution 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 Debian Integrated Solution
-<file>/etc/cdd/<var>&lt;cdd&gt;</var>/<var>&lt;cdd&gt;</var>.conf</file> contains the
+<file>/etc/dis/<var>&lt;dis&gt;</var>/<var>&lt;dis&gt;</var>.conf</file> contains the
 line
 <example>
     UPDATEUSERMENU=yes
@@ -643,7 +643,7 @@
 
 </p>
 <p>
-It is strongly suggested to use the package <package>cdd-dev</package>
+It is strongly suggested to use the package <package>dis-dev</package>
 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
@@ -655,10 +655,10 @@
      <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
+Using <package>dis-dev</package> it is very easy to build a
+<var>dis</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 Debian Integrated Solution <var>cdd</var>.
+belong to the group of users of the Debian Integrated Solution <var>dis</var>.
 For example see the <package>med-common</package> package.
 
     <example>
@@ -699,27 +699,27 @@
 <p>
 Building a metapackage is more or less equal for each meta
 package. This was the reason to build a common source package
-<package>cdd</package> that builds into two binary packages
+<package>dis</package> that builds into two binary packages
 <taglist>
-  <tag><package>cdd-dev</package></tag>
+  <tag><package>dis-dev</package></tag>
    <item><p>Helpful tools to build metapackages from a set of template
          files.  These tools are interesting for people who want to
 	 build metapackages in the style Debian Edu and Debian Med
 	 are currently doing this.  The purpose of this package is to
 	 make maintenance of metapackages as easy as possible.</p>
 	 <p>This package is described in detail in appendix <ref
-         id="cdd-dev">.</p>
+         id="dis-dev">.</p>
    </item>
-  <tag><package>cdd-common</package></tag>
+  <tag><package>dis-common</package></tag>
    <item><p>This package provides some files that are common to meta
          packages of Common Debian Distributions especially those
 	 that were built using the tools of the package
-	 <package>cdd-dev</package>. It introduces a method to handle 
+	 <package>dis-dev</package>. It introduces a method to handle 
          system users in a group named according to the name of the
 	 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>
+         id="dis-common">.</p>
    </item>
 </taglist>
 The usage of the tools that are contained in these packages are
@@ -772,7 +772,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/07_starting.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/07_starting.sgml	(original)
+++ cdd/trunk/dis/doc/en/07_starting.sgml	Fri Aug 22 16:36:35 2008
@@ -1,5 +1,5 @@
 <chapt id="starting">
-  <heading>How to start a Custom Debian Distribution</heading>
+  <heading>How to start a Debian Integrated Solution</heading>
   
 <p>
 This chapter more or less covers the text of the <url
@@ -11,11 +11,11 @@
 </p>
 
  <sect id="planning">
- <heading>Planning to form a Custom Debian Distribution</heading>
+ <heading>Planning to form a Debian Integrated Solution</heading>
 
   <p>
-  In this section, issues to think about before starting a Custom
-  Debian Distribution will be discussed. It is important to have a
+  In this section, issues to think about before starting a Debian
+  Integrated Solution will be discussed. It is important to have a
   clear idea where to head and how to get there before launching into
   this adventure.
   </p>
@@ -23,12 +23,12 @@
  <sect1 id="leadership">
  <heading>Leadership</heading>
   <p>
-  The existing Custom Debian Distributions have clearly shown
+  The existing Debian Integrated Solutions have clearly shown
   that they depend on a person who keeps things running.  If anybody
   wants to start a project at first, he has to answer the question:
   <em>"Am I the right person for the job?"</em>  Surely this is a
   question that may be faced with some amount of uncertainty.  The
-  way Custom Debian Distributions started in the past
+  way Debian Integrated Solutions started in the past
   was for the person with the idea for the project to just start
   doing the work.  After some time using this approach, it became clear that
   if the project lacked a person to take leadership, the project would become
@@ -55,13 +55,13 @@
   shared, the amount of work for each project can be reduced.
   </p>
   <p>
-  Checking for cooperation with other Custom Debian Distributions is
+  Checking for cooperation with other Debian Integrated Solutions is
   always a good idea.  In technical terms, this is obvious, but
   sometimes there are possibilities to share efforts when the goals
   of two projects have parts in common.
   </p>
   <p>
-  The one who decides to start a Custom Debian Distribution takes on a
+  The one who decides to start a Debian Integrated Solution takes on a
   responsibility for this project.  It has to be for the good of
   Debian as a whole, and should bring an extra reputation to our common
   goal to build the best operating system.
@@ -130,21 +130,20 @@
   </p>
   <p>
   Creating a new mailing list starts with a wishlist bug against
-  <package><var>lists.debian.org</var></package>.  The format of this bug has to follow
+  <package><var>lists.debian.org</var></package>.  The format of this
+  bug has to follow
   <url id="http://www.debian.org/MailingLists/HOWTO_start_list"
   name="certain rules">.
   </p>
   <p>
-  Before your list can be created, the listmasters will want
-  assurance that creation of the list is, in fact, necessary.
-  So for this reason, don't wait for your list to be created.
-  Start discussing your new project
-  on <email>debian-devel at lists.debian.org</email> immediately.  To
-  help distinguish your project's posts from the large amount of
-  traffic on this list, tag them in the Subject field with
-  an agreed-upon tag.  For instance for general discussion about Custom
-  Debian Distributions the tag <tt>[custom]</tt> should be used. An
-  example bug report to create the relevant list is bug
+  Before your list can be created, the listmasters will want assurance
+  that creation of the list is, in fact, necessary.  So for this
+  reason, don't wait for your list to be created.  Start discussing
+  your new project on <email>debian-devel at lists.debian.org</email>
+  immediately.  To help distinguish your project's posts from the
+  large amount of traffic on this list, tag them in the Subject field
+  with an agreed-upon tag. An example bug report to create the
+  relevant list is bug
   <url id="http://bugs.debian.org/237017" name="#237017">.
   </p>
   <p>
@@ -159,18 +158,18 @@
 <sect1>
   <heading>Web space</heading>
   <p>
-  A fairly important way to let people know what your Custom
-  Debian Distribution is about is certainly a web page.  While there
+  A fairly important way to let people know what your Debian
+  Integrated Solution is about is certainly a web page.  While there
   are a number of ways to go about this, the simplest is to put them
-  at the developer home page at <url id="http://people.debian.org"> if an
-  official Debian developer is starting the project.
+  at the developer home page at <url id="http://people.debian.org"> if
+  an official Debian developer is starting the project.
   </p>
   <p>
   Another possibility, and one which is fairly attractive because
   it facilitates collaborative web site creation and maintenance,
   is to put a page on the <url name="Wiki" id="http://wiki.debian.org">.  There
   is a special <url id="http://wiki.debian.org/index.cgi?CustomDebian"
-  name="Wiki page for Custom Debian Distributions">.
+  name="Wiki page for Debian Integrated Solutions">.
   </p>
   <p>
   A third, and more recent possibility is to start a project at
@@ -179,20 +178,20 @@
   site.
   </p>
   <p>
-  Finally, the best way is to have a page under <url
-  id="http://www.debian.org/devel">.  While not as straightforward as
-  any of the other options, this approach has its
+  Finally, the best way is to have a page
+  under <url id="http://www.debian.org/devel">.  While not as
+  straightforward as any of the other options, this approach has its
   advantages.  First, the site is mirrored everywhere.  Second, the
   Debian web site translators translate pages into many different
-  languages, reaching new potential audiences for your Custom Debian
-  Distribution, and improving communication with other members of your
-  project and interested parties for whom English is not their most
-  comfortable language.  Third, a number of templates are available to
-  make your site more integrated with the main web site, and to assist
-  with incorporating some dynamic content into your site. Before you
-  join the Debian-Web team you should <url
-  id="http://www.debian.org/devel/website" name="learn more about building
-  Debian web pages">.
+  languages, reaching new potential audiences for your Debian
+  Integrated Solution, and improving communication with other members
+  of your project and interested parties for whom English is not their
+  most comfortable language.  Third, a number of templates are
+  available to make your site more integrated with the main web site,
+  and to assist with incorporating some dynamic content into your
+  site. Before you join the Debian Web team you
+  should <url id="http://www.debian.org/devel/website" name="learn
+  more about building Debian web pages">.
   </p>
   <p>
   Once this is done, the Debian web pages team should be contacted via
@@ -208,8 +207,8 @@
   On <url id="http://alioth.debian.org/" name="alioth.debian.org"> a
   <url id="http://gforge.org/" name="Gforge">-site is running to host
   all Debian related project work.  Creating a project on Alioth is a
-  good idea to start teamwork on the code a certain Custom Debian
-  Distribution is releasing.
+  good idea to start teamwork on the code a certain Debian Integrated
+  Solution is releasing.
   </p>
 </sect1>
 
@@ -218,7 +217,7 @@
   <p>
   Once there is a list, or at least enough preliminary discussion on
   debian-devel to get started, and there is some information about the
-  newly planned Custom Debian Distribution available on the web,
+  newly planned Debian Integrated Solution available on the web,
   it is time to send a formal announcement to
   <email>debian-devel-announce at lists.debian.org</email>.  The
   announcement should include references to past discussions, any web
@@ -260,7 +259,7 @@
   While there are a variety of different kinds of work to be done in
   Debian, and not all of them follow this pattern, this document
   describes one particular kind of project.  Our discussion about
-  Custom Debian Distributions concerns sub-setting Debian.  A
+  Debian Integrated Solutions concerns sub-setting Debian.  A
   sub-setting project aims to identify, expand, integrate, enhance, and
   maintain a collection of packages suitable for a particular purpose
   by a particular kind of user.
@@ -299,13 +298,13 @@
   </p>
   <p>
   A good example was the request to split the microbiology
-  related packages out of Debian-Med into a Debian-Bio project.  This
+  related packages out of Debian Med into a Debian Bio project.  This
   is reasonable in principle, and should really be done.  In fact, the
-  initiator of Debian-Med would support this idea.  So he gave the
-  answer: "Just start the Debian-Bio project to take over all related
-  material.  Until this happens, Debian-Med will cover medical material
+  initiator of Debian Med would support this idea.  So he gave the
+  answer: "Just start the Debian Bio project to take over all related
+  material.  Until this happens, Debian Med will cover medical material
   that deals with sequence analysis and so forth."  Unfortunately,
-  there was silence from the Debian-Bio proponents after this answer.
+  there was silence from the Debian Bio proponents after this answer.
   </p>
   <p>
   Of course, it sometimes turns out that you start working on a project
@@ -330,8 +329,8 @@
 </p>
 <p>
   Section <ref id="text_ui"> mentions <prgn>tasksel</prgn> as a tool
-  to select a Custom Debian Distribution, and explains why
-  it is currently not possible to get a Custom Debian Distribution
+  to select a Debian Integrated Solution, and explains why
+  it is currently not possible to get a Debian Integrated Solution
   included into the task selection list.
 </p>
   </sect1>
@@ -346,7 +345,7 @@
   <p>
   Beyond the release announcement for Debian itself, it is necessary
   to put some thought and work into a release announcement for the
-  first release of a Custom Debian Distribution.  This will not only
+  first release of a Debian Integrated Solution.  This will not only
   be directed at the Debian developer community, but also at the users.
   This will include potential new Debian users abroad, who may not be
   on a Debian mailing list.  Here, the same principle applies as for
@@ -356,10 +355,10 @@
 </sect1>
 
 <sect1 id="users">
-  <heading>Users of a Custom Debian Distribution</heading>
+  <heading>Users of a Debian Integrated Solution</heading>
   <p>
   By this time, people have newly installed Debian along with the
-  material in the Custom Debian Distribution, or have installed the meta
+  material in the Debian Integrated Solution, or have installed the meta
   packages on their existing Debian systems.  Now comes the fun part,
   building relationships with the user community.
   </p>
@@ -425,7 +424,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/08_websentinel.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/08_websentinel.sgml	(original)
+++ cdd/trunk/dis/doc/en/08_websentinel.sgml	Fri Aug 22 16:36:35 2008
@@ -7,17 +7,17 @@
 <p>
 The result of the stuff described in this paragraph could for example
 be viewed at the <url id="http://debian-med.alioth.debian.org/tasks/"
-       name="tasks page of the Debian-Med project">.  If you want stuff
+       name="tasks page of the Debian Med project">.  If you want stuff
 like that just follow the instructions below.
 </p>
 <p>
-If a Custom Debian Distribution should be presented one of the first
+If a Debian Integrated Solution should be presented one of the first
 questions is, what packages are available.  The next question might be
 which packages are on the todo list for inclusion in Debian to make
-Debian even more attractive for people the CDD is targeting at.  Both
+Debian even more attractive for people the DIS is targeting at.  Both
 questions can be answered if you point people to the dynamically
 created tasks page.  The page is rebuild daily to stay up to date
-according to recent developments of the CDD.  The build process works
+according to recent developments of the DIS.  The build process works
 as follows:
  <list>
  <item>Read dependency information of the <file>tasks</file> files.</item>
@@ -32,12 +32,12 @@
 <p>
 The rationale behind this is to provide as much as possible
 information about packages that might be interesting for the target
-user of the CDD.  Moreover the page can provide useful information for
+user of the DIS.  Moreover the page can provide useful information for
 developers about things that might be a useful help for the project to
 work down the todo list and build Debian packages for software that is
 not yet included in Debian.  To get the todo list builded it is
 necessary to add some additional information to the task files which
-are the main database of information for the CDD.  The information is
+are the main database of information for the DIS.  The information is
 following the RFC822 syntax as all Debian control files do and is
 kept quite simple:
 <taglist>
@@ -89,7 +89,7 @@
        yet have an official Debian maintainer status and thus are not
        able to upload packages to the Debian mirror.  The packages at
        mentors are waiting for sponsoring of an official Debian
-       maintainer and if such a package shows up in the CDD tasks list
+       maintainer and if such a package shows up in the DIS tasks list
        it might speed up the inclusion into official Debian
        distribution.
    </item>
@@ -113,9 +113,9 @@
 Translation Project"> (see <ref id="documentation">) provides users of
 non English languages with information about Debian packages.  The
 sense of supporting especially the translations of descriptions which
-are in the focus of a CDD is to make the CDD even more usable for our
+are in the focus of a DIS is to make the DIS even more usable for our
 target users.  Moreover people interested in the special field of the
-CDD are most probably able to provide good translations if it comes to
+DIS are most probably able to provide good translations if it comes to
 texts that are specific to their field of knowledge.  Thus there is a
 web page automatically created that parses the tasks packages for
 package names and verifies the translation status of the package
@@ -132,7 +132,7 @@
    <sect id="bugs">
   <heading>Bugs overview</heading>
 <p>
-The goal of a CDD is to support their user as best as possible.  So a
+The goal of a DIS is to support their user as best as possible.  So a
 feature to have a quick overview about all packages in our focus might
 be helpful.  This is solved by the bugs overview page.  To create this
 page the <file>tasks</file> files are parsed for the listed
@@ -140,7 +140,7 @@
 known bugs of these packages.  All bugs are listed and marked with
 different colours according to their severity.  So the developers can
 easily check this page in case they plan to fix some bugs that are
-relevant for the CDD.
+relevant for the DIS.
 </p>
    </sect>
 
@@ -148,7 +148,7 @@
   <heading>SVN overview</heading>
 <p>
 This page gives a recent overview about the current development
-activities of the CDD developers.
+activities of the DIS developers.
 </p>
   </sect>
 
@@ -160,7 +160,7 @@
 status o f Debian packages.  If a package features a
 valid <file>debian/watch</file> the tool <prgn>uscan</prgn> is able to
 verify the upstream source location for newer versions.  The QA report
-page reports issues about the packages that are relevant for a CDD.
+page reports issues about the packages that are relevant for a DIS.
 </p>
   </sect>
 
@@ -177,7 +177,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/09_todo.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/09_todo.sgml	(original)
+++ cdd/trunk/dis/doc/en/09_todo.sgml	Fri Aug 22 16:36:35 2008
@@ -5,18 +5,18 @@
   <heading>Establishing and using communication platforms</heading>
 
 <p>
-Each Custom Debian Distribution has an own mailing list for discussion
+Each Debian Integrated Solution has an own mailing list for discussion
 of specific development issues.  Because there are several common
-issues between all Custom Debian Distributions also a common mailing
+issues between all Debian Integrated Solutions also a common mailing
 list was created. People who are interested in working on common
 issues like building metapackages, technical issues of menu systems
-or how to create CDs for Custom Debian Distributions could <url
+or how to create CDs for Debian Integrated Solutions could <url
 id="http://lists.debian.org/debian-custom/" name="subscribe to this
 list or read the list archive">.
 </p>
 <p>
 Moreover the project <url
-id="http://alioth.debian.org/projects/cdd/" name="cdd"> on Alioth was
+id="http://alioth.debian.org/projects/cdd/" name="dis"> on Alioth was
 started.  The <url id="http://svn.debian.org/viewcvs/cdd/"
 name="subversion repository"> can be browsed or checked out by
 by
@@ -25,7 +25,7 @@
 </example>
 for anonymous users. Developers should check out via
 <example>
-  svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/cdd/cdd/trunk cdd
+  svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/cdd/cdd/trunk dis
 </example>
 The current layout for the repository is as follows:
 <example>
@@ -41,9 +41,9 @@
        |       |                    +- 0.3
        |       |                        [Since 0.4.1 the doc is in cdd directory]
        |       |
-       |       +- trunk ----cdd [code in development for cdd source package]
+       |       +- trunk ----dis [code in development for dis source package]
        |                     |
-       |                     +-- doc [this document = cdd-doc package]
+       |                     +-- doc [this document = dis-doc package]
        |
        +- projects -+--- med ---+- branches
                     |           |
@@ -65,7 +65,7 @@
 id="http://lists.alioth.debian.org/mailman/listinfo/cdd-commits"
 name="mailing list"> with subversion changes and a <url
 id="http://cia.navi.cx/stats/project/debian-custom" name="CIA system">
-for tracking changes in the Custom Debian Distributions projects in
+for tracking changes in the Debian Integrated Solutions projects in
 real-time.
 </p>
   </sect>
@@ -76,7 +76,7 @@
 <p>
 If a user installs Debian via official install CDs the first chance to
 do a package selection to customise the box is <prgn>tasksel</prgn>.
-The first Custom Debian Distribution Debian-Junior is mentioned in the
+The first Debian Integrated Solution Debian-Junior is mentioned in the
 task selection list and thus it is clearly visible to the user who
 installs Debian.
 </p>
@@ -86,36 +86,36 @@
 problem with the <prgn>tasksel</prgn>-approach is that all included
 packages should be on the first install CD.  This would immediately
 have the consequence that the first install CD would run out of space
-if all Custom Debian Distributions would be included in the task
+if all Debian Integrated Solutions would be included in the task
 selection list.
 </p>
 <p>
-How to enhance visibility of Custom Debian Distributions for the user
+How to enhance visibility of Debian Integrated Solutions for the user
 who installs Debian from scratch?
 <taglist>
   <tag>Change <prgn>tasksel</prgn> policy.</tag>
    <item>If the <em>packages must be on the first CD</em> feature of
-         <prgn>tasksel</prgn> would be dropped all Custom Debian
-	 Distributions could be listed under this topic in the task
+         <prgn>tasksel</prgn> would be dropped all Debian Integrated
+	 Solutions could be listed under this topic in the task
 	 selection list.
    </item>
-  <tag>Custom Debian Distributions information screen.</tag>
+  <tag>Debian Integrated Solutions information screen.</tag>
    <item>Alternatively a new feature could be added to
          <prgn>tasksel</prgn> or in addition to <prgn>tasksel</prgn>
 	 in the installation procedure which presents a screen which
-	 gives some very short information about Custom Debian
-	 Distributions (perhaps pointing to this document for further
+	 gives some very short information about Debian Integrated
+	 Solutions (perhaps pointing to this document for further
 	 reference) and enables the user to select from a list of the
-	 available Custom Debian Distributions.
+	 available Debian Integrated Solutions.
    </item>
   <tag>Provide separate install CDs</tag>
    <item>By completely ignoring the installation of the official
-         installation CD each Custom Debian Distribution can offer a
+         installation CD each Debian Integrated Solution can offer a
 	 separate installation CD.  This will be done anyway for
 	 certain practical reasons (see for instance the Debian-Edu -
 	 SkoleLinux approach).  But this is really no solution we
 	 could prefer because this does not work if the user wants to
-	 install more than one Custom Debian Distribution on one
+	 install more than one Debian Integrated Solution on one
 	 computer.
    </item>
   <tag>Change overall distribution philosophy of Debian.</tag>
@@ -123,10 +123,10 @@
          who took part in Open Source World Conference in Malaga and
 	 is explained in Detail in <ref
 	 id="new_ways_of_distribution">. This would save the problem
-	 of making Custom Debian Distribution visible to users in a
+	 of making Debian Integrated Solution visible to users in a
 	 completely different way because in this case Debian would be
-	 released as its various flavours of Custom Debian
-	 Distributions.
+	 released as its various flavours of Debian Integrated
+	 Solutions.
    </item>
 </taglist>
 </p>
@@ -136,26 +136,26 @@
 invented to support them.
 </p>
    <sect1 id="webpages">
-  <heading>Custom Debian Distributions web pages</heading>
+  <heading>Debian Integrated Solutions web pages</heading>
 <p>
-Most Custom Debian Distributions maintain their own web space under 
-<tt>http://www.debian.org/devel/cdd</tt> to provide general
+Most Debian Integrated Solutions maintain their own web space under 
+<tt>http://www.debian.org/devel/DIS-name</tt> to provide general
 information which will be translated by the Debian web team. This is a
 good way to inform users about the progress of a project.  A special
 way to announce what is done and what is planed is the list of yet
 packaged software and software which is intended to be included.  To
 do this in a nice manner Tobias Toedter
-<email>t.toedter at gmx.net</email> defined a new tag for Debian-Med
+<email>t.toedter at gmx.net</email> defined a new tag for Debian Med
 in order to ease translation by making use of the 
 <prgn>gettext</prgn> functionality. In the meantime, this new tag was
-extended to be useful for other Custom Debian Distributions as well.
+extended to be useful for other Debian Integrated Solutions as well.
 </p>
 <p>
 As a result, a new <file>.pot</file> file was created, called
 <file>debian-cdd.pot</file>.  Translators of the web pages should
 update their <file>.po</file> files and translate this new file into
 their language.  For the translation teams who have already begun to
-translate the web pages of the Debian-Med Custom Debian Distribution,
+translate the web pages of the Debian-Med Debian Integrated Solution,
 here is a short explanation of the newly introduced tag and its use.
 The tag is called <tt>project</tt>, and it takes a few attributes. The
 complete (empty) tag looks like this:
@@ -175,7 +175,7 @@
 <taglist>
   <tag>name</tag>
    <item>This is the name of the project which is yet packaged or
-         should be packaged for the Custom Debian Distribution in
+         should be packaged for the Debian Integrated Solution in
          question. In most cases, you won't have to translate this
          attribute.</item>
   <tag>url</tag>
@@ -241,38 +241,19 @@
 	 dependencies.  This should be followed by the projects which
 	 has unofficial packages outside Debian.  A last group should
 	 list all not yet packaged projects which are interesting for
-	 the Custom Debian Distribution.  These groups are using a
+	 the Debian Integrated Solution.  These groups are using a
 	 certain green-yellow-red color code.
    </item>
   <tag>alphabetically</tag>
    <item>Inside each of these three groups an alphabetical order is
-         proposed to gain some consistency between all Custom Debian
-	 Distributions.
+         proposed to gain some consistency between all Debian
+         Integrated Solutions.
    </item>
 </taglist>
 The users who are visiting the web pages will like this comfortable
 overview ...
 </p>
    </sect1>
-   <sect1 id="graphingwebpages">
-  <heading>Automatically graphing the metapackage dependencies for web
-  pages</heading>
-<p>
-The new <package>cddtk</package> contains a tool which allows browsing
-a <file>Packages</file> file for all packages that are listed in the
-dependency list of a package. 
-
-<example>
-   pkgtool -p UNCOMPRESSED_PACKAGES_FILE pdeps LIST_OF_PACKAGE_NAMES
-</example>
-
-This could be used as a start to build the web-pages as suggested above
-automatically - at least for the packages which are just at the
-Debian-Mirror.  For the unofficial packages and not yet existing
-packages a fake-<file>Packages</file> following the same syntax could
-be created and processed with the same tool.
-</p>
-   </sect1>
   </sect>
 
   <sect id="debtags">
@@ -300,7 +281,7 @@
 <p>
 Besides being able to perform package selection more efficiently by
 being able to use a better categorisation, one of the first outcomes
-of Debian Package Tags for CDDs is that every CDD could maintain its
+of Debian Package Tags for DISs is that every DIS could maintain its
 own set of tags organised under a "facet", providing categorisation
 data which could be used by its users and which automatically
 interrelates with the rest of the tags.
@@ -316,7 +297,7 @@
 </p>
 <p>
 It is not excluded that this could evolve in being able to create a
-Custom Debian Distribution just by selecting all packages tagged by
+Debian Integrated Solution just by selecting all packages tagged by
 "edu::*" tags, plus dependencies; however, this option is still being
 investigated.
 </p>
@@ -328,56 +309,17 @@
   </sect>
 
   <sect id="EnhancingTechnology">
-  <heading>Enhancing basic technologies regarding Custom Debian Distributions</heading>
+  <heading>Enhancing basic technologies regarding Debian Integrated Solutions</heading>
 
 <p>
 In section <ref id="future_handling"> several issues where raised how
 handling of metapackages should be enhanced.
 </p>
 <p>
-Regarding to building metapackages for all Custom Debian
-Distributions consistently it might make sense to use the following
-approach:
-</p>
-  <!-- FIXME: How to indent a paragraph??? -->
-  <p>
-   The method how Debian-Edu currently builds its metapackages from a
-   kind of <em>database</em> (in the <file>tasks</file> directory of the source)
-   was generalised in the packages <package>cdd-dev</package> (<ref
-   id="cdd-dev">) and <package>cdd-common</package> (<ref
-   id="cdd-common">).  This approach definitely needs some
-   enhancements to fit the needs of all Custom Debian Distributions.
-   It might be a good idea to maintain a more general kind of database
-   than this <file>tasks</file> directory approach currently represents
-   for each Custom Debian Distribution.  From
-   this database the control files for all metapackages could be
-   built on demand to build the necessary files of the
-   <file>debian</file> directory in the package build process
-   dynamically.  The extra plus would be that it would be easy to
-   build tools which parse this database to generate docs and websites
-   dynamically.  It would drastically reduce the amount of work for
-   keeping the project related web sites up to date if this could be
-   done automatically.  Some tools like the following might be easily
-   done to support maintenance and documentation of the metapackages:
-<example>
-       build_cdd-package med bio
-       build_cdd-package junior toys
-       build_cdd-package education [all]
-
-       build_cdd-wml-template nonprofit &lt;foo&gt;
-       build_cdd-wml-template demudi    &lt;bar&gt;
-
-       cdd-package-info.php?cdd=&lt;foo&gt;&amp;pkg=&lt;bar&gt;
-</example>
-   If the database structure is well thought (perhaps using XML or by
-   stealing the format of other databases which are usually used in
-   Debian) not really hard to implement.
-</p>
-<p>
-Last but not least the special configuration issue has to be
-addressed.  In general developers of metapackages should provide
-patches for dependent packages if they need a certain configuration
-option and the package in question does feature a
+Currently there is no solution to address the special configuration
+issue has to be addressed.  In general developers of metapackages
+should provide patches for dependent packages if they need a certain
+configuration option and the package in question does feature a
 <prgn>debconf</prgn> configuration for this case.  Then the
 metapackage could provide the needed options by pre-seeding the
 <prgn>debconf</prgn> database while using very low priority questions
@@ -399,13 +341,13 @@
 <p>
 If there is some agreement to use <prgn>cfengine</prgn> scripts to
 change configuration - either according to <prgn>debconf</prgn>
-questions or even to adapt local configuration for Custom Debian
-Distribution use in general - a common location for this kind of stuff
+questions or even to adapt local configuration for Debian Integrated
+Solution use in general - a common location for this kind of stuff
 should be found.  Because these scripts are not configuration itself
 but substantial part of a metapackage the suggestion would be to
 store this stuff under
 <example>
-   /usr/share/cdd/#CDD#/#METAPACKAGE#/cf.#SOMETHING#
+   /usr/share/dis/#DIS#/#METAPACKAGE#/cf.#SOMETHING#
 </example>
 </p>
 <p>
@@ -423,7 +365,7 @@
   </sect>
 
   <sect id="liveCD">
-  <heading>Building Live CDs of each Custom Debian Distribution</heading>
+  <heading>Building Live CDs of each Debian Integrated Solution</heading>
 
 <p>
 The first step to convince a user to switch to Debian is to show him
@@ -440,7 +382,7 @@
 thus people started to adopt it for there special needs.  In fact
 there exist so many Debian based Live CDs that it makes hardly sense
 to list them all here.  The main problem is that most of them
-containing special applications and thus are interesting in the CDD
+containing special applications and thus are interesting in the DIS
 scope are out of date because they way the usually were builded was a
 pain.  One exception is perhaps <url id="http://dirk.eddelbuettel.com/quantian.html"
 name="Quantian"> which is quite regularly updated and is intended for
@@ -450,10 +392,10 @@
 The good news is that the problem of orphaned or outdated Live CDs can
 easily solved by debian-live and the <package>live-helper</package>.
 This package turns all work to get an up to date ISO image for a Live
-CD into calling a single script.  For the CDD tools this would simply
+CD into calling a single script.  For the DIS tools this would simply
 mean that the tasks files have to be turned into a live-helper input
 file and the basic work is done.  This will be done in a future
-cdd-dev version.
+dis-dev version.
 </p>
 
   </sect>
@@ -479,22 +421,22 @@
 process which propagates packages to <tt>testing</tt> and releasing a
 complete <tt>stable</tt> distribution also remains untouched.  The new
 thing is that the package pool could be enhanced to store more package
-versions which belong to certain subsets alias Custom Debian
-Distributions which all have a set of <tt>tested inside the
+versions which belong to certain subsets alias Debian Integrated
+Solutions which all have a set of <tt>tested inside the
 subset</tt> distribution which leads to a <tt>stable</tt> subset
 release.  The following graph might clarify this:
 
 <example>
 DD -> unstable   -->  testing  -->  stable
          |
-         +--->  CDD_A testing  -->  stable CDD_A
+         +--->  DIS_A testing  -->  stable DIS_A
          |
-         +--->  CDD_B testing  -->  stable CDD_B
+         +--->  DIS_B testing  -->  stable DIS_B
          |
          +--->  ...
 </example>
 
-where <tt>CDD_A</tt> / <tt>CDD_B</tt> might be something like
+where <tt>DIS_A</tt> / <tt>DIS_B</tt> might be something like
 <tt>debian-edu</tt> / <tt>debian-med</tt>. To implement this
 sub-setting the following things are needed:
 <taglist>
@@ -512,7 +454,7 @@
          reasonable subsets have to be defined and maintained.  A
 	 decision has to be made (if this will be implemented at all)
 	 whether this sub-setting should be done according to the
-	 Custom Debian Distribution layout or if there are better ways
+	 Debian Integrated Solution layout or if there are better ways
 	 to find subsets.
    </item>
   <tag>BTS support</tag>
@@ -522,7 +464,7 @@
    </item>
   <tag>Security</tag>
    <item>As a consequence of having more than only a single
-         <tt>stable</tt> each CDD-team has to form a security team to
+         <tt>stable</tt> each DIS-team has to form a security team to
 	 care for those package versions that are not identically with
          the "old" <tt>stable</tt>.
    </item>
@@ -530,16 +472,16 @@
 </p>
 <p>
 A not so drastically change would be to find a <em>common</em> set of
-packages which are interesting for all Custom Debian Distributions
+packages which are interesting for all Debian Integrated Solutions
 which will obtained from the "releasable set" of testing (i.e. no
 RC-bugs).  This would make the structure above a little bit more flat:
 
 <example>
 DD -> unstable --> testing --> releasable --> stable
                                    |
-                                   +--->      stable CDD_A
+                                   +--->      stable DIS_A
                                    |
-                                   +--->      stable CDD_B
+                                   +--->      stable DIS_B
                                    |
                                    +--->  ...
 </example>
@@ -554,29 +496,29 @@
                       v
 DD -> unstable --> testing --> stable
                       |
-                      +--->    stable CDD_A
+                      +--->    stable DIS_A
                       |
-                      +--->    stable CDD_B
+                      +--->    stable DIS_B
                       |
                       +--->  ...
 </example>
 
 The rationale behind these testing backports is that sometimes a
-Custom Debian Distribution is able to reduce the set of releasable
+Debian Integrated Solution is able to reduce the set of releasable
 architectures.  Thus some essential packages could be moved much 
 faster to testing and these might be "backported" to testing for this
-special Custom Debian Distribution.  For instance this might make
+special Debian Integrated Solution.  For instance this might make
 sense for Debian-Edu where usually i386 architecture is used.
 </p>
 <p>
 All these different suggestions would lead to a modification of the
 package pool scripts which could end up in a new way to distribute
-Debian.  This might result from the fact that some Custom Debian
-Distributions need a defined release cycle.  For instance the
+Debian.  This might result from the fact that some Debian Integrated
+Solutions need a defined release cycle.  For instance the
 education related distributions might trigger their release by the
 start-end-cycle of the school year.  Another reason to change the
 package pool system is the fact that some interested groups, who
-provide special service for a certain Custom Debian Distribution,
+provide special service for a certain Debian Integrated Solution,
 would take over support only for the subset of packages which is
 included in the metapackage dependencies or suggestions but they
 refuse to provide full support for the whole range of Debian
@@ -589,11 +531,11 @@
                      /binary-...
               /testing/...
               /unstable/...
-  debian-CDD_A/dists/stable/binary-[supported_architecture1]
+  debian-DIS_A/dists/stable/binary-[supported_architecture1]
                            /binary-[supported_architecture2]
                            /...
                     /testing/...
-  debian-CDD_B/dists/testing/...
+  debian-DIS_B/dists/testing/...
                     /stable/...
   ...
   pool/main
@@ -601,26 +543,26 @@
       /non-free
 </example>
 To avoid flooding the archive with unnecessarily many versions of
-packages for each single Custom Debian Distribution a common base of
-all these Custom Debian Distributions has to be defined.  Here some
+packages for each single Debian Integrated Solution a common base of
+all these Debian Integrated Solutions has to be defined.  Here some
 LSB conformance statement comes into mind: The base system of all
-currently released (stable) Custom Debian Distributions is compliant
+currently released (stable) Debian Integrated Solutions is compliant
 to LSB version x.y.
 </p>
 <p>
-Regarding to security issues there are two ways: Either one Custom
-Debian Distribution goes with the current stable Debian and thus the
+Regarding to security issues there are two ways: Either one Debian
+Integrated Solution goes with the current stable Debian and thus the
 <file>Packages.gz</file> is just pointing to the very same versions
 which are also in debian/stable.  Then no extra effort regarding to
 security issues is need.  But if there would be a special support team
 which takes over maintenance and security service for the packages in
-one certain Custom Debian Distribution they should be made reliable
+one certain Debian Integrated Solution they should be made reliable
 for this certain subset.
 </p>
 <p>
-This reduced subset of Debian packages of a Custom Debian Distribution
+This reduced subset of Debian packages of a Debian Integrated Solution
 would also make it easier to provide special install CDs at is it
-currently done by Debian-Edu.
+currently done by Debian Edu.
 </p>
   </sect>
 </chapt>
@@ -636,7 +578,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/A_devel.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/A_devel.sgml	(original)
+++ cdd/trunk/dis/doc/en/A_devel.sgml	Fri Aug 22 16:36:35 2008
@@ -1,53 +1,53 @@
   <appendix id="DevelDescription">
   <heading>Description of development tools</heading>
-  <sect id="cdd-dev">
-  <heading>Package <package>cdd-dev</package></heading>
+  <sect id="dis-dev">
+  <heading>Package <package>dis-dev</package></heading>
 
 <p>
 If metapackages are builded using the tools inside the
-<package>cdd-dev</package> package it can be ensured that the
+<package>dis-dev</package> package it can be ensured that the
 resulting metapackages will work nicely with the same version of
-<package>cdd-common</package> package.  The goal is to keep necessary
+<package>dis-common</package> package.  The goal is to keep necessary
 changes for the source of the metapackages of a Custom Debian
 Distribution as low as possible when the version of the
-<package>cdd</package> source package changes.  Thus it is
+<package>dis</package> source package changes.  Thus it is
 strongly recommended to use the tools described below.
 </p>
 <p>
-The usage of the tools in the <package>cdd-dev</package> package might
+The usage of the tools in the <package>dis-dev</package> package might
 introduce a versioned dependency in the
-<package><var>&lt;cdd&gt;</var>-common</package> package from which
-all other metapackages of the <var>CDD</var> in question will
-depend. This <package><var>&lt;cdd&gt;</var>-common</package> package
-instantiates the <var>CDD</var> in the common registry for all CDDs in
-<file>/etc/cdd</file>.
+<package><var>&lt;dis&gt;</var>-common</package> package from which
+all other metapackages of the <var>DIS</var> in question will
+depend. This <package><var>&lt;dis&gt;</var>-common</package> package
+instantiates the <var>DIS</var> in the common registry for all DISs in
+<file>/etc/dis</file>.
 </p>
 <p>
 The best idea to use the tools provided by the
-<package>cdd-dev</package> is to put a <file>Makefile</file> into the
+<package>dis-dev</package> is to put a <file>Makefile</file> into the
 build directory containig one single line
 
 <example>
-   include /usr/share/cdd-dev/Makefile
+   include /usr/share/dis-dev/Makefile
 </example>
 
-(see <file>/usr/share/doc/cdd-dev/examples/Makefile</file>).  Using
+(see <file>/usr/share/doc/dis-dev/examples/Makefile</file>).  Using
 this <file>Makefile</file> all tools that were contained in
-<package>cdd-dev</package> package versions before 0.4.  These tools
-are moved to <file>/usr/share/cdd-dev/</file> because there is no need
+<package>dis-dev</package> package versions before 0.4.  These tools
+are moved to <file>/usr/share/dis-dev/</file> because there is no need
 to call them directly.  Here is a list of the <file>make</file> targets.
 </p>
 
-<sect1 id="cdd-tasks.desc">
-  <heading>CDD<tt>-tasks.desk</tt></heading>
+<sect1 id="dis-tasks.desc">
+  <heading>DIS<tt>-tasks.desk</tt></heading>
 
 <p>
 This target is the description file that is used in
 <prgn>tasksel</prgn> to enable selecting the tasks belonging to the
-CDD.  The file will be moved to the
-<var>cdd</var><package>-tasks</package>.  All information is obtained
+DIS.  The file will be moved to the
+<var>dis</var><package>-tasks</package>.  All information is obtained
 from the single task files in the <file>tasks</file> directory of the
-CDD source.
+DIS source.
 </p>
 
 </sect1>
@@ -55,14 +55,14 @@
   <heading><tt>debian/control</tt></heading>
 
 <p>
-The <file>debian/control</file> file of a CDD metapackage source
+The <file>debian/control</file> file of a DIS metapackage source
 archive is auto generated out of dependencies that are specified in so
 called <file>tasks</file> files.  The rationale behind this is to
 enhance flexibility about changes inside the Debian package pool where
 new packages might appear and others might be renamed.
-The <file>tasks</file> just define which dependencies the CDD
+The <file>tasks</file> just define which dependencies the DIS
 maintainer group wants to be fulfilled and the
-script <prgn>cdd-gen-control</prgn> verifies whether these
+script <prgn>dis-gen-control</prgn> verifies whether these
 dependencies exist in the specified package pool and create
 the <file>debian/control</file> file according to the available
 packages.  This does not only work for the Debian package pool
@@ -118,19 +118,19 @@
               of the metapackage.  Packages that are specified with
               "Suggests" will not be taken over to
               the <prgn>tasksel</prgn> control file
-              (CDD<file>-tasks.desk</file>,
-              see <ref id="cdd-tasks.desc">) but only to the list of
+              (DIS<file>-tasks.desk</file>,
+              see <ref id="dis-tasks.desc">) but only to the list of
               suggested packages of the according metapackage.
         </item>
         <tag>Ignore</tag>
         <item>The "Ignore" key can be used as kind of "Soft-Suggests"
-              to put a package on the radar of the CDD.  Packages that
+              to put a package on the radar of the DIS.  Packages that
               are tagged with Ignore will not be taken over into the
               list of dependencies inside
               the <file>debian/control</file> file of the resulting
-              metapackage neither to the CDD<file>-tasks.desk</file>
+              metapackage neither to the DIS<file>-tasks.desk</file>
               control file for <prgn>tasksel</prgn> but will be taken
-              over onto the installation medium of a CDD in case there
+              over onto the installation medium of a DIS in case there
               is some space left.  This key becomes especially
               important for specifying not yet packaged software that
               might be packaged in the future (prospective packages).
@@ -142,36 +142,36 @@
               be listed in the the <file>debian/control</file> file as
               "Recommends" or "Suggests" but, should not go to a
               installation medium (CD, DVD, etc.) that might be
-              produced by the CDD.  A reason to avoid a package might
+              produced by the DIS.  A reason to avoid a package might
               be that it belongs to the non-free section.
         </item>
       </taglist>
 </p>
 </sect1>
 
-<sect1 id="cdd-clean-helper">
-  <heading><!-- document type does not allow element "MANREF" here--><tt>cdd-clean-helper(1)</tt></heading>
+<sect1 id="dis-clean-helper">
+  <heading><!-- document type does not allow element "MANREF" here--><tt>dis-clean-helper(1)</tt></heading>
 
 <p>
 <taglist>
   <tag>NAME</tag>
    <item>
-    <prgn>cdd-clean-helper</prgn> - cleans up debian directory in a
+    <prgn>dis-clean-helper</prgn> - cleans up debian directory in a
      metapackage building tree 
    </item>
   <tag>SYNOPSIS</tag>
    <item>
-    <prgn>cdd-clean-helper</prgn>
+    <prgn>dis-clean-helper</prgn>
    </item>
   <tag>DESCRIPTION</tag>
    <item>
     <p>
     This script can be used in <file>debian/rules</file> file to
     revert the changes which were done by <manref
-    name="cdd-install-helper" section="1"> to get a clean packaging
+    name="dis-install-helper" section="1"> to get a clean packaging
     tree.  Using this helper ensures that the
     <file>debian/rules</file> file does not needed to be changed if
-    there are changes in the <package>cdd-dev</package> package.
+    there are changes in the <package>dis-dev</package> package.
     </p>
    </item>
   <tag>EXAMPLES</tag>
@@ -185,20 +185,20 @@
 </sect1>
 
 <sect1>
-  <heading>Apt <file>sources.list</file> files in <file>/etc/cdd/</file></heading>
+  <heading>Apt <file>sources.list</file> files in <file>/etc/dis/</file></heading>
 <p>
-These files are used by <manref name="cdd-gen-control" section="1"> to
+These files are used by <manref name="dis-gen-control" section="1"> to
 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 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
+<file>/etc/dis/control.list</file> is used as default for <manref
+name="dis-gen-control" section="1"> and usually is a symbolic link
 (see <manref name="ln" section="1">) to
 <file>sources.list.</file><var>distribution</var>.  It might be
 changed using the <tt>-s </tt><var>dist</var> option of <manref
-name="cdd-gen-control" section="1">.
+name="dis-gen-control" section="1">.
 </p>
 <p>
 <strong>TODO:</strong> <em>Either parse the available
@@ -208,54 +208,54 @@
 </sect1>
 
 <sect1>
-  <heading>Templates in <file>/usr/share/cdd/templates</file></heading>
+  <heading>Templates in <file>/usr/share/dis/templates</file></heading>
 <p>
-The directory <file>/usr/share/cdd/templates</file> contains templates
-that can be used to build a <var>&lt;cdd&gt;</var><package>-common</package>,
+The directory <file>/usr/share/dis/templates</file> contains templates
+that can be used to build a <var>&lt;dis&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">).
+<package>dis-common</package> package, and are useful to manage
+<var>&lt;dis&gt;</var> user groups (see <ref id="userroles">).
 </p>
 </sect1>
 </sect>
 
-<sect id="cdd-common">
-  <heading>Package <package>cdd-common</package></heading>
+<sect id="dis-common">
+  <heading>Package <package>dis-common</package></heading>
 
 <p>
-This package creates a common registry for all CDDs in
-<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
+This package creates a common registry for all DISs in
+<file>/etc/dis</file>.  Each DIS should put the files that are used
+into a subdirectory named like the DIS of <file>/etc/dis</file>.  The
+<package>dis-common</package> package installs a common configuration
+file <file>/etc/dis/dis.conf</file>, which can be used to influence the
 behaviour of the tools described below.  
 </p>
 
 <sect1>
-  <heading><!-- document type does not allow element "MANREF" here--><tt>cdd-role(8)</tt></heading>
+  <heading><!-- document type does not allow element "MANREF" here--><tt>dis-role(8)</tt></heading>
 <p>
 <taglist>
   <tag>NAME</tag>
    <item>
-    <prgn>cdd-role</prgn> - add/remove roles in registered Custom Debian Distribution
+    <prgn>dis-role</prgn> - add/remove roles in registered Debian Integrated Solution
 
    </item>
   <tag>SYNOPSIS</tag>
    <item>
-    <prgn>cdd-role</prgn> <var>add|del</var> <var>CDD</var> [<var>Role</var>]
+    <prgn>dis-role</prgn> <var>add|del</var> <var>DIS</var> [<var>Role</var>]
    </item>
   <tag>DESCRIPTION</tag>
    <item>Add/remove (register/unregister) <var>Role</var> for the
-   specified <var>CDD</var>. If <var>Role</var> is not specified, it's
-   assumed to be named like <var>CDD</var>.
+   specified <var>DIS</var>. If <var>Role</var> is not specified, it's
+   assumed to be named like <var>DIS</var>.
    </item>
 
    
   <tag>OPTIONS</tag>
    <item>
     <taglist>
-     <tag><var>CDD</var></tag>
-      <item>A registered custom distribution in /etc/cdd, for example
+     <tag><var>DIS</var></tag>
+      <item>A registered custom distribution in /etc/dis, for example
       one of <tt>med</tt>, <tt>junior</tt>, <tt>desktop</tt>,
             <tt>edu</tt> or <tt>demudi</tt>
       </item>
@@ -268,24 +268,24 @@
 </p>
 </sect1>
 
-<sect1 id="cdd-update-menus">
+<sect1 id="dis-update-menus">
   <heading><!-- document type does not allow element "MANREF"
-  here--><tt>cdd-update-menus(8)</tt></heading>
+  here--><tt>dis-update-menus(8)</tt></heading>
 <p>
 <taglist>
   <tag>NAME</tag>
    <item>
-    <prgn>cdd-update-menus</prgn> - add menu of metapackage to all Custom Debian Distribution users
+    <prgn>dis-update-menus</prgn> - add menu of metapackage to all Debian Integrated Solution users
    </item>
   <tag>SYNOPSIS</tag>
    <item>
-    <prgn>cdd-update-menus</prgn> [<var>--cdd CDD</var> | <var>--user
+    <prgn>dis-update-menus</prgn> [<var>--dis DIS</var> | <var>--user
     user</var>]
    </item>
   <tag>DESCRIPTION</tag>
    <item>
    <p>
-   cdd-update-menus behaves differently depending on who run the
+   dis-update-menus behaves differently depending on who run the
    command:
    </p>
 
@@ -297,7 +297,7 @@
    <p>
    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
+   group of the specified Debian Integrated Solution, or only for a
    specified user, depending on which parameter is passed to the script.
    </p>
    </item>
@@ -305,8 +305,8 @@
   <tag>OPTIONS</tag>
    <item>
     <taglist>
-     <tag><var>CDD</var></tag>
-      <item>one of the installed CDDs, listed in /etc/cdd/, for example
+     <tag><var>DIS</var></tag>
+      <item>one of the installed DISs, listed in /etc/dis/, for example
       (if installed: <tt>med</tt>, <tt>junior</tt>, <tt>desktop</tt>,
             <tt>edu</tt> or <tt>demudi</tt>
       </item>
@@ -322,38 +322,38 @@
 </sect1>
 
 <sect1>
-  <heading><!-- document type does not allow element "MANREF" here--><tt>cdd-user(8)</tt></heading>
+  <heading><!-- document type does not allow element "MANREF" here--><tt>dis-user(8)</tt></heading>
 <p>
 <taglist>
   <tag>NAME</tag>
    <item>
-    <prgn>cdd-user</prgn> - add/remove user to Role of a registered Custom Debian Distribution
+    <prgn>dis-user</prgn> - add/remove user to Role of a registered Debian Integrated Solution
 
    </item>
   <tag>SYNOPSIS</tag>
    <item>
-    <prgn>cdd-user</prgn> <var>add|del</var> <var>CDD</var> <var>user</var> [<var>Role</var>]
+    <prgn>dis-user</prgn> <var>add|del</var> <var>DIS</var> <var>user</var> [<var>Role</var>]
    </item>
   <tag>DESCRIPTION</tag>
-   <item>Add/remove user to a <var>Role</var> of the specified <var>CDD</var>.
+   <item>Add/remove user to a <var>Role</var> of the specified <var>DIS</var>.
 
    If <var>Role</var> is not specified, it's assumed to be named like
-   <var>CDD</var>
+   <var>DIS</var>
    </item>
 
    
   <tag>OPTIONS</tag>
    <item>
     <taglist>
-     <tag><var>CDD</var></tag>
-      <item>A registered custom distribution in /etc/cdd, for example
+     <tag><var>DIS</var></tag>
+      <item>A registered custom distribution in /etc/dis, for example
       one of <tt>med</tt>, <tt>junior</tt>, <tt>desktop</tt>,
             <tt>edu</tt> or <tt>demudi</tt>
       </item>
      <tag><var>user</var></tag>
       <item>user to add</item>
      <tag><var>Role</var></tag>
-      <item>the role in the <var>CDD</var> that <var>user</var> will
+      <item>the role in the <var>DIS</var> that <var>user</var> will
       assume</item>
     </taglist>
    </item>
@@ -365,21 +365,21 @@
 </sect1>
 
 <sect1>
-  <heading><tt>cdd.conf(5)</tt></heading>
+  <heading><tt>dis.conf(5)</tt></heading>
 <p>
 <taglist>
   <tag>NAME</tag>
    <item>
-    <file>cdd.conf</file> - configuration for Custom Debian Distribution registry
+    <file>dis.conf</file> - configuration for Debian Integrated Solution registry
    </item>
   <tag>DESCRIPTION</tag>
    <item>This file is sourced from shell scripts inside the Custom
-         Debian Distribution package <package>cdd-common</package> and
+         Debian Distribution package <package>dis-common</package> and
    thus it has to follow shell syntax.  The variables that are set
-   inside this configuration file can be overriden by special CDD
+   inside this configuration file can be overriden by special DIS
    configration files
-   <file>/etc/cdd/<var>&lt>cdd&gt;</var>/<var>&lt>cdd&gt;</var>.conf</file>
-   for each single CDD.
+   <file>/etc/dis/<var>&lt>dis&gt;</var>/<var>&lt>dis&gt;</var>.conf</file>
+   for each single DIS.
   <tag>SYNTAX</tag>
    <item>The following variables can be set:
     <taglist>
@@ -416,8 +416,8 @@
    </item>
   <tag>SEE ALSO</tag>
    <item>
-    <file>cdd-role (8)</file>, <file>cdd-update-menus (8)</file>, 
-    <file>cdd-user (8)</file>
+    <file>dis-role (8)</file>, <file>dis-update-menus (8)</file>, 
+    <file>dis-user (8)</file>
    </item>
   <tag>AUTHOR</tag>
    <item>Andreas Tille <email>tille at debian.org</email>, 
@@ -433,20 +433,20 @@
   <heading>Working with <file>svn</file></heading>
 <p>
   Sometimes it might be interesting for developers to check out the
-  latest code of the CDD tools or a special CDD code for the meta
+  latest code of the DIS tools or a special DIS code for the meta
   packages.  In <ref id="communication"> the directory layout of the
   <file>svn</file>-directory was described.  How to derive the
   Debian packages from this layout?
 <taglist>
   <tag>Checkout</tag>
    <item>
-    For the CDD tools
+    For the DIS tools
 <example>
-  svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/cdd/cdd/trunk/cdd cdd
+  svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/cdd/cdd/trunk/dis dis
 </example>
-    or for the Custom Debian Distribution <var>cdd-name</var>
+    or for the Debian Integrated Solution <var>dis-name</var>
 <example>
-  svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/cdd/projects/<var>cdd-name</var>/trunk
+  svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/cdd/projects/<var>dis-name</var>/trunk
 </example>
    </item>
   <tag>Build source package</tag>
@@ -460,7 +460,7 @@
     file <file>Makefile</file> in your package source directory containing
 <example>
   #!/usr/bin/make -f 
-  include /usr/share/cdd-dev/Makefile
+  include /usr/share/dis-dev/Makefile
 </example>
     Which enables you to simply say
 <example>
@@ -476,7 +476,7 @@
 </taglist>
 </p>
 <p>
-The current Debian-Med packages provide a working example how to use
+The current Debian Med packages provide a working example how to use
 the tools described below.
 </p>
 </sect> 
@@ -493,7 +493,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/B_quickintro.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/B_quickintro.sgml	(original)
+++ cdd/trunk/dis/doc/en/B_quickintro.sgml	Fri Aug 22 16:36:35 2008
@@ -21,13 +21,13 @@
 
 <p>
 This howto describes the building of metapackages by using the
-<package>cdd-dev</package> package.  It is perfectly possible to build
+<package>dis-dev</package> package.  It is perfectly possible to build
 a metapackage as any other normal Debian package but this HOWTO
 has the only purpose to describe the profit you might gain by using
 these tools.
 
     <example>
-~> cp -a /usr/share/doc/cdd-dev/examples/tasks .
+~> cp -a /usr/share/doc/dis-dev/examples/tasks .
 ~> cat tasks/README
 ~> edit tasks/task1
 Description: <var>short description
@@ -38,7 +38,7 @@
 
 For each metapackage this skeleton of a <file>debian/control</file>
 entry is needed.  All necessary information is available in the
-directory <file>/usr/share/doc/cdd-dev/examples/tasks</file>.
+directory <file>/usr/share/doc/dis-dev/examples/tasks</file>.
 </p>
    </sect>
 
@@ -48,20 +48,20 @@
 <p>
 To build any Debian package you always need a directory named
 <file>debian</file>, which contains a certain set of files.  The
-package <package>cdd-dev</package> provides a complete set of example
+package <package>dis-dev</package> provides a complete set of example
 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 .
+~> cp -a /usr/share/doc/dis-dev/examples/debian .
 ~> cat debian/README
 ~> edit debian/control.stub
 </example>
 Now the variables in the file <file>control.stub</file> change the
-variables named <var>_CDD_</var>, <var>_MAINTAINER_</var> etc. to
-match the names of the Custom Debian Distribution to be built.  Please
+variables named <var>_DIS_</var>, <var>_MAINTAINER_</var> etc. to
+match the names of the Debian Integrated Solution to be built.  Please
 note that the file <file>debian/control</file> is and has to be a
 symbolic link to <file>control.stub</file> to let the
-<package>cdd-dev</package> tools work.
+<package>dis-dev</package> tools work.
 
 <example>
 ~> edit debian/rules
@@ -69,7 +69,7 @@
 
 Also in the <file>debian/rules</file> the name of the Custom Debian
 Distribution has to be inserted where the template contains
-<var>_CDD_</var>.  Depending from the way the
+<var>_DIS_</var>.  Depending from the way the
 <file>sources.list</file> should be scanned the options for the
 <prgn>gen-control</prgn> call can be adjusted. 
 </p>
@@ -82,7 +82,7 @@
 <file>Makefile</file> containing
 <example>
 #!/usr/bin/make -f 
-include /usr/share/cdd-dev/Makefile
+include /usr/share/dis-dev/Makefile
 </example>
 which enables you to simply use
 <example>
@@ -100,7 +100,7 @@
 That's all for the very simple case when the metapackages should not
 contain user menus.  Even if user menus are suggested they are not
 necessary.  The following paragraphs describe how to use the
-<package>cdd-dev</package> tools to support these menus.
+<package>dis-dev</package> tools to support these menus.
 </p>
 
    </sect>
@@ -112,22 +112,22 @@
 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>dis-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 .
+~> cp -a /usr/share/doc/dis-dev/examples/common .
 ~> cat common/README
 ~> edit common/conf common/control common/common.1
 </example>
-The variables (<var>_CDD_</var>) in these three files have to be
-adjusted to the name of the Custom Debian Distribution in question.
-This <file><var>cdd</var>-common</file> cares for the initialisation
+The variables (<var>_DIS_</var>) in these three files have to be
+adjusted to the name of the Debian Integrated Solution in question.
+This <file><var>dis</var>-common</file> cares for the initialisation
 of the role based menu system and might contain adjustments of the
-general configuration inside the <package>cdd-common</package>.
+general configuration inside the <package>dis-common</package>.
 </p>
 <p>
-If the metapackage <package><var>cdd</var>-common</package> will be
+If the metapackage <package><var>dis</var>-common</package> will be
 created according to these rules all other metapackages will depend
 automatically from this common package.  For the friends of
 <prgn>auto-apt</prgn>, a helper
@@ -144,10 +144,10 @@
 <p>
 As explained in <ref id="menu_tools"> the metapackages can contain
 user menus.  This optional feature can be implemented easily by using
-the template from the <package>cdd-dev</package> in the following way:
+the template from the <package>dis-dev</package> in the following way:
 
 <example>
-~> cp -a /usr/share/doc/cdd-dev/examples/menu .
+~> cp -a /usr/share/doc/dis-dev/examples/menu .
 ~> cat menu/README
 ~> edit menu/task1
  <var>Edit the example to legal menu entries of the
@@ -162,12 +162,12 @@
 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
+<package><var>dis</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 metapackage 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 Debian Integrated Solutions
 issue.
 </p>
 <p>
@@ -176,7 +176,7 @@
 script of the metapackage because it is granted that the needed menu
 files are installed on the system, which is not really necessary on
 the metapackage build machine.  This might be implemented in later
-versions of <package>cdd-dev</package>.  Currently the policy is that
+versions of <package>dis-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 that do not provide a menu entry.  If this is the case
@@ -200,7 +200,7 @@
 the following templates:
 
 <example>
-~> cp -a /usr/share/doc/cdd-dev/examples/docs .
+~> cp -a /usr/share/doc/dis-dev/examples/docs .
 ~> cat docs/README
 ~> edit docs/task1/dep1
  <var>Provide information about a package &lt;dep1&gt; that is
@@ -229,7 +229,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/C_bts.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/C_bts.sgml	(original)
+++ cdd/trunk/dis/doc/en/C_bts.sgml	Fri Aug 22 16:36:35 2008
@@ -19,7 +19,7 @@
 </p>
 <p>
 If you use wnpp sanely you can even tag this bug for the intended
-purpose to include it in a certain Custom Debian Distribution. This
+purpose to include it in a certain Debian Integrated Solution. This
 was described in <url
 id="http://lists.debian.org/debian-devel-announce/2005/09/msg00002.html"
 name="a mail of Anthony Towns"> and
@@ -43,7 +43,7 @@
         </p>
         <p>
            For instance if you want to tag an ITP with bug number
-           #123456 for Debian-Med section biology you would send the
+           #123456 for Debian Med section biology you would send the
            following mail to <email>request at bugs.debian.org </email>:
              <example>
                user debian-med at lists.debian.org
@@ -103,7 +103,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