Merge "Rework index.html to remove mistitled links"

www/index.html

@@ -5,13 +5,16 @@
 {% block title %}{% endblock %}
 {% block header %}{% endblock header %}
 {% block content %}
-  <!-- Begin Page Content -->
+<!-- Begin Page Content -->
-  <div class="top-docs-wrapper">
+<div class="top-docs-wrapper">
    <div class="container">
       <div class="col-lg-12">
-          <h1>Development Resources for OpenStack clouds</h1>
+         <h1>Development resources for OpenStack clouds</h1>
          <p>
-            You interact with an OpenStack cloud using a number of tools. The tool you choose depends on your use case in the cloud. Here are some starting points.
+            You can use <a href="#sdk">SDKs</a>, <a href="#api">APIs</a>, and
+            <a href="#cli">CLIs</a> to interact with private and public
+            OpenStack clouds. Use the APIs when an SDK is not available for
+            the programming language that you use.
          </p>
          <hr>
          <a href="#sdk" class="overview-btn docs-btn">View SDKs <i class="fa fa-arrow-circle-o-down"></i></a>
@@ -31,22 +34,23 @@
                  s.parentNode.insertBefore(gcse, s);
                })();
             </script>
-            <gcse:search gname="standard" as_sitesearch="docs.openstack.org">
+            <gcse:search gname="standard" as_sitesearch="docs.openstack.org"></gcse:search>
-            </gcse:search>
          </form>
       </div>
       <div class="container docs-toc">
          <div id="sdk">
             <h2>
-      Software Development Kits
+               SDKs
             </h2>
             <p>
-      A software development kit (SDK) is a collection of code, examples, and
+               A software development kit (SDK) contains code, examples, and
-      documentation that helps you to create applications in the language of
+               documentation that you use to create OpenStack cloud
-      your choice on OpenStack clouds. If one of these SDKs does not support
+               applications in the language of your choice.
-      your language or use case, use the <a href="#api">API</a> or one of the
+            </p>
-      other <a href="https://wiki.openstack.org/wiki/SDKs#Known_SDKs">known
+            <p>
-      SDKs</a>.
+               If one of the following SDKs do not support your language or use case,
+               you can use the <a href="#api">APIs</a> or one of the other <a
+                  href="https://wiki.openstack.org/wiki/SDKs#Known_SDKs">known SDKs</a>.
             </p>
             <div class="span-24" id="java">
                <h3 class="lang-name">
@@ -58,35 +62,30 @@
                         SDK
                      </dt>
                      <dd>
-        <a href="http://jclouds.apache.org/guides/openstack/">
-         Apache jclouds
-        </a>
-        <p>
                         <a class="roundedButton" href="http://jclouds.apache.org/guides/openstack/">
-        Get SDK Now
+                        Apache jclouds SDK
                         </a>
-      </p>
                      </dd>
                   </dl>
                </div>
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Docs and Resources
+                        Docs and resources
                      </dt>
                      <dd>
                         <a class="link" href="http://jclouds.apache.org/guides/openstack/" target="_top">
-         Getting Started Guide
+                        OpenStack: Getting Started Guide
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="http://jclouds.apache.org/reference/javadoc/" target="_top">
-         SDK Reference Manual
+                        Javadoc for Apache jclouds
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="http://jclouds.apache.org/releasenotes/" target="_top">
-         Release Notes
+                        Release Notes Archive
                         </a>
                      </dd>
                   </dl>
@@ -94,7 +93,7 @@
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Community Links
+                        Community
                      </dt>
                      <dd>
                         <strong>
@@ -115,7 +114,7 @@
                      </dd>
                      <dd>
                         <strong>
-         Mailing List:
+                        Mailing list:
                         </strong>
                         <a href="mailto:jclouds-user-subscribe@apache.org">
                         Register
@@ -127,14 +126,15 @@
                      </dd>
                      <dd>
                         <strong>
-         Report Issues:
+                        Issues:
                         </strong>
                         <a href="http://jclouds.apache.org/reference/report-a-bug/">
