From e93c81196f6ef8aa38fc330f3b50143160e28bc0 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 7 May 2009 09:31:24 +0000
Subject: [PATCH] - Man page *roff problems fixed thanks to input from Colin
 Watson. Problems   reported in the Debian package.

---
 CHANGES                             | 3 +++
 RELEASE-NOTES                       | 4 +++-
 docs/libcurl/curl_easy_getinfo.3    | 4 ++--
 docs/libcurl/curl_easy_setopt.3     | 4 ++--
 docs/libcurl/curl_multi_info_read.3 | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5ac7878..162ab8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel Stenberg (7 May 2009)
+- Man page *roff problems fixed thanks to input from Colin Watson. Problems
+  reported in the Debian package.
+
 - Vijay G filed bug report #2723236
   (http://curl.haxx.se/bug/view.cgi?id=2723236) identifying a problem with
   libcurl's TFTP code and its lack of dealing with the OACK packet.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fb4e004..31f8995 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,6 +41,7 @@ This release includes the following bugfixes:
  o HTTP PUT protocol line endings portions mangled from CRLF to CRCRLF
  o Rejected SSL session ids are killed properly (for OpenSSL and GnuTLS builds)
  o Deal with the TFTP OACK packet
+ o fixed roff mistakes in man pages
 
 This release includes the following known bugs:
 
@@ -53,6 +54,7 @@ advice from friends like these:
  Andre Guibert de Bruet, Andreas Farber, Frank Hempel, Pierre Brico,
  Kamil Dudka, Jim Freeman, Daniel Johnson, Toshio Kuratomi, Martin Storsjo,
  Pramod Sharma, Gisle Vanem, Leanic Lefever, Rainer Koenig, Sven Wegener,
- Tim Chen, Constantine Sapuntzakis, David McCreedy, Michael Smith
+ Tim Chen, Constantine Sapuntzakis, David McCreedy, Michael Smith,
+ Colin Watson
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/docs/libcurl/curl_easy_getinfo.3 b/docs/libcurl/curl_easy_getinfo.3
index afb0870..29f0f44 100644
--- a/docs/libcurl/curl_easy_getinfo.3
+++ b/docs/libcurl/curl_easy_getinfo.3
@@ -209,7 +209,7 @@ this returns a 1 you know that the reason you didn't get data in return is
 because it didn't fulfill the condition. The long ths argument points to will
 get a zero stored if the condition instead was met. (Added in 7.19.4)
 .SH TIMES
-.NF
+.nf
 An overview of the six time values available from curl_easy_getinfo()
 
 curl_easy_perform()
@@ -221,7 +221,7 @@ curl_easy_perform()
     |--|--|--|--|--STARTTRANSFER
     |--|--|--|--|--|--TOTAL
     |--|--|--|--|--|--REDIRECT
-.FI
+.fi
 .IP NAMELOOKUP
 \fICURLINFO_NAMELOOKUP_TIME\fP. The time it took from the start until the name
 resolving was completed.
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 06e3a11..49d9cdd 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -235,9 +235,9 @@ at the user's discretion.  \fICURL_SOCKET_BAD\fP return value from the
 callback function will signal an unrecoverable error to the library and it
 will return \fICURLE_COULDNT_CONNECT\fP.  This return code can be used for IP
 address blacklisting.  The default behavior is:
-.Bd -literal -offset indent
+.nf
    return socket(addr->family, addr->socktype, addr->protocol);
-.Ed
+.fi
 (Option added in 7.17.1.)
 .IP CURLOPT_OPENSOCKETDATA
 Pass a pointer that will be untouched by libcurl and passed as the first
diff --git a/docs/libcurl/curl_multi_info_read.3 b/docs/libcurl/curl_multi_info_read.3
index e5539c1..3a58c64 100644
--- a/docs/libcurl/curl_multi_info_read.3
+++ b/docs/libcurl/curl_multi_info_read.3
@@ -34,7 +34,7 @@ If more involved information is wanted, the particular "easy handle" in
 present in that struct and can thus be used in subsequent regular
 \fIcurl_easy_getinfo(3)\fP calls (or similar):
 
-.NF
+.nf
  struct CURLMsg {
    CURLMSG msg;       /* what this message means */
    CURL *easy_handle; /* the handle it concerns */
@@ -43,7 +43,7 @@ present in that struct and can thus be used in subsequent regular
      CURLcode result;   /* return code for transfer */
    } data;
  };
-
+.fi
 When \fBmsg\fP is \fICURLMSG_DONE\fP, the message identifies a transfer that
 is done, and then \fBresult\fP contains the return code for the easy handle
 that just completed.
-- 
2.7.4