merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 08 Oct 2009 12:34:31 +0200
branchstable
changeset 3622 f4317edf4058
parent 3621 1ec4452aa36f (current diff)
parent 3620 ec0be256882b (diff)
child 3623 9b838e2d72bb
merge
--- a/cwctl.py	Thu Oct 08 12:34:17 2009 +0200
+++ b/cwctl.py	Thu Oct 08 12:34:31 2009 +0200
@@ -70,7 +70,10 @@
     def ordered_instances(self):
         """return instances in the order in which they should be started,
         considering $REGISTRY_DIR/startorder file if it exists (useful when
-        some instances depends on another as external source
+        some instances depends on another as external source).
+
+        Instance used by another one should appears first in the file (one
+        instance per line)
         """
         regdir = cwcfg.registry_dir()
         _allinstances = list_instances(regdir)
--- a/i18n/en.po	Thu Oct 08 12:34:17 2009 +0200
+++ b/i18n/en.po	Thu Oct 08 12:34:31 2009 +0200
@@ -1029,7 +1029,7 @@
 msgstr ""
 
 msgid "addrelated"
-msgstr ""
+msgstr "add"
 
 msgid "address"
 msgstr ""