-         Issue Tracker
+                        Report a Bug
                         </a>
                      </dd>
                   </dl>
-     </div></div>
+               </div>
+            </div>
             <div class="span-24" id="nodejs">
                <h3 class="lang-name">
                   Node.js
@@ -145,35 +145,30 @@
                         SDK
                      </dt>
                      <dd>
-        <a href="https://github.com/pkgcloud/pkgcloud/blob/master/docs/providers/openstack/README.md">
+                        <a class="roundedButton" href="https://github.com/pkgcloud/pkgcloud/blob/master/docs/providers/openstack/README.md">
-         pkgcloud
+                        pkgcloud SDK
                         </a>
-        <p>
-       <a class="roundedButton" href="https://www.npmjs.org/package/pkgcloud">
-        Get SDK Now
-       </a>
-      </p>
                      </dd>
                   </dl>
                </div>
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Docs and Resources
+                        Docs and resources
                      </dt>
                      <dd>
                         <a class="link" href="https://github.com/pkgcloud/pkgcloud/blob/master/docs/providers/openstack/getting-started-compute.md" target="_top">
-         Getting Started Guide
+                        Getting started with pkgcloud &amp; Openstack
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://github.com/pkgcloud/pkgcloud#supported-apis" target="_top">
-         SDK Reference Manual
+                        Supported APIs
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://github.com/pkgcloud/pkgcloud/releases/" target="_top">
-         Release Notes
+                        pkgcloud Releases
                         </a>
                      </dd>
                   </dl>
@@ -181,7 +176,7 @@
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Community Links
+                        Community
                      </dt>
                      <dd>
                         <strong>
@@ -202,18 +197,10 @@
                      </dd>
                      <dd>
                         <strong>
-         Mailing List:
+                        Issues:
                         </strong>
                         <a href="https://github.com/pkgcloud/pkgcloud/issues">
-         GitHub Issues
+                        pkgcloud/pkgcloud Issues
-        </a>
-       </dd>
-       <dd>
-        <strong>
-         Report Issues:
-        </strong>
-        <a href="https://github.com/pkgcloud/pkgcloud/issues">
-         Issue Tracker
                         </a>
                      </dd>
                   </dl>
@@ -229,41 +216,35 @@
                         SDK
                      </dt>
                      <dd>
-        <a href="https://libcloud.apache.org/">
-        libcloud
-        </a>
-              <p>
                         <a class="roundedButton" href="https://libcloud.apache.org/">
-        Get SDK Now
+                        libcloud SDK
                         </a>
-      </p>
-
                      </dd>
                   </dl>
                </div>
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Docs and Resources
+                        Docs and resources
                      </dt>
                      <dd>
                         <a class="link" href="http://developer.openstack.org/firstapp-libcloud/getting_started.html" target="_top">
-         Writing your First OpenStack Application
+                        Getting started
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://libcloud.readthedocs.org/en/latest/compute/drivers/openstack.html" target="_top">
-         Getting Started Guide
+                        OpenStack Compute Driver Documentation
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://libcloud.readthedocs.org/en/latest/" target="_top">
-         SDK Reference Manual
+                        Welcome to Apache Libcloud’s documentation!
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://git-wip-us.apache.org/repos/asf?p=libcloud.git;a=blob;f=CHANGES.rst" target="_top">
-         Release Notes
+                        Changes with current version of Apache Libcloud
                         </a>
                      </dd>
                   </dl>
@@ -271,7 +252,7 @@
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Community Links
+                        Community
                      </dt>
                      <dd>
                         <strong>
@@ -292,7 +273,7 @@
                      </dd>
                      <dd>
                         <strong>
-         Mailing List:
+                        Mailing list:
                         </strong>
                         <a href="https://libcloud.apache.org/community.html">
                         Register
@@ -304,10 +285,10 @@
                      </dd>
                      <dd>
                         <strong>
-         Report Issues:
+                        Issues:
                         </strong>
