[Cdd-commits] r1296 - in blends/trunk/blends: . doc/en

[CDD Subversion Commit]

Author: tille
Date: Sun Jan  4 17:08:03 2009
New Revision: 1296

Modified:
   blends/trunk/blends/blend-update-menus
   blends/trunk/blends/doc/en/03_general_ideas.sgml
   blends/trunk/blends/doc/en/06_technology.sgml
Log:
Doc updates; make sure postrm files of previousely installed CDDs will not fail


Modified: blends/trunk/blends/blend-update-menus
==============================================================================
--- blends/trunk/blends/blend-update-menus	(original)
+++ blends/trunk/blends/blend-update-menus	Sun Jan  4 17:08:03 2009
@@ -21,7 +21,7 @@
 . ${SHAREDIR}/blend-update-menus
 
 # Get command line arguments
-GETOPT=`getopt -o b:u:h --long blend:,user:,help -n "$0" -- "$@"`
+GETOPT=`getopt -o b:d:u:h --long blend:,user:,help -n "$0" -- "$@"`
 eval set -- "$GETOPT"
 while true
 do
@@ -31,7 +31,10 @@
             exit 0
             ;;
 		# get blend name
-		-b|--blend)
+		# for compatibility reasons we need to handle -d option
+		# here as well because postrm of previousely installed
+		# CDDs are using this option
+		-b|--blend|-d)
 			if ! amI root; then
 				blendLog "You must be root to specify --blend parameter"
 				blendLog ""

Modified: blends/trunk/blends/doc/en/03_general_ideas.sgml
==============================================================================
--- blends/trunk/blends/doc/en/03_general_ideas.sgml	(original)
+++ blends/trunk/blends/doc/en/03_general_ideas.sgml	Sun Jan  4 17:08:03 2009
@@ -13,7 +13,7 @@
   <tag>Enterprise solutions</tag>
    <item>
        <list>
-	 <item>Corporate Server - Mandrake</item>
+	 <item>Corporate Server - Mandriva</item>
          <item>Advanced Server - RedHat</item>
          <item>Enterprise Server - SuSE</item>
        </list>
@@ -27,10 +27,10 @@
       <tag>Mail server</tag>
         <item>SuSE Linux Openexchange Server</item>
       <tag>Firewall</tag>
-        <item>Multi Network Firewall - Mandrake, SuSE Firewall on CD,
+        <item>Multi Network Firewall - Mandriva, SuSE Firewall on CD,
             ...</item>
       <tag>Cluster</tag>
-        <item>Mandrake Clustering</item>
+        <item>Mandriva Clustering</item>
       <tag>Content Management System</tag>
         <item>RedHat</item>
       <tag>Portal Server</tag>

Modified: blends/trunk/blends/doc/en/06_technology.sgml
==============================================================================
--- blends/trunk/blends/doc/en/06_technology.sgml	(original)
+++ blends/trunk/blends/doc/en/06_technology.sgml	Sun Jan  4 17:08:03 2009
@@ -801,7 +801,7 @@
 Testing CD images with <prgn>qemu</prgn> is also made simple with a
 provided script.
 </p><p>
-It has only been tested with <prgn>debian-cd</prgn> from sarge (other
+It has only been tested with <prgn>debian-cd</prgn> from Etch (other
 than <prgn>debpartial-mirror</prgn>), so if using a new
 <prgn>debian-cd</prgn> or <prgn>debian-installer</prgn>, it may
 require some tweaks.