Man page updates, pakager.py fixes, maybe SERVER-1968

* packager.py had a bug that left the man pages out of the .deb
  packages.

1 files changed, 41 insertions, 15 deletions

diff --git a/debian/mongoimport.1 b/debian/mongoimport.1
index 4b6c3de156b..689a5910b6a 100644
--- a/debian/mongoimport.1
+++ b/debian/mongoimport.1
@@ -1,4 +1,3 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
 .TH MONGOIMPORT "1" "January 2010" "10gen" "Mongo Database"
 .SH "NAME"
 mongoimport \- the Mongo import tool
@@ -12,30 +11,44 @@ is a tool to import a MongoDB collection from JSON, CSV, or TSV. The query can b
 .\".TP
 .\".B mongoimport -d test -c test1 --csv -f "name,num"
 .\"import documents from test.test1 in CSV format
-.SS "OPTIONS"
+.SH "OPTIONS"
 .TP
-\fB\-\-help\fR
+.B \-\-help
 show usage information
 .TP
+.B \-v, \-\-verbose
+be more verbose (include multiple times for more verbosity
+e.g. \-vvvvv)
+.TP
 .B \-h, \-\-host HOST
 server to connect to (default HOST=localhost)
 .TP
-.B \-d, \-\-db DATABASE
-database to use
+.B\-\-port arg
+server port. Can also use \-\-host hostname:port
 .TP
-.B \-c, \-\-c COLLECTION
-collection to use (some commands)
+.B \-\-ipv6
+enable IPv6 support (disabled by default)
+.TP
+.B \-u|\-\-username USERNAME
+specify user to log in as
+.TP
+.B \-p|\-\-password PASSWORD
+specify password of user
 .TP
 .B \-\-dbpath PATH
-directly access mongod data files in this path,
-instead of connecting to a mongod instance
+directly access mongod data files in this path, instead of connecting to a mongod instance
 .TP
-.B \-v, \-\-verbose
-be more verbose (include multiple times for more
-verbosity e.g. \fB\-vvvvv\fR)
+.B \-\-directoryperdb
+if dbpath specified, each db is in a separate directory
 .TP
-.B \-f, \-\-fields NAMES
-comma seperated list of field names e.g. \fB\-f\fR name,age
+.B \-d, \-\-db DATABASE
+database to use
+.TP
+.B \-c, \-\-c COLLECTION
+collection to use
+.TP
+.B \-f, \-\-fields FIELDS
+comma\-separated list of field names
 .TP
 .B \-\-fieldFile FILE
 file with fields names \- 1 per line
@@ -54,9 +67,22 @@ drop collection first
 .TP
 .B \-\-headerline
 CSV,TSV only \- use first line as headers
+.TP
+.B \-\-upsert
+insert or update objects that already exist
+.TP
+.B \-\-upsertFields ARG
+comma-separated fields for the query part of the upsert. You should
+make sure this is indexed
+.TP
+.B \-\-stopOnError
+stop importing at first error rather than continuing
+.TP
+.B \-\-jsonArray
+load a json array, not one item per line. Currently limited to 4MB.
 .SH "COPYRIGHT"
 .PP
-Copyright 2007\-2009 10gen
+Copyright 2007\-2011 10gen
 .SH "SEE ALSO"
 For more information, please refer to the MongoDB wiki, available at http://www.mongodb.org.
 .SH "AUTHOR"