Merge pull request #279 from evanj/master

Fix --directory option: its actually --root
This commit is contained in:
David Dollar committed 2013-01-14 05:10:11 -08:00
commit faf7b3c40f
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "FOREMAN" "1" "October 2012" "Foreman 0.60.2" "Foreman Manual" .TH "FOREMAN" "1" "October 2012" "" ""
. .
.SH "NAME" .SH "NAME"
\fBforeman\fR \- manage Procfile\-based applications \fBforeman\fR \- manage Procfile\-based applications
@@ -90,7 +90,7 @@ Specify the user the application should be run as\. Defaults to the app name
These options control all modes of foreman\'s operation\. These options control all modes of foreman\'s operation\.
. .
.TP .TP
\fB\-d\fR, \fB\-\-directory\fR \fB\-d\fR, \fB\-\-root\fR
Specify an alternate application root\. This defaults to the directory containing the Procfile\. Specify an alternate application root\. This defaults to the directory containing the Procfile\.
. .
.TP .TP
+1 -1
View File
@@ -84,7 +84,7 @@ The following options control how the application is run:
These options control all modes of foreman's operation. These options control all modes of foreman's operation.
* `-d`, `--directory`: * `-d`, `--root`:
Specify an alternate application root. This defaults to the directory Specify an alternate application root. This defaults to the directory
containing the Procfile. containing the Procfile.