From c9ff48183e3a82e1b690eb90fbe7871873f29d2a Mon Sep 17 00:00:00 2001
From: Colin Mattson <colinmattson@gmail.com>
Date: Sat, 24 May 2014 20:15:35 -0700
Subject: [PATCH] Improvements to radosgw docs - Correct a typo (`rados-admin`)
 in admin docs - Reorder sections in config so "above example" is in expected
 position

---
 doc/radosgw/admin.rst  |  2 +-
 doc/radosgw/config.rst | 37 +++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/doc/radosgw/admin.rst b/doc/radosgw/admin.rst
index e9f851150e6c..642dc957d542 100644
--- a/doc/radosgw/admin.rst
+++ b/doc/radosgw/admin.rst
@@ -43,7 +43,7 @@ Create a User
 
 To create a user (S3 interface), execute the following::
 
-	rados-admin user create --uid={username} --display-name="{display-name}" [--email={email}]
+	radosgw-admin user create --uid={username} --display-name="{display-name}" [--email={email}]
 
 For example:: 	
 	
diff --git a/doc/radosgw/config.rst b/doc/radosgw/config.rst
index 610bae424561..f2dc2dfaca60 100644
--- a/doc/radosgw/config.rst
+++ b/doc/radosgw/config.rst
@@ -118,24 +118,6 @@ you have created all of the foregoing pools::
 	rados lspools
 
 
-Create Data Directory
-=====================
-
-Deployment scripts may not create the default Ceph Object Gateway data
-directory.  Create data directories for each instance of a ``radosgw`` daemon
-(if you haven't done so already). The ``host``  variables in the Ceph
-configuration file determine which host runs each instance of a ``radosgw``
-daemon. The typical form specifies the ``radosgw`` daemon, the cluster name and
-the daemon ID. ::
-
-	sudo mkdir -p /var/lib/ceph/radosgw/{$cluster}-{$id}
-
-Using the exemplary ``ceph.conf`` settings above, you would execute the following::
-
-	sudo mkdir -p /var/lib/ceph/radosgw/ceph-radosgw.gateway
-
-
-
 Add a Gateway Configuration to Ceph
 ===================================
 
@@ -260,6 +242,25 @@ On some distributions, you must also change the ownership to ``apache``. ::
 	sudo chown apache:apache s3gw.fcgi
 
 
+
+Create Data Directory
+=====================
+
+Deployment scripts may not create the default Ceph Object Gateway data
+directory.  Create data directories for each instance of a ``radosgw`` daemon
+(if you haven't done so already). The ``host``  variables in the Ceph
+configuration file determine which host runs each instance of a ``radosgw``
+daemon. The typical form specifies the ``radosgw`` daemon, the cluster name and
+the daemon ID. ::
+
+	sudo mkdir -p /var/lib/ceph/radosgw/{$cluster}-{$id}
+
+Using the exemplary ``ceph.conf`` settings above, you would execute the following::
+
+	sudo mkdir -p /var/lib/ceph/radosgw/ceph-radosgw.gateway
+
+
+
 Create a Gateway Configuration
 ==============================
 
-- 
2.47.3