11 files changed, 22 insertions, 10 deletions
diff --git a/docs/cmdline-opts/CMakeLists.txt b/docs/cmdline-opts/CMakeLists.txt
index 5aa20dfd..3c020d41 100644
--- a/docs/cmdline-opts/CMakeLists.txt
+++ b/docs/cmdline-opts/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MANPAGE "${CMAKE_BINARY_DIR}/docs/curl.1")
+set(MANPAGE "${CURL_BINARY_DIR}/docs/curl.1")
 
 # Load DPAGES and OTHERPAGES from shared file
 transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
diff --git a/docs/cmdline-opts/Makefile.inc b/docs/cmdline-opts/Makefile.inc
index fe5fb5ba..76fa5d45 100644
--- a/docs/cmdline-opts/Makefile.inc
+++ b/docs/cmdline-opts/Makefile.inc
@@ -2,7 +2,7 @@
 
 DPAGES = abstract-unix-socket.d anyauth.d append.d basic.d cacert.d capath.d cert.d \
   cert-status.d cert-type.d ciphers.d compressed.d compressed-ssh.d     \
-  config.d                                                              \
+  config.d doh-url.d                                                    \
   connect-timeout.d connect-to.d continue-at.d cookie.d cookie-jar.d    \
   create-dirs.d crlf.d crlfile.d data-ascii.d data-binary.d data.d      \
   data-raw.d data-urlencode.d delegation.d digest.d disable.d           \
diff --git a/docs/cmdline-opts/data-binary.d b/docs/cmdline-opts/data-binary.d
index c6721c64..3f6ff2db 100644
--- a/docs/cmdline-opts/data-binary.d
+++ b/docs/cmdline-opts/data-binary.d
@@ -9,5 +9,10 @@ If you start the data with the letter @, the rest should be a filename.  Data
 is posted in a similar manner as --data does, except that newlines and
 carriage returns are preserved and conversions are never done.
 
+Like --data the default content-type sent to the server is
+application/x-www-form-urlencoded. If you want the data to be treated as
+arbitrary binary data by the server then set the content-type to octet-stream:
+-H "Content-Type: application/octet-stream".
+
 If this option is used several times, the ones following the first will append
 data as described in --data.
diff --git a/docs/cmdline-opts/doh-url.d b/docs/cmdline-opts/doh-url.d
new file mode 100644
index 00000000..8fa42c1b
--- /dev/null
+++ b/docs/cmdline-opts/doh-url.d
@@ -0,0 +1,9 @@
+Long: doh-url
+Arg: <URL>
+Help: Resolve host names over DOH
+Protocols: all
+---
+Specifies which DNS-over-HTTPS (DOH) server to use to resolve hostnames,
+instead of using the default name resolver mechanism. The URL must be HTTPS.
+
+If this option is used several times, the last one will be used.
diff --git a/docs/cmdline-opts/gen.pl b/docs/cmdline-opts/gen.pl
index dd990caf..439b7658 100755
--- a/docs/cmdline-opts/gen.pl
+++ b/docs/cmdline-opts/gen.pl
@@ -388,4 +388,3 @@ sub getargs {
 indexoptions();
 
 getargs();
-
diff --git a/docs/cmdline-opts/ipv6.d b/docs/cmdline-opts/ipv6.d
index c2392e77..6eef6dd0 100644
--- a/docs/cmdline-opts/ipv6.d
+++ b/docs/cmdline-opts/ipv6.d
@@ -3,7 +3,7 @@ Long: ipv6
 Tags: Versions
 Protocols:
 Added:
-Mutexed: ipv6
+Mutexed: ipv4
 Requires:
 See-also: http1.1 http2
 Help: Resolve names to IPv6 addresses
diff --git a/docs/cmdline-opts/metalink.d b/docs/cmdline-opts/metalink.d
index 8047e9f5..81fc8bc7 100644
--- a/docs/cmdline-opts/metalink.d
+++ b/docs/cmdline-opts/metalink.d
@@ -24,4 +24,3 @@ Metalink file at the time of this writing. Also note that if --metalink and
 including headers in the response will break Metalink parser and if the
 headers are included in the file described in Metalink file, hash check will
 fail.
-
diff --git a/docs/cmdline-opts/tlsv1.0.d b/docs/cmdline-opts/tlsv1.0.d
index 8789025e..312b67b3 100644
--- a/docs/cmdline-opts/tlsv1.0.d
+++ b/docs/cmdline-opts/tlsv1.0.d
@@ -1,6 +1,6 @@
 Long: tlsv1.0
-Help: Use TLSv1.0
+Help: Use TLSv1.0 or greater
 Protocols: TLS
 Added: 7.34.0
 ---
-Forces curl to use TLS version 1.0 when connecting to a remote TLS server.
+Forces curl to use TLS version 1.0 or later when connecting to a remote TLS server.
diff --git a/docs/cmdline-opts/tlsv1.1.d b/docs/cmdline-opts/tlsv1.1.d
index a3c10edb..8182ac6d 100644
--- a/docs/cmdline-opts/tlsv1.1.d
+++ b/docs/cmdline-opts/tlsv1.1.d
@@ -1,5 +1,5 @@
 Long: tlsv1.1
-Help: Use TLSv1.1
+Help: Use TLSv1.1 or greater
 Protocols: TLS
 Added: 7.34.0
 ---
diff --git a/docs/cmdline-opts/tlsv1.2.d b/docs/cmdline-opts/tlsv1.2.d
index 8879546b..7ba44022 100644
--- a/docs/cmdline-opts/tlsv1.2.d
+++ b/docs/cmdline-opts/tlsv1.2.d
@@ -1,5 +1,5 @@
 Long: tlsv1.2
-Help: Use TLSv1.2
+Help: Use TLSv1.2 or greater
 Protocols: TLS
 Added: 7.34.0
 ---
diff --git a/docs/cmdline-opts/tlsv1.3.d b/docs/cmdline-opts/tlsv1.3.d
index cf32e392..7061a61b 100644
--- a/docs/cmdline-opts/tlsv1.3.d
+++ b/docs/cmdline-opts/tlsv1.3.d
@@ -1,5 +1,5 @@
 Long: tlsv1.3
-Help: Use TLSv1.3
+Help: Use TLSv1.3 or greater
 Protocols: TLS
 Added: 7.52.0
 ---