[openrtm-commit:03186] r943 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-02-26 16:26:52 +0900 (Mon, 26 Feb 2018)
New Revision: 943

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
Log:
[compat, ->RELENG_1_2] fixed comment

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py	2018-02-25 13:32:37 UTC (rev 942)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py	2018-02-26 07:26:52 UTC (rev 943)
@@ -150,10 +150,12 @@
   # ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Ë±þ¤¸¤Æ½é´ü²½¤ò¼Â¹Ô¤¹¤ë¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ï
   # °Ê²¼¤Î¤â¤Î¤¬»ÈÍѲÄǽ¤Ç¤¢¤ë¡£
   #
+  # -a        : ¥Þ¥Í¡¼¥¸¥ã¥µ¡¼¥Ó¥¹¤òOFF¤Ë¤¹¤ë¡£<br>
   # -f file   : ¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¡£<br>
   # -l module : ¥í¡¼¥É¤¹¤ë¥â¥¸¥å¡¼¥ë¤ò»ØÄꤹ¤ë¡£(̤¼ÂÁõ)<br>
   # -o options: ¤½¤Î¾¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¡£<br>
-  # -d        : ¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¤ò»È¤¦¡£<br>
+  # -p        : ¥Ý¡¼¥ÈÈÖ¹æ¤ò»ØÄꤹ¤ë¡£<br>
+  # -d        : ¥Þ¥¹¥¿¡¼¥Þ¥Í¡¼¥¸¥ã¤òµ¯Æ°¤¹¤ë¡£<br>
   #
   # @param self
   # @param argv ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô
@@ -165,10 +167,12 @@
   # Initialize with command line options. The following command options
   # are available.
   #
+  # -a        : Disable Manager service<br>
   # -f file   : Specify a configuration file. <br>
   # -l module : Specify modules to be loaded at the beginning. <br>
   # -o options: Other options. <br>
-  # -d        : Use default static configuration. <br>
+  # -p        : Specify a port number. <br>
+  # -d        : Run Master Manager. <br>
   #
   # @endif
   def init(self, argv):
@@ -240,10 +244,12 @@
   #
   # @brief ¥³¥Þ¥ó¥É°ú¿ô¤ò¥Ñ¡¼¥¹¤¹¤ë
   #
+  # -a        : ¥Þ¥Í¡¼¥¸¥ã¥µ¡¼¥Ó¥¹¤òOFF¤Ë¤¹¤ë¡£<br>
   # -f file   : ¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¡£<br>
   # -l module : ¥í¡¼¥É¤¹¤ë¥â¥¸¥å¡¼¥ë¤ò»ØÄꤹ¤ë¡£(̤¼ÂÁõ)<br>
   # -o options: ¤½¤Î¾¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¡£<br>
-  # -d        : ¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¤ò»È¤¦¡£<br>
+  # -p        : ¥Ý¡¼¥ÈÈÖ¹æ¤ò»ØÄꤹ¤ë¡£<br>
+  # -d        : ¥Þ¥¹¥¿¡¼¥Þ¥Í¡¼¥¸¥ã¤òµ¯Æ°¤¹¤ë¡£<br>
   #
   # @param self
   # @param argv ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô
@@ -252,10 +258,12 @@
   #
   # @brief Parse command arguments
   #
+  # -a        : Disable Manager service<br>
   # -f file   : Specify a configuration file. <br>
   # -l module : Specify modules to be loaded at the beginning. <br>
   # -o options: Other options. <br>
-  # -d        : Use default static configuration. <br>
+  # -p        : Specify a port number. <br>
+  # -d        : Run Master Manager. <br>
   #
   # @endif
   def parseArgs(self, argv):