From f5eda3bed74953c701e764e3a3f907f4ebf3a5be Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sun, 12 Jan 2014 21:08:43 +0100
Subject: [PATCH] Update docs.o.o/developer/language-bindings.html

Remove obsolete link to API Quick Guide, replace it with links
to User Guide and Admin User Guide

Add Heat and Ceilometer clients

Redirect python-quantumclient documentation to python-neutronclient

Change-Id: I6cdf5cd107383688192ede6d08a4f18f4c51eb87
---
 www/developer/.htaccess              |  3 +++
 www/developer/language-bindings.html | 21 +++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/www/developer/.htaccess b/www/developer/.htaccess
index 2faa962b06..6464b80153 100644
--- a/www/developer/.htaccess
+++ b/www/developer/.htaccess
@@ -1,5 +1,8 @@
 # Redirect for the rename of quantum to neutron
 redirect 301 /developer/quantum/ /developer/neutron/
 
+# Redirect for the rename of python-quantumclient to python-neutronclient
+redirect 301 /developer/python-quantumclient/ /developer/python-neutronclient/
+
 # Redirect to api.openstack.org for nova's old api_ext doc
 redirect 301 /developer/nova/api_ext/ http://api.openstack.org/api-ref.html
diff --git a/www/developer/language-bindings.html b/www/developer/language-bindings.html
index 24a9f9d5a5..4688b1e403 100644
--- a/www/developer/language-bindings.html
+++ b/www/developer/language-bindings.html
@@ -122,9 +122,16 @@
 	</div>
 		<div class="container">
 		<div class="span-12">	
-		<h2><a href="http://docs.openstack.org/cli/quick-start/content/">Client Documentation</a>
+		<h2><a href="http://docs.openstack.org/user-guide/content/">OpenStack
+		End User Guide</a>
 		</h2>
-			<p>User guide for the OpenStack command-line clients.
+			<p>User guide for the OpenStack dashboard and command-line clients.
+		</p>
+		<h2><a href="http://docs.openstack.org/user-guide/content/">OpenStack
+		Admin User Guide</a>
+		</h2>
+			<p>Admin user guide for the OpenStack
+			dashboard and command-line clients.
 		</p>
 		<h2><a href="http://docs.openstack.org/developer/python-novaclient">Compute Python Bindings (nova client)</a>
 		</h2>
@@ -140,15 +147,21 @@
 			<div class="span-12 last">
 			<h2><a href="http://docs.openstack.org/developer/python-openstackclient/">Unified OpenStack Client</a></h2>
 			<p>Documentation for python-openstackclient, a unified shell command structure.</p>
-			<h2><a href="http://docs.openstack.org/developer/python-neutronclient">Network Service Python Bindings (neutron client)</a>
+			<h2><a href="http://docs.openstack.org/developer/python-neutronclient">Networking Service Python Bindings (neutron client)</a>
 			</h2>
-			<p>Python bindings for the OpenStack Network API.</p>
+			<p>Python bindings for the OpenStack Networking API.</p>
 			<h2><a href="http://docs.openstack.org/developer/python-swiftclient/">Object Storage Python Bindings (swift client)</a>
 			</h2>
 			<p>Python bindings for the OpenStack Object Storage service.</p>
 			<h2><a href="http://docs.openstack.org/developer/python-cinderclient/">Volume Python Bindings (cinder client)</a>
 			</h2>
 			<p>Python bindings for the OpenStack Volume service.</p>
+			<h2><a href="http://docs.openstack.org/developer/python-heatclient/">Orchestration Python Bindings (heat client)</a>
+			</h2>
+			<p>Python bindings for the OpenStack Orchestration service.</p>
+			<h2><a href="http://docs.openstack.org/developer/python-ceilometerclient/">Telemetry Python Bindings (ceilometer client)</a>
+			</h2>
+			<p>Python bindings for the OpenStack Telemetry service.</p>
 			
 		</div>
 				</div>