[SVN] r715 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/03-fix_docs.dpatch

[debian at incase.de]

Author: sven
Date: Sat Mar 17 21:03:04 2007
New Revision: 715

URL: https://mail.incase.de/viewcvs?rev=715&root=cyrus22&view=rev
Log:
Add a little more detail to the squatter manpage (Closes: #395063)

Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=715&root=cyrus22&r1=714&r2=715&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Sat Mar 17 21:03:04 2007
@@ -15,8 +15,9 @@
   * Add upstream patch to sort illegal dates before legal ones.
   * Add galician debconf translation (Closes: #412809)
   * Add portuguese debconf translation (Closes: #410964)
-
- -- Sven Mueller <sven at debian.org>  Tue,  6 Mar 2007 20:14:06 +0100
+  * Add a little more detail to the squatter manpage (Closes: #395063) 
+
+ -- Sven Mueller <sven at debian.org>  Sat, 17 Mar 2007 21:01:32 +0100
 
 cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
 

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch?rev=715&root=cyrus22&r1=714&r2=715&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch Sat Mar 17 21:03:04 2007
@@ -5,9 +5,9 @@
 ## DP: Fix FAQ and virtual domains installation docs
 
 @DPATCH@
-diff -urNad complete.dpatch/doc/faq.html /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html
---- complete.dpatch/doc/faq.html	2005-11-10 21:12:04.000000000 +0100
-+++ /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html	2005-11-10 21:12:05.457868786 +0100
+diff -urNad cyrus-imapd-2.2.13/doc/faq.html /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/faq.html
+--- cyrus-imapd-2.2.13/doc/faq.html	2007-02-27 05:01:09.000000000 +0100
++++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/faq.html	2007-03-17 20:49:20.580803890 +0100
 @@ -111,7 +111,7 @@
  </pre>
  
@@ -17,9 +17,9 @@
  
  </dd>
  
-diff -urNad complete.dpatch/doc/install-virtdomains.html /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html
---- complete.dpatch/doc/install-virtdomains.html	2005-11-10 21:12:04.000000000 +0100
-+++ /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html	2005-11-10 21:12:05.457868786 +0100
+diff -urNad cyrus-imapd-2.2.13/doc/install-virtdomains.html /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/install-virtdomains.html
+--- cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-02-27 05:01:09.000000000 +0100
++++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-03-17 20:49:20.581803792 +0100
 @@ -99,6 +99,10 @@
  to the <tt>defaultdomain</tt>.  See <a href=#admins>Administrators</a>
  below for further discussion.
@@ -31,10 +31,10 @@
  <p>Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
  options.</p>
  
-diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions
---- complete.dpatch/lib/imapoptions	2005-11-10 21:12:04.000000000 +0100
-+++ /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions	2005-11-10 21:13:13.246208162 +0100
-@@ -184,7 +184,11 @@
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:15.000000000 +0100
++++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:20.584803499 +0100
+@@ -187,7 +187,11 @@
     mailbox that does not have a parent mailbox. */
  
  { "defaultdomain", NULL, STRING }
@@ -47,7 +47,7 @@
  
  { "defaultpartition", "default", STRING }
  /* The partition name used by default for new mailboxes. */
-@@ -436,7 +440,10 @@
+@@ -440,7 +444,10 @@
  /* The list of remote realms whose users may authenticate using cross-realm
     authentication identifiers.  Seperate each realm name by a space.  (A
     cross-realm identity is considered any identity returned by SASL
@@ -59,3 +59,31 @@
  
  { "loginuseacl", 0, SWITCH }
  /* If enabled, any authentication identity which has \fBa\fR rights on a
+diff -urNad cyrus-imapd-2.2.13/man/squatter.8 /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/man/squatter.8
+--- cyrus-imapd-2.2.13/man/squatter.8	2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/man/squatter.8	2007-03-17 21:01:17.739413717 +0100
+@@ -83,6 +83,11 @@
+ .IR cyrus.conf (5)
+ .
+ .PP
++The
++.I mailbox
++argument can be omitted, which indexes all mailboxes. Otherwise it needs
++to be specified in the same format as used in cyradm.
++.PP
+ .B NOTE:
+ Messages and mailboxes that have not been indexed CAN still be
+ SEARCHed, just not as quickly as those with a SQUAT index.
+@@ -98,7 +103,11 @@
+ .TP
+ .B \-r
+ Recursively create indexes for all sub-mailboxes of the mailboxes or
+-mailbox prefixes given as arguments.
++mailbox prefixes given as arguments. If 
++.B \-r
++is specified, you must also specify at least one
++.I mailbox
++to recurse down from.
+ .TP
+ .B \-s
+ Skip mailboxes whose index file is older than their current squat file