INTEGRATION: CWS sdk13 (1.14.40); FILE MERGED

2004/05/12 14:06:44 jsc 1.14.40.2: #116705# improve output
2004/03/19 15:41:49 jsc 1.14.40.1: #115998# insert description for new option of regmerge

1 files changed, 60 insertions, 71 deletions

diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 05537629301e..b4e1e3b0ffc0 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -50,111 +50,111 @@
     <td colspan="3" height="8">
       <table width="100%" border="0" cellpadding="4">
         <tr> 
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td colspan="2" align=center><a href="../index.html" title="link to the SDK start page">
 	     SDK home</a></td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td colspan="2" align=center><a name="tools"/><font size="6"><b>Development Tools</b></font></td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
         <tr> 
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td colspan="2">&nbsp;</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#idlc" title="link to the idlc tool description">idlc</a></font>
           </td>
           <td>The UNOIDL compiler, generates a common binary type library format as base for all codemaker 
 	       tools and the UNO runtime type library.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#cppumaker" title="link to the cppumaker tool description">cppumaker</a></font>
           </td>
           <td>Tool for generating C++ code for the UNOIDL types stored in a type library.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#javamaker" title="link to the javamaker tool description">javamaker</a></font>
           </td>
           <td>
             Tool for generating Java code for the UNOIDL types stored in a type library.
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#rdbmaker"  title="link to the rdbmaker tool description">rdbmaker</a></font>
           </td>
           <td>Tool for building type libraries with only a specified set of types and their dependencies.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#pkgchk"  title="link to the pkgchk tool description">pkgchk</a></font>
           </td>
           <td>The UNO package deployment tool.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#regcomp"  title="link to the regcomp tool description">regcomp</a></font>
           </td>
           <td>The UNO component registration tool.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#regmerge"  title="link to the regmerge tool description">regmerge</a></font>
           </td>
           <td>Tool to merge several registry (type libraries) files into one file.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#regview"  title="link to the regview tool description">regview</a></font>
           </td>
           <td>Tool to view the content of a registry key (type node).</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#xml2cmp" title="link to the xml2cmp tool description">xml2cmp</a></font>
           </td>
           <td>A small helper tool to extract different information from xml module description files.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#unoexe"  title="link to the uno tool description">uno</a></font>
           </td>
           <td>Tool to start UNO components and provide a UNO runtime environment.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
              <font size="3"><a href="#autodoc"  title="link to the autodoc tool description">autodoc</a></font>
           </td>
           <td>Tool to generate javadoc-like documentation for C/C++ and UNOIDL files.</td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr> 
       </table>	      
     </td>
@@ -184,7 +184,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="idlc">idlc</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -250,7 +250,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -280,7 +280,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="cppumaker">cppumaker</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -370,7 +370,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
       </td>
@@ -400,7 +400,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="javamaker">javamaker</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -438,7 +438,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -468,7 +468,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="rdbmaker">rdbmaker</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -541,7 +541,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -571,7 +571,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><A name="pkgchk">pkgchk (pkgchk.bin)</A></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -656,7 +656,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -686,7 +686,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><A name="regcomp">regcomp</A></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -738,7 +738,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -768,7 +768,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><A name="regmerge">regmerge</A></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -776,51 +776,40 @@
       </p>
       <p>'regmerge' is a small tool to merge different registry files under a specified
          key into another registry file. If a value already exists in the target file
-         the value would be overwritten by the value of the source file.</p>
+         the value is overwritten by the value of the source file.</p>
       <p><b>Usage:</b></p>
-      <b><code>regmerge &lt;mergefile&gt; mergeKeyName &tg;regfile_1&gt; ... &lt;regfile_n&gt;</code></b>
+      <b><code>regmerge [-v|--verbose] &lt;mergefile&gt; &lt;mergeKeyName&gt; &lt;regfile_1&gt; ... &lt;regfile_n&gt;</code></b>
       <p><b>Options:</b></p>
       <p>
       <table width=100% border=1 cellpadding=4 cellspacing=0>
         <tr>
-          <td width=15%><code>-register|revoke</code></td>
+          <td width=15%><code>-v|--verbose</code></td>
           <td width=85%>
-            register means that the components will be installed and revoke means that they will be removed.
+            verbose output on stdout.
           </td>
         </tr>
         <tr>
-          <td width=15%><code>-br&lt;registryfile&gt;</code></td>
+          <td width=15%><code>&lt;mergefile&gt;</code></td>
           <td width=85%>
-            the name of the registry used for bootstrapping the program. If the bootstrap registry is
-            specified and has the same name as the registration registry, '-r' is optional.
+            specifies the merged registry file. If this file doesn't exists, it is created.
           </td>
         </tr>
         <tr>
-          <td width=15%><code>-r&lt;registryfile&gt;</code></td>
+          <td width=15%><code>&lt;mergeKeyName&gt;</code></td>
           <td width=85%>
-            the name of the registry (will be created if it does not exist) where the component should
-            be registered.
+            specifies the merge key, everything is merged under this key. If this key doesn't exists, it is created.
           </td>
         </tr>
         <tr>
-          <td width=15%><code>-c&lt;locationUrls&gt;</code></td>
+          <td width=15%><code>&lt;regfile_1&gt; ... &lt;regfile_n&gt;</code></td>
           <td width=85%>
-            the location of an component (DLL, Class name, or an url of a jar file) or a list of urls
-            separated by ';'s. Note, if a list of urls is specified, the components must all need the
-            same loader.
-          </td>
-        </tr>
-        <tr>
-          <td width=15%><code>-l&lt;componentLoaderName&gt;</code></td>
-          <td width=85%>
-            the name of the needed loader, if no loader is specified the 'com.sun.star.loader.SharedLibrary'
-            is used. Supported loaders: 'com.sun.star.loader.SharedLibrary' | 'com.sun.star.loader.Java'.
+            specifies one or more registry files which are merged.
           </td>
         </tr>
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -850,7 +839,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><A name="regview">regview</A></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -880,7 +869,7 @@
       </table>
       </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -910,7 +899,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="xml2cmp">xml2cmp</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -979,7 +968,7 @@
           </p>
           <p>All output files of the second version of xml2cmp are put to the &lt;outputDirectory&gt;</p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -1009,7 +998,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="unoexe">uno</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1097,7 +1086,7 @@
 	   the same url to resolve. The service provides you an instance from remote.</p>
         </p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>
@@ -1127,7 +1116,7 @@
     <td colspan="3">
       <table width="100%" border="0" cellpadding="4">
         <tr>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
           <td>
       <p><font size="5"><b><a name="autodoc">autodoc</a></b></font>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -1221,7 +1210,7 @@
       </table>
       </p>Remark: The sequence of options matters! Use them in the order given in the "Usage"-paragraph.</p>
           </td>
-	   <td align=center><img src="../docs/images/nada.gif" width="25" height="8"></td>
+	   <td align=center><img src="../docs/images/nada.gif width="25" height="1"></td>
         </tr>
       </table> 
     </td>