# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1254998071 -7200
# Node ID f4317edf4058c3bc31e09d4f020f8cc8e65cb143
# Parent  1ec4452aa36f486b3c177b82fe4b3148dbbf0da0# Parent  ec0be256882b47a558f4c669ade03627bec4fcc9
merge

diff -r 1ec4452aa36f -r f4317edf4058 cwctl.py
--- 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)
diff -r 1ec4452aa36f -r f4317edf4058 i18n/en.po
--- 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 ""