Author: marcus
Date: Thu Aug 25 18:33:54 2016
New Revision: 14970

Log:
Merged both tables into a single one to keep the same style. Added a note that 
the hotfix is not language depended.

Modified:
    dev/openoffice/4.1.2-patch1/hotfix.html

Modified: dev/openoffice/4.1.2-patch1/hotfix.html
==============================================================================
--- dev/openoffice/4.1.2-patch1/hotfix.html (original)
+++ dev/openoffice/4.1.2-patch1/hotfix.html Thu Aug 25 18:33:54 2016
@@ -56,211 +56,208 @@
 
   <h2 id="resolution">Resolution</h2>
 
-  <h3>This hotfix will resolve <a 
href="http://www.openoffice.org/security/cves/CVE-2016-1513.html";>CVE-2016-1513</a>
 (click the link for more details)</h3>
+  <h3>
+    This hotfix will resolve <a 
href="http://www.openoffice.org/security/cves/CVE-2016-1513.html";>CVE-2016-1513</a>
 (click the link for more details)
+  </h3>
 
   <p>
     The official Apache OpenOffice security bulletin was announced on July 21, 
2016. Affected is Apache OpenOffice 4.1.2 and older on all platforms and all 
languages. OpenOffice.org versions are also affected.
   </p>
 
   <p>
-    The Apache OpenOffice project recommends to update to the latest version 
4.1.2 and then to download and install the ZIP hotfix file from the table 
below. Please follow the installation instructions in the respective Readme 
file.
+    The Apache OpenOffice project recommends to update to the latest version 
4.1.2 and then to download and install the Zip file from the table below. 
Please follow the installation instructions in the respective Readme file.
   </p>
 
   <h2 id="download">Download &amp; Installation</h2>
 
-
-
+  <p>
+    The actual hotfix is not dependend on the language but only on the 
platform. However, for your convenience the instructions (incl. automated 
scripts for installing and uninstalling the hotfix on Windows) are available in 
several languages. So, you can choose your favorite one:
+  </p>
+  <br />
 
   <table style="border: 0px solid white;">
-    <tr>
-      <td>
-        &nbsp;
-      </td>
-      <td>
-        <h4>Instructions</h4>
-      </td>
-      <td>
-        <h4>Download</h4>
-      </td>
-      <td>
-        <h4>Signature</h4>
-      </td>
-      <td colspan="3">
-        <h4>Digital Hashes</h4>
-      </td>
-    </tr>
+    <thead>
+      <tr>
+        <td>
+          &nbsp;
+        </td>
+        <td>
+          <h4>Readme instructions</h4>
+        </td>
+        <td>
+          <h4>Zip file</h4>
+        </td>
+        <td colspan="4">
+          <h4>Signatures & Digital Hashes</h4>
+        </td>
+      </tr>
+    </thead>
     <tbody>
       <tr>
         <td>
-          <h4>MacOS X</h4>
+          <h4>Windows</h4>
         </td>
         <td>
-          <a href="binaries/MacOSX/MacOSX.README.txt">English</a><br />
-          <a href="binaries/MacOSX/MacOSX.README_de.txt">Deutsch</a>
+          <a href="binaries/Windows/README-4.1.2-patch1-Windows.txt">English 
(en-US)</a>
         </td>
         <td>
-          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip">zip</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip">English 
(en-US)</a>
         </td>
         <td>
-          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.asc">ASC</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.asc">ASC</a>
         </td>
         <td>
-          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.md5">MD5</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.md5">MD5</a>
         </td>
         <td>
-          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.sha1">SHA1</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.sha1">SHA1</a>
         </td>
         <td>
-          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.sha256">SHA256</a>
      
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.sha256">SHA256</a>
         </td>
       </tr>
       <tr>
         <td>
-          <h4>Linux 32-Bit</h4>
+          <h4>Windows</h4>
         </td>
         <td>
-          <a href="binaries/Linux32/Linux32.README.txt">English</a>
+          <a href="binaries/Windows/README-4.1.2-patch1-Windows_nl.txt">Dutch 
(nl)</a>
         </td>
         <td>
-          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip">zip</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip">Dutch 
(nl)</a>
         </td>
         <td>
-          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.asc">ASC</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.asc">ASC</a>
         </td>
         <td>
-          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.md5">MD5</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.md5">MD5</a>
         </td>
         <td>
-          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.sha1">SHA1</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.sha1">SHA1</a>
         </td>
         <td>
-          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.sha256">SHA256</a>
+          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.sha256">SHA256</a>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="7" style="background: grey;">
+          &nbsp;
         </td>
       </tr>
+    </tbody>
+    <tr>
+      <td>
+        &nbsp;
+      </td>
+      <td>
+        <h4>Readme instructions</h4>
+      </td>
+      <td>
+        <h4>Zip file</h4>
+      </td>
+      <td colspan="4">
+        <h4>Signatures & Digital Hashes</h4>
+      </td>
+    </tr>
+    <tbody>
       <tr>
         <td>
-          <h4>Linux 64-Bit</h4>
+          <h4>MacOS X</h4>
         </td>
         <td>
-          <a href="binaries/Linux64/Linux64.README.txt">English</a>
+          &bullet; <a href="binaries/MacOSX/MacOSX.README.txt">English 
(en-US)</a><br />
+          &bullet; <a href="binaries/MacOSX/MacOSX.README_de.txt">Deutsch 
(de)</a>
         </td>
         <td>
