gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] branch master updated: troff removal part 2. what r


From: gnunet
Subject: [GNUnet-SVN] [gnurl] branch master updated: troff removal part 2. what remains is the mkhelp.pl facility.
Date: Mon, 27 May 2019 12:26:23 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

The following commit(s) were added to refs/heads/master by this push:
     new 542a8e9b6 troff removal part 2. what remains is the mkhelp.pl facility.
542a8e9b6 is described below

commit 542a8e9b6190b0678ad65e23837a0e146126a708
Author: ng0 <address@hidden>
AuthorDate: Mon May 27 10:25:41 2019 +0000

    troff removal part 2. what remains is the mkhelp.pl facility.
---
 configure.ac                  |   2 +-
 docs/Makefile.am              |  28 +----
 docs/gnurl.1                  | 255 +++++++++++++++++++-----------------------
 docs/libcurl/opts/Makefile.am |  32 +-----
 tests/Makefile.am             |  14 ---
 5 files changed, 120 insertions(+), 211 deletions(-)

diff --git a/configure.ac b/configure.ac
index 043222440..c86e6c2c9 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3925,7 +3925,7 @@ then
   dnl if no nroff tool was found, or no option that could convert man pages
   dnl was found, then disable the built-in manual stuff
   AC_MSG_WARN([disabling built-in manual])
-  USE_MANUAL="no";
+  USE_MANUAL="yes";
 fi
 
 dnl *************************************************************************
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 618dac8f9..28e947742 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -27,18 +27,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 man_MANS = $(abs_builddir)/gnurl.1
 noinst_man_MANS = gnurl.1 mk-ca-bundle.1
 dist_man_MANS = gnurl-config.1
-GENHTMLPAGES = gnurl.html gnurl-config.html mk-ca-bundle.html
-PDFPAGES = gnurl.pdf gnurl-config.pdf mk-ca-bundle.pdf
 MANDISTPAGES = gnurl.1.dist gnurl-config.1.dist
 
-HTMLPAGES = $(GENHTMLPAGES) index.html
-
 # Build targets in this file (.) before cmdline-opts to ensure that
 # the curl.1 rule below runs first
-SUBDIRS = . cmdline-opts
+SUBDIRS = .
 DIST_SUBDIRS = $(SUBDIRS) examples libcurl
 
-CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES)
+CLEANFILES = $(MANDISTPAGES)
 
 EXTRA_DIST =                                    \
  $(noinst_man_MANS)                             \
@@ -82,9 +78,7 @@ EXTRA_DIST =                                    \
  TheArtOfHttpScripting                          \
  VERSIONS
 
-MAN2HTML= roffit $< >$@
-
-SUFFIXES = .1 .html .pdf
+SUFFIXES = .1
 
 # $(abs_builddir) is to disable VPATH when searching for this file, which
 # would otherwise find the copy in $(srcdir) which breaks the $(HUGE)
@@ -99,21 +93,5 @@ $(abs_builddir)/gnurl.1:
                $(INSTALL_DATA) "$(srcdir)/gnurl.1" $@; fi
        cd cmdline-opts && $(MAKE)
 
-html: $(HTMLPAGES)
-       cd libcurl && $(MAKE) html
-
-pdf: $(PDFPAGES)
-       cd libcurl && $(MAKE) pdf
-
-.1.html:
-       $(MAN2HTML)
-
-.1.pdf:
-       @(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \
-       groff -Tps -man $< >$$foo.ps; \
-       ps2pdf $$foo.ps $@; \
-       rm $$foo.ps; \
-       echo "converted $< to $@")
-
 distclean:
        rm -f $(CLEANFILES)
diff --git a/docs/gnurl.1 b/docs/gnurl.1
index ca200f4f0..212f039f0 100644
--- a/docs/gnurl.1
+++ b/docs/gnurl.1
@@ -399,15 +399,17 @@ is used) checks for a default config file and uses it if 
found.
 The default config file is checked for in the following places in this order:
 .Pp
 1) curl tries to find the "home dir": It first checks for the CURL_HOME and