-        <a href="https://issues.apache.org/jira/browse/LIBCLOUD">
+                        <a href="https://issues.apache.org/jira/browse/LIBCLOUD/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel">
-         Issue Tracker
+                        Issues
                         </a>
                      </dd>
                   </dl>
@@ -323,35 +304,20 @@
                         SDK
                      </dt>
                      <dd>
-        <a href="https://github.com/fog/fog/blob/master/lib/fog/openstack/docs/getting_started.md">
+                        <a class="roundedButton" href="http://rubydoc.info/gems/fog/">
-         Fog
+                        Fog SDK
                         </a>
-        <p>
-       <a class="roundedButton" href="https://github.com/fog/fog/blob/master/lib/fog/openstack/docs/getting_started.md">
-        Get SDK Now
-       </a>
-      </p>
                      </dd>
                   </dl>
                </div>
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Docs and Resources
+                        Docs and resources
                      </dt>
                      <dd>
                         <a class="link" href="https://github.com/fog/fog/blob/master/lib/fog/openstack/docs/getting_started.md" target="_top">
-         Getting Started Guide
+                        Getting Started with Fog and OpenStack
-        </a>
-       </dd>
-       <dd>
-        <a class="link" href="http://rubydoc.info/gems/fog/" target="_top">
-         SDK Reference Manual
-        </a>
-       </dd>
-       <dd>
-        <a class="link" href="https://github.com/fog/fog/blob/master/changelog.txt" target="_top">
-         Release Notes
                         </a>
                      </dd>
                   </dl>
@@ -359,7 +325,7 @@
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Community Links
+                        Community
                      </dt>
                      <dd>
                         <strong>
@@ -380,7 +346,7 @@
                      </dd>
                      <dd>
                         <strong>
-         Mailing List:
+                        Mailing list:
                         </strong>
                         <a href="http://groups.google.com/group/ruby-fog">
                         ruby-fog
@@ -388,10 +354,10 @@
                      </dd>
                      <dd>
                         <strong>
-         Report Issues:
+                        Issues:
                         </strong>
                         <a href="https://github.com/fog/fog/issues">
-         Issue Tracker
+                        fog/fog Issues
                         </a>
                      </dd>
                   </dl>
@@ -407,35 +373,25 @@
                         SDK
                      </dt>
                      <dd>
-        <a href="https://github.com/openstacknetsdk/openstack.net/releases/latest">
-         .NET
-        </a>
-        <p>
                         <a class="roundedButton"  href="https://github.com/openstacknetsdk/openstack.net/releases/latest">
-        Get SDK Now
+                        .NET SDK
                         </a>
-      </p>
                      </dd>
                   </dl>
                </div>
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Docs and Resources
+                        Docs and resources
                      </dt>
                      <dd>
                         <a class="link" href="http://www.openstacknetsdk.org/" target="_top">
-         Wiki
+                        OpenStack.NET
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://github.com/openstacknetsdk/openstack.net" target="_top">
-         Source Code
+                        openstacknetsdk/openstack.net
-        </a>
-       </dd>
-       <dd>
-        <a class="link" href="https://github.com/openstacknetsdk/openstack.net/issues" target="_top">
-         Issues
                         </a>
                      </dd>
                   </dl>
@@ -443,7 +399,7 @@
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Community Links
+                        Community
                      </dt>
                      <dd>
                         <strong>
@@ -456,7 +412,7 @@
                      </dd>
                      <dd>
                         <strong>
-         Mailing List:
+                        Mailing list:
                         </strong>
                         <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">
                         Register
@@ -468,10 +424,10 @@
                      </dd>
                      <dd>
                         <strong>
-         Report Issues:
+                        Issues:
                         </strong>
                         <a href="https://github.com/openstacknetsdk/openstack.net/issues">
-         Issue Tracker
+                        openstacknetsdk/openstack.net Issues
                         </a>
                      </dd>
                   </dl>
@@ -487,33 +443,24 @@
                         SDK
                      </dt>
                      <dd>
