From: Sage Weil <sage@redhat.com>
Date: Wed, 26 Feb 2020 15:41:02 +0000 (-0600)
Subject: Merge PR #33551 into master
X-Git-Tag: v15.1.1~240
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa0296d286f77c6bc828326c87bcce180d7c8e4b;p=ceph.git

Merge PR #33551 into master

* refs/pull/33551/head:
	doc/cephadm: Rephrased introduction sentence
	doc/cephadm: Rename section titles and fix introductions
	doc/cephadm: Add CLI and OS recommendations to TOC
	doc: move cephadm mgr doc to /doc/cephadm
	doc: move bootstrap.rst to cephadm

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

aa0296d286f77c6bc828326c87bcce180d7c8e4b
diff --cc .githubmap
index 91f292b7dedc,91f292b7dedc..69564e449be8
--- a/.githubmap
+++ b/.githubmap
@@@ -117,3 -117,3 +117,4 @@@ ronen-fr Ronen Friedman <rfriedma@redha
  yaarith Yaarit Hatuka <yaarithatuka@gmail.com>
  jmolmo Juan Miguel Olmo <jolmomar@redhat.com>
  lxbsz Xiubo Li <xiubli@redhat.com>
++asettle Alexandra Settle <asettle@suse.com>