Author: marcus
Date: Sat Aug 3 14:26:07 2013
New Revision: 1509997
URL: http://svn.apache.org/r1509997
Log:
Put the Windows, Linux and Mac OS texts together
Modified:
openoffice/ooo-site/trunk/content/download/checksums.html
Modified: openoffice/ooo-site/trunk/content/download/checksums.html
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/checksums.html?rev=1509997&r1=1509996&r2=1509997&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/checksums.html (original)
+++ openoffice/ooo-site/trunk/content/download/checksums.html Sat Aug 3
14:26:07 2013
@@ -27,18 +27,18 @@
<ul>
<li><h3><a href="other.html" title="Get the signatures and hash values
for all Apache OpenOffice builds">
Get all Apache OpenOffice signature and hash value files</a></h3></li>
- <li><h3><a href="#pgp_win" title="Verify with PGP/ASC and KEYS
signatures on Windows">
- 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_mac" title="Verify with PGP/ASC and KEYS
signatures on Mac OS">
- PGP and KEYS - 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="#pgp_win" title="How to verify with PGP/ASC and KEYS
signatures on Windows">
+ Windows - Verify with PGP and KEYS</a></h3></li>
+ <li><h3><a href="#hash_win" title="How to verify with SHA246 and MD5
hash values on Windows">
+ Windows - Verify with SHA256 and MD5</a></h3></li>
+ <li><h3><a href="#pgp_linux" title="How to verify with PGP/ASC and KEYS
signatures on Linux">
+ Linux - Verify with PGP and KEYS</a></h3></li>
+ <li><h3><a href="#hash_linux" title="How to verify with SHA256 and MD5
hash values on Linux">
+ Linux - Verify with SHA256 and MD5</a></h3></li>
+ <li><h3><a href="#pgp_mac" title="How to verify with PGP/ASC and KEYS
signatures on Mac OS">
+ Mac OS - Verify with PGP and KEYS</a></h3></li>
+ <li><h3><a href="#hash_mac" title="How to verify with SHA256 and MD5
hash values on Mac OS">
+ Mac OS - Verify with SHA26 and MD5</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">
@@ -52,13 +52,15 @@
<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. 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>
+the download process.</p>
+<p><b>Note:</b><br />
+There is no need to do all verifications. It is sufficient to verify the
signature, SHA256 or MD5 hash. However, it is
+recommended to prefer the SHA256 method than MD5.</p>
<br />
-<h3>Verify with PGP/ASC and KEYS signatures</h3>
+<h3 id="pgp_win">Verify on Windows</h3>
-<p id="pgp_win"><b>How to verify with PGP/ASC signatures on Windows</b></p>
+<p><b>How to verify with PGP/ASC signatures</b></p>
<br />
<ul>
@@ -87,47 +89,7 @@ Furthermore, it is recommended to prefer
</ul>
<br />
-<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 and
PGP/ASC file.</li>
- <li>Type in the following commands:</li>
- <li> </li>
- <li><pre>cd <path_to_AOO_and_ASC_files></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 <installation_file>.asc</pre></li>
- <li> </li>
- <li>If the signature matches the file it is indicated with an "Good
signature from <Person who has created the
- signature> statement. <br /> Otherwise with "BAD signature from ...".</li>
-</ul>
-<br />
-
-<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 and PGP/ASC file.</li>
- <li>Type in the following commands:</li>
- <li> </li>
- <li><pre>cd <path_to_AOO_and_ASC_files></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 <installation_file>.asc</pre></li>
- <li> </li>
- <li>If the signature matches the file it is indicated with an "Good
signature from <Person who has created the
- signature> 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 SHA256 / MD5 hashes</h3>
-
-<p id="hash_win"><b>How to verify SHA256 / MD5 hash values on Windows</b></p>
+<p id="hash_win"><b>How to verify SHA256 / MD5 hash values</b></p>
<br />
<ul>
@@ -157,9 +119,30 @@ Furthermore, it is recommended to prefer
<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>
+
+<p class="footer"><small><a href="#" title="Go to the start of the page">Start
of page</a></small></p>
<br />
-<p id="hash_linux"><b>How to verify SHA256 / MD5 hash values on Linux</b></p>
+<h3 id="pgp_linux">Verify on Linux</h3>
+
+<p><b>How to verify with PGP/ASC signatures</b></p>
+<br />
+
+<ul>
+ <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> </li>
+ <li><pre>cd <path_to_AOO_and_ASC_files></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 <installation_file>.asc</pre></li>
+ <li> </li>
+ <li>If the signature matches the file it is indicated with an "Good
signature from <Person who has created the
+ signature> statement. <br /> Otherwise with "BAD signature from ...".</li>
+</ul>
+<br />
+
+<p id="hash_linux"><b>How to verify SHA256 / MD5 hash values</b></p>
<br />
<ul>
@@ -178,9 +161,32 @@ Furthermore, it is recommended to prefer
<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>
+
+<p class="footer"><small><a href="#" title="Go to the start of the page">Start
of page</a></small></p>
<br />
-<p id="hash_mac"><b>How to verify SHA256 / MD5 hash values on Mac OS</b></p>
+<h3 id="pgp_mac">Verify on Mac OS</h3>
+
+<p><b>How to verify with PGP/ASC signatures</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 and PGP/ASC file.</li>
+ <li>Type in the following commands:</li>
+ <li> </li>
+ <li><pre>cd <path_to_AOO_and_ASC_files></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 <installation_file>.asc</pre></li>
+ <li> </li>
+ <li>If the signature matches the file it is indicated with an "Good
signature from <Person who has created the
+ signature> statement. <br /> Otherwise with "BAD signature from ...".</li>
+</ul>
+<br />
+
+<p id="hash_mac"><b>How to verify SHA256 / MD5 hash values</b></p>
<br />
<ul>
@@ -200,10 +206,6 @@ Furthermore, it is recommended to prefer
<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 />
