From: Josh Durgin <josh.durgin@inktank.com>
Date: Mon, 5 May 2014 22:12:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-doc-radosgw-80'
X-Git-Tag: v0.81~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea34f48cd9ad7fa71f43d5570a4ea299a4a7c7e9;p=ceph.git

Merge remote-tracking branch 'origin/wip-doc-radosgw-80'

Conflicts:
	doc/radosgw/config.rst
---

ea34f48cd9ad7fa71f43d5570a4ea299a4a7c7e9
diff --cc doc/radosgw/config.rst
index b334c64f6900,b7d6a5f0fa7c..40e158b05dbc
--- a/doc/radosgw/config.rst
+++ b/doc/radosgw/config.rst
@@@ -456,3 -432,5 +432,5 @@@ Guide`_ for details
  .. _Pools: ../../rados/operations/pools
  .. _Cephx Guide: ../../rados/operations/authentication/#cephx-guide
  .. _Operating a Cluster: ../../rados/rados/operations/operating
+ .. _Admin Guide: ../admin
 -.. _Add Wildcard to DNS: ../../install/install-ceph-gateway#add-wildcard-to-dns
++.. _Add Wildcard to DNS: ../../install/install-ceph-gateway#add-wildcard-to-dns