[Libreoffice-commits] core.git: 2 commits - odk/CustomTarget_html.mk odk/docs odk/examples odk/index.html

Stephan Bergmann sbergman at redhat.com
Wed Jun 5 02:06:43 PDT 2013


 odk/CustomTarget_html.mk                   |    8 
 odk/docs/install.html                      |   88 ++---
 odk/docs/tools.html                        |  244 ++++++---------
 odk/examples/DevelopersGuide/examples.html |  459 +++++++++++++----------------
 odk/examples/examples.html                 |  191 ++++++------
 odk/index.html                             |   77 ++--
 6 files changed, 514 insertions(+), 553 deletions(-)

New commits:
commit 2c2dc8ebb7a3961f6f33d64a328f33dd3c9a40c6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 5 11:03:59 2013 +0200

    Use api.libreoffice.org fallback links when no local doxygen/javadoc docu
    
    Change-Id: I2b108da334f63d79a16af0e3ba956240a5aff80c

diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk
index 008a7fb..a00bb2a 100644
--- a/odk/CustomTarget_html.mk
+++ b/odk/CustomTarget_html.mk
@@ -19,6 +19,12 @@ $(eval $(call gb_CustomTarget_register_targets,odk/html,\
 
 $(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html
 	$(call gb_Output_announce,$*.html,$(true),SED,1)
-	cat $< | tr -d "\015" | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCTVERSION)/g' > $@
+	sed -e 's|%PRODUCT_RELEASE%|$(PRODUCTVERSION)|g' \
+	    -e 's|%DOXYGEN_PREFIX0%|$(if $(DOXYGEN),.,http://api.libreoffice.org)|g' \
+	    -e 's|%DOXYGEN_PREFIX1%|$(if $(DOXYGEN),..,http://api.libreoffice.org)|g' \
+	    -e 's|%DOXYGEN_PREFIX2%|$(if $(DOXYGEN),../..,http://api.libreoffice.org)|g' \
+	    -e 's|%JAVADOC_PREFIX0%|$(if $(SOLAR_JAVA),.,http://api.libreoffice.org)|g' \
+	    -e 's|%JAVADOC_PREFIX1%|$(if $(SOLAR_JAVA),..,http://api.libreoffice.org)|g' \
+	    < $< > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index ffac2d8..83b157d 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -264,7 +264,7 @@
 		  <p><code>[c:\] uno.exe -s foo.bar.FooBarService -r myregistry.rdb
 		  -- foo bar</code></p>
 		  <p>The starter loads the component and instantiates it. The component
-		  must export the interface <a href="common/ref/com/sun/star/lang/XMain.html" title="link into the IDL reference to the interface com.sun.star.lang.XMain">com.sun.star.lang.XMain</a>:</p>
+		  must export the interface <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMain.html" title="link into the IDL reference to the interface com.sun.star.lang.XMain">com.sun.star.lang.XMain</a>:</p>
 		  <p>
 		  <code>interface XMain : com::sun::star::uno::XInterface <br/>
             { <br/>
@@ -319,7 +319,7 @@
 			time instead of creating a new instance for each connection.</td>
           </tr>
           </table>
-		  <p><b>Service <a href="common/ref/com/sun/star/bridge/UnoUrlResolver.html" title="link into the IDL reference to the service com.sun.star.bridge.UnoUrlResolver">com.sun.star.bridge.UnoUrlResolver</a></b></p>
+		  <p><b>Service <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1bridge_1_1UnoUrlResolver.html" title="link into the IDL reference to the service com.sun.star.bridge.UnoUrlResolver">com.sun.star.bridge.UnoUrlResolver</a></b></p>
 		  <p>You can easily connect to a server started with the
 		  <code>-u (url)</code> option by using this service, giving the same url
 		  to resolve. The service provides you an instance from remote.</p>
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index e94cda5..bea89e3 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -337,7 +337,7 @@ of losing connection to LibreOffice %PRODUCT_RELEASE%.</td>
                   <td class="cell80">Builds a connection to
 LibreOffice %PRODUCT_RELEASE% using the URL given on the command line. This example
 shows the usage of <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1bridge_1_1XUnoUrlResolver.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1bridge_1_1XUnoUrlResolver.html"
  title="link to the reference documentation of com.sun.star.bridge.XUnoResolver"><code>XUnoUrlResolver</code></a>.</td>
                 </tr>
               </tbody>
@@ -366,11 +366,11 @@ LibreOffice %PRODUCT_RELEASE% using C++.</td>
  href="./ProfUNO/CppBinding/string_samples.cxx"
  title="link to ProfUNO/Cppbinding/string_samples.java">string_samples.cxx</a></td>
                   <td class="cell80">Demonstrates usage of RTL string
-classes <a href="../../docs/cpp/ref/names/rtl/c-OString.html"
+classes <a href="%DOXYGEN_PREFIX2%/docs/cpp/ref/names/rtl/c-OString.html"
  title="link to the reference documentation of rtl::OString"><code>OString</code></a>,
-                  <a href="../../docs/cpp/ref/names/rtl/c-OUString.html"
+                  <a href="%DOXYGEN_PREFIX2%/docs/cpp/ref/names/rtl/c-OUString.html"
  title="link to the reference documentation of rtl::OUString"><code>OUString</code></a>
-and <a href="../../docs/cpp/ref/names/rtl/c-OUStringBuffer.html"
+and <a href="%DOXYGEN_PREFIX2%/docs/cpp/ref/names/rtl/c-OUStringBuffer.html"
  title="link to the reference documentation of rtl::OUStringBuffer"><code>OUStringBuffer</code></a>.</td>
                 </tr>
               </tbody>
@@ -614,10 +614,10 @@ components.</td>
  title="link to Components/JavaComponent/TestComponentA.java">TestComponentA</a></td>
                   <td class="cell80">Shows a simple demo component
 which implements <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XTypeProvider.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XTypeProvider.html"
  title="link to the reference documentation of com.sun.star.lang.XTypeProvider"><code>XTypeProvider</code></a>,
                   <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XServiceInfo.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XServiceInfo.html"
  title="link to the reference documentation of com.sun.star.lang.XServicedInfo">
                   <code>XServiceInfo</code></a> and an own interface <code>XSomethingA</code>.</td>
                 </tr>
@@ -627,10 +627,10 @@ which implements <a
  title="link to Components/JavaComponent/TestComponentB.java">TestComponentB</a></td>
                   <td class="cell80">Shows a simple demo component
 which implements <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XTypeProvider.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XTypeProvider.html"
  title="link to the reference documentation of com.sun.star.lang.XTypeProvider">
                   <code>XTypeProvider</code></a>, <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XServiceInfo.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XServiceInfo.html"
  title="link to the reference documentation of com.sun.star.lang.XServiceInfo"><code>XServiceInfo</code></a>
 and an own interface <code>XSomethingB</code>.</td>
                 </tr>
@@ -981,7 +981,7 @@ interceptor for a specific URL.</td>
  href="./OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java"
  title="link to OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java">JavaWindowPeerFake</a></td>
                   <td class="cell80">Fakes an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1XWindowPeer.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1XWindowPeer.html"
  title=" link to the reference documentation of com.sun.star.awt.XWindowPeer"><code>XWindowPeer</code></a>
 for the Java native window handle to create a child window for the
 office frame.</td>
@@ -1013,7 +1013,7 @@ to decouple asynchronous oneway calls in the Java process.</td>
  href="./OfficeDev/DesktopEnvironment/StatusListener.java"
  title="link to OfficeDev/DesktopEnvironment/StatusListener.java">StatusListener</a></td>
                   <td class="cell80">Implements a listener for a <a
- href="../../docs/idl/ref/structcom_1_1sun_1_1star_1_1frame_1_1FeatureStateEvent.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/structcom_1_1sun_1_1star_1_1frame_1_1FeatureStateEvent.html"
  title="link to the reference documentation of com.sun.star.frame.FeatureStateEvent">
                   <code>FeatureStateEvent</code></a>.</td>
                 </tr>
@@ -1101,7 +1101,7 @@ TerminateListener and shows the use of them in a running program.</td>
  href="./OfficeDev/TerminationTest/TerminateListener.java"
  title="link to OfficeDev/TerminationTest/TerminateListener.java">TerminateListener</a></td>
                   <td class="cell80">An example implementation of <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1frame_1_1XTerminateListener.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1frame_1_1XTerminateListener.html"
  title="link to the reference documentation of com.sun.star.frame.XTerminationListener">
                   <code>XTerminateListener</code></a>. It is called
 when LibreOffice %PRODUCT_RELEASE% terminates.</td>
@@ -1208,7 +1208,7 @@ tracking the spell checking relevant properties.</td>
  href="./OfficeDev/Linguistic/SampleHyphenator.java"
  title="link to OfficeDev/Linguistic/SampleHyphenator.java">SampleHyphenator</a></td>
                   <td class="cell80">A simple implementation for a <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1linguistic2_1_1Hyphenator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1linguistic2_1_1Hyphenator.html"
  title="link to the reference documentation of com.sun.star.linguistic2.Hypenator"><code>Hyphenator</code></a>
 service.</td>
                 </tr>
@@ -1217,7 +1217,7 @@ service.</td>
  href="./OfficeDev/Linguistic/SampleSpellChecker.java"
  title="link to OfficeDev/Linguistic/SampleSpellChecker.java">SampleSpellChecker</a></td>
                   <td class="cell80">A simple implementation for a <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1linguistic2_1_1SpellChecker.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1linguistic2_1_1SpellChecker.html"
  title="link to the reference documentation of com.sun.star.linguistic2.SpellChecker"><code>SpellChecker</code></a>
 service.</td>
                 </tr>
@@ -1226,7 +1226,7 @@ service.</td>
  href="./OfficeDev/Linguistic/SampleThesaurus.java"
  title="link to OfficeDev/Linguistic/SampleThesaurus.java">SampleThesaurus</a></td>
                   <td class="cell80">A simple implementation for a <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1linguistic2_1_1Thesaurus.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1linguistic2_1_1Thesaurus.html"
  title="link to the reference documentation of com.sun.star.linguistic2.Thesaurus"><code>Thesaurus</code></a>
 service.</td>
                 </tr>
@@ -1235,7 +1235,7 @@ service.</td>
  href="./OfficeDev/Linguistic/XHyphenatedWord_impl.java"
  title="link to OfficeDev/Linguistic/XHyphenatedWord_impl.java">XHyphenatedWord_impl</a></td>
                   <td class="cell80">An object implementing the <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XHyphenatedWord.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XHyphenatedWord.html"
  title="link to the reference documentation of com.sun.star.linguistic2/XHyphenatedWord"><code>XHyphenatedWord</code></a>
 interface. An instance of this type may be returned by the hyphenator.</td>
                 </tr>
@@ -1244,7 +1244,7 @@ interface. An instance of this type may be returned by the hyphenator.</td>
  href="./OfficeDev/Linguistic/XMeaning_impl.java"
  title="link to OfficeDev/Linguistic/XMeaning_impl.java">XMeaning_impl</a></td>
                   <td class="cell80">An object implementing the <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XMeaning.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XMeaning.html"
  title="link to the reference documentation of com.sun.star.linguistic2.XMeaning"><code>XMeaning</code></a>
 interface. An instance of this type may be returned by the thesaurus.</td>
                 </tr>
@@ -1253,7 +1253,7 @@ interface. An instance of this type may be returned by the thesaurus.</td>
  href="./OfficeDev/Linguistic/XPossibleHyphens_impl.java"
  title="link to OfficeDev/Linguistic/XPossibleHyphens_impl.java">XPossibleHyphens_impl</a></td>
                   <td class="cell80">An object implementing the <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XPossibleHyphens.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XPossibleHyphens.html"
  title="link to the reference documentation of com.sun.star.linguistic2.XPossibleHyphens">
                   <code>XPossibleHyphens</code></a> interface. An
 instance of this type may be returned by the hyphenator.</td>
@@ -1263,7 +1263,7 @@ instance of this type may be returned by the hyphenator.</td>
  href="./OfficeDev/Linguistic/XSpellAlternatives_impl.java"
  title="link to OfficeDev/Linguistic/XSpellAlternatives_impl.java">XSpellAlternatives_impl</a></td>
                   <td class="cell80">An object implementing the <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XSpellAlternatives.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1linguistic2_1_1XSpellAlternatives.html"
  title="link to the reference documentation of com.sun.star.linguistic2.XSpellAlternatives">
                   <code>XSpellAlternatives</code></a> interface. An
 instance of this type may be returned by the spell checker.</td>
@@ -1286,12 +1286,12 @@ instance of this type may be returned by the spell checker.</td>
  title="link to OfficeDev/PathSettings/PathSettingsTest.java">PathsettingsTest</a></td>
                   <td class="cell80">This code example creates the
 service <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1util_1_1PathSettings.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1util_1_1PathSettings.html"
  title="link to the reference documentation of com.sun.star.util.PathSettingst">
                   <code>com.sun.star.util.PathSettings</code></a> and
 retrieves all path properties from it. It shows how a developer can
 change the path properties using the <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1beans_1_1XPropertySet.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1beans_1_1XPropertySet.html"
  title="link to the reference documentation of com.sun.star.beans.XPropertySet"><code>XPropertySet</code></a>
 interface.</td>
                 </tr>
@@ -1313,7 +1313,7 @@ interface.</td>
  title="link to OfficeDev/PathSubstitution/PathSubstitutionTest.java">PathSubstitutionTest</a></td>
                   <td class="cell80">This code example creates the path
 substitution service <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1util_1_1PathSubstitution.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1util_1_1PathSubstitution.html"
  title="link to the reference documentation of com.sun.star.util.PathSubstitution">
                   <code>com.sun.star.util.PathSubstitution</code></a>
 and retrieves the pre-defined Office path variables. It shows the
@@ -1473,16 +1473,16 @@ deployed before it can be used.</td>
  title="link to Spreadsheet/ExampleDataPilotSource.java">ExampleDataPilotSource</a></td>
                   <td class="cell80">Shows usage of a wide variety of
 spreadsheet interfaces like <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XCellRangeData.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XCellRangeData.html"
  title="link to the reference documentation of com.sun.star.sheet.XCellRangeData">
                   <code>XCellRangeData</code></a>, <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XCellSeries.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XCellSeries.html"
  title="link to the reference documentation of com.sun.star.sheet.XCellSeries"><code>XCellSeries</code></a>,
                   <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XArrayFormulaRange.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XArrayFormulaRange.html"
  title="link to the reference documentation of com.sun.star.sheet.XArrayFormularRange"><code>XArrayFormulaRange</code></a>
 and <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XMultipleOperation.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sheet_1_1XMultipleOperation.html"
  title="link to the reference documentation of com.sun.star.sheet.XMultipleOperation"><code>XMultipleOperations</code></a>
 as well as named ranges, label ranges and data pilot.</td>
                 </tr>
@@ -1969,9 +1969,9 @@ LibreOffice %PRODUCT_RELEASE% and executes the code SalesMan samples for databas
  href="./Database/OpenQuery.java"
  title="link to Database/OpenQuery.java">OpenQuery</a></td>
                   <td class="cell80">Demonstrates the use of <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sdbc_1_1XResultSetUpdate.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sdbc_1_1XResultSetUpdate.html"
  title="link to the reference documentation of com.sun.star.sdbc.XResultSetUpdate"><code>XResultSetUpdate</code></a>
-and <a href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sdbc_1_1XRowUpdate.html"
+and <a href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sdbc_1_1XRowUpdate.html"
  title="link to the reference documentation of com.sun.star.sdbc.XRowUpdate">
                   <code>XRowUpdate</code></a>.</td>
                 </tr>
@@ -2202,7 +2202,7 @@ examples</a></td>
  title="link to Forms/BooleanValidator.java">BooleanValidator</a></td>
                   <td class="cell80">The class <code>BooleanOperator</code>
 implements an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
  title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a>
 for a form control, which can veto certain radio button or check box
 states.</td>
@@ -2221,7 +2221,7 @@ functionality. The class ButtonOperator, well, operates these buttons.</td>
  title="link to Forms/ComponentTreeTraversal.java">ComponentTreeTraversal</a></td>
                   <td class="cell80">Helper classes for traveling
 through a tree of <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1form_1_1FormComponent.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1form_1_1FormComponent.html"
  title="link to the reference documentation of com.sun.star.form.FormComponent">
                   <code>FormComponent's</code></a>.</td>
                 </tr>
@@ -2230,7 +2230,7 @@ through a tree of <a
  title="link to Forms/ControlLock.java">ControlLock</a></td>
                   <td class="cell80">Helper class for implementing the
 locking of control depending on the state of the underlying <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1sdb_1_1RowSet.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1sdb_1_1RowSet.html"
  title="link to the reference documentation of com.sun.star.sdb.RowSet"><code>RowSet</code></a>.</td>
                 </tr>
                 <tr>
@@ -2248,7 +2248,7 @@ controls, and attaches several validators to those controls</td>
  title="link to Forms/ControlValidator.java">ControlValidator</a></td>
                   <td class="cell80">Base class implementing the common
 denominator for components <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1form_1_1validation_1_1ValidatableControlModel.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1form_1_1validation_1_1ValidatableControlModel.html"
  title="link to the reference documentation of com.sun.star.form.validation.ValidatableControlModel">validating
 form controls.</a></td>
                 </tr>
@@ -2268,7 +2268,7 @@ fields from these tables.</td>
  title="link to Forms/DateValidator.java">DateValidator</a></td>
                   <td class="cell80">The class <code>DateValidator</code>
 implements an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
  title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a>
 for a form control, which can check the content of a form date field. </td>
                 </tr>
@@ -2319,7 +2319,7 @@ manipulating the form layer of a document.</td>
 responsible for validating the input in a specific grid control column.
 This is not to be mixed up with the control-based validation as
 described in the <a
- href="../../docs/idl/ref/namespacecom_1_1sun_1_1star_1_1form_1_1validation.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1form_1_1validation.html"
  title="link to the reference documentation of com.sun.star.form.validation">validation</a>
 module. Instead, a <code>GridFieldValidator</code> assembles and uses
 various other concepts.</td>
@@ -2329,7 +2329,7 @@ various other concepts.</td>
  href="./Forms/InteractionRequest.java"
  title="link to Forms/InteractionRequest.java">InteractionRequest</a></td>
                   <td class="cell80">A simple implementation of a <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1task_1_1XInteractionRequest.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1task_1_1XInteractionRequest.html"
  title="link to the reference documentation of com.sun.star.task.XInteractionRequest"><code>XInteractionRequest</code></a>.
 Not tied to the form layer example, but a general helper.</td>
                 </tr>
@@ -2338,7 +2338,7 @@ Not tied to the form layer example, but a general helper.</td>
  title="link to Forms/KeyGenerator.java">KeyGenerator</a></td>
                   <td class="cell80">Helper class which is able to
 generate (unique) keys for a (<a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1sdb_1_1RowSet.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1sdb_1_1RowSet.html"
  title="link to the reference documentation of com.sun.star.sdb.RowSet"><code>RowSet</code>
                   </a>) column. An instance of this class can be tied
 to a specific row set column. It then monitors the state of the
@@ -2352,7 +2352,7 @@ created (two modi, too) key into the column.</td>
  title="link to Forms/ListSelectionValidator.java">ListSelectionValidator</a></td>
                   <td class="cell80">The class <code>ListSelectionValidator</code>
 implements an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form/validation_1_1XValidator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form/validation_1_1XValidator.html"
  title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a>
 for a form control, which can veto certain selections in a list box
 control.</td>
@@ -2363,7 +2363,7 @@ control.</td>
  title="link to Forms/NumericValidator.java">NumericValidator</a></td>
                   <td class="cell80">The class <code>NumericValidator</code>
 implements an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form/validation_1_1XValidator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form/validation_1_1XValidator.html"
  title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a>
 for a form control, which can veto certain values in every control
 which allows exchanging numerical values.</td>
@@ -2375,7 +2375,7 @@ which allows exchanging numerical values.</td>
                   <td class="cell80">Though form documents feature
 inbuilt mechanisms for visually indicating invalid control content (see
                   <a
- href="../../docs/idl/ref/namespacecom_1_1sun_1_1star_1_1form_1_1validation.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1form_1_1validation.html"
  title="link to the reference documentation of com.sun.star.form.validation"><code>com.sun.star.form.validation</code>
                   </a> for discussions about validity), the <a
  href="./Forms/ControlValidation.java"
@@ -2394,7 +2394,7 @@ ties together a validatable control and those status texts.</td>
  title="link to Forms/DocumentHelper.java"><code>DocumentHelper</code></a>
 which represents a spreadsheet document, and offers some form related
 functionality. For instance, this class allows the creation of <a
- href="../../docs/idl/ref/servicecom_1_1sun_1_1star_1_1table_1_1CellValueBinding.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/servicecom_1_1sun_1_1star_1_1table_1_1CellValueBinding.html"
  title="link to the reference documentation of com.sun.star.table.CellValueBinding">
                   <code>CellValueBinding</code></a> instances, which
 can be used to couple the content of a form control with the content of
@@ -2424,7 +2424,7 @@ which represents a view to a spreadsheet document.</td>
                   <td class="cell80">This class allows binding the
 control of a form control with a table cell in a text document. For
 this, it uses the mechanisms of the <a
- href="../../docs/idl/ref/namespacecom_1_1sun_1_1star_1_1form_1_1binding.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1form_1_1binding.html"
  title="link to the reference documentation of com.sun.star.form.binding">
                   <code>com.sun.star.form.binding</code></a> module.</td>
                 </tr>
@@ -2434,7 +2434,7 @@ this, it uses the mechanisms of the <a
  title="link to Forms/TextValidator.java">TextValidator</a></td>
                   <td class="cell80">The class <code>TextValidator</code>
 implements an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
  title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a>
 for a form control, which can monitor a form text field.</td>
                 </tr>
@@ -2444,7 +2444,7 @@ for a form control, which can monitor a form text field.</td>
  title="link to Forms/TimeValidator.java">TimeValidator</a></td>
                   <td class="cell80">The class <code>TimeValidator</code>
 implements an <a
- href="../../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
+ href="%DOXYGEN_PREFIX2%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1form_1_1validation_1_1XValidator.html"
  title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a>
 for a form control, which can monitor the content of a form time field.
                   </td>
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index 7086f8d5..6b838db 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -159,34 +159,34 @@
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">BookmarkInsertion</a></td>
 		  <td class="cell80">This application connects to the office server and
-		  gets the <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be opened
+		  gets the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be opened
 		  and an example text will be entered. Afterwards, some bookmarks will be
 		  inserted.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">HardFormatting</a></td>
 		  <td class="cell80">This program connects to the office server and gets
-		  the <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Furthermore, an empty text document will be
+		  the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Furthermore, an empty text document will be
 		  opened, an example text will be entered, some text attributes will be
-		  inspected, and the <a href="../docs/idl/ref/namespacecom_1_1sun_1_1star_1_1beans.html#PropertyState" title="link into the IDL reference to the enum com.sun.star.beans.PropertyState"> PropertyState</a> will be checked from the selection.</td>
+		  inspected, and the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1beans.html#PropertyState" title="link into the IDL reference to the enum com.sun.star.beans.PropertyState"> PropertyState</a> will be checked from the selection.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">SWriter</a></td>
 		  <td class="cell80">The program connects to the office server and gets the
-          <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be created, some
+          <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be created, some
 		  text will be entered, and a text table, a colored text, and text frame
 		  will be inserted.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">StyleCreation</a></td>
 		  <td class="cell80">The example connects to the office server and gets the
-          <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be opened, a new
+          <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be opened, a new
 		  paragraph style will be created, and applied.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">StyleInitialization</a></td>
 		  <td class="cell80">The program connects to the office server and gets the
-          <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Thereafter, an empty text document will be
+          <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Thereafter, an empty text document will be
 		  opened and an example text will be entered. The paragraph collection will
 		  be used, in order to apply a different paragraph style on the
 		  paragraphs.</td>
@@ -194,14 +194,14 @@
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">TextDocumentStructure</a></td>
 		  <td class="cell80">The application connects to the office server and gets
-		  the <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be opened, an
+		  the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be opened, an
 		  enumeration of all paragraphs and an enumeration of all text portions
 		  will be created.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/Text/" title="link to the source directory of the Java Text examples">TextReplace</a></td>
 		  <td class="cell80">The example connects to the office server and gets the
-          <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be created, an
+          <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. An empty text document will be created, an
 		  example text will be inserted, and some English spelled words will be
 		  replaced with US spelled words.</td>
 		  </tr>
@@ -243,14 +243,14 @@
 		  <tr>
 		  <td class="cell20"><a href="java/Spreadsheet/" title="link to the source directory of the Java Spreadsheet examples">EuroAdaption</a></td>
 		  <td class="cell80">The application connects to the office server and gets
-		  the <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>, opens an empty Calc document, enters an
+		  the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>, opens an empty Calc document, enters an
 		  example text, sets the number format to DM, changes the number format to
 		  EUR (Euro), and uses the DM/EUR factor on each cell with content.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/Spreadsheet/" title="link to the source directory of the Java Spreadsheet examples">SCalc</a></td>
 		  <td class="cell80">The program connects to the office server and gets the
-          <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Then an empty calc document will be opened,
+          <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Then an empty calc document will be opened,
 		  cell styles will be created, some data will be inserted into the sheets,
 		  and the created cell styles will be applied. Finally, a 3D chart will be
 		  inserted.</td>
@@ -270,7 +270,7 @@
 		  <tr>
 		  <td class="cell20"><a href="java/Drawing/" title="link to the source directory of the Java Drawing examples">SDraw</a></td>
 		  <td class="cell80">This program connects to the office server and gets
-		  the <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Afterwards, an empty text document will
+		  the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMultiComponentFactory.html" title="link into the IDL reference to the interface com.sun.star.lang.XMultiComponentFactory"> multi component factory</a>. Afterwards, an empty text document will
 		  be created and some shapes will be inserted on the draw page.</td>
 		  </tr>
 		  </tbody>
@@ -340,7 +340,7 @@
 		  <tr>
 		  <td class="cell20"><a href="java/PropertySet/" title="link to the source directory of the Java PropertySet example">PropTest</a></td>
 		  <td class="cell80">Contains a component that provides property set
-		  interfaces by means of inheriting <a href="../docs/java/ref/com/sun/star/lib/uno/helper/PropertySet.html" title="link into the Java UNO reference to the PropertySet helper class">com.sun.star.lib.uno.helper.ProperterSet</a>.</td>
+		  interfaces by means of inheriting <a href="%JAVADOC_PREFIX1%/docs/java/ref/com/sun/star/lib/uno/helper/PropertySet.html" title="link into the Java UNO reference to the PropertySet helper class">com.sun.star.lib.uno.helper.ProperterSet</a>.</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><a href="java/ToDo/" title="link to the source directory of the Java ToDo example">ToDo</a></td>
@@ -492,7 +492,7 @@
 		  <td class="cell80">The 'uno' program is used to export an arbitrary
 		  service to other processes. In this example the com.sun.star.uno.Pipe
 		  service (which is built in io-module) is exported. The client component
-		  implements the <a href="../docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMain.html" title="link into the IDL reference to the interface com.sun.star.lang.XMain">
+		  implements the <a href="%DOXYGEN_PREFIX1%/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1lang_1_1XMain.html" title="link into the IDL reference to the interface com.sun.star.lang.XMain">
 		  com.sun.star.lang.XMain</a> interface. In the run method, it connects to
 		  the servers process and retrieves an instance and does some calls on the
 		  instance.</td>
@@ -515,7 +515,7 @@
 		  <p>
 		  <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/C%2B%2B_Component" title="link to the "How to write a UNO component in C++" chapter in the Developer's Guide">How to write a UNO component in C++</a><br/>
 		  <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/C%2B%2B_Language_Binding" title="link to the "C++ UNO Language Binding" chapter in the Developer's Guide">C++ UNO Language Binding</a><br/>
-		  <a href="../docs/cpp/ref/index.html" title="link to the C++ API reference">C++ reference</a>
+		  <a href="%DOXYGEN_PREFIX1%/docs/cpp/ref/index.html" title="link to the C++ API reference">C++ reference</a>
 		  </p>
 		  </td>
 		  </tr>
diff --git a/odk/index.html b/odk/index.html
index a161fa84..a454cbf 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -69,7 +69,7 @@
 			  will be no limit for office automation in heterogeneous environments.
 			  Currently supported platforms of the SDK are Linux, Solaris (sparc,
 			  x86), and Windows.</p>
-            <p>The SDK also contains <a href="docs/idl/ref/index.html" title="link to the IDL reference documentation"> reference</a> documentation
+            <p>The SDK also contains <a href="%DOXYGEN_PREFIX0%/docs/idl/ref/index.html" title="link to the IDL reference documentation"> reference</a> documentation
               for the API and a complete <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is available online in the Apache OpenOffice Wiki, with
 			  lots of examples, which introduce the API, explain the concepts behind
 			  it, and make it possible for all users to quickly get started with
@@ -112,17 +112,17 @@
               </tr>
               <tr valign="top">
                 <td class="content4"><img src="docs/images/arrow-1.gif"/></td>
-                <td colspan="2"><a href="docs/idl/ref/index.html" title="link to the IDL reference documentation">IDL Reference</a></td>
+                <td colspan="2"><a href="%DOXYGEN_PREFIX0%/docs/idl/ref/index.html" title="link to the IDL reference documentation">IDL Reference</a></td>
                 <td class="content70">Complete LibreOffice %PRODUCT_RELEASE% API reference.</td>
               </tr>
               <tr valign="top">
                 <td class="content4"><img src="docs/images/arrow-1.gif"/></td>
-                <td colspan="2"><a href="docs/java/ref/index.html" title="link to the Java UNO runtime API reference documentation">Java UNO Runtime Reference </a></td>
+                <td colspan="2"><a href="%JAVADOC_PREFIX0%/docs/java/ref/index.html" title="link to the Java UNO runtime API reference documentation">Java UNO Runtime Reference </a></td>
                 <td class="content70">Reference documentation of the Java UNO runtime API.</td>
               </tr>
               <tr valign="top">
                 <td class="content4"><img src="docs/images/arrow-1.gif"/></td>
-                <td colspan="2"><a href="docs/cpp/ref/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td>
+                <td colspan="2"><a href="%DOXYGEN_PREFIX0%/docs/cpp/ref/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td>
                 <td class="content70">Reference documentation of the C++ UNO runtime and a
 				set of C/C++ base and helper functions and classes to abstract from
 				the system layer.</td>
commit 06c73497580c32f77f2848a6f57feb037516695e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 5 10:22:03 2013 +0200

    Some HTML clean up
    
    Change-Id: I5f1b5d5e5fc59bc1496a292a5f002d87584732a4

diff --git a/odk/docs/install.html b/odk/docs/install.html
index 7f44cb1..efc82d2 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -19,10 +19,8 @@
 <html>
 <head>
   <title>LibreOffice %PRODUCT_RELEASE% SDK - Installation Guide</title>
-  <link rel="stylesheet" type="text/css" href="sdk_styles.css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <meta name="author" content="Jürgen Schmidt">
-  <meta name="created" content="2004-12-14">
+  <link rel="stylesheet" type="text/css" href="sdk_styles.css"/>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 </head>
     <body>
         <div id="BgContainer">
@@ -40,16 +38,16 @@
                         <h1>
                             Installation Guide
                         </h1>
-<table class="table1" cellpadding=0>
+<table class="table1" cellpadding="0">
   <tr>
-    <td colspan="3"><img  class="nothing10" src="images/nada.gif"></td>
+    <td colspan="3"><img  class="nothing10" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
 	    <tr>
-		  <td colspan="3"><img class="nothing1" src="images/nada.gif"></td>
+		  <td colspan="3"><img class="nothing1" src="images/nada.gif"/></td>
         </tr>
 		<tr>
           <td>
@@ -65,26 +63,25 @@
 		  </td>
 		  </tr>
 		  <tr valign="top">
-          <td><b>LibreOffice %PRODUCT_RELEASE% installation</td>
+          <td><b>LibreOffice %PRODUCT_RELEASE% installation</b></td>
           <td class="content80">The SDK works on top of an existing office
 		  installation and uses the same libraries as the office installation.</td>
-          </tr>
 		  </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr valign="top">
-          <td><b>JDK (1.5 or higher)<b></td>
+          <td><b>JDK (1.5 or higher)</b></td>
           <td class="content80">
 		  <p>A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on <a target="_blank" href="http://java.sun.com/products" title="link to the Java SDK download page (online)">http://java.sun.com/products</a>.</p>
 		  <p>Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only.</p>
 		  <p><b>Note</b>: The Java compiler is <b><u>optional</u></b>!</p></td>
           </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr valign="top">
-          <td><b>C++ compiler<b></td>
+          <td><b>C++ compiler</b></td>
           <td class="content80">A C++ compiler is necessary for developing C++
 		  components or applications. UNO depends on a compiler dependent language
 		  binding, so that we use the appropriate compiler where a language binding
@@ -103,62 +100,62 @@
 		  <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022)</td>
 		  </tr>
 		  </table>
-		  <p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en">Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</a></p></td>
+		  <p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en">Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</p></td>
           </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr valign="top">
-          <td><b>Microsoft .NET Framework SDK version 1.0 or higher<b></td>
+          <td><b>Microsoft .NET Framework SDK version 1.0 or higher</b></td>
           <td class="content80">The SDK is required for building CLI applications.
-		  That is, programs written in languages, such as C# or VB.NET.<br>
+		  That is, programs written in languages, such as C# or VB.NET.<br/>
 		  <p><b>Note</b>: The .NET Framework is <b><u>optional</u></b>!</p></td>
           </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr valign="top">
-          <td><b>GNU make (3.79.1 or higher)<b></td>
+          <td><b>GNU make (3.79.1 or higher)</b></td>
           <td class="content80">
 		  <p>GNU make is used to build the examples of the SDK. GNU make is available from <a target="_blank" href="http://www.gnu.org" title="link to www.gnu.org (online)">http://www.gnu.org</a>. It can be ftped via <a target="_blank" href="ftp://ftp.gnu.org/gnu/make" title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make</a></p>
 		  <p><b>Note</b>: Windows user can find an executable of gnu make under <a target="_blank" href="http://www.mingw.org/wiki/Getting_Started" title="link to the MinGW Getting Started wiki (online)">http://www.mingw.org/wiki/Getting_Started</a> (see the mingw32-make link under "Manual Installation"). Do not use the Cygwin make, because it does not
-		  work well. On Solaris gnu make can be found often under <b><i>/usr/sfw/bin/gmake</i></b>, but keep in mind that you have to use <b>'gmake'</b> then. Or you can find gnu make also under <a target="_blank" href="http://www.sunfreeware.com/" title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a>.</td>
+		  work well. On Solaris gnu make can be found often under <b><i>/usr/sfw/bin/gmake</i></b>, but keep in mind that you have to use <b>'gmake'</b> then. Or you can find gnu make also under <a target="_blank" href="http://www.sunfreeware.com/" title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a>.</p></td>
           </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr valign="top">
-          <td><b>zip tool (2.3 or higher)<b></td>
+          <td><b>zip tool (2.3 or higher)</b></td>
           <td class="content80">The zip tool is used to create UNO packages. zip is
-		  a new requirement to make the SDK independent of a Java SDK.<br>
+		  a new requirement to make the SDK independent of a Java SDK.<br/>
 		  If you do not have these already, you can download them from <a target="_blank" href="http://www.info-zip.org" title="link to www.ubfi-zip.org (online)">http://www.info-zip.org</a>. Note: The cygwin zip.exe does not work for the build under
 		  the 4NT shell. You have to use the native w32 version.</td>
           </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr valign="middle">
           <td colspan="2">
 		  <p>The SDK provides an implicit configuration mechanism, which
 		  configures the SDK build environment to your personal needs the first
 		  time you use the SDK environment. This configuration step creates one
-		  new setsdkenv_XXX script in the user's home directory:</P>
+		  new setsdkenv_XXX script in the user's home directory:</p>
 		  <ul>
-		    <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b>  -> for Unix
-            <li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b></a>  -> for Windows2000/XP or later
+		    <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b>  -> for Unix</li>
+            <li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b>  -> for Windows2000/XP or later</li>
           </ul>
 		  <p>The automatically started configure script (Unix and Windows2000/XP)
 		  requests relevant information and directories (SDK, LibreOffice, GNU make,
 		  Java, C++), in order to prepare a working SDK environment. After completing the
 		  configure script once, the newly created script is always used to set the
 		  necessary environment variables for using the SDK and the required
-		  tools.</P>
+		  tools.</p>
 		  <p>On UNIX operating systems, the configure script uses Perl. LINUX systems should have
 		  installed a working Perl version, and on Solaris you can find a working
 		  Perl version under <a target="_blank" href="http://www.sunfreeware.com/" title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a> if
 		  necessary. On Windows, the configure script uses Windows Script and
 		  a JScipt. If you have problems with Windows Script, you can download a
-		  newer version of <a href ="http://www.microsoft.com/downloads/details.aspx?FamilyId=C717D943-7E4B-4622-86EB-95A22B832CAA&displaylang=en" link"link to the download page for the Windows Script">Windows Script</a>.
+		  newer version of <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=C717D943-7E4B-4622-86EB-95A22B832CAA&displaylang=en" title="link to the download page for the Windows Script">Windows Script</a>.
           </p>
           <p>On other versions of Windows, use the batch
 		  file template <b><OO_SDK_HOME>\setsdkenv_windows.template</b>,
@@ -174,8 +171,8 @@
           and OO_SDK_URE_HOME must be set. The other should be either unset or
           set to an empty value.</td>
 		  </tr>
-          <tr><a name="oosdkname"/>
-          <td class="cell20"><b>OO_SDK_NAME</b></td>
+          <tr>
+          <td class="cell20"><a name="oosdkname"/><b>OO_SDK_NAME</b></td>
           <td class="cell80">The configuration uses the
 		  directory name of the SDK, but you can use another name as well.
 		  It is important that the name does not contain spaces, because of a limitation
@@ -214,7 +211,7 @@
 		  <td class="cell80">Path to the C# compiler and VB.NET compiler (on
 		  Windows, this directory can be found under the system directory (e.g.
 		  c:\WINXP\Microsoft.NET\Framework\v1.0.3705). The compilers are
-		  <b>optional</b> and only necessary for building the CLI examples.<br>
+		  <b>optional</b> and only necessary for building the CLI examples.<br/>
 		  <b>Note: Windows only!</b></td>
 		  </tr>
 		  <tr>
@@ -250,7 +247,7 @@
 		  </td>
           </tr>
 		  <tr valign="middle">
-            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
+            <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>
           </tr>
 		  <tr>
 		  <td colspan="2">
@@ -293,7 +290,7 @@
               $OO_SDK_URE_JAVA_DIR/ridl.jar;
               $OO_SDK_URE_JAVA_DIR/unoloader.jar;
               [$OO_SDK_URE_JAVA_DIR/unoil.jar;]
-              $CLASSPATH</i><br>
+              $CLASSPATH</i><br/>
           <p>The classpath will be set or extended to the necessary jar files of
 		  the specified office installation. (<i>unoil.jar</i> is only included
           when OFFICE_HOME is set.)</p>
@@ -301,7 +298,7 @@
 		  </tr>
 		  <tr valign="top">
 		  <td class="cell20">OFFICE_PROGRAM_PATH</td>
-		  <td class="cell80">=<i>$OFFICE_HOME/program</i><br>
+		  <td class="cell80">=<i>$OFFICE_HOME/program</i><br/>
 		  <p>This variable is used to find, for example, the office type library and
 		  the UNO package deployment tool. This variable is only relevant when
           OFFICE_HOME is set.</p>
@@ -309,7 +306,7 @@
 		  </tr>
 		  <tr valign="top">
 		  <td class="cell20">UNO_PATH</td>
-		  <td class="cell80">=<i>$OFFICE_PROGRAM_PATH</i><br>
+		  <td class="cell80">=<i>$OFFICE_PROGRAM_PATH</i><br/>
           <p>This variable is used to ensure that the new C++ UNO bootstrap
 		  mechanism uses the configured office installation of the SDK. Normally
 		  the bootstrap mechanism finds the default office installation for the
@@ -325,7 +322,7 @@
 		  <table class="table4">
 		  <tr valign="top">
 		  <td class="cell20">LD_LIBRARY_PATH</td>
-		  <td class="cell80">=<i>$OO_SDK_URE_LIB_DIR: $OO_SDK_HOME/(solsparc|solintel)/lib: $LD_LIBRARY_PATH</i><br>
+		  <td class="cell80">=<i>$OO_SDK_URE_LIB_DIR: $OO_SDK_HOME/(solsparc|solintel)/lib: $LD_LIBRARY_PATH</i><br/>
 		  <p>The LD_LIBRARY_PATH will be set or will be extended by the office/URE
 		  library path, the platform dependent lib directory for several additional
 		  libraries.</p>
@@ -333,7 +330,7 @@
 		  </tr>
 		  <tr valign="top">
 		  <td class="cell20">PATH</td>
-		  <td class="cell80">=<i>$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH</i></b><br>
+		  <td class="cell80">=<i>$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH</i><br/>
           <p>The PATH variable will be extended by the paths for the SDK development
 		  tools, the compiler, the JDK, GNU make, the zip tool and the
 		  OO_SDK_URE_BIN_DIR, where the compiler or the JDK are
@@ -351,7 +348,7 @@
 		  <table class="table4">
 		  <tr valign="top">
 		  <td class="cell20">LD_LIBRARY_PATH</td>
-		  <td class="cell80">=<i>$OO_SDK_URE_LIB_DIR: $SDK_HOME/linux/lib: $LD_LIBRARY_PATH</i><br>
+		  <td class="cell80">=<i>$OO_SDK_URE_LIB_DIR: $SDK_HOME/linux/lib: $LD_LIBRARY_PATH</i><br/>
 		  <p>The LD_LIBRARY_PATH will be set or will be extended by the office/URE
 		  library path, the platform dependent lib directory for some additional
 		  libraries.</p>
@@ -359,7 +356,7 @@
 		  </tr>
 		  <tr valign="top">
 		  <td class="cell20">PATH</td>
-		  <td class="cell80">=<i>$OO_SDK_HOME/linux/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH</i><br>
+		  <td class="cell80">=<i>$OO_SDK_HOME/linux/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH</i><br/>
 		  <p>The PATH variable will be extended by the paths for the SDK development
 		  tools, the compiler, the JDK, GNU make, the zip tool and the
 		  OO_SDK_URE_BIN_DIR, where the compiler and the JDK are
@@ -377,7 +374,7 @@
 		  <table class="table4">
 		  <tr valign="top">
 		  <td class="cell20">PATH</td>
-		  <td class="cell80">=<i>%OO_SDK_HOME%\windows\bin; %OO_SDK_MAKE_HOME%; %OO_SDK_ZIP_HOME%; [%OO_SDK_CLI_HOME%;] [%OO_SDK_CPP_HOME%;] [%OO_SDK_JAVA_HOME%\bin;] %OO_SDK_URE_BIN_DIR%; %PATH%</i><br>
+		  <td class="cell80">=<i>%OO_SDK_HOME%\windows\bin; %OO_SDK_MAKE_HOME%; %OO_SDK_ZIP_HOME%; [%OO_SDK_CLI_HOME%;] [%OO_SDK_CPP_HOME%;] [%OO_SDK_JAVA_HOME%\bin;] %OO_SDK_URE_BIN_DIR%; %PATH%</i><br/>
 		  <p>The PATH variable will be extended by the paths for the SDK development
 		  tools, the compiler, the JDK, GNU make, the zip tool and the
 		  OO_SDK_URE_BIN_DIR.</p>
@@ -385,7 +382,7 @@
 		  </tr>
 		  <tr valign="top">
 		  <td class="cell20">LIB</td>
-		  <td class="cell80">=<i>%OO_SDK_HOME%\windows\lib; %LIB%</i><br>
+		  <td class="cell80">=<i>%OO_SDK_HOME%\windows\lib; %LIB%</i><br/>
 		  <p>The LIB variable will be extended by the path to the import libraries
 		  that are necessary for Windows.</p>
 		  </td>
@@ -411,11 +408,11 @@
                     <div id="FooterText">
                         <p>
                             Copyright © 2000, 2013 LibreOffice contributors and/or their affiliates. All rights reserved.
-                            <br>
+                            <br/>
                             LibreOffice was created by The Document Foundation,
                             based on Apache OpenOffice, which is Copyright 2011
                             The Apache Software Foundation.
-                            <br>
+                            <br/>
                             The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
                         </p>
                         <p>
@@ -429,6 +426,7 @@
                 </div>
             </div>
         </div>
+        </div>
     </body>
 </html>
 
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 364cb09..ffac2d8 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -19,9 +19,8 @@
 <html>
 <head>
   <title>LibreOffice %PRODUCT_RELEASE% SDK - Development Tools</title>
-  <link rel="stylesheet" type="text/css" href="sdk_styles.css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <meta name="author" content="Jürgen Schmidt">
+  <link rel="stylesheet" type="text/css" href="sdk_styles.css"/>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 </head>
 <body>
         <a name="tools"></a>
@@ -40,29 +39,29 @@
                         <h1>
                             Development Tools
                         </h1>
-<table class="table1" cellpadding=0>
+<table class="table1" cellpadding="0">
   <tr>
-    <td colspan="3"><img  class="nothing10" src="images/nada.gif"></td>
+    <td colspan="3"><img  class="nothing10" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
 	    <tr>
-		  <td colspan="3"><img class="nothing1" src="images/nada.gif"></td>
+		  <td colspan="3"><img class="nothing1" src="images/nada.gif"/></td>
         </tr>
         <tr>
           <td>
           <table class="table3">
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#unopkg"  title="link to the unopkg tool description">unopkg</a></td>
               <td class="content87">The new UNO package deployment tool. It 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 class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#unoexe"  title="link to the uno tool description">uno</a></td>
               <td class="content87">Tool to provide a UNO runtime environment and
 			  provide configured (deployed) or single components. This tool
@@ -70,59 +69,59 @@
 			  directory of the office installation.</td>
             </tr>
            <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <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">Tool to merge several registry (e.g. type
 			  libraries) files into one file. <b>Note:</b> Since OpenOffice.org 3 it is not 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 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 registry file
 			  in a human readable manner. Special support for type library
 			  nodes. <b>Note:</b> Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the <b>ure</b>.</td>
             </tr>
             <tr valign="middle">
-              <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+              <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
             </tr>
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#idlc" title="link to the idlc tool description">idlc</a></td>
               <td class="content87">The UNOIDL compiler, generates a common
 			  binary type library format as base for all codemaker tools and
 			  the UNO runtime type library.</td>
             </tr>
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#cppumaker" title="link to the cppumaker tool description">cppumaker</a></td>
               <td class="content87">Tool for generating C++ code for the UNOIDL
 			  types stored in a type library.</td>
             </tr>
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#javamaker" title="link to the javamaker tool description">javamaker</a></td>
               <td class="content87">Tool for generating Java class files for the
 			  UNOIDL types stored in a type library.</td>
             </tr>
            <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#climaker" title="link to the climaker tool description">climaker</a></td>
               <td class="content87">Tool for generating CLI assemblies for the
 			  UNOIDL types stored in a type library (windows only).</td>
             </tr>
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <td class="content3"><img src="images/arrow-1.gif"/></td>
               <td><a href="#uno-skeletonmaker" title="link to the uno-skeletonmaker tool description">uno-skeletonmaker</a></td>
               <td class="content87">Tool for dumping type definitions on stdout or generating complete code skeletons for Java/C++.</td>
             </tr>
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <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">Tool to merge several registry (e.g. type
 			  libraries) files into one file.</td>
             </tr>
             <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
