Revert "Update to 7.40.1"

[platform/upstream/curl.git] / docs / MANUAL

diff --git a/docs/MANUAL b/docs/MANUAL
index 113df20..11960e1 100644 (file)
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -41,28 +41,17 @@ SIMPLE USAGE
 
   Get a file from an SSH server using SFTP:
 
-        curl -u username sftp://example.com/etc/issue
+        curl -u username sftp://shell.example.com/etc/issue
 
-  Get a file from an SSH server using SCP using a private key
-  (not password-protected) to authenticate:
+  Get a file from an SSH server using SCP using a private key to authenticate:
 
-        curl -u username: --key ~/.ssh/id_rsa \
-             scp://example.com/~/file.txt
-
-  Get a file from an SSH server using SCP using a private key
-  (password-protected) to authenticate:
-
-        curl -u username: --key ~/.ssh/id_rsa --pass private_key_password \
-             scp://example.com/~/file.txt
+        curl -u username: --key ~/.ssh/id_dsa --pubkey ~/.ssh/id_dsa.pub \
+            scp://shell.example.com/~/personal.txt
 
   Get the main page from an IPv6 web server:
 
         curl "http://[2001:1890:1112:1::20]/"
 
-  Get a file from an SMB server:
-
-        curl -u "domain\username:passwd" smb://server.example.com/share/file.txt
-
 DOWNLOAD TO A FILE
 
   Get a web page and store in a local file with a specific name:
@@ -102,13 +91,10 @@ USING PASSWORDS
 
  SFTP / SCP
 
-   This is similar to FTP, but you can use the --key option to specify a
-   private key to use instead of a password. Note that the private key may
-   itself be protected by a password that is unrelated to the login password
-   of the remote system; this password is specified using the --pass option.
-   Typically, curl will automatically extract the public key from the private
-   key file, but in cases where curl does not have the proper library support,
-   a matching public key file must be specified using the --pubkey option.
+   This is similar to FTP, but you can specify a private key to use instead of
+   a password. Note that the private key may itself be protected by a password
+   that is unrelated to the login password of the remote system.  If you
+   provide a private key file you must also provide a public key file.
 
  HTTP
 
@@ -122,10 +108,10 @@ USING PASSWORDS
         curl -u name:passwd http://machine.domain/full/path/to/file
 
    HTTP offers many different methods of authentication and curl supports
-   several: Basic, Digest, NTLM and Negotiate (SPNEGO). Without telling which
-   method to use, curl defaults to Basic. You can also ask curl to pick the
-   most secure ones out of the ones that the server accepts for the given URL,
-   by using --anyauth.
+   several: Basic, Digest, NTLM and Negotiate. Without telling which method to
+   use, curl defaults to Basic. You can also ask curl to pick the most secure
+   ones out of the ones that the server accepts for the given URL, by using
+   --anyauth.
 
    NOTE! According to the URL specification, HTTP URLs can not contain a user
    and password, so that style will not work when using curl via a proxy, even
@@ -232,11 +218,6 @@ UPLOADING
 
         curl --proxytunnel -x proxy:port -T localfile ftp.upload.com
 
-SMB / SMBS
-
-        curl -T file.txt -u "domain\username:passwd" 
-         smb://server.example.com/share/
-
  HTTP
 
   Upload all data on stdin to a specified HTTP site: