Author: buildbot
Date: Sat Aug  3 13:46:17 2013
New Revision: 872588

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/checksums.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Aug  3 13:46:17 2013
@@ -1 +1 @@
-1509987
+1509988

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Aug  3 13:46:17 2013
@@ -1 +1 @@
-1509987
+1509988

Modified: websites/staging/ooo-site/trunk/content/download/checksums.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/checksums.html (original)
+++ websites/staging/ooo-site/trunk/content/download/checksums.html Sat Aug  3 
13:46:17 2013
@@ -46,14 +46,11 @@
   PGP and KEYS - Windows</a></h3></li>
   <li><h3><a href="#pgp_linux"    title="Verify with PGP/ASC and KEYS 
signatures on Linux">
   PGP and KEYS - Linux</a></h3></li>
-  <li><h3><a href="#pgp_macos"    title="Verify with PGP/ASC and KEYS 
signatures on Mac OS">
+  <li><h3><a href="#pgp_mac"    title="Verify with PGP/ASC and KEYS signatures 
on Mac OS">
   PGP and KEYS - Mac OS</a></h3></li>
-  <li><h3><a href="#md5_win"      title="Verify with MD5 hash values on 
Windows">MD5 - Windows</a></h3></li>
-  <li><h3><a href="#md5_linux"    title="Verify with MD5 hash values on 
Linux">MD5 - Linux</a></h3></li>
-  <li><h3><a href="#md5_macos"    title="Verify with MD5 hash values on Mac 
OS">MD5 - Mac OS</a></h3></li>
-  <li><h3><a href="#sha256_win"   title="Verify with SHA256 hash values on 
Windows">SHA256 - Windows</a></h3></li>
-  <li><h3><a href="#sha256_linux" title="Verify with SHA256 hash values on 
Linux">SHA256 - Linux</a></h3></li>
-  <li><h3><a href="#sha256_macos" title="Verify with SHA256 hash values on Mac 
OS">SHA256 - Mac OS</a></h3></li>
+  <li><h3><a href="#hash_win"      title="Verify with SHA246/MD5 hash values 
on Windows">SHA256/MD5 - Windows</a></h3></li>
+  <li><h3><a href="#hash_linux"    title="Verify with SHA256/MD5 hash values 
on Linux">SHA256/MD5 - Linux</a></h3></li>
+  <li><h3><a href="#hash_mac"    title="Verify with SHA256/MD5 hash values on 
Mac OS">SHA26/MD5 - Mac OS</a></h3></li>
   <li><h3><a href="#no_match"     title="What to do when the values do not 
match?">
   What to do when the values do not match?</a></h3></li>
   <li><h3><a href="#notes"        title="Please read the important notes 
before downloading and using Apache OpenOffice">
@@ -67,12 +64,13 @@
 
 <p>A <a href="http://en.wikipedia.org/wiki/Checksum"; title="What means to 
verify the file integrity?">hash value</a>
 processed on the downloaded file is a way to make sure that the content is 
transferred OK and has not been damaged during
-the download process.</p>
+the download process. There is no need to do all verifications. It is OK to 
verify the signature, SHA256 hash or MD5.
+Furthermore, it is recommended to prefer the SHA256 method than MD5.</p>
 <br />
 
 <h3>Verify with PGP/ASC and KEYS signatures</h3>
 
-<p id="pgp_win"><b>This is how you verify with PGP/ASC signatures on 
Windows</b></p>
+<p id="pgp_win"><b>How to verify with PGP/ASC signatures on Windows</b></p>
 <br />
 
 <ul>
@@ -80,61 +78,68 @@ the download process.</p>
   <a href="http://www.gnupg.de/download/"; title="GnuPG by The GNU 
Project">"GnuPG"</a>
   just to name a few and not to prefer a specific tool. For the following 
instructions "GnuPG" will be used as an example
   an example to show for your convenience how the verification is working.</li>
+  <li>&nbsp;</li>
   <li>For verifying signatures you need the software "GnuPg". This is a tool 
that runs not in the graphical mode but in the
   command prompt of Windows. Therefore you have to enter always the full path 
(default location after installation:
   <code>C:\Program Files\Gnu\GnuPg\gpg.exe</code>) until you add it to the 
<code>$PATH</code> system environment
   variable.</li>
-  <li>Save the following file with your Internet browser to the location where 
the downloaded AOO file is stored:</li>
+  <li>&nbsp;</li>
+  <li>Save the following file with your Internet browser to the location where 
the downloaded AOO and PGP/ASC file is
+  stored:</li>
   <li><a href="http://www.apache.org/dist/openoffice/KEYS"; 
