]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-doc-radosgw-80'
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 5 May 2014 22:12:29 +0000 (15:12 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 5 May 2014 22:14:22 +0000 (15:14 -0700)
Conflicts:
doc/radosgw/config.rst

1  2 
doc/radosgw/config.rst

index b334c64f6900d24a1106b4e3e116cdde2a8f5c13,b7d6a5f0fa7c9e5b6fc6939d764c595feb985263..40e158b05dbc98ca4aaf558ef1485a4558e2dc7a
@@@ -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
 -.. _Add Wildcard to DNS: ../../install/install-ceph-gateway#add-wildcard-to-dns
+ .. _Admin Guide: ../admin
++.. _Add Wildcard to DNS: ../../install/install-ceph-gateway#add-wildcard-to-dns