[DRE-commits] [unicorn] 02/04: Refresh patch

Sat May 31 14:57:39 UTC 2014

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch master
in repository unicorn.

commit 8450212f6dabc4aa08b5cfd6dbcf75aedb7852cd
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Sat May 31 16:54:11 2014 +0300

    Refresh patch
---
 ...explicitly-use-escaped-minus-in-man-pages.patch | 103 ++++++++++-----------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch b/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
index 44237ca..2d3c032 100644
--- a/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
+++ b/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
@@ -20,16 +20,16 @@ index 2401be4..b4d22de 100644
  .SH DESCRIPTION
  .PP
  A rackup(1)-like command to launch Rack applications using Unicorn.
-@@ -26,7 +26,7 @@ Embedded command-line options are mostly parsed for compatibility
- with rackup(1) but strongly discouraged.
+@@ -25,7 +25,7 @@ Embedded command-line options are mostly parsed for compatibility
+ rackup(1) but strongly discouraged.
  .SH UNICORN OPTIONS
  .TP
 -.B -c, --config-file CONFIG_FILE
 +.B \-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.
-@@ -38,7 +38,7 @@ viewing ps(1) output.
+ The config file is implemented as a Ruby DSL, so Ruby code may executed.
+ See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
+@@ -36,7 +36,7 @@ viewing ps(1) output.
  .RS
  .RE
  .TP
@@ -37,8 +37,8 @@ index 2401be4..b4d22de 100644
 +.B \-D, \-\-daemonize
  Run daemonized in the background.
  The process is detached from the controlling terminal and stdin is
- redirected to \[lq]/dev/null\[rq].
-@@ -50,13 +50,13 @@ redirected to \[lq]/dev/null\[rq].
+ redirected to "/dev/null".
+@@ -47,7 +47,7 @@ redirected to \[lq]/dev/null\[rq].
  .RS
  .RE
  .TP
@@ -47,14 +47,12 @@ index 2401be4..b4d22de 100644
  Run under the given RACK_ENV.
  See the RACK ENVIRONMENT section for more details.
  .RS
- .RE
- .TP
 -.B -l, --listen ADDRESS
 +.B \-l, \-\-listen ADDRESS
  Listens on a given ADDRESS.
  ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken
  to mean a TCP socket and PATH is meant to be a path to a UNIX
-@@ -68,7 +68,7 @@ socket options.
+@@ -64,7 +64,7 @@ socket options.
  .RS
  .RE
  .TP
@@ -147,24 +145,24 @@ index a593acb..c644d03 100644
 --- a/man/man1/unicorn_rails.1
 +++ b/man/man1/unicorn_rails.1
 @@ -5,7 +5,7 @@ unicorn_rails - a script/server-like command to launch the Unicorn
- HTTP server
+ server
  .SH SYNOPSIS
  .PP
 -unicorn_rails [-c CONFIG_FILE] [-E RAILS_ENV] [-D] [RACKUP_FILE]
 +unicorn_rails [\-c CONFIG_FILE] [\-E RAILS_ENV] [\-D] [RACKUP_FILE]
  .SH DESCRIPTION
  .PP
- A rackup(1)-like command to launch Rails applications using
-@@ -31,7 +31,7 @@ stick to the few command-line options specified in the SYNOPSIS and
- use the CONFIG_FILE as much as possible.
+ A rackup(1)-like command to launch Rails applications using Unicorn.
+@@ -30,7 +30,7 @@ stick to the few command-line options specified in the SYNOPSIS and
+ as much as possible.
  .SH UNICORN OPTIONS
  .TP
 -.B -c, --config-file CONFIG_FILE
 +.B \-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.
-@@ -43,7 +43,7 @@ viewing ps(1) output.
+ The config file is implemented as a Ruby DSL, so Ruby code may executed.
+ See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
+@@ -41,7 +41,7 @@ viewing ps(1) output.
  .RS
  .RE
  .TP
@@ -172,8 +170,8 @@ index a593acb..c644d03 100644
 +.B \-D, \-\-daemonize
  Run daemonized in the background.
  The process is detached from the controlling terminal and stdin is
- redirected to \[lq]/dev/null\[rq].
-@@ -61,7 +61,7 @@ override this Unicorn config file.
+ redirected to "/dev/null".
+@@ -58,7 +58,7 @@ override this Unicorn config file.
  .RS
  .RE
  .TP
@@ -182,58 +180,55 @@ index a593acb..c644d03 100644
  Run under the given RAILS_ENV.
  This sets the RAILS_ENV environment variable.
  Acceptable values are exactly those you expect in your Rails
-@@ -70,7 +70,7 @@ application, typically \[lq]development\[rq] or
+@@ -66,7 +66,7 @@ application, typically \[lq]development\[rq] or
  .RS
  .RE
  .TP
 -.B -l, --listen ADDRESS
 +.B \-l, \-\-listen ADDRESS
  Listens on a given ADDRESS.
- ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken
- to mean a TCP socket and PATH is meant to be a path to a UNIX
-@@ -84,28 +84,28 @@ socket options.
+ ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken to
+ mean a TCP socket and PATH is meant to be a path to a UNIX domain
+@@ -78,26 +78,26 @@ socket options.
  .RE
  .SH RACKUP COMPATIBILITY OPTIONS
  .TP
 -.B -o, --host HOST
 +.B \-o, \-\-host HOST
- Listen on a TCP socket belonging to HOST, default is
- \[lq]0.0.0.0\[rq] (all addresses).
- If specified multiple times on the command-line, only the
- last-specified value takes effect.
- This option only exists for compatibility with the rackup(1)
--command, use of \[lq]-l\[rq]/\[lq]--listen\[rq] switch is
-+command, use of \[lq]\-l\[rq]/\[lq]\-\-listen\[rq] switch is
- recommended instead.
+ Listen on a TCP socket belonging to HOST, default is "0.0.0.0" (all
+ addresses).
+ If specified multiple times on the command-line, only the last-specified
+ value takes effect.
+ This option only exists for compatibility with the rackup(1) command,
+-use of "-l"/"--listen" switch is recommended instead.
++use of "\-l"/"\-\-listen" switch is recommended instead.
  .RS
  .RE
  .TP
 -.B -p, --port PORT
 +.B \-p, \-\-port PORT
  Listen on the specified TCP PORT, default is 8080.
- If specified multiple times on the command-line, only the
- last-specified value takes effect.
- This option only exists for compatibility with the rackup(1)
--command, use of \[lq]-l\[rq]/\[lq]--listen\[rq] switch is
-+command, use of \[lq]\-l\[rq]/\[lq]\-\-listen\[rq] switch is
- recommended instead.
+ If specified multiple times on the command-line, only the last-specified
+ value takes effect.
+ This option only exists for compatibility with the rackup(1) command,
+-use of "-l"/"--listen" switch is recommended instead.
++use of "\-l"/"\-\-listen" switch is recommended instead.
  .RS
  .RE
  .TP
 -.B --path PATH
 +.B \-\-path PATH
- Mounts the Rails application at the given PATH (instead of
- \[lq]/\[rq]).
- This is equivalent to setting the RAILS_RELATIVE_URL_ROOT
-@@ -115,26 +115,26 @@ This is only supported under Rails 2.3 or later at the moment.
+ Mounts the Rails application at the given PATH (instead of "/").
+ This is equivalent to setting the RAILS_RELATIVE_URL_ROOT environment
+ variable.
+@@ -106,25 +106,25 @@ This is only supported under Rails 2.3 or later at the moment.
  .RE
  .SH RUBY OPTIONS
  .TP
 -.B -e, --eval LINE
 +.B \-e, \-\-eval LINE
  Evaluate a LINE of Ruby code.
- This evaluation happens immediately as the command-line is being
- parsed.
+ This evaluation happens immediately as the command-line is being parsed.
  .RS
  .RE
  .TP
@@ -255,24 +250,24 @@ index a593acb..c644d03 100644
 +.B \-I, \-\-include PATH
  specify $LOAD_PATH.
  PATH will be prepended to $LOAD_PATH.
- The \[aq]:\[aq] character may be used to delimit multiple
-@@ -145,7 +145,7 @@ they were specified on the command-line.
+ The \[aq]:\[aq] character may be used to delimit multiple directories.
+@@ -134,7 +134,7 @@ they were specified on the command-line.
  .RS
  .RE
  .TP
 -.B -r, --require LIBRARY
 +.B \-r, \-\-require LIBRARY
  require a specified LIBRARY before executing the application.
- The "require" statement will be executed immediately and in the
- order they were specified on the command-line.
-@@ -164,8 +164,8 @@ Embedded command-line options are mostly parsed for compatibility
- with rackup(1) but strongly discouraged.
+ The "require" statement will be executed immediately and in the order
+ they were specified on the command-line.
+@@ -153,8 +153,8 @@ Embedded command-line options are mostly parsed for compatibility
+ rackup(1) but strongly discouraged.
  .SH ENVIRONMENT VARIABLES
  .PP
 -The RAILS_ENV variable is set by the aforementioned -E switch.
--The RAILS_RELATIVE_URL_ROOT is set by the aforementioned --path
+-The RAILS_RELATIVE_URL_ROOT is set by the aforementioned --path switch.
 +The RAILS_ENV variable is set by the aforementioned \-E switch.
-+The RAILS_RELATIVE_URL_ROOT is set by the aforementioned \-\-path
- switch.
- Either of these variables may also be set in the shell or the
- Unicorn CONFIG_FILE.
++The RAILS_RELATIVE_URL_ROOT is set by the aforementioned \-\-path switch.
+ Either of these variables may also be set in the shell or the Unicorn
+ CONFIG_FILE.
+ All application or library-specific environment variables (e.g.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/unicorn.git