title="http://www.apache.org/dist/openoffice/KEYS";>
   http://www.apache.org/dist/openoffice/KEYS</a></li>
   <li>Open the start menu and enter <code>cmd.exe</code> into the search 
box.</li>
   <li>Now change to the directory with the downloaded AOO, KEYS and PGP/ASC 
file, import and verify with the following
   commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_KEYS_and_ASC_file&gt;</pre></li>
+  <li><pre>cd &lt;path_to_AOO_and_KEYS_and_ASC_files&gt;</pre></li>
   <li><pre>C:\Program Files\Gnu\GnuPg\gpg.exe --import KEYS</pre></li>
   <li><pre>C:\Program Files\Gnu\GnuPg\gpg.exe --verify 
&lt;installation_file&gt;.asc</pre></li>
   <li>If the signature matches the file it is indicated with an "Good 
signature from &lt;Person who has created the
-  signature&gt; statement. <br /> Otherwise "BAD signature from ...".</li>
+  signature&gt; statement. <br /> Otherwise with "BAD signature from ...".</li>
 </ul>
 <br />
 
-<p id="pgp_linux"><b>This is how you verify with PGP/ASC signatures on 
Linux</b></p>
+<p id="pgp_linux"><b>How to verify with PGP/ASC signatures on Linux</b></p>
 <br />
 
 <ul>
-  <li>Open a terminal and change to the directory with the downloaded AOO, 
KEYS and PGP/ASC file.</li>
+  <li>Open a terminal and change to the directory with the downloaded AOO and 
PGP/ASC file.</li>
   <li>Type in the following commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_KEYS_and_ASC_file&gt;</pre></li>
+  <li>&nbsp;</li>
+  <li><pre>cd &lt;path_to_AOO_and_ASC_files&gt;</pre></li>
   <li><pre>wget http://www.apache.org/dist/openoffice/KEYS</pre></li>
   <li><pre>gpg --import KEYS</pre></li>
   <li><pre>gpg --verify &lt;installation_file&gt;.asc</pre></li>
+  <li>&nbsp;</li>
   <li>If the signature matches the file it is indicated with an "Good 
signature from &lt;Person who has created the
-  signature&gt; statement. <br /> Otherwise "BAD signature from ...".</li>
+  signature&gt; statement. <br /> Otherwise with "BAD signature from ...".</li>
 </ul>
 <br />
 
-<p id="pgp_macos"><b>This is how you verify with PGP/ASC signatures on Mac 
OS</b></p>
+<p id="pgp_mac"><b>How to verify with PGP/ASC signatures on Mac OS</b></p>
 <br />
 
 <ul>
   <li>A requirement is that you have installed <a 
href="http://www.gpgtools.org";>GnuPG</a>.</li>
   <li>Open a terminal (usually from here: "/Applications/Utilities") and 
change to the directory with the downloaded
-  AOO, KEYS and PGP/ASC file.</li>
+  AOO and PGP/ASC file.</li>
   <li>Type in the following commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_KEYS_and_ASC_file&gt;</pre></li>
+  <li>&nbsp;</li>
+  <li><pre>cd &lt;path_to_AOO_and_ASC_files&gt;</pre></li>
   <li><pre>curl http://www.apache.org/dist/openoffice/KEYS -o KEYS</pre></li>
   <li><pre>gpg --import KEYS</pre></li>
   <li><pre>gpg --verify &lt;installation_file&gt;.asc</pre></li>
+  <li>&nbsp;</li>
   <li>If the signature matches the file it is indicated with an "Good 
signature from &lt;Person who has created the
-  signature&gt; statement. <br /> Otherwise "BAD signature from ...".</li>
+  signature&gt; statement. <br /> Otherwise with "BAD signature from ...".</li>
 </ul>
 
 <p class="footer"><small><a href="#" title="Go to the start of the page">Start 
of page</a></small></p>
 <br />
 
-<h3>Verify with MD5 hashes</h3>
+<h3>Verify with SHA256 / MD5 hashes</h3>
 
-<p id="md5_win"><b>This is how you verify MD5 hash values on Windows</b></p>
+<p id="hash_win"><b>How to verify SHA256 / MD5 hash values on Windows</b></p>
 <br />
 
 <ul>
@@ -142,67 +147,6 @@ the download process.</p>
   <a href="http://implbits.com/HashTab/HashTabWindows.aspx"; title="HashTab (by 
Implbits.com)">"HashTab"</a>,
   <a href="http://www.pc-tools.net/win32/md5sums/"; title="MD5sums (by 
PC-Tools.Net)">"MD5sums"</a>,
   <a href="http://www.slavasoft.com/fsum/"; title="FSUM (by 