-          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip">zip</a>
+          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip">Download</a>
         </td>
         <td>
-          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.asc">ASC</a>
+          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.asc">ASC</a>
         </td>
         <td>
-          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.md5">MD5</a>
+          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.md5">MD5</a>
         </td>
         <td>
-          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.sha1">SHA1</a>
+          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.sha1">SHA1</a>
         </td>
         <td>
-          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.sha256">SHA256</a>
+          <a 
href="binaries/MacOSX/apache-openoffice-4.1.2-patch1-apply-MacOSX.zip.sha256">SHA256</a>
         </td>
       </tr>
       <tr>
         <td>
-          <h4>Source</h4>
+          <h4>Linux 32-Bit</h4>
         </td>
         <td>
-          &nbsp;
+          <a href="binaries/Linux32/Linux32.README.txt">English (en-US)</a>
         </td>
         <td>
-          <a href="source/apache-openoffice-4.1.2-patch1.zip">zip</a>
+          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip">Download</a>
         </td>
         <td>
-          <a href="source/apache-openoffice-4.1.2-patch1.zip.asc">ASC</a>
-        </td>   
+          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.asc">ASC</a>
+        </td>
         <td>
-          <a href="source/apache-openoffice-4.1.2-patch1.zip.md5">MD5</a>
+          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.md5">MD5</a>
         </td>
         <td>
-          <a href="source/apache-openoffice-4.1.2-patch1.zip.sha1">SHA1</a>
+          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.sha1">SHA1</a>
         </td>
         <td>
-          <a href="source/apache-openoffice-4.1.2-patch1.zip.sha256">SHA256</a>
+          <a 
href="binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip.sha256">SHA256</a>
         </td>
       </tr>
-    </tbody>
-  </table>
-
-
-  <p>The Windows Hotfix downloads are for individual languages.  
-     Each has localized scripts for automation of patch installation and 
removal. 
-  </p>
-
-  <table style="border: 0px solid white;">
-    <tr>
-      <td>
-        <h4>Windows Hotfix</h4>
-      </td>
-      <td>
-        <h4>Instructions</h4>
-      </td>
-      <td>
-        <h4>Download</h4>
-      </td>
-      <td>
-        <h4>Signature</h4>
-      </td>
-      <td colspan="3">
-        <h4>Digital Hashes</h4>
-      </td>
-    </tr>
-    <tbody>
       <tr>
         <td>
-          <h4>English (en-US)</h4>
+          <h4>Linux 64-Bit</h4>
         </td>
         <td>
-          <a 
href="binaries/Windows/README-4.1.2-patch1-Windows.txt">English</a>
+          <a href="binaries/Linux64/Linux64.README.txt">English (en-US)</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip">Zip</a>
+          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip">Download</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.asc">ASC</a>
+          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.asc">ASC</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.md5">MD5</a>
+          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.md5">MD5</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.sha1">SHA1</a>
+          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.sha1">SHA1</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86.zip.sha256">SHA256</a>
+          <a 
href="binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip.sha256">SHA256</a>
         </td>
       </tr>
       <tr>
         <td>
-          <h4>Nederland (nl) Dutch</h4>
+          <h4>Source</h4>
         </td>
         <td>
-          <a 
href="binaries/Windows/README-4.1.2-patch1-Windows_nl.txt">Nederland</a>
+          &nbsp;
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip">Zip</a>
+          <a href="source/apache-openoffice-4.1.2-patch1.zip">Download</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.asc">ASC</a>
+          <a href="source/apache-openoffice-4.1.2-patch1.zip.asc">ASC</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.md5">MD5</a>
+          <a href="source/apache-openoffice-4.1.2-patch1.zip.md5">MD5</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.sha1">SHA1</a>
+          <a href="source/apache-openoffice-4.1.2-patch1.zip.sha1">SHA1</a>
         </td>
         <td>
-          <a 
href="binaries/Windows/apache-openoffice-4.1.2-patch1-Win_x86_nl.zip.sha256">SHA256</a>
+          <a href="source/apache-openoffice-4.1.2-patch1.zip.sha256">SHA256</a>
         </td>
       </tr>
     </tbody>
-  </table> 
+  </table>
 
   <p>
-    Please choose the ZIP file for your favorite platform and save it to a 
desired directory. The following are the default directories. But you can also 
use an own location:
+    Please choose the Zip file for your favorite platform and save it to a 
desired directory. The following are the default directories. But you can also 
use an own location:
 
     <ul>
       <li><b>Windows:</b> C:\Users\&lt;user_name&gt;\Downloads</li>
@@ -270,7 +267,7 @@
   </p>
 
   <p>
-    The next step is to unzip the downloaded file:
+    The next step is to unzip the downloaded Zip file:
 
     <ul>
       <li><b>On Windows</b> review the Readme instructions for "Extract here" 
to unzip the contents into a folder.</li>
@@ -286,7 +283,7 @@
   <h2 id="verify">How to verify the download &amp; installation?</h2>
 
   <p>
-    If you want, in the table above you can also download suitable hash value 
and signature files to verify that the ZIP file was downloaded correctly. For 
more information about how to do the verifification see here:
+    If you want, in the table above you can also download suitable hash value 
and signature files to verify that the Zip file was downloaded correctly. For 
more information about how to do the verifification see here:
     <a href="http://www.openoffice.org/download/checksums.html";>How to verify 
the integrity of the downloaded file?</a>
   </p>
 


Reply via email to