Author: markt
Date: Sun Jun 10 15:09:29 2012
New Revision: 1348612

URL: http://svn.apache.org/viewvc?rev=1348612&view=rev
Log:
Make verification text consistent across all components

Modified:
    tomcat/site/trunk/docs/download-55.html
    tomcat/site/trunk/docs/download-60.html
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/xdocs/download-55.xml
    tomcat/site/trunk/xdocs/download-60.xml
    tomcat/site/trunk/xdocs/download-70.xml
    tomcat/site/trunk/xdocs/download-connectors.xml
    tomcat/site/trunk/xdocs/download-native.xml

Modified: tomcat/site/trunk/docs/download-55.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-55.html (original)
+++ tomcat/site/trunk/docs/download-55.html Sun Jun 10 15:09:29 2012
@@ -250,12 +250,14 @@
 <p>
 <blockquote>
     
-<p>You <strong>must</strong> verify the integrity of the downloaded files.  We 
provide
-    <code>PGP</code> signatures for every release file.  This signature should 
be matched
-    against the <a 
href="http://www.apache.org/dist/tomcat/tomcat-5/KEYS";>KEYS</a> file which 
contains
-    the PGP keys of Tomcat's Release Managers.  We also provide an 
<code>MD5</code> checksum
-    for every release file.  After you download the file, you should calculate 
a checksum
-    for your download, and make sure it is the same as ours.
+<p>You <strong>must</strong> verify the integrity of the downloaded files.
+    We provide OpenPGP signatures for every release file.  This signature 
should
+    be matched against the
+    <a href="http://www.apache.org/dist/tomcat/tomcat-5/KEYS";>KEYS</a> file
+    which contains the OpenPGP keys of Tomcat's Release Managers. We also
+    provide an <code>MD5</code> checksum for every release file. After you
+    download the file, you should calculate a checksum for your download, and
+    make sure it is the same as ours.
     </p>
   
 </blockquote>

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Sun Jun 10 15:09:29 2012
@@ -242,12 +242,14 @@
 <p>
 <blockquote>
     
-<p>You <strong>must</strong> verify the integrity of the downloaded files.  We 
provide
-    <code>PGP</code> signatures for every release file.  This signature should 
be matched
-    against the <a 
href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file which 
contains
-    the PGP keys of Tomcat's Release Managers.  We also provide an 
<code>MD5</code> checksum
-    for every release file.  After you download the file, you should calculate 
a checksum
-    for your download, and make sure it is the same as ours.
+<p>You <strong>must</strong> verify the integrity of the downloaded files.
+    We provide OpenPGP signatures for every release file.  This signature 
should
+    be matched against the
+    <a href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file
+    which contains the OpenPGP keys of Tomcat's Release Managers. We also
+    provide an <code>MD5</code> checksum for every release file. After you
+    download the file, you should calculate a checksum for your download, and
+    make sure it is the same as ours.
     </p>
   
 </blockquote>

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Sun Jun 10 15:09:29 2012
@@ -242,12 +242,14 @@
 <p>
 <blockquote>
     
-<p>You <strong>must</strong> verify the integrity of the downloaded files.  We 
provide
-    <code>PGP</code> signatures for every release file.  This signature should 
be matched
-    against the <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> file which 
contains
-    the PGP keys of Tomcat's Release Managers.  We also provide an 
<code>MD5</code> checksum
-    for every release file.  After you download the file, you should calculate 
a checksum
-    for your download, and make sure it is the same as ours.
+<p>You <strong>must</strong> verify the integrity of the downloaded files.
+    We provide OpenPGP signatures for every release file.  This signature 
should
+    be matched against the
+    <a href="http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> file
+    which contains the OpenPGP keys of Tomcat's Release Managers. We also
+    provide an <code>MD5</code> checksum for every release file. After you
+    download the file, you should calculate a checksum for your download, and
+    make sure it is the same as ours.
     </p>
   
 </blockquote>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Sun Jun 10 15:09:29 2012
@@ -372,57 +372,16 @@
 <tr>
 <td>
 <blockquote>
-
-        
-<p>It is essential that you verify the integrity of the downloaded
-        files using the PGP or MD5 signatures. The PGP signatures can be 
verified using PGP or GPG.
-        First download the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-        as well as the <code>PGP</code> signature file for the relevant
-        distribution.  Make sure you get these files from the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main site</a>,
-        rather than from a mirror. The above [<code>PGP</code>] links 
automatically
-        retrieve the signature files from the main site. Then verify the 
signatures
-        using</p>
-
-        
-<p>
-<code>
-        % pgpk -a KEYS<br>
-        % pgpv tomcat-connectors-1.2.37-src.tar.gz.asc<br>
-        
-</code>
-        <em>or</em>
-<br>
-        
-<code>
-        % pgp -ka KEYS<br>
-        % pgp tomcat-connectors-1.2.37-src.tar.gz.asc<br>
         