-        <a href="http://docs.php-opencloud.com/en/latest/getting-started-with-openstack.html">PHP</a>
+                        <a class="roundedButton"
-        <p>
+                           href="http://docs.php-opencloud.com/en/latest/getting-started-with-openstack.html">PHP SDK</a>
-       <a class="roundedButton" href="http://docs.php-opencloud.com/en/latest/getting-started-with-openstack.html">
-        Get SDK Now
-       </a>
-      </p>
                      </dd>
                   </dl>
                </div>
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Docs and Resources
+                        Docs and resources
                      </dt>
                      <dd>
                         <a class="link" href="http://docs.php-opencloud.com/" target="_top">
-         Wiki
+                        Welcome to php-opencloud!
                         </a>
                      </dd>
                      <dd>
                         <a class="link" href="https://github.com/php-opencloud/openstack" target="_top">
-         Source Code
+                        php-opencloud/openstack
-        </a>
-       </dd>
-       <dd>
-        <a class="link" href="https://github.com/php-opencloud/openstack/issues" target="_top">
-         Issues
                         </a>
                      </dd>
                   </dl>
@@ -521,7 +468,7 @@
                <div class="col-md-4">
                   <dl>
                      <dt>
-        Community Links
+                        Community
                      </dt>
                      <dd>
                         <strong>
@@ -534,7 +481,7 @@
                      </dd>
                      <dd>
                         <strong>
-         Mailing List:
+                        Mailing list:
                         </strong>
                         <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">
                         Register
@@ -546,10 +493,10 @@
                      </dd>
                      <dd>
                         <strong>
-         Report Issues:
+                        Issues:
                         </strong>
                         <a href="https://github.com/php-opencloud/openstack/issues">
-         Issue Tracker
+                        php-opencloud/openstack Issues
                         </a>
                      </dd>
                   </dl>
@@ -558,218 +505,36 @@
          </div>
          <div id="api">
             <h2>
-     Application Programming Interfaces
+               APIs
             </h2>
             <p>
-     Use an application programming interface (API) to access the capabilities
+               An application programming interface (API) lets you access service
-     of a service through predefined functions. Use the API when an SDK does
+               capabilities through predefined functions.
-     not support your preferred programming language. Consider contributing to
+            </p>
-     one of the <a
+            <p>
-     href="https://wiki.openstack.org/wiki/SDKs#Known_SDKs">known SDKs</a>.
+               To learn how to use the APIs, see the <a
-     For details about the basics for interacting with the services, see <a
+               href="http://docs.openstack.org/api/quick-start/content/">OpenStack
-     href="http://docs.openstack.org/api/quick-start/content/">OpenStack API
+               API Guide</a> and <a href="http://developer.openstack.org/api-ref.html">OpenStack
-     Quick Start</a>.
+               API Complete Reference</a>.
             </p>
