documentation tweaks

mojolicious · Jan 16, 2013 · a5d572b · a5d572b
1 parent 86d51fd
commit a5d572b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 40 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-3.81  2013-01-16
+3.81  2013-01-17
   - Added modules Mojo::Server::Prefork and Mojolicious::Command::prefork.
   - Updated jQuery to version 1.9.
   - Improved documentation.

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -81,12 +81,10 @@ sub _config {
   my $prefork = $self->{prefork};
   $prefork->pid_file($c->{pid_file}
       || catfile(dirname($ENV{HYPNOTOAD_APP}), 'hypnotoad.pid'));
-  my @settings = (
-    qw(accept_interval accepts backlog graceful_timeout group),
+  defined $c->{$_} and $prefork->$_($c->{$_})
+    for qw(accept_interval accepts backlog graceful_timeout group),
     qw(heartbeat_interval heartbeat_timeout inactivity_timeout lock_file),
-    qw(lock_timeout multi_accept user workers)
-  );
-  defined $c->{$_} and $prefork->$_($c->{$_}) for @settings;
+    qw(lock_timeout multi_accept user workers);
   $prefork->max_clients($c->{clients}) if $c->{clients};
   $prefork->max_requests($c->{keep_alive_requests})
     if $c->{keep_alive_requests};

diff --git a/lib/Mojolicious/Command/daemon.pm b/lib/Mojolicious/Command/daemon.pm
@@ -9,21 +9,20 @@ has usage       => <<"EOF";
 usage: $0 daemon [OPTIONS]
 
 These options are available:
-  -b, --backlog <size>         Set listen backlog size, defaults to
-                               SOMAXCONN.
-  -c, --clients <number>       Set maximum number of concurrent clients,
-                               defaults to 1000.
-  -g, --group <name>           Set group name for process.
-  -i, --inactivity <seconds>   Set inactivity timeout, defaults to the value
-                               of MOJO_INACTIVITY_TIMEOUT or 15.
-  -l, --listen <location>      Set one or more locations you want to listen
-                               on, defaults to the value of MOJO_LISTEN or
+  -b, --backlog <size>         Listen backlog size, defaults to SOMAXCONN.
+  -c, --clients <number>       Maximum number of concurrent clients, defaults
+                               to 1000.
+  -g, --group <name>           Group name for process.
+  -i, --inactivity <seconds>   Inactivity timeout, defaults to the value of
+                               MOJO_INACTIVITY_TIMEOUT or 15.
+  -l, --listen <location>      One or more locations you want to listen on,
+                               defaults to the value of MOJO_LISTEN or
                                "http://*:3000".
   -p, --proxy                  Activate reverse proxy support, defaults to
                                the value of MOJO_REVERSE_PROXY.
-  -r, --requests <number>      Set maximum number of requests per keep-alive
+  -r, --requests <number>      Maximum number of requests per keep-alive
                                connection, defaults to 25.
-  -u, --user <name>            Set username for process.
+  -u, --user <name>            Username for process.
 EOF
 
 sub run {

diff --git a/lib/Mojolicious/Command/prefork.pm b/lib/Mojolicious/Command/prefork.pm
@@ -10,37 +10,36 @@ has usage => <<"EOF";
 usage: $0 prefork [OPTIONS]
 
 These options are available:
-  -A, --accepts <number>               Set number of connections for workers
-                                       to accept, defaults to 1000.
-  -a, --accept-interval <seconds>      Set accept interval, defaults to 0.025.
-  -b, --backlog <size>                 Set listen backlog size, defaults to
+  -A, --accepts <number>               Number of connections for workers to
+                                       accept, defaults to 1000.
+  -a, --accept-interval <seconds>      Accept interval, defaults to 0.025.
+  -b, --backlog <size>                 Listen backlog size, defaults to
                                        SOMAXCONN.
-  -c, --clients <number>               Set maximum number of concurrent
-                                       clients, defaults to 1000.
-  -G, --graceful-timeout <seconds>     Set graceful timeout, defaults to 20.
-  -g, --group <name>                   Set group name for process.
-      --heartbeat-interval <seconds>   Set heartbeat interval, defaults to 5.
-  -H, --heartbeat-timeout <seconds>    Set heartbeat timeout, defaults to 20.
-  -i, --inactivity <seconds>           Set inactivity timeout, defaults to the
+  -c, --clients <number>               Maximum number of concurrent clients,
+                                       defaults to 1000.
+  -G, --graceful-timeout <seconds>     Graceful timeout, defaults to 20.
+  -g, --group <name>                   Group name for process.
+      --heartbeat-interval <seconds>   Heartbeat interval, defaults to 5.
+  -H, --heartbeat-timeout <seconds>    Heartbeat timeout, defaults to 20.
+  -i, --inactivity <seconds>           Inactivity timeout, defaults to the
                                        value of MOJO_INACTIVITY_TIMEOUT or 15.
-      --lock-file <path>               Set path to lock file, defaults to a
-                                       random file.
-  -L, --lock-timeout <seconds>         Set lock timeout, defaults to 0.5.
-  -l, --listen <location>              Set one or more locations you want to
+      --lock-file <path>               Path to lock file, defaults to a random
+                                       file.
+  -L, --lock-timeout <seconds>         Lock timeout, defaults to 0.5.
+  -l, --listen <location>              One or more locations you want to
                                        listen on, defaults to the value of
                                        MOJO_LISTEN or "http://*:3000".
-      --multi-accept <number>          Set number of connection to accept at
-                                       once, defaults to 50.
-  -P, --pid-file <path>                Set path to process id file, defaults
-                                       to a random file.
+      --multi-accept <number>          Number of connection to accept at once,
+                                       defaults to 50.
+  -P, --pid-file <path>                Path to process id file, defaults to a
+                                       random file.
   -p, --proxy                          Activate reverse proxy support,
                                        defaults to the value of
                                        MOJO_REVERSE_PROXY.
-  -r, --requests <number>              Set maximum number of requests per
+  -r, --requests <number>              Maximum number of requests per
                                        keep-alive connection, defaults to 25.
-  -u, --user <name>                    Set username for process.
-  -w, --workers <number>               Set number of worker processes,
-                                       defaults to 4.
+  -u, --user <name>                    Username for process.
+  -w, --workers <number>               Number of workers, defaults to 4.
 EOF
 
 sub run {