-</code>
-        <em>or</em>
-<br>
-        
-<code>
-        % gpg --import KEYS<br>
-        % gpg --verify tomcat-connectors-1.2.37-src.tar.gz.asc
-        </code>
-</p>
-
-        
-<p>Alternatively, you can verify the MD5 signature (hash value) on the files.
-        Make sure you get these files from the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main site</a>,
-        rather than from a mirror. The above [<code>MD5</code>] links 
automatically
-        retrieve the signature files from the main site.</p>
-        
-<p>Check the integrity of your download by comparing the downloaded MD5
-        signature files with the MD5 signature of the downloaded archives 
created on
-        your system. A unix program called <code>md5</code> or 
<code>md5sum</code> is
-        included in many unix distributions.  It is also available as part of
-        <a href="http://www.gnu.org/software/textutils/textutils.html"; 
rel="nofollow">GNU Textutils</a>. Windows users can get binary md5
-        programs from
-        <a href="http://www.fourmilab.ch/md5/"; rel="nofollow">here</a>,
-        <a href="http://www.pc-tools.net/win32/freeware/console/"; 
rel="nofollow">here</a>, or
-        <a href="http://www.slavasoft.com/fsum/"; rel="nofollow">here</a>.</p>
-
+<p>You <strong>must</strong> verify the integrity of the downloaded
+        files. We provide OpenPGP signatures for every release file. This
+        signature should be matched against the
+        <a href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file
+        which contains the OpenPGP keys of Tomcat's Release Managers. We also
+        provide an <code>MD5</code> checksum for every release file. After you
+        download the file, you should calculate a checksum for your download,
+        and make sure it is the same as ours.
+        </p>
       
 </blockquote>
 </td>

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Sun Jun 10 15:09:29 2012
@@ -357,57 +357,16 @@
 <tr>
 <td>
 <blockquote>
-
-        
-<p>It is essential that you verify the integrity of the downloaded
-        files using the PGP or MD5 signatures. The PGP signatures can be 
verified using PGP or GPG.
-        First download the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-        as well as the <code>PGP</code> signature file for the relevant
-        distribution.  Make sure you get these files from the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main site</a>,
-        rather than from a mirror. The above [<code>PGP</code>] links 
automatically
-        retrieve the signature files from the main site. Then verify the 
signatures
-        using</p>
-
-        
-<p>
-<code>
-        % pgpk -a KEYS<br>
-        % pgpv tomcat-native-1.1.23-src.tar.gz.asc<br>
-        
-</code>
-        <em>or</em>
-<br>
-        
-<code>
-        % pgp -ka KEYS<br>
-        % pgp tomcat-native-1.1.23-src.tar.gz.asc<br>
         
-</code>
-        <em>or</em>
-<br>
-        
-<code>
-        % gpg --import KEYS<br>
-        % gpg --verify tomcat-native-1.1.23-src.tar.gz.asc
-        </code>
-</p>
-
-        
-<p>Alternatively, you can verify the MD5 signature (hash value) on the files.
-        Make sure you get these files from the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main site</a>,
-        rather than from a mirror. The above [<code>MD5</code>] links 
automatically
-        retrieve the signature files from the main site.</p>
-        
-<p>Check the integrity of your download by comparing the downloaded MD5
-        signature files with the MD5 signature of the downloaded archives 
created on
-        your system. A unix program called <code>md5</code> or 
<code>md5sum</code> is
-        included in many unix distributions.  It is also available as part of
-        <a href="http://www.gnu.org/software/textutils/textutils.html"; 
rel="nofollow">GNU Textutils</a>. Windows users can get binary md5
-        programs from
-        <a href="http://www.fourmilab.ch/md5/"; rel="nofollow">here</a>,
-        <a href="http://www.pc-tools.net/win32/freeware/console/"; 
rel="nofollow">here</a>, or
-        <a href="http://www.slavasoft.com/fsum/"; rel="nofollow">here</a>.</p>
-
+<p>You <strong>must</strong> verify the integrity of the downloaded
+        files. We provide OpenPGP signatures for every release file. This
+        signature should be matched against the
+        <a href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file
+        which contains the OpenPGP keys of Tomcat's Release Managers. We also
+        provide an <code>MD5</code> checksum for every release file. After you
+        download the file, you should calculate a checksum for your download,
+        and make sure it is the same as ours.
+        </p>
       
 </blockquote>
 </td>