-     <dl>
-      <dt>
-       References
-      </dt>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-blockstorage-v2.html">
-         Block Storage API v2 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-blockstorage-v1.html">
-         Block Storage API v1 (DEPRECATED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-clustering-v1.html">
-         Clustering API v1 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-compute-v2.1.html">
-         Compute API (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-data-processing-v1.1.html">
-         Data Processing API v1.1 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-database-v1.html">
-         Database Service API v1.0 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-identity-v3.html">
-         Identity API v3 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-identity-v3-ext.html">
-         Identity API v3 extensions (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-identity-v2.html">
-         Identity API v2.0 (SUPPORTED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-identity-admin-v2.html">
-          Identity Admin API v2.0 (SUPPORTED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-identity-v2-ext.html">
-          Identity API v2.0 extensions (SUPPORTED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-image-v2.html">
-         Image Service API v2 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-image-v1.html">
-         Image Service API v1 (SUPPORTED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-networking-v2.html">
-         Networking API v2.0 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-networking-v2-ext.html">
-         Networking API v2.0 extensions (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-objectstorage-v1.html">
-         Object Storage API v1 (SUPPORTED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-orchestration-v1.html">
-         Orchestration API v1 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-share-v2.html">
-         Shared File Systems API v2 (CURRENT)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-share-v1.html">
-         Shared File Systems API v1 (SUPPORTED)
-        </a>
-       </dd>
-       <dd>
-        <a href="http://developer.openstack.org/api-ref-telemetry-v2.html">
-         Telemetry API v2 (CURRENT)
-        </a>
-       </dd>
-      </dl>
          </div>    
          <div id="cli">
             <h2>
-     Command-Line Interface
+               CLIs
             </h2>
             <p>
-     The OpenStack client is a text-based command-line interface (CLI) that
+               A command-line interface (CLI) is a text-based client that helps
-     helps you to create scripts for interacting with OpenStack clouds. The
+               you create scripts to interact with OpenStack clouds.
-     centralized <code>openstack</code> CLI is the preferred way to interact
+            </p>
-     with OpenStack services. Some services, such as Compute, have their own
+            <p>
-     Python libraries but OpenStack is phasing out these individual clients
+               To install the CLIs, see <a target="_top" class="link"
-     and recommends the use of the OpenStack client.
+               href="http://docs.openstack.org/cli-reference/common/cli_install_openstack_command_line_clients.html">Install the CLIs</a>.
+            </p>
+            <p>
+               To use the CLIs, see <a class="link" href="http://docs.openstack.org/user-guide/cli.html"
+               target="_top">OpenStack command-line clients</a>.
             </p>
-     <div class="col-md-4">
-      <dl>
-       <dt>
-        Official CLI
-       </dt>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-openstackclient/">
-         OpenStack Client
-        </a>
-       </dd>
-      </dl>
          </div>
-     <div class="col-md-4">
-      <dl>
-       <dt>
-        Docs and Resources
-       </dt>
-       <dd>
-        <a class="link" href="http://docs.openstack.org/user-guide" target="_top">
-         Getting Started Guide
-        </a>
-       </dd>
-       <dd>
-        <a class="link" href="http://docs.openstack.org/cli-reference/" target="_top">
-         CLI Reference Manual
-        </a>
-       </dd>
-      </dl>
-     </div>
-     <div class="col-md-4">
-      <dl>
-       <dt>
-        Community Links
-       </dt>
-       <dd>
-        <strong>
-         Twitter:
-        </strong>
-        <a href="https://twitter.com/openstack">
-         @openstack
-        </a>
-       </dd>
-       <dd>
-        <strong>
-         IRC:
-        </strong>
-        <a href="irc://irc.freenode.net/openstack">
-         #openstack
-        </a>
-       </dd>
-       <dd>
-        <strong>
-         Mailing List:
-        </strong>
-        <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack">
-         Register
-        </a>
-        |
-        <a href="http://openstack.markmail.org/">
-         Archive
-        </a>
-       </dd>
-       <dd>
-        <strong>
-         Report Issues:
-        </strong>
-        <a href="https://bugs.launchpad.net/">
-         Issue Tracker
-        </a>
-       </dd>
-       <dd>
-        <strong>
-         Support:
-        </strong>
-        <a href="https://ask.openstack.org/">
-         Ask
-        </a>
-       </dd>
-      </dl>
-     </div>
-   </div>
-
       </div>
       <!-- End Page Content -->
       <hr/>
@@ -788,13 +553,11 @@
          .
       </p>
    </div>
-    </div>
+</div>
-  {% endblock content %}
+{% endblock content %}
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript">
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript"></script>
-  </script>
+<script charset="utf-8" src="/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript"></script>
-  <script charset="utf-8" src="/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript">
+<script charset="utf-8" type="text/javascript">
-  </script>
-  <script charset="utf-8" type="text/javascript">
    //<![CDATA[
     $(document).ready(function() {
    
@@ -818,6 +581,6 @@
    
     });
     //]]>
-  </script>
+</script>
- </body>
+</body>
 </html>