about summary refs log tree commit homepage
path: root/Documentation
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-09-18 14:06:57 -0700
committerEric Wong <normalperson@yhbt.net>2009-09-18 14:06:57 -0700
commit71d47a28731cd08b0b831d49ff022760726a6625 (patch)
tree19dd02e7e37b4e8c4ff652fe4e734f876838688b /Documentation
parent2b1b119f93cb19946b92496f56350140472b400b (diff)
downloadunicorn-71d47a28731cd08b0b831d49ff022760726a6625.tar.gz
The inline formatting for the CLI switch was too hard to
get right and was too long anyways.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/unicorn.1.txt45
1 files changed, 24 insertions, 21 deletions
diff --git a/Documentation/unicorn.1.txt b/Documentation/unicorn.1.txt
index 6dbedab..205912b 100644
--- a/Documentation/unicorn.1.txt
+++ b/Documentation/unicorn.1.txt
@@ -8,7 +8,7 @@ unicorn - a rackup-like command to launch the Unicorn HTTP server
 
 # SYNOPSIS
 
-unicorn [-c CONFIG_FILE] [-E ENVIRONMENT] [-D] [RACKUP_FILE]
+unicorn [-c CONFIG_FILE] [-E RACK_ENV] [-D] [RACKUP_FILE]
 
 # DESCRIPTION
 
@@ -47,26 +47,9 @@ with rackup(1) but strongly discouraged.
     Unless specified in the CONFIG_FILE, stderr and stdout will
     also be redirected to "/dev/null".
 
--E, \--env ENVIRONMENT
-:   Run under the given ENVIRONMENT.  Accepted values and the
-    middleware they automatically load (outside of RACKUP_FILE)
-    are exactly as those in rackup(1) and detailed below:
-
-      * development - loads Rack::CommonLogger,
-                      Rack::ShowExceptions, and
-                      Rack::Lint middleware
-      * deployment  - loads Rack::CommonLogger middleware
-      * none        - loads no middleware at all, relying
-                      entirely on RACKUP_FILE
-
-     All unrecognized values for ENVIRONMENT are assumed to be
-     "none".  Production deployments are strongly encouraged to use
-     "deployment" or "none" for maximum performance.
-
-     Note that the Rack::ContentLength and Rack::Chunked middlewares
-     are never loaded by default.  If needed, they should be
-     individually specified in the RACKUP_FILE, some frameworks do
-     not require them.
+-E, \--env RACK_ENV
+:   Run under the given RACK_ENV.  See the RACK ENVIRONMENT section
+    for more details.
 
 -l, \--listen ADDRESS
 :   Listens on a given ADDRESS.  ADDRESS may be in the form of
@@ -140,6 +123,26 @@ The following UNIX signals may be sent to the master process:
 See the [SIGNALS][4] document for full description of all signals
 used by Unicorn.
 
+#  RACK ENVIRONMENT
+
+Accepted values of RACK_ENV and the middleware they automatically load
+(outside of RACKUP_FILE) are exactly as those in rackup(1):
+
+* development - loads Rack::CommonLogger, Rack::ShowExceptions, and
+                Rack::Lint middleware
+* deployment  - loads Rack::CommonLogger middleware
+* none        - loads no middleware at all, relying
+                entirely on RACKUP_FILE
+
+All unrecognized values for RACK_ENV are assumed to be
+"none".  Production deployments are strongly encouraged to use
+"deployment" or "none" for maximum performance.
+
+Note that the Rack::ContentLength and Rack::Chunked middlewares
+are never loaded by default.  If needed, they should be
+individually specified in the RACKUP_FILE, some frameworks do
+not require them.
+
 # SEE ALSO
 
 * unicorn_rails(1)