[DRE-commits] [SCM] unicorn.git branch, master, updated. debian/4.3.1-3-13-g1c84890

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 1c8489005b0dd04f4fca50ac1b63832feb7c83fc
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sat Mar 16 13:47:36 2013 +0300

    update patch for --no-default-middleware

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 7ba58d2..c015bde 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
@@ -54,7 +54,16 @@ index 0b496af..749272a 100644
  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
-@@ -69,51 +69,51 @@ socket options.
+@@ -68,7 +68,7 @@ socket options.
+ .RS
+ .RE
+ .TP
+-.B -N, --no-default-middleware
++.B \-N, \-\-no\-default\-middleware
+ Disables loading middleware implied by RACK_ENV.
+ This bypasses the configuration documented in the RACK ENVIRONMENT
+ section, but still allows RACK_ENV to be used for
+@@ -77,51 +77,51 @@ application/framework-specific purposes.
  .RE
  .SH RACKUP COMPATIBILITY OPTIONS
  .TP
@@ -115,7 +124,7 @@ index 0b496af..749272a 100644
  specify $LOAD_PATH.
  PATH will be prepended to $LOAD_PATH.
  The \[aq]:\[aq] character may be used to delimit multiple
-@@ -124,7 +124,7 @@ they were specified on the command-line.
+@@ -132,7 +132,7 @@ they were specified on the command-line.
  .RS
  .RE
  .TP

-- 
unicorn.git