Merge change 8339 into donut

* changes:
  Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc

tools/droiddoc/templates-sdk/sdkpage.cs

@@ -45,8 +45,7 @@
     <p><a href="/sdk/<?cs var:sdk.current ?>/index.html">Download the current Android SDK</a></p>
   </div>
 <?cs /if ?>
-  
-  
+
 <?cs if:android.whichdoc != "online" ?>
 
 <p>The sections below provide an overview of the SDK package. </p>
@@ -58,14 +57,13 @@
 application developers build performance-critical portions of their apps in
 native code. It is designed for use <em>only</em> in conjunction with the
 Android SDK, so if you have not already installed the Android 1.5 SDK, please do
-so before downloading the NDK. Also, please read <a href="">What is the Android
-NDK?</a> to get an understanding of what the NDK offers and whether it will be
-useful to you.</p>
+so before downloading the NDK. Also, please read <a href="#overview">What is the 
+Android NDK?</a> to get an understanding of what the NDK offers and whether it 
+will be useful to you.</p>
 
 <p>Select the download package that is appropriate for your development
-computer. Note that separate download packages are provided for 32- and 64-bit
-Linux platforms.</p>
-  
+computer. </p>
+
   <table class="download">
     <tr>
       <th>Platform</th>
@@ -76,7 +74,7 @@ Linux platforms.</p>
   <tr>
     <td>Windows</td>
     <td>
-  <a href="http://dl.google.com/android/<?cs var:ndk.win_download ?>"><?cs var:ndk.win_download ?></a>
+  <a href="http://dl.google.com/android/ndk/<?cs var:ndk.win_download ?>"><?cs var:ndk.win_download ?></a>
     </td>
     <td><?cs var:ndk.win_bytes ?> bytes</td>
     <td><?cs var:ndk.win_checksum ?></td>
@@ -84,27 +82,19 @@ Linux platforms.</p>
   <tr class="alt-color">
     <td>Mac OS X (intel)</td>
     <td>
-  <a href="http://dl.google.com/android/<?cs var:ndk.mac_download ?>"><?cs var:ndk.mac_download ?></a>
+  <a href="http://dl.google.com/android/ndk/<?cs var:ndk.mac_download ?>"><?cs var:ndk.mac_download ?></a>
     </td>
     <td><?cs var:ndk.mac_bytes ?> bytes</td>
     <td><?cs var:ndk.mac_checksum ?></td>
   </tr>
   <tr>
-    <td>Linux 32-bit (i386)</td>
+    <td>Linux 32/64-bit (x86)</td>
     <td>
-  <a href="http://dl.google.com/android/<?cs var:ndk.linux_download ?>"><?cs var:ndk.linux_download ?></a>
+  <a href="http://dl.google.com/android/ndk/<?cs var:ndk.linux_download ?>"><?cs var:ndk.linux_download ?></a>
     </td>
     <td><?cs var:ndk.linux_bytes ?> bytes</td>
     <td><?cs var:ndk.linux_checksum ?></td>
   </tr>
-  <tr class="alt-color">
-    <td>Linux 64-bit (x86_64)</td>
-    <td>
-  <a href="http://dl.google.com/android/<?cs var:ndk.linux_64_download ?>"><?cs var:ndk.linux_64_download ?></a>
-    </td>
-    <td><?cs var:ndk.linux_64_bytes ?> bytes</td>
-    <td><?cs var:ndk.linux_64_checksum ?></td>
-  </tr>
   </table>
 
   <?cs else ?>