more documentation tweaks

mojolicious · Jan 18, 2014 · 80589f8 · 80589f8
1 parent acc842e
commit 80589f8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-4.68  2014-01-18
+4.68  2014-01-19
   - Removed deprecated http_proxy attribute from Mojo::UserAgent.
   - Removed deprecated https_proxy attribute from Mojo::UserAgent.
   - Removed deprecated name attribute from Mojo::UserAgent.

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -361,7 +361,7 @@ randomly to improve load balancing between multiple server processes.
   my $max = $loop->max_connections;
   $loop   = $loop->max_connections(1000);
 
-The maximum number of parallel connections this event loop is allowed to
+The maximum number of concurrent connections this event loop is allowed to
 handle before stopping to accept new incoming connections, defaults to
 C<1000>. Setting the value to C<0> will make this event loop stop accepting
 new connections and allow it to shut down gracefully without interrupting

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -433,7 +433,7 @@ TLS verification mode, defaults to C<0x03>.
   my $max = $daemon->max_clients;
   $daemon = $daemon->max_clients(1000);
 
-Maximum number of parallel client connections, defaults to C<1000>.
+Maximum number of concurrent client connections, defaults to C<1000>.
 
 =head2 max_requests
 

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -278,10 +278,11 @@ Listen backlog size, defaults to C<SOMAXCONN>.
 
   clients => 100
 
-Maximum number of parallel client connections per worker process, defaults to
-C<1000>. Note that depending on how many blocking operations your application
-may perform, you might want to decrease this value and increase L</"workers">
-instead for better performance.
+Maximum number of concurrent client connections per worker process, defaults
+to C<1000>. Note that high concurrency works best with applications that
+perform mostly non-blocking operations, to optimize for blocking operations
+you can decrease this value and increase L</"workers"> instead for better
+performance.
 
 =head2 graceful_timeout
 
@@ -386,8 +387,8 @@ Username for worker processes.
 
 Number of worker processes, defaults to C<4>. A good rule of thumb is two
 worker processes per CPU core for applications that perform mostly
-non-blocking operations, blocking operations often require more and profit
-from decreasing the number of concurrent L</"clients">.
+non-blocking operations, blocking operations often require more and benefit
+from decreasing the number of concurrent L</"clients"> (often as low as C<1>).
 
 =head1 METHODS
 

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -463,8 +463,9 @@ Full path of process id file, defaults to a random temporary path.
 
 Number of worker processes, defaults to C<4>. A good rule of thumb is two
 worker processes per CPU core for applications that perform mostly
-non-blocking operations, blocking operations often require more and profit
-from decreasing the number of concurrent L<Mojo::Server::Daemon/"clients">.
+non-blocking operations, blocking operations often require more and benefit
+from decreasing the number of concurrent L<Mojo::Server::Daemon/"clients">
+(often as low as C<1>).
 
 =head1 METHODS
 

diff --git a/lib/Mojolicious/Guides/Cookbook.pod b/lib/Mojolicious/Guides/Cookbook.pod
@@ -985,7 +985,7 @@ the entire previous chunk has actually been written.
 L<Mojo::UserAgent> has been designed from the ground up to be non-blocking,
 the whole blocking API is just a simple convenience wrapper. Especially for
 high latency tasks like web crawling this can be extremely useful, because you
-can keep many parallel connections active at the same time.
+can keep many concurrent connections active at the same time.
 
   use Mojo::UserAgent;
   use Mojo::IOLoop;