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

diff --cc doc/bootstrap.rst
index 22ae5e2cfb4e16f642de35b1f65322be84e11938,8c51d7a885a7e51f0ef545d42455c436ca7534b4..c288bb7d4d3b1454e2a029b85decb92ff9ff5c01
--- 1/doc/bootstrap.rst
--- 2/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
  =======================