directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1333379 - in /directory/site/trunk/templates: download-change-mirror.html download-verify-file-integrity.html studio/download-linux.html studio/download-macosx.html studio/download-sources.html studio/download-windows.html
Date Thu, 03 May 2012 09:27:11 GMT
Author: pamarcelot
Date: Thu May  3 09:27:11 2012
New Revision: 1333379

URL: http://svn.apache.org/viewvc?rev=1333379&view=rev
Log:
Refactored and updated the Apache Directory Studio download pages.

Added:
    directory/site/trunk/templates/download-change-mirror.html
    directory/site/trunk/templates/download-verify-file-integrity.html
Modified:
    directory/site/trunk/templates/studio/download-linux.html
    directory/site/trunk/templates/studio/download-macosx.html
    directory/site/trunk/templates/studio/download-sources.html
    directory/site/trunk/templates/studio/download-windows.html

Added: directory/site/trunk/templates/download-change-mirror.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/download-change-mirror.html?rev=1333379&view=auto
==============================================================================
--- directory/site/trunk/templates/download-change-mirror.html (added)
+++ directory/site/trunk/templates/download-change-mirror.html Thu May  3 09:27:11 2012
@@ -0,0 +1,33 @@
+<p>
+    <form action="[location]" method="get" id="SelectMirror">
+        Other mirrors:
+        <select name="Preferred">
+            [if-any http]
+            <optgroup label="HTTP mirrors">
+                [for http]<option value="[http]">[http]</option>[end]
+            </potgroup>
+            [end]
+            [if-any ftp]
+            <optgroup label="FTP mirrors">
+                [for ftp]<option value="[ftp]">[ftp]</option>[end]
+            </potgroup>
+            [end]
+            [if-any backup]
+            <optgroup label="Backup mirrors">
+                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+            </potgroup>
+            [end]
+        </select>
+        <input type="submit" value="Change Mirror"/>
+    </form>
+</p>
+
+<p>
+    <div class="noteMacro" align="center" border="0" cellpadding="5" cellspacing="8" width="85%">
+        We encourage you to <a href="#verifyIntegrity">verify the integrity</a>
of the downloaded file using:
+        <ul>
+            <li>the ASC file (OpenPGP compatible signature) with the <a href="http://www.apache.org/dist/directory/KEYS">KEYS
file</a> (code signing keys used to sign the product)</li>
+            <li>the MD5 file (checksum).</li>
+        </ul>
+    </div>
+</p>
\ No newline at end of file

Added: directory/site/trunk/templates/download-verify-file-integrity.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/download-verify-file-integrity.html?rev=1333379&view=auto
==============================================================================
--- directory/site/trunk/templates/download-verify-file-integrity.html (added)
+++ directory/site/trunk/templates/download-verify-file-integrity.html Thu May  3 09:27:11
2012
@@ -0,0 +1,30 @@
+<h1><a name="verifyIntegrity"></a>Verify the integrity of the file</h1>
+                    
+<p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/directory/KEYS">KEYS</a>
as well as the <em>asc</em> signature file for the relevant distribution. Then
verify the signatures using:</p>
+
+<div class="preformatted">
+    <div class="preformattedContent">
+        <pre>$ pgpk -a KEYS
+$ pgpv {% block filename %}{% endblock %}.asc</pre>
+    </div>
+</div>
+or
+<div class="preformatted">
+    <div class="preformattedContent">
+        <pre>$ pgp -ka KEYS
+$ pgp {% block filename %}{% endblock %}.asc</pre>
+    </div>
+</div>
+or
+<div class="preformatted">
+    <div class="preformattedContent">
+        <pre>$ gpg --import KEYS
+$ gpg --verify {% block filename %}{% endblock %}.asc</pre>
+    </div>
+</div>
+
+<p>&nbsp;</p>
+
+<p>Alternatively, you can verify the MD5 signature on the files. A unix program called
<em>md5</em> or <em>md5sum</em> is included in many unix distributions.
It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU
Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>,
<a href="http://www.pc-tools.net/win32/freeware/console/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.</p>
+
+<p>&nbsp;</p>
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-linux.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-linux.html?rev=1333379&r1=1333378&r2=1333379&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-linux.html (original)
+++ directory/site/trunk/templates/studio/download-linux.html Thu May  3 09:27:11 2012
@@ -9,53 +9,101 @@
     We suggest the following mirror site for your download:
 </p>
 