Modified: tomcat/site/trunk/xdocs/download-55.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-55.xml?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-55.xml (original)
+++ tomcat/site/trunk/xdocs/download-55.xml Sun Jun 10 15:09:29 2012
@@ -30,12 +30,14 @@
 
 
   <section name="Release Integrity">
-    <p>You <strong>must</strong> verify the integrity of the downloaded files. 
 We provide
-    <code>PGP</code> signatures for every release file.  This signature should 
be matched
-    against the <a 
href="http://www.apache.org/dist/tomcat/tomcat-5/KEYS";>KEYS</a> file which 
contains
-    the PGP keys of Tomcat's Release Managers.  We also provide an 
<code>MD5</code> checksum
-    for every release file.  After you download the file, you should calculate 
a checksum
-    for your download, and make sure it is the same as ours.
+    <p>You <strong>must</strong> verify the integrity of the downloaded files.
+    We provide OpenPGP signatures for every release file.  This signature 
should
+    be matched against the
+    <a href="http://www.apache.org/dist/tomcat/tomcat-5/KEYS";>KEYS</a> file
+    which contains the OpenPGP keys of Tomcat's Release Managers. We also
+    provide an <code>MD5</code> checksum for every release file. After you
+    download the file, you should calculate a checksum for your download, and
+    make sure it is the same as ours.
     </p>
   </section>
 

Modified: tomcat/site/trunk/xdocs/download-60.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-60.xml?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-60.xml (original)
+++ tomcat/site/trunk/xdocs/download-60.xml Sun Jun 10 15:09:29 2012
@@ -24,12 +24,14 @@
 
 
   <section name="Release Integrity">
-    <p>You <strong>must</strong> verify the integrity of the downloaded files. 
 We provide
-    <code>PGP</code> signatures for every release file.  This signature should 
be matched
-    against the <a 
href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file which 
contains
-    the PGP keys of Tomcat's Release Managers.  We also provide an 
<code>MD5</code> checksum
-    for every release file.  After you download the file, you should calculate 
a checksum
-    for your download, and make sure it is the same as ours.
+    <p>You <strong>must</strong> verify the integrity of the downloaded files.
+    We provide OpenPGP signatures for every release file.  This signature 
should
+    be matched against the
+    <a href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file
+    which contains the OpenPGP keys of Tomcat's Release Managers. We also
+    provide an <code>MD5</code> checksum for every release file. After you
+    download the file, you should calculate a checksum for your download, and
+    make sure it is the same as ours.
     </p>
   </section>
 

Modified: tomcat/site/trunk/xdocs/download-70.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-70.xml?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-70.xml (original)
+++ tomcat/site/trunk/xdocs/download-70.xml Sun Jun 10 15:09:29 2012
@@ -24,12 +24,14 @@
 
 
   <section name="Release Integrity">
-    <p>You <strong>must</strong> verify the integrity of the downloaded files. 
 We provide
-    <code>PGP</code> signatures for every release file.  This signature should 
be matched
-    against the <a 
href="http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> file which 
contains
-    the PGP keys of Tomcat's Release Managers.  We also provide an 
<code>MD5</code> checksum
-    for every release file.  After you download the file, you should calculate 
a checksum
-    for your download, and make sure it is the same as ours.
+    <p>You <strong>must</strong> verify the integrity of the downloaded files.
+    We provide OpenPGP signatures for every release file.  This signature 
should
+    be matched against the
+    <a href="http://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS</a> file
+    which contains the OpenPGP keys of Tomcat's Release Managers. We also
+    provide an <code>MD5</code> checksum for every release file. After you
+    download the file, you should calculate a checksum for your download, and
+    make sure it is the same as ours.
     </p>
   </section>
 

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Sun Jun 10 15:09:29 2012
@@ -93,49 +93,15 @@
       </subsection>
 
       <subsection name="Verify the Integrity of the Files">
