From 643994afcdbd4121c0d131a87052cdd17d40e54f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 25 Dec 2009 01:49:13 +0000 Subject: [PATCH] doc: update manpages since we got new features working_directory and Worker#user got added over time, so recommending Dir.chdir and Process::UID.change_privilege is bad. --- Documentation/unicorn.1.txt | 11 +++++------ Documentation/unicorn_rails.1.txt | 10 ++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Documentation/unicorn.1.txt b/Documentation/unicorn.1.txt index 70776904..e05a916b 100644 --- a/Documentation/unicorn.1.txt +++ b/Documentation/unicorn.1.txt @@ -13,8 +13,8 @@ unicorn [-c CONFIG_FILE] [-E RACK_ENV] [-D] [RACKUP_FILE] # DESCRIPTION A rackup(1)-like command to launch Rack applications using Unicorn. -It is expected to be started in your application root (APP_ROOT), but -"Dir.chdir" may also be executed in the CONFIG_FILE or RACKUP_FILE. +It is expected to be started in your application root (APP_ROOT), +but the "working_directory" directive may be used in the CONFIG_FILE. While Unicorn takes a myriad of command-line options for compatibility with ruby(1) and rackup(1), it is recommended to stick @@ -33,10 +33,9 @@ with rackup(1) but strongly discouraged. # UNICORN OPTIONS -c, \--config-file CONFIG_FILE : Path to the Unicorn-specific config file. The config file is - implemented as a Ruby DSL, so Ruby code may executed (e.g. - "Dir.chdir", "Process::UID.change_privilege"). See the RDoc/ri - for the *Unicorn::Configurator* class for the full list of - directives available from the DSL. + implemented as a Ruby DSL, so Ruby code may executed. + See the RDoc/ri for the *Unicorn::Configurator* class for the full + list of directives available from the DSL. -D, \--daemonize : Run daemonized in the background. The process is detached from diff --git a/Documentation/unicorn_rails.1.txt b/Documentation/unicorn_rails.1.txt index 5ffb4b47..d2d81903 100644 --- a/Documentation/unicorn_rails.1.txt +++ b/Documentation/unicorn_rails.1.txt @@ -14,8 +14,7 @@ unicorn_rails [-c CONFIG_FILE] [-E RAILS_ENV] [-D] [RACKUP_FILE] A rackup(1)-like command to launch Rails applications using Unicorn. It is expected to be started in your Rails application root (RAILS_ROOT), -but "Dir.chdir" may also be executed in the CONFIG_FILE or -optionally, RACKUP_FILE. +but the "working_directory" directive may be used in the CONFIG_FILE. The outward interface resembles rackup(1), the internals and default middleware loading is designed like the `script/server` command @@ -29,10 +28,9 @@ as much as possible. # UNICORN OPTIONS -c, \--config-file CONFIG_FILE : Path to the Unicorn-specific config file. The config file is - implemented as a Ruby DSL, so Ruby code may executed (e.g. - "Dir.chdir", "Process::UID.change_privilege"). See the RDoc/ri - for the *Unicorn::Configurator* class for the full list of - directives available from the DSL. + implemented as a Ruby DSL, so Ruby code may executed. + See the RDoc/ri for the *Unicorn::Configurator* class for the + full list of directives available from the DSL. -D, \--daemonize : Run daemonized in the background. The process is detached from -- 2.11.4.GIT