+<h2>Linux 64 bit</h2>
+
+<p>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz">
+                        <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz">
+                        <strong>
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz.md5">MD5</a>]
+                </td>
+            </tr>
+        </table>
+    </div>
+</p>
+
+<h2>Linux 32 bit</h2>
+
 <p>
-    <div id="downloadContent">
-        <table border="0" width="100%">
+    <div class="download">
+        <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
-                        <img src="images/download.png" width="32" height="32" border="0"/>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz">
+                        <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-{{version}}.dmg
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-linux-x86-{{version}}.tar.gz.md5">MD5</a>]
                 </td>
             </tr>
         </table>
     </div>
 </p>
 
+<p>&nbsp;</p>
+
+{% include "download-change-mirror.html" %}
+
+<p>&nbsp;</p>
+
+<h1>Installation</h1>
+                    
 <p>
-    <form action="[location]" method="get" id="SelectMirror">
-        Other mirrors:
-        <select name="Preferred">
-            [if-any http]
-            <optgroup label="HTTP mirrors">
-                [for http]<option value="[http]">[http]</option>[end]
-            </potgroup>
-            [end]
-            [if-any ftp]
-            <optgroup label="FTP mirrors">
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-            </potgroup>
-            [end]
-            [if-any backup]
-            <optgroup label="Backup mirrors">
-                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-            </potgroup>
-            [end]
-        </select>
-        <input type="submit" value="Change Mirror"/>
-    </form>
+    <table class="noBorder">
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_1.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_linux_1.jpg" width="225" height="141"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Click on the link above to download Apache Directory Studio for your
Linux architecture.<br />Your download appears in the download manager of your web browser.</td>
+        </tr>
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_2.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_linux_2.jpg" width="225" height="150"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Extract the downladed archive and place the extracted folder where
you want Apache Directory Studio to be installed.</td>
+        </tr>
+    </table>
 </p>
