list proxy support as one feature

mojolicious · Jul 31, 2014 · 4ddf646 · 4ddf646
1 parent b9c6a56
commit 4ddf646
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@
     magic and no requirements besides Perl 5.10.1 (although 5.18+ is
     recommended, and optional CPAN modules will be used to provide advanced
     functionality if they are installed).
-  * Full stack HTTP and WebSocket client/server implementation with IPv6,
-    SOCKS5, TLS, SNI, IDNA, Comet (long polling), keep-alive, connection
-    pooling, timeout, cookie, multipart, proxy, and gzip compression support.
+  * Full stack HTTP and WebSocket client/server implementation with IPv6, TLS,
+    SNI, IDNA, Comet (long polling), HTTP/SOCKS5 proxy, keep-alive, connection
+    pooling, timeout, cookie, multipart, and gzip compression support.
   * Built-in non-blocking I/O web server, supporting multiple event loops as
     well as optional preforking and hot deployment, perfect for embedding.
   * Automatic CGI and [PSGI](http://plackperl.org) detection.

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -435,9 +435,9 @@ Mojo::UserAgent - Non-blocking I/O HTTP and WebSocket user agent
 =head1 DESCRIPTION
 
 L<Mojo::UserAgent> is a full featured non-blocking I/O HTTP and WebSocket user
-agent, with IPv6, SOCKS5, TLS, SNI, IDNA, Comet (long polling), keep-alive,
-connection pooling, timeout, cookie, multipart, proxy, gzip compression and
-multiple event loop support.
+agent, with IPv6, TLS, SNI, IDNA, Comet (long polling), HTTP/SOCKS5 proxy,
+keep-alive, connection pooling, timeout, cookie, multipart, gzip compression
+and multiple event loop support.
 
 All connections will be reset automatically if a new process has been forked,
 this allows multiple processes to share the same L<Mojo::UserAgent> object