+              <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 registry file
 			  in a human readable manner. Special support for type library
@@ -133,20 +132,20 @@
 		</tr>
       </table>
     </td>
-	<td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+	<td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="unopkg"/>unopkg</td>
 		  <td align="right">
-			<a style="a:link:visited #FFFFFF;" href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-			<a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td>
+			<a style="a:link:visited #FFFFFF;" href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+			<a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a></td>
         </tr>
 		<tr>
 		  <td colspan="3">
@@ -164,17 +163,16 @@
 		  <p class="head2">Usage:</p>
 		  <blockquote>
 		  <b><code>
-		    unopkg add <options> package-path...<br>
-			unopkg remove <options> package-name...<br>
-			unopkg list <options> package-name...<br>
-			unopkg reinstall <options><br>
-			unopkg gui<br>
-			unopkg -V<br>
-			unopkg -h<br>
+		    unopkg add <options> package-path...<br/>
+			unopkg remove <options> package-name...<br/>
+			unopkg list <options> package-name...<br/>
+			unopkg reinstall <options><br/>
+			unopkg gui<br/>
+			unopkg -V<br/>
+			unopkg -h<br/>
 		  </code></b>
 		  </blockquote>
 		  <p class="head2">Sub-commands:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
 		    <td class="cell15"><code>add</code></td>