-
-        <p>It is essential that you verify the integrity of the downloaded
-        files using the PGP or MD5 signatures. The PGP signatures can be 
verified using PGP or GPG.
-        First download the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-        as well as the <code>PGP</code> signature file for the relevant
-        distribution.  Make sure you get these files from the <a
-        href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main 
site</a>,
-        rather than from a mirror. The above [<code>PGP</code>] links 
automatically
-        retrieve the signature files from the main site. Then verify the 
signatures
-        using</p>
-
-        <p><code>
-        % pgpk -a KEYS<br />
-        % pgpv tomcat-connectors-1.2.37-src.tar.gz.asc<br />
-        </code>
-        <em>or</em><br />
-        <code>
-        % pgp -ka KEYS<br />
-        % pgp tomcat-connectors-1.2.37-src.tar.gz.asc<br />
-        </code>
-        <em>or</em><br />
-        <code>
-        % gpg --import KEYS<br />
-        % gpg --verify tomcat-connectors-1.2.37-src.tar.gz.asc
-        </code></p>
-
-        <p>Alternatively, you can verify the MD5 signature (hash value) on the 
files.
-        Make sure you get these files from the <a
-        href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main 
site</a>,
-        rather than from a mirror. The above [<code>MD5</code>] links 
automatically
-        retrieve the signature files from the main site.</p>
-        <p>Check the integrity of your download by comparing the downloaded MD5
-        signature files with the MD5 signature of the downloaded archives 
created on
-        your system. A unix program called <code>md5</code> or 
<code>md5sum</code> is
-        included in many unix distributions.  It is also available as part of
-        <a href="http://www.gnu.org/software/textutils/textutils.html";
-        rel="nofollow">GNU Textutils</a>. Windows users can get binary md5
-        programs from
-        <a href="http://www.fourmilab.ch/md5/"; rel="nofollow">here</a>,
-        <a href="http://www.pc-tools.net/win32/freeware/console/";
-        rel="nofollow">here</a>, or
-        <a href="http://www.slavasoft.com/fsum/"; rel="nofollow">here</a>.</p>
-
+        <p>You <strong>must</strong> verify the integrity of the downloaded
+        files. We provide OpenPGP signatures for every release file. This
+        signature should be matched against the
+        <a href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file
+        which contains the OpenPGP keys of Tomcat's Release Managers. We also
+        provide an <code>MD5</code> checksum for every release file. After you
+        download the file, you should calculate a checksum for your download,
+        and make sure it is the same as ours.
+        </p>
       </subsection>
 
     </section>

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1348612&r1=1348611&r2=1348612&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Sun Jun 10 15:09:29 2012
@@ -85,49 +85,15 @@
       </subsection>
 
       <subsection name="Verify the Integrity of the Files">
-
-        <p>It is essential that you verify the integrity of the downloaded
-        files using the PGP or MD5 signatures. The PGP signatures can be 
verified using PGP or GPG.
-        First download the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-        as well as the <code>PGP</code> signature file for the relevant
-        distribution.  Make sure you get these files from the <a
-        href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main 
site</a>,
-        rather than from a mirror. The above [<code>PGP</code>] links 
automatically
-        retrieve the signature files from the main site. Then verify the 
signatures
-        using</p>
-
-        <p><code>
-        % pgpk -a KEYS<br />
-        % pgpv tomcat-native-1.1.23-src.tar.gz.asc<br />
-        </code>
-        <em>or</em><br />
-        <code>
-        % pgp -ka KEYS<br />
-        % pgp tomcat-native-1.1.23-src.tar.gz.asc<br />
-        </code>
-        <em>or</em><br />
-        <code>
-        % gpg --import KEYS<br />
-        % gpg --verify tomcat-native-1.1.23-src.tar.gz.asc
-        </code></p>
-
-        <p>Alternatively, you can verify the MD5 signature (hash value) on the 
files.
-        Make sure you get these files from the <a
-        href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main 
site</a>,
-        rather than from a mirror. The above [<code>MD5</code>] links 
automatically
-        retrieve the signature files from the main site.</p>
-        <p>Check the integrity of your download by comparing the downloaded MD5
-        signature files with the MD5 signature of the downloaded archives 
created on
-        your system. A unix program called <code>md5</code> or 
<code>md5sum</code> is
-        included in many unix distributions.  It is also available as part of
-        <a href="http://www.gnu.org/software/textutils/textutils.html";
-        rel="nofollow">GNU Textutils</a>. Windows users can get binary md5
-        programs from
-        <a href="http://www.fourmilab.ch/md5/"; rel="nofollow">here</a>,
-        <a href="http://www.pc-tools.net/win32/freeware/console/";
-         rel="nofollow">here</a>, or
-        <a href="http://www.slavasoft.com/fsum/"; rel="nofollow">here</a>.</p>
-
+        <p>You <strong>must</strong> verify the integrity of the downloaded
+        files. We provide OpenPGP signatures for every release file. This
+        signature should be matched against the
+        <a href="http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS</a> file
+        which contains the OpenPGP keys of Tomcat's Release Managers. We also
+        provide an <code>MD5</code> checksum for every release file. After you
+        download the file, you should calculate a checksum for your download,
+        and make sure it is the same as ours.
+        </p>
       </subsection>
 
     </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to