odk/docs/tools.html |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

New commits:
commit bdfab729df65d782bdc1aad53b8b1a413062847d
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Apr 11 10:59:08 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Apr 11 13:12:28 2022 +0200

    Drop duplicate regmerge/regview items
    
    ...that had been added with 26db47abd059a1482bd03df937314f4645c38ece
    "CWS-TOOLING: integrate CWS jsc312", probably due to a mis-merge.  (The 
first
    occurrences had been updated over time, and the second ones not, but lets 
keep
    the second ones, properly updated, as that matches the order in which the 
tools'
    full descriptions appear further down below.)
    
    Change-Id: I725105e926a5761c210c5901e00179ea9a1b6b5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132812
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 8b991d6a4abf..49d1e911cfc1 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -68,19 +68,6 @@
                          comes with the office installation and can be found 
in the program
                          directory of the office installation.</td>
             </tr>
-           <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"/></td>
-              <td><a href="#regmerge"  title="link to the regmerge tool 
description">regmerge</a></td>
-              <td class="content87">Deprecated tool to merge several legacy 
registry (e.g. type
-                         libraries) files into one file. <b>Note:</b> Since 
OpenOffice.org 3 it is no longer part of the SDK but it comes directly with the 
office as part of the <b>ure</b>.</td>
-            </tr>
-            <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"/></td>
-              <td><a href="#regview"  title="link to the regview tool 
description">regview</a></td>
-              <td class="content87">Tool to view the content of a legacy 
registry file
-                         in a human readable manner. Special support for type 
library
-                         nodes. <b>Note:</b> Since OpenOffice.org 3 it is no 
longer part of the SDK but it comes directly with the office as part of the 
<b>ure</b>.</td>
-            </tr>
             <tr valign="top">
               <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#idlc" title="link to the idlc tool 
description">idlc</a></td>
@@ -122,14 +109,14 @@
               <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#regmerge"  title="link to the regmerge tool 
description">regmerge</a></td>
               <td class="content87">Deprecated tool to merge several legacy 
registry (e.g. type
-                         libraries) files into one file.</td>
+                         libraries) files into one file. <b>Note:</b> Since 
OpenOffice.org 3 it is no longer part of the SDK but it comes directly with the 
office as part of the <b>ure</b>.</td>
             </tr>
             <tr valign="top">
               <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#regview"  title="link to the regview tool 
description">regview</a></td>
               <td class="content87">Tool to view the content of a legacy 
registry file
                          in a human readable manner. Special support for type 
library
-                         nodes.</td>
+                         nodes. <b>Note:</b> Since OpenOffice.org 3 it is no 
longer part of the SDK but it comes directly with the office as part of the 
<b>ure</b>.</td>
             </tr>
             </table>
           </td>

Reply via email to