summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2021-09-10 11:22:07 +0200
committerRalph Boehme <slow@samba.org>2021-09-10 15:10:30 +0000
commit29910da882d75b20d63714a1365a7b0dba6904a7 (patch)
treec8571f877316b4043a56631994b8509f1bafb6dd /docs-xml
parent9a3b7f1338e2947aa1cbf1ae34d0e1e7cb692ee9 (diff)
downloadsamba-29910da882d75b20d63714a1365a7b0dba6904a7.tar.gz
lib/cmdline: restore s3 option name --max-protocol for MAXPROTOCOL from 4.14
s4 used --maxprotocol, s3 used --max-protocol. We should continue supporting --max-protocol. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/build/DTD/samba.entities6
-rw-r--r--docs-xml/manpages/mdsearch.1.xml2
-rw-r--r--docs-xml/manpages/net.8.xml2
-rw-r--r--docs-xml/manpages/nmblookup.1.xml2
-rw-r--r--docs-xml/manpages/rpcclient.1.xml2
-rw-r--r--docs-xml/manpages/samba-regedit.8.xml2
-rw-r--r--docs-xml/manpages/smbcacls.1.xml2
-rw-r--r--docs-xml/manpages/smbclient.1.xml2
-rw-r--r--docs-xml/manpages/smbcquotas.1.xml2
-rw-r--r--docs-xml/manpages/winexe.1.xml2
10 files changed, 12 insertions, 12 deletions
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index beff3cb1f6e..0a4a21db63e 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -556,9 +556,9 @@
</varlistentry>
'>
-<!ENTITY cmdline.common.connection.maxprotocol '
+<!ENTITY cmdline.common.connection.max-protocol '
<varlistentry>
- <term>-m|--maxprotocol=MAXPROTOCOL</term>
+ <term>-m|--max-protocol=MAXPROTOCOL</term>
<listitem>
<para>
The value of the parameter (a string) is the highest
@@ -577,7 +577,7 @@
<!ENTITY cmdline.common.connection '
&cmdline.common.connection.nameresolve;
&cmdline.common.connection.socketoptions;
-&cmdline.common.connection.maxprotocol;
+&cmdline.common.connection.max-protocol;
&cmdline.common.connection.netbiosname;
&cmdline.common.connection.netbiosscope;
&cmdline.common.connection.workgroup;
diff --git a/docs-xml/manpages/mdsearch.1.xml b/docs-xml/manpages/mdsearch.1.xml
index 14bc825feac..e5b443f4a75 100644
--- a/docs-xml/manpages/mdsearch.1.xml
+++ b/docs-xml/manpages/mdsearch.1.xml
@@ -34,7 +34,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index aade21a5a5a..1bd82933137 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -32,7 +32,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml
index 9ac602cbd59..08b0882504f 100644
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -40,7 +40,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index 16fbe9207e4..7c0c380cd8d 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -34,7 +34,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml
index aa2668e869e..2cda0c00bdb 100644
--- a/docs-xml/manpages/samba-regedit.8.xml
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -30,7 +30,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 715308bf73d..9cc2d66a898 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -48,7 +48,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 9b62f46f563..40f9d896e30 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -43,7 +43,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml
index 0d9b6d69e29..b5ce53ce31b 100644
--- a/docs-xml/manpages/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
@@ -38,7 +38,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
diff --git a/docs-xml/manpages/winexe.1.xml b/docs-xml/manpages/winexe.1.xml
index a7768424dd2..ddce91e3fa8 100644
--- a/docs-xml/manpages/winexe.1.xml
+++ b/docs-xml/manpages/winexe.1.xml
@@ -34,7 +34,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
- <arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
+ <arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>
View Lorry Controller Status