-then the HOME environment variables. Failing that, it uses getpwuid() on
-Unix-like systems (which returns the home dir given the current user in your
-system). On Windows, it then checks for the APPDATA variable, or as a last
-resort the '%USERPROFILE%\\Application Data'.
+then the HOME environment variables. Failing that, it uses
+.Fn getpwuid
+on Unix-like systems (which returns the home directory given the
+current user in your system). On Windows, it then checks for the
+.Ev APPDATA
+variable, or as a last resort the '%USERPROFILE%\\Application Data'.
 .Pp
 2) On windows, if there is no _curlrc file in the home dir, it checks for one
 in the same dir the curl executable is placed. On Unix-like systems, it will
 simply try to load .curlrc from the determined home dir.
-.Bl -literal -offset indent -compact
+.Bd -literal -offset indent -compact
 # --- Example file ---
 # this is a comment
 url = "example.com"
@@ -419,7 +421,7 @@ url = "example.com/docs/manpage.html"
 -O
 referer = "http://nowhereatall.example.com/";
 # --- End of example file ---
-.El
+.Ed
 This option can be used multiple times to load multiple config files.
 .It Fl -connect-timeout Ar <seconds>
 Maximum time in seconds that you allow curl's connection to take.
@@ -637,11 +639,13 @@ generate a post chunk that looks like 
\&'name=daniel&skill=lousy'.
 If you start the data with the letter @, the rest should be a file
 name to read the data from, or - if you want curl to read the data
 from stdin. Multiple files can also be specified. Posting data from a
-file named
-'foobar' would thus be done with \fI-d, --data\fP @foobar. When --data is told 
to read
-from a file like that, carriage returns and newlines will be stripped
-out. If you don't want the @ character to have a special
-interpretation use \fI--data-raw\fP instead.
+file named 'foobar' would thus be done with
+.Fl d , -data Ar @foobar .
+When
+.Fl -data
+is told to read from a file like that, carriage returns and newlines
+will be stripped out.  If you don't want the @ character to have a
+special interpretation use \fI--data-raw\fP instead.
 .Pp
 See also \fI--data-binary\fP and \fI--data-urlencode\fP and
 \fI--data-raw\fP. This option overrides \fI-F, --form\fP and \fI-I,
@@ -755,12 +759,14 @@ Set the list of DNS servers to be used instead of the 
system default.
 The list of IP addresses should be separated with commas. Port numbers
 may also optionally be given as \fI:<port-number>\fP after each IP
 address.
-
-\fI--dns-servers\fP requires that the underlying libgnurl was built to support 
c-ares. Added in 7.33.0.
+.Pp
+.Fl -dns-servers
+requires that the underlying libgnurl was built to support c-ares.
+Added in 7.33.0.
 .It Fl -doh-url <URL>
 (all) Specifies which DNS-over-HTTPS (DOH) server to use to resolve hostnames,
 instead of using the default name resolver mechanism. The URL must be HTTPS.
-
+.Pp
 If this option is used several times, the last one will be used.
 .It Fl D  Ar <filename> | Fl -dump-header Ar <filename>
 (HTTP FTP) Write the received protocol headers to the specified file.
@@ -899,25 +905,28 @@ Example: send a your name and shoe size in two text 
fields to the server:
 Example: send a your essay in a text field to the server. Send it as a
 plain text field, but get the contents for it from a local file:
 .Pp
