From: zdover23 <1445107+zdover23@users.noreply.github.com>
Date: Fri, 22 Nov 2019 09:16:06 +0000 (+1000)
Subject: Merge branch 'master' into wip-doc-prompts-update
X-Git-Tag: v15.1.0~610^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=267cbbd69db053656560734f569b2adf02c7f7fd;p=ceph.git

Merge branch 'master' into wip-doc-prompts-update
---

267cbbd69db053656560734f569b2adf02c7f7fd
diff --cc doc/bootstrap.rst
index 22ae5e2cfb4e,8c51d7a885a7..c288bb7d4d3b
--- a/doc/bootstrap.rst
+++ b/doc/bootstrap.rst
@@@ -21,20 -10,19 +21,21 @@@ Get ceph-daemo
  ===============
  
  The ``ceph-daemon`` utility is used to bootstrap a new Ceph Cluster.
 -You can get the utility by either installing a package provided by
 -your Linux distribution::
  
 -  sudo apt install -y ceph-daemon   # or,
 -  sudo dnf install -y ceph-daemon   # or,
 -  sudo yum install -y ceph-daemon
 +Use curl to fetch the standalone script::
 +
 +  [monitor 1] # curl --silent --remote-name --location https://github.com/ceph/ceph/raw/master/src/ceph-daemon/ceph-daemon
 +  [monitor 1] # chmod +x ceph-daemon
 +  [monitor 1] # sudo install -m 0755 ceph-daemon /usr/sbin    # optional!
 +  
 +You can also get the utility by installing a package provided by
 +your Linux distribution::
  
 -or by simply downloading the standalone script manually::
 +   [monitor 1] # sudo apt install -y ceph-daemon   # or,
 +   [monitor 1] # sudo dnf install -y ceph-daemon   # or,
 +   [monitor 1] # sudo yum install -y ceph-daemon
  
 -  curl --silent --remote-name --location https://github.com/ceph/ceph/raw/master/src/ceph-daemon/ceph-daemon
 -  chmod +x ceph-daemon
 -  sudo install -m 0755 ceph-daemon /usr/sbin    # optional!
+ 
  Bootstrap a new cluster
  =======================