aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-10-26 08:53:07 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-10-26 08:53:07 +0000
commitb8e1e633797f4115174b0988bc0fc1543a4cc6c8 (patch)
treed814f4582209480b9c8f473bf610e543e4bafcbf /docs
parent448d2b5f491067f110e96c4a60342d0c34dd7010 (diff)
spell fix by Michael Wood
Diffstat (limited to 'docs')
-rw-r--r--docs/curl.15
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 51868ec83..d6f85c10d 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -221,7 +221,12 @@ To create remote directories when using FTP or SFTP, try
(FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
.IP "--crlfile <file>"
(HTTPS/FTPS) Provide a file using PEM format with a Certificate Revocation
+<<<<<<< curl.1
+List that may specify what peer certificates that are to be considered
+revoked.
+=======
List that may specify peer certificates that are to be considered revoced.
+>>>>>>> 1.278
If this option is used several times, the last one will be used.