@@ -199,9 +197,7 @@
 			(GUI)</td>
           </tr>
 		  </table>
-		  </p>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-h, --help</code></td>
@@ -223,7 +219,7 @@
           <tr>
             <td class="cell15"><code>--log-file <file></code></td>
 			<td class="cell85">custom log file; default:
-			<i><cache-dir&gt/log.txt</i>.</td>
+			<i><cache-dir>/log.txt</i>.</td>
           </tr>
           <tr>
             <td class="cell15"><code>--shared</code></td>
@@ -232,30 +228,29 @@
 			running!</td>
           </tr>
           <tr>
-		    <td class="cell15"><code>--deployment-context <context&gt</code>
+		    <td class="cell15"><code>--deployment-context <context></code>
 			</td>
 			<td class="cell85">expert feature: explicit deployment context</td>
           </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-	<td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+	<td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="unoexe"/>uno</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
@@ -271,14 +266,14 @@
 		  <p>The starter loads the component and instantiates it. The component
 		  must export the interface <a href="common/ref/com/sun/star/lang/XMain.html" title="link into the IDL reference to the interface com.sun.star.lang.XMain">com.sun.star.lang.XMain</a>:</p>
 		  <p>
-		  <code>interface XMain : com::sun::star::uno::XInterface <br>
-            { <br>
-                  /** This method is called to run the component.<br>
-                      <br>
-                      @param aArguments command line arguments <br>
-                      @return process error code to be returned to system <br>
-                  */ <br>
-                  long run( [in] sequence< string > arguments ); <br>
+		  <code>interface XMain : com::sun::star::uno::XInterface <br/>
+            { <br/>
+                  /** This method is called to run the component.<br/>
+                      <br/>
+                      @param aArguments command line arguments <br/>
+                      @return process error code to be returned to system <br/>
+                  */ <br/>
+                  long run( [in] sequence< string > arguments ); <br/>
             };
           </code>
 		  </p>
@@ -289,14 +284,13 @@
 		  <p class="head2">Usage:</p>
 		  <blockquote>
 		  <b><code>uno (-c<ComponentImplementationName> -l <LocationUrl>
-		    | -s <ServiceName>) <br>
-            [-u uno:(socket[,host=<HostName>][,port=<nnn>]|pipe[,name=<PipeName>]);iiop|urp;<Name><br>
-            [--singleaccept] [--singleinstance]] <br>
+		    | -s <ServiceName>) <br/>
+            [-u uno:(socket[,host=<HostName>][,port=<nnn>]|pipe[,name=<PipeName>]);iiop|urp;<Name><br/>
+            [--singleaccept] [--singleinstance]] <br/>
             [-- <Argument1 Argument2 ...>]
           </code></b>
 		  </blockquote>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
           <tr>
             <td class="cell15"><code><HostName></code></td>
