Reword package descriptions

6 files changed, 34 insertions, 26 deletions

diff --git a/changelog b/changelog
index c1dc889..9a0495c 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ curl (7.74.0-1) trunk
   * Update maintainer and homepage.
   * libcurl.4-dev: Remove static library.
   * Organize packages into sections.
+  * Reword package descriptions.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sat, 26 Dec 2020 21:01:49 -0500
 
diff --git a/curl-doc.pkg/control b/curl-doc.pkg/control
index ee1075c..e107171 100644
--- a/curl-doc.pkg/control
+++ b/curl-doc.pkg/control
@@ -2,12 +2,7 @@ Architecture: all
 Platform: all
 Section: doc
 Depends: libcurl.4 (>= ${Source-Version})
-Description: Documentation for the curl command line tool and library
- curl is a command line tool and library for transferring data with URL syntax,
- supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP,
- LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP.  curl
- supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based
- upload, proxies, HTTP/2, cookies, user+password authentication (Basic, Digest,
- NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and more.
+Description: curl command-line tool and library - documentation
+ ${Both-Description}
  .
- This package provides documentation for the curl command line tool and library.
+ This package provides documentation for the curl command-line tool and library.
diff --git a/curl.pkg/control b/curl.pkg/control
index 82303b1..281c6ec 100644
--- a/curl.pkg/control
+++ b/curl.pkg/control
@@ -2,10 +2,5 @@ Architecture: any
 Platform: all
 Section: util
 Depends: libcurl.4 (= ${Binary-Version}), libz.1
-Description: Command line tool for transferring data with URL syntax
- curl is a command line tool for transferring data with URL syntax, supporting
- DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3,
- POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP.  curl supports SSL
- certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
- proxies, HTTP/2, cookies, user+password authentication (Basic, Digest, NTLM,
- Negotiate, kerberos...), file transfer resume, proxy tunneling and more.
+Description: Command-line tool for transferring data with URL syntax
+ ${Curl-Description}
diff --git a/libcurl.4-dev.pkg/control b/libcurl.4-dev.pkg/control
index 8058936..0008f37 100644
--- a/libcurl.4-dev.pkg/control
+++ b/libcurl.4-dev.pkg/control
@@ -2,8 +2,8 @@ Architecture: any
 Platform: all
 Section: libdev
 Depends: libcurl.4 (= ${Binary-Version})
-Description: Multiprotocol file transfer library - development files
+Description: Client-side URL transfer library - development files
  ${Libcurl-Description}
  .
- This package provides development files for the libcurl multiprotocol file
+ This package provides development files for the libcurl client-side URL
  transfer library.
diff --git a/libcurl.4.pkg/control b/libcurl.4.pkg/control
index 9a1183e..d84f4f5 100644
--- a/libcurl.4.pkg/control
+++ b/libcurl.4.pkg/control
@@ -2,5 +2,5 @@ Architecture: any
 Platform: all
 Section: lib
 Depends: libz.1
-Description: Multiprotocol file transfer library
+Description: Client-side URL transfer library
  ${Libcurl-Description}
diff --git a/substvars b/substvars
index 4d12035..31024c4 100644
--- a/substvars
+++ b/substvars
@@ -1,11 +1,28 @@
 Libcurl-Description:
  libcurl is a free and easy-to-use client-side URL transfer library, supporting
- DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3,
- POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP.  libcurl supports
- SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
- proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
- Kerberos), file transfer resume, http proxy tunneling and more!
+ DICT, FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS,
+ TELNET, and TFTP.  libcurl supports SSL certificates, HTTP POST, HTTP PUT, FTP
+ uploading, HTTP form based upload, proxies, HTTP/2, HTTP/3, cookies,
+ user+password authentication (Basic, Digest, NTLM, Negotiate, and Kerberos),
+ file transfer resume, HTTP proxy tunneling, and more!
+Curl-Description:
+ curl is a command-line tool for getting or sending files using URL syntax,
+ supporting DICT, FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS,
+ LDAP, LDAPS, MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP,
+ SMTPS, TELNET, and TFTP.  libcurl supports SSL certificates, HTTP POST, HTTP
+ PUT, FTP uploading, HTTP form based upload, proxies, HTTP/2, HTTP/3, cookies,
+ user+password authentication (Basic, Digest, NTLM, Negotiate, and Kerberos),
+ file transfer resume, HTTP proxy tunneling, and more!
+Both-Description:
+ libcurl is a free and easy-to-use client-side URL transfer library, supporting
+ DICT, FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS,
+ TELNET, and TFTP.  libcurl supports SSL certificates, HTTP POST, HTTP PUT, FTP
+ uploading, HTTP form based upload, proxies, HTTP/2, HTTP/3, cookies,
+ user+password authentication (Basic, Digest, NTLM, Negotiate, and Kerberos),
+ file transfer resume, HTTP proxy tunneling, and more!
  .
- libcurl is free, thread-safe, IPv6 compatible, feature rich, well supported,
- fast, thoroughly documented and is already used by many known, big and
- successful companies and numerous applications.
+ curl is a command-line tool for getting or sending files using URL syntax.
+ Since curl uses libcurl, curl supports the same wide range of common Internet
+ protocols that libcurl does.