Merge branch 'master' into wip-doc-radosgw-admin-max-buckets

diff --cc doc/man/8/radosgw-admin.rst
index 17bcbdb0d8ea405313434bd9e3112ee768b60199,b883176a8d6dbbc4a4cfa1594b28ed41806eef7d..541e6b437ef6fed82c21f2fa7034d056ed49c57a
--- 1/doc/man/8/radosgw-admin.rst
--- 2/doc/man/8/radosgw-admin.rst
+++ b/doc/man/8/radosgw-admin.rst
@@@ -312,14 -507,26 +507,31 @@@ Option
  
        Temporary url key.
  
 +.. option:: --max-buckets
 +
 +      max number of buckets for a user (0 for no limit, negative value to disable bucket creation).
 +      Default is 1000.
 +
+ .. option:: --access=<access>
+ 
+    Set the access permissions for the sub-user.
+    Available access permissions are read, write, readwrite and full.
+ 
+ .. option:: --display-name=<name>
+ 
+    The display name of the user.
+ 
+ .. option:: --max-buckets
+ 
+    Maximum number of buckets for a user.
+ 
+ .. option:: --admin
+ 
+    Set the admin flag on the user.
+ 
  .. option:: --system
  
-       Set the system flag on the user.
+    Set the system flag on the user.
  
  .. option:: --bucket=bucket