@@ -329,25 +323,24 @@
 		  <p>You can easily connect to a server started with the
 		  <code>-u (url)</code> option by using this service, giving the same url
 		  to resolve. The service provides you an instance from remote.</p>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="idlc"/>idlc</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
@@ -355,13 +348,12 @@
 		  <p>'idlc' is the UNOIDL compiler.  It is a full featured compiler used
 		  to check UNODL type definitions and transform valid type definitions
 		  into a binary type library format, which is later used by all codemaker
-		  tools. It is also used as a dynamic type library for UNO at runtime.<br>
+		  tools. It is also used as a dynamic type library for UNO at runtime.<br/>
 		  You can find a syntax description for UNOIDL <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/AppendixD/UNOIDL_Syntax_Specification" title="link to the "UNOIDL Syntax Specification" chapter in the Developer's Guide">here</a>.</p>
 		  <p class="head2">Usage:</p>
 		  <blockquote>
 		  <b><code>idlc [-options] file_1 ... file_n | @<filename></code></b>
 		  </blockquote>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>file_1 ... file_n</code></td>
@@ -374,9 +366,7 @@
 			file.</td>
           </tr>
 		  </table>
-		  </p>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-O<path></code></td>
@@ -404,32 +394,31 @@
 			<td class="cell85">print this help message and exit.</td>
           </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="cppumaker"/>cppumaker</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
 		  <td colspan="3">
 		  <p>The 'cppumaker' generates a C++ representation for idl types. The
 		  cppumaker works on a typelibrary, which is generated by the UNOIDL
-		  compiler (<a href="#idlc" link="link to the idlc tool description">
+		  compiler (<a href="#idlc" title="link to the idlc tool description">
 		  idlc</a>). It generates the output for all specified types and for all
 		  types the specified types depend on.</p>
 		  <p class="head2">Usage:</p>
@@ -437,7 +426,6 @@
 		  <b><code>cppumaker [-options] file_1 ... file_n</code></b>
 		  </blockquote>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-O<path></code></td>
@@ -446,7 +434,7 @@
 			directory.</td>
           </tr>
 		  <tr>
-            <td class="cell15"><code>-T<name><br>
+            <td class="cell15"><code>-T<name><br/>
 			|-T<t1>;<t2>...</code></td>
 			<td class="cell85">name specifies a type or a list of types. The
 			output for this type and all dependent types are generated. If no '-T'
@@ -494,32 +482,31 @@
 			for generation.</td>
           </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="javamaker"/>javamaker</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
 		  <td colspan="3">
 		  <p>The 'javamaker' generates the appropriate Java class file for each idl
 		  type. The javamaker works on a typelibrary which is generated by the
-		  UNOIDL compiler (<a href="#idlc" link="link to the idlc tool description">
+		  UNOIDL compiler (<a href="#idlc" title="link to the idlc tool description">
 		  idlc</a>). It generates the output for all specified types and for all
 types the specified types depend on.</p>
 		  <p class="head2">Usage:</p>
@@ -527,7 +514,6 @@ types the specified types depend on.</p>
 		  <b><code>javamaker [-options] file_1 ... file_n -Xfile_n+1 -Xfile_n+2</code></b>
 		  </blockquote>	
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-O<path></code></td>
@@ -572,32 +558,31 @@ types the specified types depend on.</p>
 			for generation.</td>
           </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="climaker"/>climaker</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
 		  <td colspan="3">
 		  <p>The 'climaker' (windows only) generates the appropriate CLI assemblies file for each idl
 		  type. The climaker works on a typelibrary which is generated by the
-		  UNOIDL compiler (<a href="#idlc" link="link to the idlc tool description">
+		  UNOIDL compiler (<a href="#idlc" title="link to the idlc tool description">
 		  idlc</a>). It generates the output for all specified types and for all
 		    types the specified types depend on.</p>
 		  <p class="head2">Usage:</p>
@@ -605,11 +590,10 @@ types the specified types depend on.</p>
 		  <b><code>climaker <switches> [registry-file-1 registry-file-2 ...]</code></b>
 		  </blockquote>	
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
 		    <td class="cell15"><code>-O, --out <output_file></code></td>
-		    <td class="cell85">output assembly file;<br>
+		    <td class="cell85">output assembly file;<br/>
 		      defaults to cli_unotypes.dll if more than one registry-file is given, else <registry-file>.dll</td>
 		  </tr>
 		  <tr>
@@ -665,26 +649,25 @@ types the specified types depend on.</p>
 		  </tr>
 
 		  </table>
-		  </p>
 		  <p><b>Example:</b> <code>climaker --out cli_mytypes.dll --reference cli_uretypes.dll --extra types.rdb mytypes.rdb</code></p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="uno-skeletonmaker"/>uno-skeletonmaker</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
@@ -693,16 +676,15 @@ types the specified types depend on.</p>
 		  <p class="head2">Usage:</p>
 		  <blockquote>
 		  <b><code>
-			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) dump [<options>] -t <type> ...<br>
-			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) component [<options>] -n <name> -t <type> ...<br>
-			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) calc-add-in [<options>] -n <name> -t <add-in_service><br>
+			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) dump [<options>] -t <type> ...<br/>
+			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) component [<options>] -n <name> -t <type> ...<br/>
+			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) calc-add-in [<options>] -n <name> -t <add-in_service><br/>
 			uno-skeletonmaker (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>) add-on [<options>] -n <name> -p <protocol_name:command,...>
