Author: kkolinko
Date: Fri Apr 18 13:54:11 2014
New Revision: 1588472
URL: http://svn.apache.org/r1588472
Log:
Rearrange Windows binaries download links and description.
Add note that DLL must match JVM.
Modified:
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/xdocs/download-native.xml
Modified: tomcat/site/trunk/docs/download-native.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1588472&r1=1588471&r2=1588472&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Fri Apr 18 13:54:11 2014
@@ -266,8 +266,7 @@
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz"
rel="nofollow">
- Native 1.1.30 Source Release tar.gz
- </a> (e.g. Unix, Linux, Mac OS)
+ Native 1.1.30 Source Release tar.gz</a> (e.g. Unix, Linux, Mac
OS)
<ul class="attributes">
<li>
@@ -283,8 +282,7 @@
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip"
rel="nofollow">
- Native 1.1.30 Source Release zip
- </a> (e.g. Windows)
+ Native 1.1.30 Source Release zip</a> (e.g. Windows)
<ul class="attributes">
<li>
@@ -309,26 +307,35 @@
</p>
-<p>The Windows binaries are available in two variants. Each archive
- contains <code>tcnative-1.dll</code> for 32-bit, 64-bit (x64) and
- Intel Itanium 64-bit (i64) CPU architectures.</p>
-
<ul class="downloads">
<li class="download">
-<div class="links">Default. This is what people usually use. This
- version of library is included in Apache Tomcat
distributions.</div>
+<div class="links">Binaries for Microsoft Windows</div>
+
+<div class="links">
+<p>The Windows binaries are available in two
+ variants. a) Default. This is what people usually use. This
+ version of library is included in Apache Tomcat distributions.
+ b) OCSP-enabled. This one has enabled (experimental)
+ support for verification of client SSL certificates via OCSP
+ protocol (<a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=45392";>45392</a>).
+ </p>
+
+<p>Each archive contains <code>tcnative-1.dll</code> for 32-bit,
+ 64-bit (x64) and Intel Itanium 64-bit (i64) CPU architectures.
+ You have to use the DLL that matches CPU architecture of JVM that
+ you use to run Tomcat.</p>
+
+</div>
<ul>
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip"
rel="nofollow">
- Native 1.1.30 Windows Binaries zip
- </a>
-
-<ul class="attributes">
+ Native 1.1.30 Windows Binaries zip</a> (recommended)
+ <ul class="attributes">
<li>
[<a
href="https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip.asc";>PGP</a>],
@@ -339,24 +346,11 @@
</ul>
</li>
-
-</ul>
-
-</li>
-
-<li class="download">
-
-<div class="links">OCSP-enabled. This one has enabled (experimental)
- support for verification of client SSL certificates via OCSP
- protocol. (<a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=45392";>45392</a>)</div>
-
-<ul>
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip"
rel="nofollow">
- Native 1.1.30 Windows OCSP Binaries zip
- </a>
+ Native 1.1.30 Windows OCSP-enabled Binaries zip</a>
<ul class="attributes">
Modified: tomcat/site/trunk/xdocs/download-native.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1588472&r1=1588471&r2=1588472&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Fri Apr 18 13:54:11 2014
@@ -50,8 +50,7 @@
<ul>
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz"
rel="nofollow">
- Native 1.1.30 Source Release tar.gz
- </a> (e.g. Unix, Linux, Mac OS)
+ Native 1.1.30 Source Release tar.gz</a> (e.g. Unix, Linux, Mac
OS)
<ul class="attributes">
<li>
[<a
href="https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-src.tar.gz.asc";>PGP</a>],
@@ -62,8 +61,7 @@
</li>
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip"
rel="nofollow">
- Native 1.1.30 Source Release zip
- </a> (e.g. Windows)
+ Native 1.1.30 Source Release zip</a> (e.g. Windows)
<ul class="attributes">
<li>
[<a
href="https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/source/tomcat-native-1.1.30-win32-src.zip.asc";>PGP</a>],
@@ -79,18 +77,25 @@
You may download them from
<a href="[preferred]tomcat/tomcat-connectors/native/1.1.30/binaries"
rel="nofollow">HERE</a>
</p>
- <p>The Windows binaries are available in two variants. Each archive
- contains <code>tcnative-1.dll</code> for 32-bit, 64-bit (x64) and
- Intel Itanium 64-bit (i64) CPU architectures.</p>
<ul class="downloads">
<li class="download">
- <div class="links">Default. This is what people usually use. This
- version of library is included in Apache Tomcat
distributions.</div>
+ <div class="links">Binaries for Microsoft Windows</div>
+ <div class="links"><p>The Windows binaries are available in two
+ variants. a) Default. This is what people usually use. This
+ version of library is included in Apache Tomcat distributions.
+ b) OCSP-enabled. This one has enabled (experimental)
+ support for verification of client SSL certificates via OCSP
+ protocol (<bug>45392</bug>).
+ </p>
+ <p>Each archive contains <code>tcnative-1.dll</code> for 32-bit,
+ 64-bit (x64) and Intel Itanium 64-bit (i64) CPU architectures.
+ You have to use the DLL that matches CPU architecture of JVM that
+ you use to run Tomcat.</p>
+ </div>
<ul>
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip"
rel="nofollow">
- Native 1.1.30 Windows Binaries zip
- </a>
+ Native 1.1.30 Windows Binaries zip</a> (recommended)
<ul class="attributes">
<li>
[<a
href="https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-win32-bin.zip.asc";>PGP</a>],
@@ -99,17 +104,9 @@
</li>
</ul>
</li>
- </ul>
- </li>
- <li class="download">
- <div class="links">OCSP-enabled. This one has enabled
(experimental)
- support for verification of client SSL certificates via OCSP
- protocol. (<bug>45392</bug>)</div>
- <ul>
<li class="download">
<a
href="[preferred]tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip"
rel="nofollow">
- Native 1.1.30 Windows OCSP Binaries zip
- </a>
+ Native 1.1.30 Windows OCSP-enabled Binaries zip</a>
<ul class="attributes">
<li>
[<a
href="https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.30/binaries/tomcat-native-1.1.30-ocsp-win32-bin.zip.asc";>PGP</a>],
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
