From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 18 Jun 2020 08:56:35 +0000 (+0200)
Subject: doc/cephadm: adopt: fix misleading `apply` examples
X-Git-Tag: wip-pdonnell-testing-20200918.022351~927^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e74fc0671b73b6da3669f5389f372342d4e62843;p=ceph-ci.git

doc/cephadm: adopt: fix misleading `apply` examples

Fixes: https://tracker.ceph.com/issues/46052
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/doc/cephadm/adoption.rst b/doc/cephadm/adoption.rst
index 1f15b2c46d5..20ded51a282 100644
--- a/doc/cephadm/adoption.rst
+++ b/doc/cephadm/adoption.rst
@@ -113,7 +113,7 @@ Adoption process
    each file system.  You can list file systems by name with ``ceph fs
    ls``.  For each file system::
 
-     # ceph orch apply mds <fs-name> <num-daemons>
+     # ceph orch apply mds <fs-name> [--placement=<placement>]
 
    For example, in a cluster with a single file system called `foo`::
 
@@ -133,7 +133,7 @@ Adoption process
 #. Redeploy RGW daemons.  Cephadm manages RGW daemons by zone.  For each
    zone, deploy new RGW daemons with cephadm::
 
-     # ceph orch apply rgw <realm> <zone> <placement> [--port <port>] [--ssl]
+     # ceph orch apply rgw <realm> <zone> [--subcluster=<subcluster>] [--port=<port>] [--ssl] [--placement=<placement>]
 
    where *<placement>* can be a simple daemon count, or a list of
    specific hosts (see :ref:`orchestrator-cli-placement-spec`).