Hi Noèl,

Please find attached a patch that brings the man page of mb2md up to date 
again with the actual shipped program. It closes four bugs in the BTS, I hope 
you can upload it.

I'll happily upload it for you if you wish, just let me know.

cheers,
Thijs
diff -u mb2md-3.20/mb2md.1 mb2md-3.20/mb2md.1
--- mb2md-3.20/mb2md.1
+++ mb2md-3.20/mb2md.1
@@ -3,21 +3,27 @@
 mb2md \(em Converts Mbox mailboxes to Maildir format. 
 .SH "SYNOPSIS" 
 .PP 
-\fBmb2md\fR [\fB-h\fP]  
+\fBmb2md\fR [\-h]  
 .PP 
-\fBmb2md\fR [\fB-m\fP]  [\fB-d \fIdestdir\fR\fP]  
+\fBmb2md\fR [\fB-c\fP]  [\-m]  [\fB-d \fIdestdir\fR\fP]  
 .PP 
-\fBmb2md\fR [\-s \fIsourcedir\fR \fB-R|\-f \fIsomefolder\fR\fP \fB-d \fIdestdir\fR\fP \fB-r \fIstrip_extension\fR\fP]  
-.SH "DESCRIPTION" 
+\fBmb2md\fR [\fB-c\fP]  [\-s \fIsourcefile\fR]  [\fB-d \fIdestdir\fR\fP]  
 .PP 
-This manual page documents briefly the 
-\fBmb2md\fR. 
+\fBmb2md\fR [\fB-c\fP]  [\-s \fIsourcedir\fR]  [\fB-l \fIwu-mailboxlist\fR\fP]  [\fB-R|\-f \fIsomefolder\fR\fP]  [\fB-d \fIdestdir\fR\fP]  [\fB-r \fIstrip_extension\fR\fP]  
+.SH "DESCRIPTION" 
 .PP 
 \fBmb2md\fR  
 Converts Mbox mailboxes to Maildir format. 
 .SH "OPTIONS" 
 .IP "\fB-h\fP         " 10 
 Show summary of options. 
+.IP "\fB-c\fP         " 10 
+Use the Content-Length: headers (if present) to find the 
+beginning of the next message. 
+Use with caution! Results may be unreliable. I recommend to do 
+a run without "\-c" first and only use it if you are certain, 
+that the mbox in question really needs the "\-c" option. 
+ 
 .IP "\fB-m\fP         " 10 
 If this is used then the source will 
 be the single mailbox at /var/spool/mail/blah for 
@@ -74,6 +80,19 @@
 the corresponding maildir. The extension must be 
 given without the leading dot ("."). See the example below. 
  
+.IP "\fB-l\fP \fIWU-file\fR         " 10 
+File containing the list of subscribed folders.  If 
+migrating from WU-IMAP the list of subscribed folders will 
+be found in the file called .mailboxlist in the users 
+home directory.  This will convert all subscribed folders 
+for a single user: 
+.IP "" 10 
+/bin/mb2md \-s mail \-l .mailboxlist \-R \-d Maildir 
+.IP "" 10 
+and for all users in a directory as root you can do the following: 
+.IP "" 10 
+for i in *; do echo $i;su \- $i \-c "/bin/mb2md \-s mail \-l .mailboxlist \-R \-d Maildir";done 
+ 
 .SH "USAGE" 
 .PP 
 Please read the USAGE documentation 
@@ -90 +109 @@
-.\" created by instant / docbook-to-man, Mon 18 Jun 2007, 15:35 
+.\" created by instant / docbook-to-man, Wed 12 Mar 2008, 20:20 
diff -u mb2md-3.20/debian/mb2md.sgml mb2md-3.20/debian/mb2md.sgml
--- mb2md-3.20/debian/mb2md.sgml
+++ mb2md-3.20/debian/mb2md.sgml
@@ -63,26 +63,27 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
-      <arg><option>-h</option></arg>
+      <arg>-h</arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&dhpackage;</command>
-      <arg><option>-m</option></arg> <arg><option>-d <replaceable>destdir</replaceable></option></arg>
+      <arg><option>-c</option></arg> <arg>-m</arg> <arg><option>-d <replaceable>destdir</replaceable></option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&dhpackage;</command>
-      <arg>-s <replaceable>sourcedir</replaceable> <option>-R|-f <replaceable>somefolder</replaceable></option> <option>-d <replaceable>destdir</replaceable></option> <option>-r <replaceable>strip_extension</replaceable></option></arg>
+      <arg><option>-c</option></arg> <arg>-s <replaceable>sourcefile</replaceable></arg> <arg><option>-d <replaceable>destdir</replaceable></option></arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <arg><option>-c</option></arg> <arg>-s <replaceable>sourcedir</replaceable></arg> <arg><option>-l <replaceable>wu-mailboxlist</replaceable></option></arg> <arg><option>-R|-f <replaceable>somefolder</replaceable></option></arg> <arg><option>-d <replaceable>destdir</replaceable></option></arg> <arg><option>-r <replaceable>strip_extension</replaceable></option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
                                                                                                 
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command>.</para>
- 
     <para><command>&dhpackage;</command> 
     Converts Mbox mailboxes to Maildir format.</para>
-                                                                                                
+
   </refsect1>
   <refsect1>
     <title>OPTIONS</title>
@@ -96,6 +97,18 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>-c</option>
+        </term>
+        <listitem>
+          <para>Use the Content-Length: headers (if present) to find the
+		beginning of the next message.
+		Use with caution! Results may be unreliable. I recommend to do
+		a run without "-c" first and only use it if you are certain,
+		that the mbox in question really needs the "-c" option.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>-m</option>
         </term>
         <listitem>
@@ -142,7 +155,7 @@
           <para>
                 The "somefolder" directory
                 name will be encoded into the new mailboxes' names.
-                See the examples below.</para>
+                See the example in the USAGE file (see below).</para>
           <para>
                 This does not save an UW IMAP dummy message file
                 at the start of the Mbox file.  Small changes
@@ -152,7 +165,7 @@
                 Don't let the source directory you give as "somefolders"
                 contain any "."s in its name, unless you want to
                 create subfolders from the IMAP user's point of
-                view.  See the example below.</para>
+                view. See the example in the USAGE file (see below).</para>
           <para>
                 Incompatible with '-R' </para>
         </listitem>
@@ -180,7 +193,26 @@
                 If defined this extension will be stripped from
                 the original mailbox file name before creating
                 the corresponding maildir. The extension must be
-                given without the leading dot ("."). See the example below.
+                given without the leading dot (".").
+		See the example in the USAGE file (see below).
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-l</option> <replaceable>WU-file</replaceable>
+        </term>
+        <listitem>
+          <para>File containing the list of subscribed folders.  If
+		migrating from WU-IMAP the list of subscribed folders will
+		be found in the file called .mailboxlist in the users
+		home directory.  This will convert all subscribed folders
+		for a single user:</para>
+	  <para>/bin/mb2md -s mail -l .mailboxlist -R -d Maildir</para>
+
+	  <para>and for all users in a directory as root you can do the following:</para>
+
+	  <para>
+                for i in *; do echo $i;su - $i -c "/bin/mb2md -s mail -l .mailboxlist -R -d Maildir";done
           </para>
         </listitem>
       </varlistentry>
diff -u mb2md-3.20/debian/changelog mb2md-3.20/debian/changelog
--- mb2md-3.20/debian/changelog
+++ mb2md-3.20/debian/changelog
@@ -1,3 +1,10 @@
+mb2md (3.20-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update documentation (closes: #438891, #438893, #438896, #438898)
+
+ -- Thijs Kinkhorst <[EMAIL PROTECTED]>  Wed, 12 Mar 2008 20:16:26 +0100
+
 mb2md (3.20-3) unstable; urgency=low
 
   * updated Standards-Version
diff -u mb2md-3.20/USAGE mb2md-3.20/USAGE
--- mb2md-3.20/USAGE
+++ mb2md-3.20/USAGE
@@ -57,7 +57,7 @@
 #                create subfolders from the IMAP user's point of
 #                view.  See the example below.
 #
-#                Incompatible with '-f'
+#                Incompatible with '-R'
 #
 #
 #  -d destdir    Directory where the Maildir format directories will be created.

Reply via email to