summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-14 12:56:22 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-14 12:56:22 (GMT)
commit171ea5d3cf58c40807ad9afaf80c0100993f98cb (patch)
treeb3201edff67663300c62e833039d957fef64ca6e /Help
parentb93623550dceac981aa4cc49f9e892c497aee49a (diff)
parentabeb42f1d9efc113ab16600d354f8ad1dd85281f (diff)
downloadCMake-171ea5d3cf58c40807ad9afaf80c0100993f98cb.zip
CMake-171ea5d3cf58c40807ad9afaf80c0100993f98cb.tar.gz
CMake-171ea5d3cf58c40807ad9afaf80c0100993f98cb.tar.bz2
Merge topic 'file-curl-userpw'
abeb42f1 Help: Add notes for topic 'file-curl-userpw' e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
Diffstat (limited to 'Help')
-rw-r--r--Help/command/file.rst3
-rw-r--r--Help/release/dev/file-curl-userpw.rst5
2 files changed, 8 insertions, 0 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 256d16d..f8727f0 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -222,6 +222,9 @@ Options to both ``DOWNLOAD`` and ``UPLOAD`` are:
``TIMEOUT <seconds>``
Terminate the operation after a given total time has elapsed.
+``USERPWD <username>:<password>``
+ Set username and password for operation.
+
Additional options to ``DOWNLOAD`` are:
``EXPECTED_HASH ALGO=<value>``
diff --git a/Help/release/dev/file-curl-userpw.rst b/Help/release/dev/file-curl-userpw.rst
new file mode 100644
index 0000000..4ae1fee
--- /dev/null
+++ b/Help/release/dev/file-curl-userpw.rst
@@ -0,0 +1,5 @@
+file-curl-userpw
+----------------
+
+* The :command:`file(DOWNLOAD)` and :command:`file(UPLOAD)` commands
+ gained a ``USERPWD <username>:<password>`` option.