SlavaSoft.com)">"FSUM"</a>,
-  <a href="http://www.krylack.com/file-checksum-tool/"; title="File Checksum 
Tool (by KRyLack Software)">
-  "File Checksum Tool"</a>
-  just to name a few and not to prefer a specific tool. For the following 
instructions "File Checksum Tool" will be used as
-  an example to show for your convenience how the verification is working.</li>
-  <li>Start the tool from where you have saved the downloaded file.</li>
-  <li>Section "1) File to Verify": Insert the path and filename of the 
downloaded AOO file. The [Browse] button will
-  help to locate it with the Windows Explorer.</li>
-  <li>Section "2) Hashing Algorithm": Choose "MD5".</li>
-  <li>Section "3) File Checksum": Click on [Calculate Hash].</li>
-  <li>Section "4) Verify With": Paste the hash from the MD5 file you have 
downloaded. First you have to open it and
-  copy the hash value.</li>
-  <li>Finally, click on [Compare].</li>
-  <li>When both hash values match a dialogbox shows "Checksums match". 
Otherwise "Checksums do not match".</li>
-  <li>If the hash values do not match, please see the <a href="#no_match"
-  title="What to do when the values do not match?">section below</a>.</li>
-</ul>
-<br />
-
-<p id="md5_linux"><b>This is how you verify MD5 hash values on Linux</b></p>
-<br />
-
-<ul>
-  <li>Open a terminal and change to the directory with the downloaded AOO and 
MD5 file.</li>
-  <li>Type in the following commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_MD5_file&gt;</pre></li>
-  <li><pre>md5sum -c &lt;AOO file&gt;.tar.gz.md5</pre></li>
-  <li>When both hash values match it is indicated with an "&lt;AOO 
file&gt;.tar.gz: OK" statement.
-  <br />Otherwise "md5sum: WARNING: 1 of 1 computed checksum did NOT 
match".</li>
-  <li>If the hash values do not match, please see the <a href="#no_match"
-  title="What to do when the values do not match?">section below</a>.</li>
-</ul>
-<br />
-
-<p id="md5_macos"><b>This is how you verify MD5 hash values on Mac OS</b></p>
-<br />
-
-<ul>
-  <li>Open a terminal (usually from here: "/Applications/Utilities").</li>
-  <li>Type in the following commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_MD5_file&gt;</pre></li>
-  <li><pre>openssl dgst -md5 &lt;AOO file&gt;.dmg</pre></li>
-  <li><pre>cat &lt;MD5 file&gt;.md5</pre></li>
-  <li>Now compare both MD5 hash values.</li>
-  <li>If the hash values do not match, please see the <a href="#no_match"
-  title="What to do when the values do not match?">section below</a>.</li>
-</ul>
-<br />
-
-<p>For more information please refer to the more detailed description about <a 
href="../dev_docs/using_md5sums.html"
-title="How to use MD5 hashes">how to use MD5 hashes</a> on Windows, Linux and 
via Firefox (for all platforms)..</p>
-
-<p class="footer"><small><a href="#" title="Go to the start of the page">Start 
of page</a></small></p>
-<br />
-
-<h3>Verify with SHA256 hashes</h3>
-
-<p id="sha256_win"><b>This is how you verify SHA256 hash values on 
Windows</b></p>
-<br />
-
-<ul>
-  <li>There are several tools available like
   <a href="http://implbits.com/HashTab/HashTabWindows.aspx"; title="HashTab (by 
Implbits.com)">"HashTab"</a>,
   <a href="http://sourceforge.net/projects/quickhash/"; title="Quick Hash GUI 
(by tedtechnology)">"Quick Hash GUI"</a>,
   <a 
href="https://kanguru.zendesk.com/entries/21747773-SHA256-Checksum-Utility"; 
title="SHA256 Checksum Utility (by )">
@@ -211,48 +155,67 @@ title="How to use MD5 hashes">how to use
   "File Checksum Tool"</a>
   just to name a few and not to prefer a specific tool. For the following 
instructions "File Checksum Tool" will be used as
   an example to show for your convenience how the verification is working.</li>
+  <li>&nbsp;</li>
   <li>Start the tool from where you have saved the downloaded file.</li>
   <li>Section "1) File to Verify": Insert the path and filename of the 
downloaded AOO file. The [Browse] button will
   help to locate it with the Windows Explorer.</li>
-  <li>Section "2) Hashing Algorithm": Choose "SHA-256".</li>
+  <li>Section "2) Hashing Algorithm": Choose "SHA-256" or "MD5".</li>
   <li>Section "3) File Checksum": Click on [Calculate Hash].</li>