+
+<p>&nbsp;</p>
+
+<h1>Requirements</h1>
+
+<p>
+    Apache Directory Studio for Linux requires at least:
+    <ul>
+        <li>a recent Linux distribution. It has been tested successfully on Ubuntu.</li>
+        <li><a href="http://www.java.com/">Java Runtime Environment</a>
6 or later.</li>
+    </ul>
+</p>
+
+<p>&nbsp;</p>
+
+    {% extends "download-verify-file-integrity.html" %}
+        {% block filename %}ApacheDirectoryStudio-linux-x86_64-{{version}}.tar.gz{% endblock
%}
+    {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-macosx.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-macosx.html?rev=1333379&r1=1333378&r2=1333379&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-macosx.html (original)
+++ directory/site/trunk/templates/studio/download-macosx.html Thu May  3 09:27:11 2012
@@ -9,53 +9,107 @@
     We suggest the following mirror site for your download:
 </p>
 
+<h2>Mac OS X 64 bit</h2>
+
+<p>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg">
+                        <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg">
+                        <strong>
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg.md5">MD5</a>]
+                </td>
+            </tr>
+        </table>
+    </div>
+</p>
+
+<h2>Mac OS X 32 bit</h2>
+
 <p>
-    <div id="downloadContent">
-        <table border="0" width="100%">
+    <div class="download">
+        <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
-                        <img src="images/download.png" width="32" height="32" border="0"/>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg">
+                        <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-{{version}}.dmg
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-x86-{{version}}.dmg.md5">MD5</a>]
                 </td>
             </tr>
         </table>
     </div>
 </p>
 
+<p>&nbsp;</p>
+
+{% include "download-change-mirror.html" %}
+
+<p>&nbsp;</p>
+
+<h1>Installation</h1>
+                    
 <p>
-    <form action="[location]" method="get" id="SelectMirror">
-        Other mirrors:
-        <select name="Preferred">
-            [if-any http]
-            <optgroup label="HTTP mirrors">
-                [for http]<option value="[http]">[http]</option>[end]
-            </potgroup>
-            [end]
-            [if-any ftp]
-            <optgroup label="FTP mirrors">
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-            </potgroup>
-            [end]
-            [if-any backup]
-            <optgroup label="Backup mirrors">
-                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-            </potgroup>
-            [end]
-        </select>
-        <input type="submit" value="Change Mirror"/>
-    </form>
+    <table class="noBorder">
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_1.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_macosx_1.jpg" width="225" height="120"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Click on the link above to download Apache Directory Studio for Mac
OS X.<br />Your download appears in the download manager of your web browser.</td>
+        </tr>
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_2.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_macosx_2.jpg" width="225" height="161"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Double-click on the disk image to open it.<br/>It may have already
been opened by your web browser.</td>
+        </tr>
+        <tr>
+            <td width="64" height="64"><img src="{{base}}images/figure_3.gif" width="64"
height="64"/></td>
+            <td><img src="images/installation_macosx_3.jpg" width="225" height="207"/></td>
+            <td>&nbsp;&nbsp;</td>
+            <td>Drag-and-drop the <em>Apache Directory Studio</em> application
on the <em>Applications</em> folder to install it.</td>
+        </tr>
+    </table>
 </p>
+
+<p>&nbsp;</p>
+
+<h1>Requirements</h1>
+
+<p>
+    Apache Directory Studio for Mac OS X requires at least:
+    <ul>
+        <li>Mac OS X version 10.4 (Tiger) or later.</li>
+        <li><a href="http://www.java.com/">a Java Runtime Environment</a>
6 or later.</li>
+    </ul>
+</p>
+
+<p>&nbsp;</p>
+
+    {% extends "download-verify-file-integrity.html" %}
+        {% block filename %}ApacheDirectoryStudio-macosx-x86_64-{{version}}.dmg{% endblock
%}
+    {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-sources.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-sources.html?rev=1333379&r1=1333378&r2=1333379&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-sources.html (original)
+++ directory/site/trunk/templates/studio/download-sources.html Thu May  3 09:27:11 2012
@@ -1,6 +1,6 @@
 {% extends "studio/page.html" %}
     {% block content %}
-<h1>Download for Mac OS X</h1>
+<h1>Download Sources</h1>
 
 <p>
     [if-any logo]
@@ -10,52 +10,38 @@
 </p>
 
 <p>
-    <div id="downloadContent">
-        <table border="0" width="100%">
+    <div class="download">
+        <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
-                        <img src="images/download.png" width="32" height="32" border="0"/>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip">
+                        <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg">
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-macosx-{{version}}.dmg
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-sources-{{version}}.zip
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-macosx-{{version}}.dmg.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-sources-{{version}}.zip.md5">MD5</a>]
                 </td>
             </tr>
         </table>
     </div>
 </p>
 
-<p>
-    <form action="[location]" method="get" id="SelectMirror">
-        Other mirrors:
-        <select name="Preferred">
-            [if-any http]
-            <optgroup label="HTTP mirrors">
-                [for http]<option value="[http]">[http]</option>[end]
-            </potgroup>
-            [end]
-            [if-any ftp]
-            <optgroup label="FTP mirrors">
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-            </potgroup>
-            [end]
-            [if-any backup]
-            <optgroup label="Backup mirrors">
-                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-            </potgroup>
-            [end]
-        </select>
-        <input type="submit" value="Change Mirror"/>
-    </form>
-</p>
+<p>&nbsp;</p>
+
+{% include "download-change-mirror.html" %}
+
+<p>&nbsp;</p>
+
+    {% extends "download-verify-file-integrity.html" %}
+        {% block filename %}ApacheDirectoryStudio-sources-{{version}}.zip{% endblock %}
+    {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file

Modified: directory/site/trunk/templates/studio/download-windows.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/studio/download-windows.html?rev=1333379&r1=1333378&r2=1333379&view=diff
==============================================================================
--- directory/site/trunk/templates/studio/download-windows.html (original)
+++ directory/site/trunk/templates/studio/download-windows.html Thu May  3 09:27:11 2012
@@ -9,67 +9,66 @@
     We suggest the following mirror site for your download:
 </p>
 
+<h2>Windows 64 bit</h2>
+
 <p>
     <div class="download">
         <table width="100%" class="noBorder">
             <tr>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe">
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe">
                         <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
                     </a>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe">
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe">
                         <strong>
-                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-{{version}}.exe
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe
                         </strong>
                     </a>
                 </td>
                 <td align="right">
-                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-{{version}}.exe.md5">MD5</a>]
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86_64-{{version}}.exe.md5">MD5</a>]
                 </td>
             </tr>
         </table>
     </div>
 </p>
 
-<p>
-    <form action="[location]" method="get" id="SelectMirror">
-        Other mirrors:
-        <select name="Preferred">
-            [if-any http]
-            <optgroup label="HTTP mirrors">
-                [for http]<option value="[http]">[http]</option>[end]
-            </potgroup>
-            [end]
-            [if-any ftp]
-            <optgroup label="FTP mirrors">
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-            </potgroup>
-            [end]
-            [if-any backup]
-            <optgroup label="Backup mirrors">
-                [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-            </potgroup>
-            [end]
-        </select>
-        <input type="submit" value="Change Mirror"/>
-    </form>
-</p>
+<h2>Windows 32 bit</h2>
 
 <p>
-    <div class="noteMacro" align="center" border="0" cellpadding="5" cellspacing="8" width="85%">
-        We encourage you to <a href="#verifyIntegrity">verify the integrity</a>
of the downloaded file using:
-        <ul>
-            <li>the ASC file (OpenPGP compatible signature) with the <a href="http://www.apache.org/dist/directory/KEYS">KEYS
file</a> (code signing keys used to sign the product)</li>
-            <li>the MD5 file (checksum).</li>
-        </ul>
+    <div class="download">
+        <table width="100%" class="noBorder">
+            <tr>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe">
+                        <img src="{{base}}images/download.png" width="32" height="32"
border="0"/>
+                    </a>
+                </td>
+                <td>&nbsp;</td>
+                <td>
+                    <a href="[preferred]/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe">
+                        <strong>
+                            [preferred]/&#91;...&#93;/ApacheDirectoryStudio-win32-x86-{{version}}.exe
+                        </strong>
+                    </a>
+                </td>
+                <td align="right">
+                    [<a href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe.asc">ASC</a>-<a
href="http://archive.apache.org/dist/directory/studio/stable/{{version}}/ApacheDirectoryStudio-win32-x86-{{version}}.exe.md5">MD5</a>]
+                </td>
+            </tr>
+        </table>
     </div>
 </p>
 
 <p>&nbsp;</p>
 
+{% include "download-change-mirror.html" %}
+
+<p>&nbsp;</p>
+
 <h1>Installation</h1>
                     
 <p>
@@ -108,42 +107,15 @@
 <p>
     Apache Directory Studio for Windows requires at least:
     <ul>
-	    <li>Windows XP, Vista or 7.</li>
-	    <li><span class="nobr"><a href="http://www.java.com/">a 32-bit Java
Runtime Environment</a></span> 5 or later.</li>
+        <li>Windows XP, Vista or 7.</li>
+        <li><a href="http://www.java.com/">a Java Runtime Environment</a>6
or later.</li>
     </ul>
 </p>
 
 <p>&nbsp;</p>
 
-<h1>Verify the integrity of the file</h1>
-                    
-<p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/directory/KEYS">KEYS</a>
as well as the <em>asc</em> signature file for the relevant distribution. Then
verify the signatures using:</p>
-
-<div class="preformatted">
-    <div class="preformattedContent">
-        <pre>$ pgpk -a KEYS
-$ pgpv ApacheDirectoryStudio-win32-{{version}}.exe.asc</pre>
-    </div>
-</div>
-or
-<div class="preformatted">
-    <div class="preformattedContent">
-        <pre>$ pgp -ka KEYS
-$ pgp ApacheDirectoryStudio-win32-{{version}}.exe.asc</pre>
-    </div>
-</div>
-or
-<div class="preformatted">
-    <div class="preformattedContent">
-        <pre>$ gpg --import KEYS
-$ gpg --verify ApacheDirectoryStudio-win32-{{version}}.exe.asc</pre>
-    </div>
-</div>
-
-<p>&nbsp;</p>
-
-<p>Alternatively, you can verify the MD5 signature on the files. A unix program called
<em>md5</em> or <em>md5sum</em> is included in many unix distributions.
It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU
Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>,
<a href="http://www.pc-tools.net/win32/freeware/console/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.</p>
-
-<p>&nbsp;</p>
+    {% extends "download-verify-file-integrity.html" %}
+        {% block filename %}ApacheDirectoryStudio-win32-x86_64-{{version}}.exe{% endblock
%}
+    {% endextends %}
     {% endblock %}
 {% endextends %}
\ No newline at end of file



Mime
View raw message