-			uno-skeletonmaker -V, --version<br>
-			uno-skeletonmaker -h, --help<br>
+			uno-skeletonmaker -V, --version<br/>
+			uno-skeletonmaker -h, --help<br/>
 		  </code></b>
 		  </blockquote>
 		  <p class="head2">Sub-commands:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
 		    <td class="cell15"><code>dump</code></td>
@@ -721,9 +703,7 @@ types the specified types depend on.</p>
 		    <td class="cell85">generates a language specific code skeleton for an add-on compnent using the implementation name as the file and class name. The protocol name(s) and the corresponding command(s) have to be specified with the '-p' option.</td>
 		  </tr>
 		  </table>
-		  </p>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-env:INIFILENAME=<url></code></td>
@@ -739,9 +719,9 @@ types the specified types depend on.</p>
           </tr>
           <tr>
             <td class="cell15"><code>--(java4|java5|cpp)</code></td>
-			<td class="cell85">select the target language<br>
-			--java4	generate output for Java 1.4 or earlier<br>
-			--java5 generate output for Java 1.5 or later (is currently the default)<br>
+			<td class="cell85">select the target language<br/>
+			--java4	generate output for Java 1.4 or earlier<br/>
+			--java5 generate output for Java 1.5 or later (is currently the default)<br/>
 			--cpp generate output for C++</td>
           </tr>
 		  <tr>
