Permalink
Browse files

Merge branch 'master' into tutorial

  • Loading branch information...
MiguelMadero committed Oct 3, 2012
2 parents c084efc + ecc606a commit f6dc0aad31282888a53dfb51c24282191a21d31e
View
@@ -32,7 +32,7 @@ usage = [
, 'Options:'
, ' --environment, -e Environment to use'
, ' --port, -p Port to connect to'
- , ' --workers, -w Number of worker processes to start(Default: 2)'
+ , ' --workers, -w Number of worker processes to start (default: 1)'
, ' --debug, -d Sets the log level to output debug messages to'
, ' the console'
, ' --jade, -j When generating views this will create Jade'
View
@@ -314,7 +314,8 @@ var App = function () {
reqUrl = reqUrl.replace(/\/{2,}/g, '/');
// Strip trailing slash for the purpose of looking for a matching
// route (will still check for directory + index on statics)
- reqUrl = reqUrl.replace(/\/$/, '');
+ // Don't strip if the entire path is just '/'
+ reqUrl = reqUrl.replace(/(.+)\/$/, '$1');
// Buffered request-obj -- buffer the request data,
// and pass this proxy object to the controller
View
@@ -180,7 +180,7 @@ <h4>Options:</h4>
<ul>
<li><code>--environment</code>, <code>-e</code>: Environment to use</li>
<li><code>--port</code>, <code>-p</code>: Port to connect server to</li>
- <li><code>--workers</code>, <code>-w</code>: Number of workers to use(Default: 2)</li>
+ <li><code>--workers</code>, <code>-w</code>: Number of workers to use (default: 1)</li>
<li><code>--debug</code>, <code>-d</code>: Sets the log level to output debug messages to console</li>
<li><code>--jade</code>, <code>-j</code>: When generating views, use Jade templates(Default: EJS)</li>
<li><code>--handle</code>, <code>-H</code>: When generating views, use Handlebars templates(Default: EJS)</li>
Oops, something went wrong.

0 comments on commit f6dc0aa

Please sign in to comment.