authx -> cephx everywhere it's used

The term authx was in the mount.ceph man page, and got accidentally
copied into rbd help.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/doc/man/8/mount.ceph.rst b/doc/man/8/mount.ceph.rst
index 799e5d3949855f4181af08681f231b997843eff6..336efc1387a00231ab785b2152ff2e7283fc48d5 100644 (file)
--- a/doc/man/8/mount.ceph.rst
+++ b/doc/man/8/mount.ceph.rst
@@ -81,10 +81,10 @@ Options
   string, set the name of the hidden snapdir. Default: .snap
 
 :command:`name`
-  string, used with authx, Default: guest
+  string, used with cephx, Default: guest
 
 :command:`secret`
-  string, used with authx
+  string, used with cephx
 
 :command:`ip`
   my ip

diff --git a/man/mount.ceph.8 b/man/mount.ceph.8
index 5bb3a02d6f078b336b941bb21afed523b5dc7ea5..90177945026f081c10424c4c2a5414bdeb0ccb1c 100644 (file)
--- a/man/mount.ceph.8
+++ b/man/mount.ceph.8
@@ -107,10 +107,10 @@ memory. Default: calculated from available memory
 string, set the name of the hidden snapdir. Default: .snap
 .TP
 .B \fBname\fP
-string, used with authx, Default: guest
+string, used with cephx, Default: guest
 .TP
 .B \fBsecret\fP
-string, used with authx
+string, used with cephx
 .TP
 .B \fBip\fP
 my ip

diff --git a/src/rbd.cc b/src/rbd.cc
index a4850c3174425965859e70f26f67c2a670f66c15..216d0f9f2c7292de5346fe848286af0b048054ff 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -99,7 +99,7 @@ void usage()
        << "\n"
        << "For the map command:\n"
        << "  --user <username>            rados user to authenticate as\n"
-       << "  --secret <path>              file containing secret key for use with authx\n";
+       << "  --secret <path>              file containing secret key for use with cephx\n";
 }
 
 void usage_exit()

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 675da6b324db00ae23bf0db4c55ae207a8a46c5b..e9aafff4e235c3baac07eb1d7daaea95c9f3034b 100644 (file)
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -37,4 +37,4 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx

diff --git a/src/test/cli/rbd/invalid-snap-usage.t b/src/test/cli/rbd/invalid-snap-usage.t
index 386a23a232c02ce735e041a05d7ceb01874a7a79..44037e4b13cff9bb919db6e2f6126dc43df42ea3 100644 (file)
--- a/src/test/cli/rbd/invalid-snap-usage.t
+++ b/src/test/cli/rbd/invalid-snap-usage.t
@@ -38,7 +38,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd resize img@snap
   error: snapname specified for a command that doesn't use it
@@ -80,7 +80,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd import --snap=snap1 /bin/ls ls
   error: snapname specified for a command that doesn't use it
@@ -122,7 +122,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd create --snap=snap img
   error: snapname specified for a command that doesn't use it
@@ -164,7 +164,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd rm --snap=snap img
   error: snapname specified for a command that doesn't use it
@@ -206,7 +206,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd rename --snap=snap img
   error: snapname specified for a command that doesn't use it
@@ -248,7 +248,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd ls --snap=snap rbd
   error: snapname specified for a command that doesn't use it
@@ -290,7 +290,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd snap ls --snap=snap img
   error: snapname specified for a command that doesn't use it
@@ -332,7 +332,7 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]
   $ rbd watch --snap=snap img
   error: snapname specified for a command that doesn't use it
@@ -374,5 +374,5 @@
   
   For the map command:
     --user <username>            rados user to authenticate as
-    --secret <path>              file containing secret key for use with authx
+    --secret <path>              file containing secret key for use with cephx
   [1]