-.Dl curl -F "story=<hugefile.txt" https://example.com/
+.Dl curl -F \(dqstory=<hugefile.txt\(dq https://example.com/
 .Pp
 You can also tell curl what Content-Type to use by using 'type=', in a
 manner similar to:
 .Pp
-.Dl curl -F "address@hidden;type=text/html" example.com
+.Dl curl -F \(address@hidden;type=text/html\(dq example.com
 .Pp
 or
 .Pp
-.Dl curl -F "name=daniel;type=text/foo" example.com
+.Dl curl -F \(dqname=daniel;type=text/foo\(dq example.com
 .Pp
 You can also explicitly change the name field of a file upload part by
 setting filename=, like this:
 .Pp
-.Dl curl -F "address@hidden;filename=nameinpost" example.com
+.Dl curl -F \(address@hidden;filename=nameinpost\(dq example.com
 .Pp
 If filename/path contains ',' or ';', it must be quoted by double-quotes like:
 .Pp
-.Dl curl -F "address@hidden"localfile\\";filename=\\"nameinpost\\"" example.com
+.\" We want this to render:
+.\" curl -F "address@hidden"localfile\";filename=\"nameinpost\"" example.com
+.\" might be useful for reference: cc.1
+.Dl curl -F 
\(address@hidden(dqlocalfile\e\(dq\&;filename=\e\(dqnameinpost\e\(dq\(dq 
example.com
 .Pp
 or
 .Pp
@@ -934,11 +943,11 @@ leading/trailing spaces or leading double quotes:
 .Pp
 You can add custom headers to the field by setting headers=, like
 .Pp
-.Dl  curl -F "submit=OK;headers=\\"X-submit-type: OK\\"" example.com
+.Dl  curl -F \(dqsubmit=OK;headers=\e\(dqX-submit-type: OK\e\(dq\(dq 
example.com
 .Pp
 or
 .Pp
-.Dl  curl -F "submit=OK;address@hidden" example.com
+.Dl curl -F \(dqsubmit=OK;address@hidden(dq example.com
 .Pp
 The headers= keyword may appear more that once and above notes about
 quoting apply. When headers are read from a file, Empty lines and
@@ -946,7 +955,7 @@ lines starting with '#' are comments and ignored; each 
header can be
 folded by splitting between two words and starting the continuation
 line with a space; embedded carriage-returns and trailing spaces are
 stripped.  Here is an example of a header file contents:
-.Bd -literal -offset indent compact
+.Bd -literal -offset indent -compact
   # This file contain two headers.
   X-header-1: this is a header
 
@@ -968,7 +977,7 @@ a multipart can be terminated with a '=)' argument.
 Example: the following command sends an SMTP mime e-mail consisting in
 an inline part in two alternative formats: plain text and HTML. It
 attaches a text file:
-.Bd -literal -offset indent compact
+.Bd -literal -offset indent -compact
  curl -F '=(;type=multipart/alternative' \\
          -F '=plain text message' \\
          -F '= <body>HTML message</body>;type=text/html' \\
@@ -983,7 +992,7 @@ schemes, limiting lines length to 76 characters.
 .Pp
 Example: send multipart mail with a quoted-printable text message and
 a base64 attached file:
-.Bd -literal -offset indent compact
+.Bd -literal -offset indent -compact
  curl -F '=text message;encoder=quoted-printable' \\
       -F 'address@hidden;encoder=base64' ... smtp://example.com
 .Ed
@@ -1295,13 +1304,13 @@ and
 Added in 7.49.0.
 .It Fl -http2
 (HTTP) Tells curl to use HTTP version 2.
-
+.Pp
 See also \fI--no-alpn\fP. \fI--http2\fP requires that the underlying libgnurl 
was built to support HTTP/2. This option overrides \fI--http1.1\fP and \fI-0, 
--http1.0\fP and \fI--http2-prior-knowledge\fP. Added in 7.33.0.
 .It Fl -ignore-content-length
 (FTP HTTP) For HTTP, Ignore the Content-Length header. This is particularly 
useful for
 servers running Apache 1.x, which will report incorrect Content-Length for
 files larger than 2 gigabytes.
-
+.Pp
 For FTP (since 7.46.0), skip the RETR command to figure out the size before
 downloading a file.
 .It Fl i | -include
@@ -2333,27 +2342,20 @@ option.
 (HTTP FTP SFTP FILE) Retrieve a byte range (i.e. a partial document)
 from an HTTP/1.1, FTP or SFTP server or a local FILE. Ranges can be
 specified in a number of ways.
-.RS
-.TP 10
-.B 0-499
+.Bl -tag -width indent
+.It 0-499
 specifies the first 500 bytes
-.TP
-.B 500-999
+.It 500-999
 specifies the second 500 bytes
-.TP
-.B -500
+.It -500
 specifies the last 500 bytes
-.TP
-.B 9500-
+.It 9500-
 specifies the bytes from offset 9500 and forward
-.TP
-.B 0-0,-1
+.It 0-0,-1
 specifies the first and last byte only(*)(HTTP)
-.TP
-.B 100-199,500-599
+.It 100-199,500-599
 specifies two separate 100-byte ranges(*) (HTTP)
-.RE
-.It Fl
+.El
 (*) = NOTE that this will cause the server to reply with a multipart
 response!
 .Pp
@@ -2378,7 +2380,7 @@ transfer encodings and instead makes them passed on 
unaltered, raw.
 Added in 7.16.2.
 .It Fl e | -referer Ar <URL>
 (HTTP) Sends the "Referrer Page" information to the HTTP server. This
-can also be set with the
+bcan also be set with the
 .Fl H ,
 .Fl -header
 flag of course. When used with
@@ -2804,6 +2806,7 @@ Sets the terminal type.
 Sets the X display location.
 .It NEW_ENV=<var,val>
 Sets an environment variable.
+.El
 .It Fl -tftp-blksize Ar <value>
 (TFTP) Set TFTP BLKSIZE option (must be >512). This is the block size
 that curl will try to use when transferring data to or from a TFTP
@@ -2879,64 +2882,64 @@ Set username for use with the TLS authentication method 
specified with
 Added in 7.21.4.
 .It Fl -tlsv1.0
 (TLS) Forces curl to use TLS version 1.0 or later when connecting to a remote 
TLS server.
-
+.Pp
 Added in 7.34.0.
 .It Fl -tlsv1.1
 (TLS) Forces curl to use TLS version 1.1 or later when connecting to a remote 
TLS server.
-
+.Pp
 Added in 7.34.0.
 .It Fl -tlsv1.2
 (TLS) Forces curl to use TLS version 1.2 or later when connecting to a remote 
TLS server.
-
+.Pp
 Added in 7.34.0.
 .It Fl -tlsv1.3
 (TLS) Forces curl to use TLS version 1.3 or later when connecting to a remote 
TLS server.
-
+.Pp
 Note that TLS 1.3 is only supported by a subset of TLS backends. At the time
 of this writing, they are BoringSSL, NSS, and Secure Transport (on iOS 11 or
 later, and macOS 10.13 or later).
-
+.Pp
 Added in 7.52.0.
 .It Fl 1 | -tlsv1
 (SSL) Tells curl to use at least TLS version 1.x when negotiating with a 
remote TLS
 server. That means TLS version 1.0 or higher
-
+.Pp
 See also \fI--http1.1\fP and \fI--http2\fP. \fI-1, --tlsv1\fP requires
 that the underlying libgnurl was built to support TLS. This option
 overrides \fI--tlsv1.1\fP and \fI--tlsv1.2\fP and \fI--tlsv1.3\fP.
 .It Fl -tr-encoding
 (HTTP) Request a compressed Transfer-Encoding response using one of the 
algorithms
 curl supports, and uncompress the data while receiving it.
-
+.Pp
 Added in 7.21.6.
 .It Fl -trace-ascii Ar <file>
 Enables a full trace dump of all incoming and outgoing data, including
 descriptive information, to the given output file. Use "-" as filename to have
 the output sent to stdout.
-
+.Pp
 This is very similar to \fI--trace\fP, but leaves out the hex part and only 
shows
 the ASCII part of the dump. It makes smaller output that might be easier to
 read for untrained humans.
-
+.Pp
 If this option is used several times, the last one will be used.
-
+.Pp
 This option overrides \fI--trace\fP and \fI-v, --verbose\fP.
 .It Fl -trace-time
 Prepends a time stamp to each trace or verbose line that curl displays.
-
+.Pp
 Added in 7.14.0.
 .It Fl -trace Ar <file>
 Enables a full trace dump of all incoming and outgoing data, including
 descriptive information, to the given output file. Use "-" as filename to have
 the output sent to stdout. Use "%" as filename to have the output sent to
 stderr.
-
+.Pp
 If this option is used several times, the last one will be used.
-
+.Pp
 This option overrides \fI-v, --verbose\fP and \fI--trace-ascii\fP.
 .It Fl -unix-socket Ar <path>
 (HTTP) Connect through this Unix domain socket, instead of using the network.
-
+.Pp
 Added in 7.40.0.
 .It Fl T Ar file | Fl -upload-file Ar <file>
 This transfers the specified local file to the remote URL. If there is
@@ -3129,139 +3132,105 @@ output a newline by using \\n, a carriage return with 
\\r and a tab space with
 The output will be written to standard output, but this can be switched to
 standard error by using %{stderr}.
 .Pp
-.B NOTE:
-The %-symbol is a special symbol in the win32-environment, where all
-occurrences of % must be doubled when using this option.
-
+NOTE: The %-symbol is a special symbol in the win32-environment, where
+all occurrences of % must be doubled when using this option.
+.Pp
 The variables available are:
-.RS
-.TP 15
-.B content_type
+.Bl -tag -width indent
+.It content_type
 The Content-Type of the requested document, if there was any.
-.TP
-.B filename_effective
+.It filename_effective
 The ultimate filename that curl writes out to. This is only meaningful if curl
 is told to write to a file with the \fI-O, --remote-name\fP or \fI-o, 
--output\fP
 option. It's most useful in combination with the \fI-J, --remote-header-name\fP
 option. (Added in 7.26.0)
-.TP
-.B ftp_entry_path
+.It ftp_entry_path
 The initial path curl ended up in when logging on to the remote FTP
 server. (Added in 7.15.4)
-.TP
-.B http_code
+.It http_code
 The numerical response code that was found in the last retrieved HTTP(S) or
 FTP(s) transfer. In 7.18.2 the alias \fBresponse_code\fP was added to show the
 same info.
-.TP
-.B http_connect
+.It http_connect
 The numerical code that was found in the last response (from a proxy) to a
 curl CONNECT request. (Added in 7.12.4)
-.TP
-.B http_version
+.It http_version
 The http version that was effectively used. (Added in 7.50.0)
-.TP
-.B local_ip
+.It local_ip
 The IP address of the local end of the most recently done connection - can be
 either IPv4 or IPv6 (Added in 7.29.0)
-.TP
-.B local_port
+.It local_port
 The local port number of the most recently done connection (Added in 7.29.0)
-.TP
-.B num_connects
+.It num_connects
 Number of new connects made in the recent transfer. (Added in 7.12.3)
-.TP
-.B num_redirects
+.It num_redirects
 Number of redirects that were followed in the request. (Added in 7.12.3)
-.TP
-.B proxy_ssl_verify_result
+.It proxy_ssl_verify_result
 The result of the HTTPS proxy's SSL peer certificate verification that was
 requested. 0 means the verification was successful. (Added in 7.52.0)
-.TP
-.B redirect_url
+.It redirect_url
 When an HTTP request was made without \fI-L, --location\fP to follow redirects 
(or when
 --max-redir is met), this variable will show the actual URL a redirect
 \fIwould\fP have gone to. (Added in 7.18.2)
-.TP
-.B remote_ip
+.It remote_ip
 The remote IP address of the most recently done connection - can be either
 IPv4 or IPv6 (Added in 7.29.0)
-.TP
-.B remote_port
+.It remote_port
 The remote port number of the most recently done connection (Added in 7.29.0)
-.TP
-.B scheme
+.It scheme
 The URL scheme (sometimes called protocol) that was effectively used (Added in 
7.52.0)
-.TP
-.B size_download
+.It size_download
 The total amount of bytes that were downloaded.
-.TP
-.B size_header
+.It size_header
 The total amount of bytes of the downloaded headers.
-.TP
-.B size_request
+.It size_request
 The total amount of bytes that were sent in the HTTP request.
-.TP
-.B size_upload
+.It size_upload
 The total amount of bytes that were uploaded.
-.TP
-.B speed_download
+.It speed_download
 The average download speed that curl measured for the complete download. Bytes
 per second.
-.TP
-.B speed_upload
+.It speed_upload
 The average upload speed that curl measured for the complete upload. Bytes per
 second.
-.TP
-.B ssl_verify_result
+.It ssl_verify_result
 The result of the SSL peer certificate verification that was requested. 0
 means the verification was successful. (Added in 7.19.0)
-.TP
-.B stderr
+.It stderr
 From this point on, the \fI-w, --write-out\fP output will be written to 
standard
 error. (Added in 7.63.0)
-.TP
-.B stdout
+.It stdout
 From this point on, the \fI-w, --write-out\fP output will be written to 
standard output.
 This is the default, but can be used to switch back after switching to stderr.
 (Added in 7.63.0)
-.TP
-.B time_appconnect
+.It time_appconnect
 The time, in seconds, it took from the start until the SSL/SSH/etc
 connect/handshake to the remote host was completed. (Added in 7.19.0)
-.TP
-.B time_connect
+.It time_connect
 The time, in seconds, it took from the start until the TCP connect to the
 remote host (or proxy) was completed.
-.TP
-.B time_namelookup
+.It time_namelookup
 The time, in seconds, it took from the start until the name resolving was
 completed.
-.TP
-.B time_pretransfer
+.It time_pretransfer
 The time, in seconds, it took from the start until the file transfer was just
 about to begin. This includes all pre-transfer commands and negotiations that
 are specific to the particular protocol(s) involved.
-.TP
-.B time_redirect
+.It time_redirect
 The time, in seconds, it took for all redirection steps including name lookup,
 connect, pretransfer and transfer before the final transaction was
 started. time_redirect shows the complete execution time for multiple
 redirections. (Added in 7.12.3)
-.TP
-.B time_starttransfer
+.It time_starttransfer
 The time, in seconds, it took from the start until the first byte was just
 about to be transferred. This includes time_pretransfer and also the time the
 server needed to calculate the result.
-.TP
-.B time_total
+.It time_total
 The total time, in seconds, that the full operation lasted.
-.TP
-.B url_effective
+.It url_effective
 The URL that was fetched last. This is most meaningful if you've told curl
 to follow location: headers.
-.RE
-.It Fl
+.El
 If this option is used several times, the last one will be used.
 .It Fl -xattr
 When saving output to a file, this option tells curl to store certain file
@@ -3284,35 +3253,39 @@ Using an environment variable to set the proxy has the 
same effect as using
 the
 .Fl -proxy
 option.
-.Pp
-.IP "http_proxy [protocol://]<host>[:port]"
+.Bl -tag -width indent
+.It "http_proxy [protocol://]<host>[:port]"
 Sets the proxy server to use for HTTP.
-.IP "HTTPS_PROXY [protocol://]<host>[:port]"
+.It "HTTPS_PROXY [protocol://]<host>[:port]"
 Sets the proxy server to use for HTTPS.
-.IP "[url-protocol]_PROXY [protocol://]<host>[:port]"
+.It "[url-protocol]_PROXY [protocol://]<host>[:port]"
 Sets the proxy server to use for [url-protocol], where the protocol is a
 protocol that curl supports and as specified in a URL. FTP, FTPS, POP3, IMAP,
 SMTP, LDAP etc.
-.IP "ALL_PROXY [protocol://]<host>[:port]"
+.It "ALL_PROXY [protocol://]<host>[:port]"
 Sets the proxy server to use if no protocol-specific proxy is set.
-.IP "NO_PROXY <comma-separated list of hosts/domains>"
+.It "NO_PROXY <comma-separated list of hosts/domains>"
 list of host names that shouldn't go through any proxy. If set to an asterisk
 \&'*' only, it matches all hosts. Each name in this list is matched as either
 a domain name which contains the hostname, or the hostname itself.
-
+.El
+.Pp
 This environment variable disables use of the proxy even when specified with
-the \fI-x, --proxy\fP option. That is
-.B NO_PROXY=direct.example.com curl -x http://proxy.example.com
-.B http://direct.example.com
+the
+.Fl x , -proxy
+option. That is
+.Pp
+.Dl NO_PROXY=direct.example.com curl -x http://proxy.example.com  
http://direct.example.com
+.Pp
 accesses the target URL directly, and
-.B NO_PROXY=direct.example.com curl -x http://proxy.example.com
-.B http://somewhere.example.com
+.Pp
+.Dl NO_PROXY=direct.example.com curl -x http://proxy.example.com 
http://somewhere.example.com
+.Pp
 accesses the target URL through the proxy.
 .Pp
 The list of host names can also be include numerical IP addresses, and IPv6
 versions should then be given without enclosing brackets.
-.Pp
-.Sh PROXY PROTOCOL PREFIXES
+.Ss PROXY PROTOCOL PREFIXES
 Since curl version 7.21.7, the proxy string may be specified with a
 protocol:// prefix to specify alternative proxy protocols.
 .Pp
diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am
index f3cffc22a..2ed94e6fb 100644
--- a/docs/libcurl/opts/Makefile.am
+++ b/docs/libcurl/opts/Makefile.am
@@ -26,36 +26,8 @@ include Makefile.inc
 
 man_DISTMANS = $(man_MANS:.3=.3.dist)
 
-HTMLPAGES = $(man_MANS:.3=.html)
-
-PDFPAGES = $(man_MANS:.3=.pdf)
-
-CLEANFILES = $(HTMLPAGES) $(PDFPAGES) $(man_DISTMANS)
+CLEANFILES = $(man_DISTMANS)
 
 EXTRA_DIST = $(man_MANS) CMakeLists.txt
-MAN2HTML= roffit --mandir=. $< >$@
-
-SUFFIXES = .3 .html
-
-html: $(HTMLPAGES)
-
-.3.html:
-       $(MAN2HTML)
-
-pdf: $(PDFPAGES)
-
-.3.pdf:
-       @(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \
-       groff -Tps -man $< >$$foo.ps; \
-       ps2pdf $$foo.ps $@; \
-       rm $$foo.ps; \
-       echo "converted $< to $@")
 
-mancheck:
-       @cd $(top_srcdir)/docs/libcurl/opts && ls `awk -F, '!/OBSOLETE/ && /^  
CINIT/ { a=substr($$1, 9); print "CURLOPT_" a ".3"}' 
$(top_srcdir)/include/gnurl/curl.h`
-       rm -f in_temp
-       @(for a in $(man_MANS); do echo $$a >>in_temp; done)
-       sort in_temp > in_makefile
-       ls CURL*.3 > in_directory
-       -diff -u in_makefile in_directory
-       rm in_temp in_directory in_makefile
+SUFFIXES = .3
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c995e168..e2f757c4f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,8 +20,6 @@
 #
 ###########################################################################
 
-HTMLPAGES = testcurl.html runtests.html
-PDFPAGES = testcurl.pdf runtests.pdf
 MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
 # the path to the impacket python lib used for SMB tests
@@ -60,8 +58,6 @@ PERLFLAGS = -I$(srcdir)
 
 CLEANFILES = .http.pid .https.pid .ftp.pid .ftps.pid $(MANDISTPAGES)
 
-MAN2HTML= roffit $< >$@
-
 curl:
        @cd $(top_builddir) && $(MAKE)
 
@@ -104,16 +100,6 @@ torture-test: perlcheck all
 event-test: perlcheck all
        $(TEST) $(TEST_E) $(TFLAGS)
 
-.1.html:
-       $(MAN2HTML)
-
-.1.pdf:
-       @(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \
-       groff -Tps -man $< >$$foo.ps; \
-       ps2pdf $$foo.ps $@; \
-       rm $$foo.ps; \
-       echo "converted $< to $@")
-
 checksrc:
        cd libtest && $(MAKE) checksrc
        cd unit && $(MAKE) checksrc

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]