diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-06-24 23:34:51 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-06-24 23:34:51 +0200 |
| commit | f87a3d736f3200029c8bed3ab4dad50f9680be7a (patch) | |
| tree | 7db1fde8016a6f576d7cba006365f461aaee00d0 /docs/libcurl/libcurl-errors.3 | |
| parent | bf5218c85eba8d13c6c40a8047b8018b4ff5f1ed (diff) | |
| parent | f44b803f1605edcfc4058b1a818c44552f0affec (diff) | |
| download | curl-http2-push.tar.gz | |
Merge branch 'master' into http2-pushhttp2-push
Diffstat (limited to 'docs/libcurl/libcurl-errors.3')
| -rw-r--r-- | docs/libcurl/libcurl-errors.3 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/libcurl/libcurl-errors.3 b/docs/libcurl/libcurl-errors.3 index 07091b5e5..3828996f8 100644 --- a/docs/libcurl/libcurl-errors.3 +++ b/docs/libcurl/libcurl-errors.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -74,7 +74,7 @@ After having sent the FTP password to the server, libcurl expects a proper reply. This error code indicates that an unexpected code was returned. .IP "CURLE_FTP_ACCEPT_TIMEOUT (12)" During an active FTP session while waiting for the server to connect, the -\fICURLOPT_ACCEPTTIMOUT_MS(3)\fP (or the internal default) timeout expired. +\fICURLOPT_ACCEPTTIMEOUT_MS(3)\fP (or the internal default) timeout expired. .IP "CURLE_FTP_WEIRD_PASV_REPLY (13)" libcurl failed to get a sensible result back from the server as a response to either a PASV or a EPSV command. The server is flawed. |