@@ -757,7 +737,7 @@ types the specified types depend on.</p>
 			<td class="cell85">generates a default LibreOffice MPLv2 license header at the beginning of a component source file. This option is taken into account in 'component' mode only and if -o is unequal 'stdout'.</td>
           </tr>
           <tr>
-            <td class="cell15"><code>-bc<br>--backward-compatible</code></td>
+            <td class="cell15"><code>-bc<br/>--backward-compatible</code></td>
 			<td class="cell85">specifies that the generated calc add-in is backward compatible to older office versions and implement the former required add-in interfaces where the implementation is mapped on the new add-in configuration. In this case the config schema needs to be bundled with the extension add-in as well. Default is a minimal add-in component skeleton based on the add-in configuration coming with the office since OO.org 2.0.4.</td>
           </tr>
           <tr>
@@ -793,25 +773,24 @@ types the specified types depend on.</p>
 			<td class="cell85">print this help and exit.</td>
           </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="regmerge"/>regmerge</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
@@ -825,7 +804,6 @@ types the specified types depend on.</p>
 		  <b><code>regmerge [-v|--verbose] <mergefile> <mergeKeyName> <regfile_1> ... <regfile_n></code></b>
 		  </blockquote>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-v|--verbose</code></td>
@@ -847,25 +825,24 @@ types the specified types depend on.</p>
 			merged.</td>
 		  </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="regview"/>regview</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
@@ -878,10 +855,9 @@ types the specified types depend on.</p>
 		  <b><code>regview <registryfile> [<keyName>]</code></b>
 		  </blockquote>
 		  <p class="head2">Options:</p>
-		  <p>
 		  <table class="table4">
 		  <tr>
-            <td class="cell15">-br<registryfile></code></td>
+            <td class="cell15"><code>-br<registryfile></code></td>
 			<td class="cell85">the name of the registry whose contents should
 			be viewed.</td>
           </tr>
@@ -894,25 +870,24 @@ types the specified types depend on.</p>
 			content of the registry file.</td>
 		  </tr>
 		  </table>
-		  </p>
 		  </td>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
   <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
+    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"/></td>
   </tr>
   <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
     <td>
       <table class="table2">
         <tr>
 		  <td colspan="2" class="head1"><a name="autodoc"/>autodoc</td>
 		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
+		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"/></a>
+		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"/></a>
 		  </td>
         </tr>
 		<tr>
@@ -928,7 +903,7 @@ types the specified types depend on.</p>
 		</tr>
       </table>
     </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
+    <td class="content1"><img class="nothing8" src="images/nada.gif"/></td>
   </tr>
 </table>
                 </div>
@@ -936,11 +911,11 @@ types the specified types depend on.</p>
                     <div id="FooterText">
                         <p>
                             Copyright © 2000, 2013 LibreOffice contributors and/or their affiliates. All rights reserved.
-                            <br>
+                            <br/>
                             LibreOffice was created by The Document Foundation,
                             based on Apache OpenOffice, which is Copyright 2011
                             The Apache Software Foundation.
-                            <br>
+                            <br/>
                             The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
                         </p>
                         <p>
@@ -954,6 +929,7 @@ types the specified types depend on.</p>
                 </div>
             </div>
         </div>
+        </div>
     </body>
 </html>
 
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index c900bb6..e94cda5 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -19,9 +19,8 @@
 <html>
 <head>
   <title>LibreOffice %PRODUCT_RELEASE% SDK - Developer's Guide Examples</title>
-  <link rel="stylesheet" type="text/css" href="../../docs/sdk_styles.css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <meta name="author" content="Jürgen Schmidt">
+  <link rel="stylesheet" type="text/css" href="../../docs/sdk_styles.css"/>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 </head>
 <body>
         <a name="tools"></a>
@@ -40,11 +39,12 @@
                         <h1>
                             Developer's Guide Examples
                         </h1>
-<table class="table1" cellpadding=0>
+<table class="table1" cellpadding="0">
     <tr>
       <td colspan="3"><img class="nothing10"
- src="../../docs/images/nada.gif"></td>
+ src="../../docs/images/nada.gif"/></td>
     </tr>
+<td colspan="3"><table class="table2">
           <tr>
             <td>
             <table class="table3">
@@ -62,7 +62,7 @@ to modify an existing example to their own needs.</p>
 instance listening on a port. If this is necessary you will get further
 information in the makefiles.</p>
                   <p>All examples marked with a <img
- src="../../docs/images/bluball.gif"> are executable and be started
+ src="../../docs/images/bluball.gif"/> are executable and be started
 using a run target in the makefile. The name of the binary (C++) can
 differ compared to the source file, please see the run target in the
 appropriate makefile. Some of the examples which create a component
@@ -76,7 +76,7 @@ detail how to create a working data source (see the office help).</p>
                 </tr>
                 <tr>
                   <td><img class="line"
- src="../../docs/images/sdk_line-1.gif"></td>
+ src="../../docs/images/sdk_line-1.gif"/></td>
                 </tr>
               </tbody>
             </table>
@@ -88,112 +88,111 @@ detail how to create a working data source (see the office help).</p>
               <tbody>
                 <tr valign="top">
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#FirstSteps"
  title="link to the First Steps examples">First Steps</a></td>
                   <td class="content4"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#ProfessionalUNO"
  title="link to the Professional UNO examples">Professional UNO</a></td>
                   <td class="content10"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Components"
  title="link to the Components examples">Writing UNO components</a></td>
                 </tr>
                 <tr valign="top">
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#OfficeDevelopment"
  title="link to the Office Development examples">Office Development</a></td>
                   <td class="content4"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Text" title="link to the Text examples">Text
 Documents</a></td>
                   <td class="content10"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Spreadsheet"
  title="link to the Spreadsheet examples">Spreadsheet Documents</a></td>
                 </tr>
                 <tr valign="top">
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Drawing"
  title="link to the Drawing And Presentation examples">Drawing and
 Presentation Documents</a></td>
                   <td class="content4"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Charts"
  title="link to the Charts examples">Charts</a></td>
                   <td class="content10"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#BasicandDialogs"
  title="link to the Basic And Dialogs examples">LibreOffice %PRODUCT_RELEASE% Basic and
 Dialogs</a></td>
                 </tr>
                 <tr valign="top">
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Database"
  title="link to the Database examples">Database Access</a></td>
                   <td class="content4"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Forms"
  title="link to the Forms examples">Forms</a></td>
                   <td class="content10"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
-                  <td><a href="#UniversalContentBroker%28UCB%29"
+ src="../../docs/images/arrow-1.gif"/></td>
+                  <td><a href="#UniversalContentBroker"
  title="link to the Universal Content Broker examples">Universal
 Content Broker (UCB)</a></td>
                 </tr>
                 <tr valign="top">
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#Configuration"
  title="link to the Configuration examples">Configuration Management</a></td>
                   <td class="content4"></td>
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#OfficeBean"
  title="link to the OOoBean examples">Office Bean</a></td>
                   <td class="content10"></td>
                 </tr>
+                <tr valign="top">
                   <td class="content3"><img
- src="../../docs/images/arrow-1.gif"></td>
+ src="../../docs/images/arrow-1.gif"/></td>
                   <td><a href="#ScriptingFramework" title="link to the Scripting Framework examples">Scripting Framework</a></td>
                   <td class="content4"></td>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list