2 files changed, 5 insertions, 4 deletions
diff --git a/hadori.1 b/hadori.1
index c1218b9..df947f2 100644
--- a/hadori.1
+++ b/hadori.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH HADORI "1" "November 2011" "hadori 0.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.5.
+.TH HADORI "1" "January 2012" "hadori 0.1" "User Commands"
 .SH NAME
 hadori \- hadori
 .SH DESCRIPTION
@@ -26,7 +26,8 @@ show which files get linked
 show files being examined
 .TP
 \fB\-s\fR [ \fB\-\-stdin\fR ]
-read arguments from stdin, one per line
+read arguments from stdin, one per line; you can't
+combine that with arguments on the commandline
 .TP
 \fB\-0\fR [ \fB\-\-null\fR ]
 implies \fB\-\-stdin\fR, but use null bytes as delimiter
diff --git a/hadori.C b/hadori.C
index 46ea864..376e2f0 100644
--- a/hadori.C
+++ b/hadori.C
@@ -173,7 +173,7 @@ int main (int const argc, char ** argv) {
 		("dry-run,n",	"don't change anything, implies --verbose")
 		("verbose,v",	"show which files get linked")
 		("debug,d",	"show files being examined")
-		("stdin,s",	"read arguments from stdin, one per line")
+		("stdin,s",	"read arguments from stdin, one per line; you can't combine that with arguments on the commandline")
 		("null,0",	"implies --stdin, but use null bytes as delimiter")
 		;
 	po::options_description all_opts;