Merge "Modifies the wording for the OpenStack CLIs"

www/index.html

@@ -37,16 +37,16 @@
         </div>
     <div class="container docs-toc">
    <div id="sdk">
-          <h2>
-            Software Development Kits
-          </h2>
-          <p>
-            A Software Development Kit (SDK) is a collection of code, examples, and
-            documentation that helps you to create applications in the language of
-            your choice on OpenStack clouds. If one of the following SDKs do not
-            support your language or use case, you can use the <a href="#api">API</a>
-            or one of the other <a
-     href="https://wiki.openstack.org/wiki/SDKs#Known_SDKs">Known SDKs</a>.
+    <h2>
+      Software Development Kits
+    </h2>
+    <p>
+      A software development kit (SDK) is a collection of code, examples, and
+      documentation that helps you to create applications in the language of
+      your choice on OpenStack clouds. If one of these SDKs does not support
+      your language or use case, use the <a href="#api">API</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">
@@ -561,11 +561,14 @@
      Application Programming Interfaces
     </h2>
     <p>
-     An Application Programming Interface (API) offers a way to use the capabilities of a service by using predefined functions. Use the API when the programming language you're using is not supported in an SDK. Please consider contributing that work to one of the
-     <a href="https://wiki.openstack.org/wiki/SDKs#Known_SDKs">
-      Known SDKs</a>. The <a href="http://developer.openstack.org/api-guide/quick-start/">
-         OpenStack API Guide
-        </a> gives you the basics for interacting with the services.
+     Use an application programming interface (API) to access the capabilities
+     of a service through predefined functions. Use the API when an SDK does
+     not support your preferred programming language. Consider contributing to
+     one of the <a
+     href="https://wiki.openstack.org/wiki/SDKs#Known_SDKs">known SDKs</a>.
+     For details about the basics for interacting with the services, see <a
+     href="http://docs.openstack.org/api/quick-start/content/">OpenStack API
+     Quick Start</a>.
     </p>
      <dl>
       <dt>
@@ -675,10 +678,15 @@
     </div>
    <div id="cli">
     <h2>
-     Command Line Interfaces
+     Command-Line Interface
     </h2>
     <p>
-     An OpenStack Command Line Interface (CLI) is a text based client that helps you to create scripts for interacting with OpenStack clouds.
+     The OpenStack client is a text-based command-line interface (CLI) that
+     helps you to create scripts for interacting with OpenStack clouds. The
+     centralized <code>openstack</code> CLI is the preferred way to interact
+     with OpenStack services. Some services, such as Compute, have their own
+     Python libraries but OpenStack is phasing out these individual clients
+     and recommends the use of the OpenStack client.
     </p>
      <div class="col-md-4">
       <dl>
@@ -690,61 +698,6 @@
          OpenStack Client
         </a>
        </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-cinderclient/">
-         Block Storage
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-novaclient/">
-         Compute
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-saharaclient/">
-         Data Processing
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-troveclient/">
-         Database Service
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-keystoneclient/">
-         Identity Service
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-glanceclient/">
-         Image Service
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-neutronclient/">
-         Networking
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-swiftclient/">
-         Object Storage
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-heatclient/">
-         Orchestration
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-manilaclient/">
-         Shared File Systems
-        </a>
-       </dd>
-       <dd>
-        <a href="https://git.openstack.org/cgit/openstack/python-ceilometerclient/">
-         Telemetry
-        </a>
-       </dd>
       </dl>
       </div>
      <div class="col-md-4">