-  <li>Section "4) Verify With": Paste the hash from the SHA256 file you have 
downloaded. First you have to open it and
+  <li>Section "4) Verify With": Paste the hash from the SHA256 / MD5 file you 
have downloaded. First you have to open it and
   copy the hash value.</li>
   <li>Finally, click on [Compare].</li>
+  <li>&nbsp;</li>
   <li>When both hash values match a dialogbox shows "Checksums match". 
Otherwise "Checksums do not match".</li>
-  <li>If the hash values do not match, please see the <a href="#no_match"
-  title="What to do when the values do not match?">section below</a>.</li>
+  <li>If they do not match, please see the <a href="#no_match" title="What to 
do when the values do not match?">
+  section below</a>.</li>
 </ul>
 <br />
 
-<p id="sha256_linux"><b>This is how you verify SHA256 hash values on 
Linux</b></p>
+<p id="hash_linux"><b>How to verify SHA256 / MD5 hash values on Linux</b></p>
 <br />
 
 <ul>
-  <li>Open a terminal, change to the directory with the downloaded AOO file 
and SHA256 file.</li>
+  <li>The instructions to compare SHA256 and MD5 hash values are very similar. 
Therefore both are mentioned together.</li>
+  <li>&nbsp;</li>
+  <li>Open a terminal and change to the directory with the downloaded AOO and 
SHA256 / MD5 file.</li>
   <li>Type in the following commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_SHA256_file&gt;</pre></li>
+  <li>&nbsp;</li>
+  <li><pre>cd &lt;path_to_AOO_and_SHA256/MD5_files&gt;</pre></li>
+  <li><pre>md5sum -c &lt;AOO file&gt;.tar.gz.md5</pre></li>
+  <li>or</li>
   <li><pre>sha256sum -c &lt;AOO file&gt;.tar.gz.sha256</pre></li>
-  <li>When both hash values match it is indicated with an "&lt;AOO 
file&gt;.tar.gz: OK" statement.
-  <br />Otherwise "sha256sum: WARNING: 1 of 1 computed checksum did NOT 
match".</li>
-  <li>If the hash values do not match, please see the <a href="#no_match"
-  title="What to do when the values do not match?">section below</a>.</li>
+  <li>&nbsp;</li>
+  <li>When both SHA256 / MD5 hash values match it is indicated with an 
"&lt;AOO file&gt;.tar.gz: OK" statement.
+  <br />Otherwise "WARNING: 1 of 1 computed checksum did NOT match".</li>
+  <li>If they do not match, please see the <a href="#no_match" title="What to 
do when the values do not match?">
+  section below</a>.</li>
 </ul>
 <br />
 
-<p id="sha256_macos"><b>This is how you verify SHA256 hash values on Mac 
OS</b></p>
+<p id="hash_mac"><b>How to verify SHA256 / MD5 hash values on Mac OS</b></p>
 <br />
 
 <ul>
+  <li>The instructions to compare SHA256 and MD5 hash values are very similar. 
Therefore both are mentioned together.</li>
+  <li>&nbsp;</li>
   <li>Open a terminal (usually from here: "/Applications/Utilities").</li>
   <li>Type in the following commands:</li>
-  <li><pre>cd &lt;path_to_AOO_and_SHA256_file&gt;</pre></li>
+  <li>&nbsp;</li>
+  <li><pre>cd &lt;path_to_AOO_and_SHA256/MD5_files&gt;</pre></li>
+  <li><pre>openssl dgst -md5 &lt;AOO file&gt;.dmg</pre></li>
+  <li><pre>cat &lt;MD5 file&gt;.md5</pre></li>
+  <li>or</li>
   <li><pre>openssl dgst -sha256 &lt;AOO file&gt;.dmg</pre></li>
   <li><pre>cat &lt;SHA256 file&gt;.sha256</pre></li>
-  <li>Now compare both SHA256 hash values.</li>
-  <li>If the hash values do not match, please see the <a href="#no_match"
-  title="What to do when the values do not match?">section below</a>.</li>
+  <li>&nbsp;</li>
+  <li>Now compare both SHA256 / MD5 hash values.</li>
+  <li>If they do not match, please see the <a href="#no_match" title="What to 
do when the values do not match?">
+  section below</a>.</li>
 </ul>
+<br />
+
+<p>For more information please refer to the more detailed description about <a 
href="../dev_docs/using_md5sums.html"
+title="How to use MD5 hashes">how to use MD5 hashes</a> on Windows, Linux and 
via Firefox (for all platforms)..</p>
 
 <p class="footer"><small><a href="#" title="Go to the start of the page">Start 
of page</a></small></p>
 <br />


Reply via email to