/offlineimap/head: changeset 327

Bumped version number to 3.99.6

diff --git a/offlineimap/head/ChangeLog b/offlineimap/head/ChangeLog
index 09deb1582b7317d8bd5646541bf9ba1e67d5279f..df6e2b4fe6f53125f1b137dcc0bcf7dff4439919 100644 (file)
--- a/offlineimap/head/ChangeLog
+++ b/offlineimap/head/ChangeLog
@@ -1,3 +1,376 @@
+------------------------------------------------------------------------
+rev 326:  jgoerzen | 2003-01-06 15:30:37 -0600 (Mon, 06 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap.conf
+   A /offlineimap/head/offlineimap.conf.minimal
+
+Added minimal config file; noted this in changelog
+
+------------------------------------------------------------------------
+rev 325:  jgoerzen | 2003-01-06 15:15:22 -0600 (Mon, 06 Jan 2003) | 4 lines
+Changed paths:
+   M /offlineimap/head/debian/copyright
+   M /offlineimap/head/offlineimap/CustomConfig.py
+   M /offlineimap/head/offlineimap/accounts.py
+   M /offlineimap/head/offlineimap/imapserver.py
+   M /offlineimap/head/offlineimap/init.py
+   M /offlineimap/head/offlineimap/mbnames.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/Tk.py
+   M /offlineimap/head/offlineimap/ui/detector.py
+   M /offlineimap/head/offlineimap.conf
+
+Touched up the isactive tests.
+
+Added defaults for many more options.
+
+------------------------------------------------------------------------
+rev 324:  jgoerzen | 2003-01-06 14:37:19 -0600 (Mon, 06 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/debian/control
+   M /offlineimap/head/manual.html
+   M /offlineimap/head/manual.pdf
+   M /offlineimap/head/manual.ps
+   M /offlineimap/head/manual.txt
+   M /offlineimap/head/offlineimap.1
+   M /offlineimap/head/offlineimap.conf
+
+Updated documentation and information with information about new settings
+
+------------------------------------------------------------------------
+rev 323:  jgoerzen | 2003-01-06 14:21:46 -0600 (Mon, 06 Jan 2003) | 8 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/TTY.py
+
+Due to possibly having one account sleep while another is reading a
+password, and other tricky situations, support for nice updating and
+cancelling of a sleep in TTY.TTYUI has been removed.
+
+However, this is not going to be a huge problem because the new Curses
+Blinkenlights interface has this support, and does it a lot better than
+TTY.TTYUI ever could have.
+
+------------------------------------------------------------------------
+rev 322:  jgoerzen | 2003-01-06 14:18:09 -0600 (Mon, 06 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Curses.py
+
+Curses interface now can sleep, too.  Woohoo.
+
+------------------------------------------------------------------------
+rev 321:  jgoerzen | 2003-01-06 12:18:06 -0600 (Mon, 06 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+More fine-tunning.  Looks like using the grid manager is helping out.
+
+------------------------------------------------------------------------
+rev 320:  jgoerzen | 2003-01-06 12:00:43 -0600 (Mon, 06 Jan 2003) | 10 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Reworked the canvas.
+
+Before, problem was the label and buttons to the right of the lights would
+make the window too wide.  When the button got added, the window would get
+even wider.  That was because the canvas would not shrink.
+
+My workaround is to use a separate canvas for each light.  Seems to be OK
+here....
+
+
+------------------------------------------------------------------------
+rev 319:  jgoerzen | 2003-01-06 11:31:19 -0600 (Mon, 06 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Working better now. 
+
+------------------------------------------------------------------------
+rev 318:  jgoerzen | 2003-01-06 11:14:17 -0600 (Mon, 06 Jan 2003) | 3 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+More visual tweaking.  The Button doesn't seem to be working well, so I'm
+going to try a MenuButton.
+
+------------------------------------------------------------------------
+rev 317:  jgoerzen | 2003-01-06 11:04:40 -0600 (Mon, 06 Jan 2003) | 5 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Basic Tk.Blinkenlights structure completed.  Need to fine-tune the display.
+
+Sleeping API added to Blinkenlights base class.
+
+
+------------------------------------------------------------------------
+rev 316:  jgoerzen | 2003-01-06 10:19:00 -0600 (Mon, 06 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap.conf
+
+Noted a few things for the docs
+
+------------------------------------------------------------------------
+rev 315:  jgoerzen | 2003-01-06 10:15:15 -0600 (Mon, 06 Jan 2003) | 5 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Fixed up the VerboseUI for new account system.  All that really needed
+updating with the "Sync immediately" button, to cope with syncing different
+accounts at different times.  It's better now.
+
+
+------------------------------------------------------------------------
+rev 314:  jgoerzen | 2003-01-06 09:58:29 -0600 (Mon, 06 Jan 2003) | 16 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/threadutil.py
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/debuglock.py
+
+More locking updates.
+
+Introduced a new MultiLock to threadutil.  This lock will let a single
+thread acquire the same lock more than once, keeping track of how many times
+this happens, and will release the actual lock only when the lock's
+lock count gets back to zero.
+
+By using MultiLock, various functions in Curses.py and Blinkenlights.py no
+longer need to pass around to other functions a parameter indicating whether
+or not a lock should be obtained.  This was a large cause of complexity and
+errors, which is now eliminated.
+
+Everything seems to be working properly wrt locking at this point.  The
+Curses.Blinkenlights interface has achieved basic working functionality.
+
+
+------------------------------------------------------------------------
+rev 313:  jgoerzen | 2003-01-06 08:41:14 -0600 (Mon, 06 Jan 2003) | 3 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/mbnames.py
+
+Just to be sure, since it could be called by multiple threads, genmbnames
+will not lock itself.
+
+------------------------------------------------------------------------
+rev 312:  jgoerzen | 2003-01-06 08:40:23 -0600 (Mon, 06 Jan 2003) | 6 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/accounts.py
+   M /offlineimap/head/offlineimap/mbnames.py
+   M /offlineimap/head/offlineimap/syncmaster.py
+
+Updated the mbnames recorder to bring it back up-to-date with the new
+account-centric system.  It will now gather reports from account sync
+threads, and when it has all that it's supposed to, it'll write out the
+file.
+
+
+------------------------------------------------------------------------
+rev 311:  jgoerzen | 2003-01-05 23:11:00 -0600 (Sun, 05 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Curses.py
+
+Fixed a problem that prevented it from working on the console.
+
+------------------------------------------------------------------------
+rev 310:  jgoerzen | 2003-01-05 23:07:16 -0600 (Sun, 05 Jan 2003) | 6 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   A /offlineimap/head/offlineimap/ui/debuglock.py
+
+Added some temporary debug code to help weed out a few race conditions with
+the curses Blinkenlights interface.  Think I've finally got it.  I'm leaving
+the debugging code in for now, though, to help in case there are future
+problems.
+
+
+------------------------------------------------------------------------
+rev 309:  jgoerzen | 2003-01-05 16:54:59 -0600 (Sun, 05 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/accounts.py
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+
+More progress with bug fixes and locking
+
+------------------------------------------------------------------------
+rev 308:  jgoerzen | 2003-01-05 11:07:58 -0600 (Sun, 05 Jan 2003) | 8 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/accounts.py
+   M /offlineimap/head/offlineimap/folder/Base.py
+   M /offlineimap/head/offlineimap/folder/IMAP.py
+   M /offlineimap/head/offlineimap/folder/LocalStatus.py
+   M /offlineimap/head/offlineimap/folder/Maildir.py
+   M /offlineimap/head/offlineimap/repository/LocalStatus.py
+   M /offlineimap/head/offlineimap/repository/Maildir.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/UIBase.py
+
+More progress at debugging.  The curses blinkenlights is now working well,
+though it still has an occasional tendency to corrupt the light display with
+comments from the log.  I suspect a locking problem -- need to be more
+strict with iolock I suspect.
+
+Updated various modules to register the threads' account names, etc.
+
+
+------------------------------------------------------------------------
+rev 307:  jgoerzen | 2003-01-05 00:01:17 -0600 (Sun, 05 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/UIBase.py
+
+Starting to work now.
+
+------------------------------------------------------------------------
+rev 306:  jgoerzen | 2003-01-04 23:55:37 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+
+Removed debug prints
+
+------------------------------------------------------------------------
+rev 305:  jgoerzen | 2003-01-04 23:50:01 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/UIBase.py
+
+Believed to be somewhat working now
+
+------------------------------------------------------------------------
+rev 304:  jgoerzen | 2003-01-04 20:11:46 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap.1
+
+Clarified copyright statement
+
+------------------------------------------------------------------------
+rev 303:  jgoerzen | 2003-01-04 20:07:40 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Curses.py
+
+Removed password echo for debugging
+
+------------------------------------------------------------------------
+rev 302:  jgoerzen | 2003-01-04 20:07:00 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Curses.py
+
+Now capable of actually reading passwords.
+
+------------------------------------------------------------------------
+rev 301:  jgoerzen | 2003-01-04 19:51:35 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   M /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/__init__.py
+   M /offlineimap/head/offlineimap/ui/detector.py
+   M /offlineimap/head/offlineimap/version.py
+
+Nominally-working Blinkenlights interface for Curses!
+
+------------------------------------------------------------------------
+rev 300:  jgoerzen | 2003-01-04 16:51:17 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   A /offlineimap/head/offlineimap/ui/Blinkenlights.py
+   A /offlineimap/head/offlineimap/ui/Curses.py
+   M /offlineimap/head/offlineimap/ui/__init__.py
+
+Beginnings of support for a curses-based Blinkenlights.
+
+------------------------------------------------------------------------
+rev 299:  jgoerzen | 2003-01-04 15:35:36 -0600 (Sat, 04 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Started breaking Blinkenlights out into a base class.
+
+------------------------------------------------------------------------
+rev 298:  jgoerzen | 2003-01-03 16:58:04 -0600 (Fri, 03 Jan 2003) | 2 lines
+Changed paths:
+   D /offlineimap/head/offlineimap/test.py
+
+Removed this (not a real part of the program)
+
+------------------------------------------------------------------------
+rev 297:  jgoerzen | 2003-01-03 16:57:46 -0600 (Fri, 03 Jan 2003) | 5 lines
+Changed paths:
+   A /offlineimap/head/debian/changelog
+   A /offlineimap/head/offlineimap/CustomConfig.py
+   A /offlineimap/head/offlineimap/accounts.py
+   M /offlineimap/head/offlineimap/init.py
+   M /offlineimap/head/offlineimap/mbnames.py
+   M /offlineimap/head/offlineimap/syncmaster.py
+   A /offlineimap/head/offlineimap/test.py
+   M /offlineimap/head/offlineimap/threadutil.py
+   M /offlineimap/head/offlineimap/ui/Noninteractive.py
+   M /offlineimap/head/offlineimap/ui/UIBase.py
+   M /offlineimap/head/offlineimap/ui/detector.py
+
+  * Changed to a more account-centric behavior.  The refresh time is now
+    a per-account variable.  Implemented new account classes.  User
+    interfaces must now be updated to take advantage of this.
+
+
+------------------------------------------------------------------------
+rev 296:  jgoerzen | 2003-01-03 16:57:20 -0600 (Fri, 03 Jan 2003) | 2 lines
+Changed paths:
+   D /offlineimap/head/debian/changelog
+
+Fixing error
+
+------------------------------------------------------------------------
+rev 295:  jgoerzen | 2003-01-02 19:08:10 -0600 (Thu, 02 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Got Tk working again.  Woohoo.
+
+------------------------------------------------------------------------
+rev 294:  jgoerzen | 2003-01-02 19:01:41 -0600 (Thu, 02 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/offlineimap/folder/LocalStatus.py
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Updated with various fixes
+
+------------------------------------------------------------------------
+rev 293:  jgoerzen | 2003-01-02 14:05:14 -0600 (Thu, 02 Jan 2003) | 6 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/imaputil.py
+
+  * Now properly handles folder names that contain parenthesis.  Used
+    patch from Kyler Laird in
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=173895.
+    Closes: #173895.   
+
+
+------------------------------------------------------------------------
+rev 292:  jgoerzen | 2003-01-02 14:00:23 -0600 (Thu, 02 Jan 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/ui/Tk.py
+
+Beginning of work to make it work with a threaded Tcl/Tk Tkinter.
+
+------------------------------------------------------------------------
+rev 291:  jgoerzen | 2002-12-03 10:26:03 -0600 (Tue, 03 Dec 2002) | 2 lines
+Changed paths:
+   M /offlineimap/head/ChangeLog
+
+This is 3.99.5
+
 ------------------------------------------------------------------------
 rev 290:  jgoerzen | 2002-12-03 10:25:06 -0600 (Tue, 03 Dec 2002) | 2 lines
 Changed paths:

diff --git a/offlineimap/head/bin/offlineimap b/offlineimap/head/bin/offlineimap
index f533dc0b41b21fcdeee5f7a47d4a0b187cb98eb8..666646c85a08183b5ddadaa16d2408a2288555e8 100644 (file)
--- a/offlineimap/head/bin/offlineimap
+++ b/offlineimap/head/bin/offlineimap
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.2
 # Startup from system-wide installation
-# Copyright (C) 2002 John Goerzen
+# Copyright (C) 2002, 2003 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -18,4 +18,4 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from offlineimap import init
-init.startup('3.99.5')
+init.startup('3.99.6')

diff --git a/offlineimap/head/manual.html b/offlineimap/head/manual.html
index a8233637bcdbb3ac83d8c15c48659c466cea78f9..06c156aa1d8512128cacfc0b7e7b2b1e7e8d7cfa 100644 (file)
--- a/offlineimap/head/manual.html
+++ b/offlineimap/head/manual.html
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.18.1 -->
-<!-- CreationDate: Mon Jan  6 14:35:15 2003 -->
+<!-- CreationDate: Mon Jan  6 15:32:30 2003 -->
 <html>
 <head>
 <meta name="generator" content="groff -Thtml, see www.gnu.org">
@@ -314,6 +314,12 @@ location and then edit. This file is vital to proper
 operation of the system; it sets everything you need to run
 <b>OfflineIMAP.</b> Full documentation for the configuration
 file is included within the sample file.</p>
+<!-- INDENTATION -->
+<p><b>OfflineIMAP</b> also ships a file named
+<i>offlineimap.conf.minimal</i> that you can also try.
+It&rsquo;s useful if you want to get started with the most
+basic feature set, and you can read about other features
+later with <i>offlineimap.conf.</i></p>
 </td>
 </table>
 <a name="OPTIONS"></a>
@@ -333,12 +339,12 @@ Nevertheless, there are a few options that you may set for
 <table width="100%" border=0 rules="none" frame="void"
        cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
-<td width="11%"></td>
+<td width="13%"></td>
 <td width="2%">
 
 <p><b>&minus;1</b></p>
 </td>
-<td width="7%"></td>
+<td width="5%"></td>
 <td width="77%">
 
 <p>Disable all multithreading operations and use solely a
@@ -453,12 +459,12 @@ operations.</p>
 <table width="100%" border=0 rules="none" frame="void"
        cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
-<td width="13%"></td>
+<td width="11%"></td>
 <td width="2%">
 
 <p><b>&minus;o</b></p>
 </td>
-<td width="5%"></td>
+<td width="7%"></td>
 <td width="77%">
 
 <p>Run only once, ignoring any autorefresh setting in the
@@ -571,12 +577,12 @@ are as follows:</p>
 <table width="100%" border=0 rules="none" frame="void"
        cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
-<td width="13%"></td>
+<td width="11%"></td>
 <td width="7%">
 
 <p><b>Black</b></p>
 </td>
-<td width="1%"></td>
+<td width="2%"></td>
 <td width="77%">
 
 <p>indicates that this light&rsquo;s thread has terminated;
@@ -605,14 +611,13 @@ remind you of HAL 9000 in <i>2001.</i></p>
 </table>
 <!-- TABS -->
 <table width="100%" border=0 rules="none" frame="void"
-       cols="4" cellspacing="0" cellpadding="0">
+       cols="3" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="8%">
+<td width="10%">
 
 <p><b>Gray</b></p>
 </td>
-<td width="1%"></td>
 <td width="77%">
 
 <p>indicates that the thread is establishing a new
@@ -620,11 +625,10 @@ connection to the IMAP server.</p>
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="8%">
+<td width="10%">
 
 <p><b>Purple</b></p>
 </td>
-<td width="1%"></td>
 <td width="77%">
 
 <p>is the color of an account synchronization thread that
@@ -633,22 +637,20 @@ is monitoring the progress of the folders in that account
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="8%">
+<td width="10%">
 
 <p><b>Cyan</b></p>
 </td>
-<td width="1%"></td>
 <td width="77%">
 
 <p>indicates that the thread is syncing a folder.</p>
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="8%">
+<td width="10%">
 
 <p><b>Green</b></p>
 </td>
-<td width="1%"></td>
 <td width="77%">
 
 <p>means that a folder&rsquo;s message list is being
@@ -656,11 +658,10 @@ loaded.</p>
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="8%">
+<td width="10%">
 
 <p><b>Blue</b></p>
 </td>
-<td width="1%"></td>
 <td width="77%">
 
 <p>is the color of a message synchronization controller
@@ -668,11 +669,10 @@ thread.</p>
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="8%">
+<td width="10%">
 
 <p><b>Orange</b></p>
 </td>
-<td width="1%"></td>
 <td width="77%">
 
 <p>indicates that an actual message is being copied.</p>
@@ -697,13 +697,14 @@ thread.</p>
 </table>
 <!-- TABS -->
 <table width="100%" border=0 rules="none" frame="void"
-       cols="3" cellspacing="0" cellpadding="0">
+       cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="10%">
+<td width="8%">
 
 <p><b>Yellow</b></p>
 </td>
+<td width="1%"></td>
 <td width="77%">
 
 <p>(bright orange) indicates that message flags are being
@@ -711,10 +712,11 @@ added.</p>
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="10%">
+<td width="8%">
 
 <p><b>Pink</b></p>
 </td>
+<td width="1%"></td>
 <td width="77%">
 
 <p>(bright red) indicates that message flags are being
@@ -1397,11 +1399,11 @@ connection&quot;</p>
        cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="2%">
+<td width="1%">
 
 <p>&bull;</p>
 </td>
-<td width="7%"></td>
+<td width="8%"></td>
 <td width="77%">
 
 <p>Internet Message Access Protocol version 4rev1 (IMAP
@@ -1409,11 +1411,11 @@ connection&quot;</p>
 </td>
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="2%">
+<td width="1%">
 
 <p>&bull;</p>
 </td>
-<td width="7%"></td>
+<td width="8%"></td>
 <td width="77%">
 
 <p>CRAM-MD5 as specified in RFC2195</p>
@@ -1423,12 +1425,12 @@ connection&quot;</p>
 <table width="100%" border=0 rules="none" frame="void"
        cols="4" cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
-<td width="11%"></td>
+<td width="13%"></td>
 <td width="1%">
 
 <p>&bull;</p>
 </td>
-<td width="8%"></td>
+<td width="7%"></td>
 <td width="77%">
 
 <p>Maildir as specified in
@@ -1436,12 +1438,12 @@ http://www.qmail.org/qmail-manual-html/man5/maildir.html and
 http://cr.yp.to/proto/maildir.html.</p>
 </td>
 <tr valign="top" align="left">
-<td width="11%"></td>
+<td width="13%"></td>
 <td width="1%">
 
 <p>&bull;</p>
 </td>
-<td width="8%"></td>
+<td width="7%"></td>
 <td width="77%">
 
 <p>Standard Python 2.2.1 as implemented on POSIX-compliant

diff --git a/offlineimap/head/manual.pdf b/offlineimap/head/manual.pdf
index d9297fa55874009625fbf7fb311cf09c20eebc8d..2511e0d769399eb90427958131264228ef0540be 100644 (file)
Binary files a/offlineimap/head/manual.pdf and b/offlineimap/head/manual.pdf differ

diff --git a/offlineimap/head/manual.ps b/offlineimap/head/manual.ps
index b77850c859a7eb4f99cc35919d0f0d742e54564b..8e6ba3b1d231386eec78006a5ad4b1b737e9c803 100644 (file)
--- a/offlineimap/head/manual.ps
+++ b/offlineimap/head/manual.ps
@@ -1,6 +1,6 @@
 %!PS-Adobe-3.0
 %%Creator: groff version 1.18.1
-%%CreationDate: Mon Jan  6 14:35:13 2003
+%%CreationDate: Mon Jan  6 15:32:27 2003
 %%DocumentNeededResources: font Times-Roman
 %%+ font Times-Bold
 %%+ font Times-Italic
@@ -471,452 +471,458 @@ F1<4f668d696e65494d4150>108 432 Q F0 .547<6973207265>3.046 F .547<67756c
 <4f668d696e65494d4150>3.138 E<2e>-1.1 E F0 .638
 <46756c6c20646f63756d656e74612d>5.638 F<74696f6e20666f722074686520636f6e
 8c6775726174696f6e208c6c6520697320696e636c756465642077697468696e20746865
-2073616d706c65208c6c652e>108 468 Q F2<4f5054494f4e53>72 484.8 Q F0 .061<
-4d6f737420636f6e8c6775726174696f6e20697320646f6e65207669612074686520636f
-6e8c6775726174696f6e208c6c652e>108 496.8 R<4e65>5.061 E -.15<7665>-.25 G
-.061<727468656c6573732c207468657265206172652061206665>.15 F 2.561<776f>
--.25 G .061<7074696f6e73207468617420796f75206d617920736574>-2.561 F
-<666f72>108 508.8 Q F1<4f668d696e65494d4150>2.5 E<2e>-1.1 E<ad31>108
-525.6 Q F0 .281<44697361626c6520616c6c206d756c7469746872656164696e67206f
-7065726174696f6e7320616e642075736520736f6c656c7920612073696e676c652d7468
-726561642073796e632e>25.3 F .281<54686973206566>5.281 F<6665637469>-.25
-E -.15<7665>-.25 G .281<6c79207365747320746865>.15 F F1
-<6d617873796e636163636f756e7473>144 537.6 Q F0<616e6420616c6c>2.5 E F1
+2073616d706c65208c6c652e>108 468 Q F1<4f668d696e65494d4150>108 484.8 Q
+F0 .113<616c736f2073686970732061208c6c65206e616d6564>2.614 F F3<6f66>
+2.843 E<8d696e65696d61702e636f6e66>-.18 E<2e6d696e696d616c>-.15 E F0
+.113<7468617420796f752063616e20616c736f20747279>3.123 F 5.113<2e49>-.65
+G<7427>-5.113 E 2.613<7375>-.55 G .113<736566756c20696620796f752077>
+-2.613 F<616e74>-.1 E 3.586<746f2067657420737461727465642077697468207468
+65206d6f73742062617369632066656174757265207365742c20616e6420796f75206361
+6e20726561642061626f7574206f74686572206665617475726573206c61746572207769
+7468>108 496.8 R F3<6f66>108.23 508.8 Q<8d696e65696d61702e636f6e66>-.18
+E<2e>-.15 E F2<4f5054494f4e53>72 525.6 Q F0 .061<4d6f737420636f6e8c6775
+726174696f6e20697320646f6e65207669612074686520636f6e8c6775726174696f6e20
+8c6c652e>108 537.6 R<4e65>5.061 E -.15<7665>-.25 G .061
+<727468656c6573732c207468657265206172652061206665>.15 F 2.561<776f>-.25
+G .061<7074696f6e73207468617420796f75206d617920736574>-2.561 F<666f72>
+108 549.6 Q F1<4f668d696e65494d4150>2.5 E<2e>-1.1 E<ad31>108 566.4 Q F0
+.281<44697361626c6520616c6c206d756c7469746872656164696e67206f7065726174
+696f6e7320616e642075736520736f6c656c7920612073696e676c652d74687265616420
+73796e632e>25.3 F .281<54686973206566>5.281 F<6665637469>-.25 E -.15
+<7665>-.25 G .281<6c79207365747320746865>.15 F F1
+<6d617873796e636163636f756e7473>144 578.4 Q F0<616e6420616c6c>2.5 E F1
 <6d6178636f6e6e656374696f6e73>2.5 E F0
 <636f6e8c6775726174696f6e208c6c652076>2.5 E
-<61726961626c657320746f20312e>-.25 E F1<ad50>108 554.4 Q F3<7072>2.5 E
-<6f8c6c65646972>-.45 E F0<53657473>144 566.4 Q F1<4f668d696e65494d4150>
+<61726961626c657320746f20312e>-.25 E F1<ad50>108 595.2 Q F3<7072>2.5 E
+<6f8c6c65646972>-.45 E F0<53657473>144 607.2 Q F1<4f668d696e65494d4150>
 4.196 E F0 1.696<696e746f2070726f8c6c65206d6f64652e>4.196 F 1.695
 <5468652070726f6772616d2077696c6c20637265617465>6.696 F F1<7072>4.195 E
 <6f8c6c65646972>-.18 E F0 1.695
-<286974206d757374206e6f7420616c7265616479>4.195 F -.15<6578>144 578.4 S
+<286974206d757374206e6f7420616c7265616479>4.195 F -.15<6578>144 619.2 S
 2.88<697374292e204173>.15 F .381<69742072756e732c20507974686f6e2070726f
 8c6c696e6720696e666f726d6174696f6e2061626f757420656163682074687265616420
 6973206c6f6767656420696e746f2070726f8c6c65646972>2.88 F 5.381<2e50>-.55
 G<6c65617365>-5.381 E .485<6e6f74653a2054686973206f7074696f6e2069732070
-726573656e7420666f7220646562>144 590.4 R .485
+726573656e7420666f7220646562>144 631.2 R .485
 <756767696e6720616e64206f7074696d697a6174696f6e206f6e6c79>-.2 F 2.985
 <2c61>-.65 G .484<6e642073686f756c64204e4f>-2.985 F 2.984<5462>-.4 G
 2.984<6575>-2.984 G .484<73656420756e6c657373>-2.984 F .778
-<796f75206861>144 602.4 R 1.078 -.15<766520612073>-.2 H .778
+<796f75206861>144 643.2 R 1.078 -.15<766520612073>-.2 H .778
 <706563698c6320726561736f6e20746f20646f20736f2e>.15 F .778
 <49742077696c6c207369676e698c63616e746c7920736c6f>5.778 F 3.278<7770>
 -.25 G .778
 <726f6772616d20706572666f726d616e63652c206d617920726564756365>-3.278 F
-<72656c696162696c697479>144 614.4 Q 2.5<2c61>-.65 G<6e642063616e2067656e
+<72656c696162696c697479>144 655.2 Q 2.5<2c61>-.65 G<6e642063616e2067656e
 6572617465206875676520616d6f756e7473206f6620646174612e>-2.5 E -1.1<596f>
 5 G 2.5<756d>1.1 G<7573742075736520746865>-2.5 E F1<ad31>2.5 E F0
 <6f7074696f6e207768656e20796f7520757365>2.5 E F1<2d50>2.5 E<2e>-1.1 E
-<ad61>108 643.2 Q F3<6163636f756e746c697374>2.5 E F0<4f76>144 655.2 Q
-.84<6572726964657320746865>-.15 F F1<6163636f756e7473>3.34 E F0 .84
+<ad61>108 684 Q F3<6163636f756e746c697374>2.5 E F0<4f76>144 696 Q .84
+<6572726964657320746865>-.15 F F1<6163636f756e7473>3.34 E F0 .84
 <73656374696f6e20696e2074686520636f6e8c67208c6c652e>3.34 F .84<4c657473
 20796f752073706563696679206120706172746963756c6172206163636f756e74206f72
 20736574206f66>5.84 F 1.647
-<6163636f756e747320746f2073796e6320776974686f7574206861>144 667.2 R
-1.647<76696e6720746f20656469742074686520636f6e8c67208c6c652e>-.2 F -1.1
-<596f>6.648 G 4.148<756d>1.1 G 1.648
-<6967687420757365207468697320746f2065>-4.148 F 1.648
-<78636c756465206365727461696e>-.15 F<6163636f756e74732c206f7220746f2073
-796e6320736f6d65206163636f756e7473207468617420796f75206e6f726d616c6c7920
-707265666572206e6f7420746f2e>144 679.2 Q F1<ad63>108 696 Q F3
-<636f6e8c678c6c65>2.5 E F0<53706563698c6573206120636f6e8c6775726174696f
-6e208c6c6520746f2075736520696e206c696575206f662074686520646566>144 708 Q
-<61756c742c>-.1 E F3<7e2f2e6f66>2 E<8d696e65696d617072>-.18 E<632e>-.37
-E F0<4a6f686e20476f65727a656e>72 768 Q<4a756c792031322c2032303032>
-151.655 E<32>201.915 E 0 Cg EP
+<6163636f756e747320746f2073796e6320776974686f7574206861>144 708 R 1.647
+<76696e6720746f20656469742074686520636f6e8c67208c6c652e>-.2 F -1.1<596f>
+6.648 G 4.148<756d>1.1 G 1.648<6967687420757365207468697320746f2065>
+-4.148 F 1.648<78636c756465206365727461696e>-.15 F<6163636f756e74732c20
+6f7220746f2073796e6320736f6d65206163636f756e7473207468617420796f75206e6f
+726d616c6c7920707265666572206e6f7420746f2e>144 720 Q
+<4a6f686e20476f65727a656e>72 768 Q<4a756c792031322c2032303032>151.655 E
+<32>201.915 E 0 Cg EP
 %%Page: 3 3
 %%BeginPageSetup
 BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E/F1 10/Times-Bold@0 SF<ad64>108 84 Q/F2 10/Times-Italic@0 SF
-<646562>2.5 E<7567747970655b2c646562>-.2 E<756774797065>-.2 E<2e2e2e5d>
--.15 E F0 .506<456e61626c657320646562>144 96 R .506
-<756767696e6720666f72204f66>-.2 F<8d696e65494d4150>-.25 E 5.506<2e54>
--1.11 G .505<6869732069732075736566756c20696620796f75206172652074727969
-6e6720746f20747261636b20646f>-5.506 F .505
+113.72 E/F1 10/Times-Bold@0 SF<ad63>108 84 Q/F2 10/Times-Italic@0 SF
+<636f6e8c678c6c65>2.5 E F0<53706563698c6573206120636f6e8c6775726174696f
+6e208c6c6520746f2075736520696e206c696575206f662074686520646566>144 96 Q
+<61756c742c>-.1 E F2<7e2f2e6f66>2 E<8d696e65696d617072>-.18 E<632e>-.37
+E F1<ad64>108 112.8 Q F2<646562>2.5 E<7567747970655b2c646562>-.2 E
+<756774797065>-.2 E<2e2e2e5d>-.15 E F0 .506<456e61626c657320646562>144
+124.8 R .506<756767696e6720666f72204f66>-.2 F<8d696e65494d4150>-.25 E
+5.506<2e54>-1.11 G .505<6869732069732075736566756c20696620796f7520617265
+20747279696e6720746f20747261636b20646f>-5.506 F .505
 <776e2061206d616c66756e6374696f6e>-.25 F .113<6f72208c67757265206f757420
-7768617420697320676f696e67206f6e20756e6465722074686520686f6f642e>144 108
-R 2.613<4973>5.113 G .113
+7768617420697320676f696e67206f6e20756e6465722074686520686f6f642e>144
+136.8 R 2.613<4973>5.113 G .113
 <756767657374207468617420796f752075736520746869732077697468>-2.613 F F1
 <ad31>2.613 E F0 .113<696e206f7264657220746f206d616b>2.613 F<65>-.1 E
-<74686520726573756c7473206d6f72652073656e7369626c652e>144 120 Q .15
-<2d64206e6f>144 136.8 R 2.65<7772>-.25 G .15
+<74686520726573756c7473206d6f72652073656e7369626c652e>144 148.8 Q .15
+<2d64206e6f>144 165.6 R 2.65<7772>-.25 G .15
 <65717569726573206f6e65206f72206d6f726520646562>-2.65 F .149
 <756774797065732c2073657061726174656420627920636f6d6d61732e>-.2 F .149
 <54686573652064658c6e6520776861742065>5.149 F .149
-<786163746c792077696c6c206265>-.15 F<646562>144 148.8 Q .346
+<786163746c792077696c6c206265>-.15 F<646562>144 177.6 Q .346
 <75676765642c20616e6420736f2066>-.2 F .346<617220696e636c756465207477>
 -.1 F 2.847<6f6f>-.1 G<7074696f6e733a>-2.847 E F1<696d6170>2.847 E F0
 <616e64>2.847 E F1<6d61696c646972>2.847 E<2e>-1 E F0<546865>5.347 E F1
 <696d6170>2.847 E F0 .347
 <6f7074696f6e2077696c6c20656e61626c6520494d4150>2.847 F .363
 <70726f746f636f6c2073747265616d20616e642070617273696e6720646562>144
-160.8 R 2.862<756767696e672e204e6f7465>-.2 F .362
+189.6 R 2.862<756767696e672e204e6f7465>-.2 F .362
 <7468617420746865206f7574707574206d617920636f6e7461696e207061737377>
 2.862 F .362<6f7264732c20736f2074616b>-.1 F 2.862<6563>-.1 G<617265>
--2.862 E .982<746f2072656d6f>144 172.8 R 1.282 -.15<76652074>-.15 H .982
+-2.862 E .982<746f2072656d6f>144 201.6 R 1.282 -.15<76652074>-.15 H .982
 <6861742066726f6d2074686520646562>.15 F .983<756767696e67206f7574707574
 206265666f72652073656e64696e6720697420746f20616e>-.2 F .983
 <796f6e6520656c73652e>-.15 F<546865>5.983 E F1<6d61696c646972>3.483 E F0
-<6f7074696f6e>3.483 E<77696c6c20656e61626c6520646562>144 184.8 Q<756767
+<6f7074696f6e>3.483 E<77696c6c20656e61626c6520646562>144 213.6 Q<756767
 696e6720666f72206365727461696e204d61696c646972206f7065726174696f6e732e>
--.2 E F1<ad6f>108 201.6 Q F0
+-.2 E F1<ad6f>108 230.4 Q F0
 <52756e206f6e6c79206f6e63652c2069676e6f72696e6720616e>25.3 E 2.5<7961>
 -.15 G<75746f726566726573682073657474696e6720696e2074686520636f6e8c6720
-8c6c652e>-2.5 E F1<ad682c20adad68656c70>108 218.4 Q F0<53686f>144 230.4
+8c6c652e>-2.5 E F1<ad682c20adad68656c70>108 247.2 Q F0<53686f>144 259.2
 Q 2.5<7773>-.25 G<756d6d617279206f66206f7074696f6e732e>-2.5 E F1<ad75>
-108 247.2 Q F2<696e74657266616365>2.5 E F0 1.133
-<53706563698c657320616e20616c7465726e617469>144 259.2 R 1.433 -.15
+108 276 Q F2<696e74657266616365>2.5 E F0 1.133
+<53706563698c657320616e20616c7465726e617469>144 288 R 1.433 -.15
 <76652075>-.25 H 1.133<73657220696e74657266>.15 F 1.133
 <616365206d6f64756c6520746f207573652e>-.1 F 1.133<54686973206f>6.133 F
 -.15<7665>-.15 G 1.133<7272696465732074686520646566>.15 F 1.132
 <61756c742073706563698c656420696e20746865>-.1 F .28
-<636f6e8c6775726174696f6e208c6c652e>144 271.2 R .28
+<636f6e8c6775726174696f6e208c6c652e>144 300 R .28
 <5468652055492073706563698c65642077697468>5.28 F F1<2d75>2.78 E F0 .281
 <77696c6c20626520666f7263656420746f20626520757365642c2065>2.78 F -.15
 <7665>-.25 G 2.781<6e69>.15 G 2.781<6669>-2.781 G<7473>-2.781 E F1
 <69737561626c652829>2.781 E F0<6d6574686f64>2.781 E .274
-<73746174657320746861742069742063616e6e6f742062652e>144 283.2 R .274
+<73746174657320746861742069742063616e6e6f742062652e>144 312 R .274
 <5573652074686973206f7074696f6e207769746820636172652e>5.274 F .273<5468
 65207072652d64658c6e6564206f7074696f6e7320617265206c697374656420696e2074
-68652055534552>5.273 F<494e54455246>144 295.2 Q -.4<4143>-.74 G
+68652055534552>5.273 F<494e54455246>144 324 Q -.4<4143>-.74 G
 <45532073656374696f6e2e>.4 E/F3 10.95/Times-Bold@0 SF
-<5553455220494e54455246>72 312 Q -.602<4143>-.986 G<4553>.602 E F1
-<4f668d696e65494d4150>108 324 Q F0 .85<686173206120706c756767>3.35 F .85
-<61626c65207573657220696e74657266>-.05 F .851
+<5553455220494e54455246>72 340.8 Q -.602<4143>-.986 G<4553>.602 E F1
+<4f668d696e65494d4150>108 352.8 Q F0 .85<686173206120706c756767>3.35 F
+.85<61626c65207573657220696e74657266>-.05 F .851
 <6163652073797374656d2074686174206c65747320796f752063686f6f736520686f>
 -.1 F 3.351<7774>-.25 G .851
 <68652070726f6772616d20636f6d6d756e696361746573>-3.351 F 1.534
-<696e666f726d6174696f6e20746f20796f752e>108 336 R 1.534
+<696e666f726d6174696f6e20746f20796f752e>108 364.8 R 1.534
 <546865726520617265207477>6.534 F 4.034<6f67>-.1 G 1.534
 <726170686963616c20696e74657266>-4.034 F 1.534<616365732c207477>-.1 F
 4.034<6f74>-.1 G 1.534<65726d696e616c20696e74657266>-4.034 F 1.534
 <616365732c20616e64207477>-.1 F 4.033<6f6e>-.1 G<6f6e696e74657261637469>
--4.033 E -.15<7665>-.25 G<696e74657266>108 348 Q 1.094<6163657320737569
-7461626c6520666f7220736372697074696e67206f72206c6f6767696e6720707572706f
-7365732e>-.1 F<546865>6.095 E F2<7569>3.675 E F0 1.095<6f7074696f6e2069
-6e2074686520636f6e8c6775726174696f6e208c6c652073706563698c657320746865>
-3.955 F .38<7573657220696e74657266>108 360 R .38
+-4.033 E -.15<7665>-.25 G<696e74657266>108 376.8 Q 1.094<61636573207375
+697461626c6520666f7220736372697074696e67206f72206c6f6767696e672070757270
+6f7365732e>-.1 F<546865>6.095 E F2<7569>3.675 E F0 1.095<6f7074696f6e20
+696e2074686520636f6e8c6775726174696f6e208c6c652073706563698c657320746865>
+3.955 F .38<7573657220696e74657266>108 388.8 R .38
 <61636520707265666572656e6365732e>-.1 F<546865>5.38 E F2<ad75>2.519 E F0
 .379<636f6d6d616e642d6c696e65206f7074696f6e2063616e206f>3.129 F -.15
 <7665>-.15 G .379
 <72726964652074686520636f6e8c6775726174696f6e208c6c652e>.15 F .379
-<5468652061>5.379 F -.25<7661>-.2 G<696c61626c65>.25 E -.25<7661>108 372
-S<6c75657320666f722074686520636f6e8c6775726174696f6e208c6c65206f7220636f
-6d6d616e642d6c696e65206172652064657363726962656620696e207468697320736563
-74696f6e2e>.25 E F1<546b2e426c696e6b>87 388.8 Q
+<5468652061>5.379 F -.25<7661>-.2 G<696c61626c65>.25 E -.25<7661>108
+400.8 S<6c75657320666f722074686520636f6e8c6775726174696f6e208c6c65206f72
+20636f6d6d616e642d6c696e65206172652064657363726962656620696e207468697320
+73656374696f6e2e>.25 E F1<546b2e426c696e6b>87 417.6 Q
 <656e6c6967687473206f72204375727365732e426c696e6b>-.1 E
 <656e6c6967687473>-.1 E F0 1.708<5468697320697320616e20696e74657266>108
-400.8 R 1.709
+429.6 R 1.709
 <6163652064657369676e656420746f20626520736c65656b2c2066756e20746f2077>
 -.1 F 1.709<617463682c20616e6420696e666f726d617469>-.1 F 2.009 -.15
 <7665206f>-.25 H 4.209<6674>.15 G 1.709<6865206f>-4.209 F -.15<7665>-.15
 G 1.709<72616c6c2070696374757265206f662077686174>.15 F F1
-<4f668d696e65494d4150>108 412.8 Q F0 .18<697320646f696e672e>2.68 F 2.68
+<4f668d696e65494d4150>108 441.6 Q F0 .18<697320646f696e672e>2.68 F 2.68
 <4963>5.18 G .18<6f6e736964657220697420746f2062652074686520626573742067
 656e6572616c2d707572706f736520696e74657266>-2.68 F .18<61636520696e>-.1
 F F1<4f668d696e65494d4150>2.68 E<2e>-1.1 E F0<546b2e426c696e6b>5.18 E
 <656e2d>-.1 E .499<6c696768747320636f6e7461696e732c20627920646566>108
-424.8 R .499<61756c742c206120736d616c6c2077696e646f>-.1 F 2.999<7777>
+453.6 R .499<61756c742c206120736d616c6c2077696e646f>-.1 F 2.999<7777>
 -.25 G .499<697468206120726f>-2.999 F 2.999<776f>-.25 G 2.999<664c>
 -2.999 G .499<45447320616e64206120726f>-2.999 F 2.999<776f>-.25 G 2.999
 <6663>-2.999 G .499<6f6d6d616e642062>-2.999 F 2.999
 <7574746f6e732e20546865>-.2 F<746f74616c>2.999 E .553
-<73697a65206f66207468652077696e646f>108 436.8 R 3.053<7769>-.25 G 3.053
+<73697a65206f66207468652077696e646f>108 465.6 R 3.053<7769>-.25 G 3.053
 <7376>-3.053 G .552<65727920736d616c6c2c20736f2069742075736573206c697474
 6c65206465736b746f702073706163652c20796574206974206973207175697465206675
 6e6374696f6e616c2e>-3.203 F .552<546865726520697320616c736f20616e>5.552
-F 1.339<6f7074696f6e616c2c20746f6767>108 448.8 R 1.339
+F 1.339<6f7074696f6e616c2c20746f6767>108 477.6 R 1.339
 <61626c652c206c6f6720746861742073686f>-.05 F 1.339<7773206d6f7265206465
 7461696c2061626f757420776861742069732068617070656e696e6720616e6420697320
 636f6c6f72>-.25 F 1.34<2d636f64656420746f206d6174636820746865>-.2 F
-<636f6c6f72206f6620746865206c69676874732e>108 460.8 Q
-<4375727365732e426c696e6b>108 477.6 Q .393
+<636f6c6f72206f6620746865206c69676874732e>108 489.6 Q
+<4375727365732e426c696e6b>108 506.4 Q .393
 <656e6c696768747320697320616e20696e74657266>-.1 F .393<6163652076>-.1 F
 .393<6572792073696d696c617220746f20546b2e426c696e6b>-.15 F .393
 <656e6c69676874732c2062>-.1 F .392<75742069732064657369676e656420746f20
-62652072756e20696e206120636f6e736f6c65>-.2 F<77696e646f>108 489.6 Q
+62652072756e20696e206120636f6e736f6c65>-.2 F<77696e646f>108 518.4 Q
 3.461<7728>-.25 G .961<616e20787465726d2c204c696e7578207669727475616c20
 7465726d696e616c2c206574632e29>-3.461 F .962
 <53696e636520697420646f65736e27>5.962 F 3.462<7468>-.18 G -2.25 -.2
 <61762065>-3.462 H .962
 <61636365737320746f2067726170686963732c2069742069736e27>3.662 F 3.462
-<7471>-.18 G .962<75697465206173>-3.462 F<707265747479>108 501.6 Q 2.5
+<7471>-.18 G .962<75697465206173>-3.462 F<707265747479>108 530.4 Q 2.5
 <2c62>-.65 G
 <7574206974207374696c6c206765747320746865206a6f6220646f6e652e>-2.7 E
-<546b2e426c696e6b>108 518.4 Q 5.224
+<546b2e426c696e6b>108 547.2 Q 5.224
 <656e6c696768747320697320746865206f6e6c79207573657220696e74657266>-.1 F
 5.224<61636520746861742068617320636f6e8c67757261626c6520706172616d657465
 72733b20736565207468652065>-.1 F<78616d706c65>-.15 E F2<6f66>108.23
-530.4 Q<8d696e65696d61702e636f6e66>-.18 E F0
+559.2 Q<8d696e65696d61702e636f6e66>-.18 E F0
 <666f72206d6f72652064657461696c732e>4.46 E .427
-<45616368206c6967687420696e2074686520546b2e426c696e6b>108 547.2 R .428
+<45616368206c6967687420696e2074686520546b2e426c696e6b>108 576 R .428
 <656e6c6967687473206f72204375727365732e426c696e6b>-.1 F .428
 <656e6c696768747320696e74657266>-.1 F .428
 <61636520726570726573656e7473206120746872656164206f662065>-.1 F -.15
 <7865>-.15 G .428<637574696f6e202d2d2074686174>.15 F .203
-<69732c206120706172746963756c6172207461736b2074686174>108 559.2 R F1
+<69732c206120706172746963756c6172207461736b2074686174>108 588 R F1
 <4f668d696e65494d4150>2.703 E F0 .203
 <697320706572666f726d696e67207269676874206e6f>2.703 F 4.002 -.65
 <772e2054>-.25 H .202<686520636f6c6f7220696e6469636174657320776861742074
 61736b2074686520706172746963756c6172>.65 F<7468726561642069732070657266
-6f726d696e672c20616e642061726520617320666f6c6c6f>108 571.2 Q<77733a>-.25
-E F1<426c61636b>108 588 Q F0 .569
+6f726d696e672c20616e642061726520617320666f6c6c6f>108 600 Q<77733a>-.25 E
+F1<426c61636b>108 616.8 Q F0 .569
 <696e6469636174657320746861742074686973206c6967687427>11.55 F 3.069
 <7374>-.55 G .569<687265616420686173207465726d696e617465643b206974207769
 6c6c206c69676874207570206167>-3.069 F .57
 <61696e206c61746572207768656e206e65>-.05 F 3.07<7774>-.25 G .57
-<687265616473207374617274>-3.07 F 2.5<75702e20536f2c>144 600 R
+<687265616473207374617274>-3.07 F 2.5<75702e20536f2c>144 628.8 R
 <626c61636b20696e64696361746573206e6f2061637469>2.5 E<76697479>-.25 E
-<2e>-.65 E F1<52656420284d65616e696e67203129>108 616.8 Q F0 .442
+<2e>-.65 E F1<52656420284d65616e696e67203129>108 645.6 Q F0 .442
 <69732074686520636f6c6f72206f6620746865206d61696e2070726f6772616d27>144
-628.8 R 2.942<7374>-.55 G .442<68726561642c207768696368206261736963616c
+657.6 R 2.942<7374>-.55 G .442<68726561642c207768696368206261736963616c
 6c7920646f6573206e6f7468696e672062>-2.942 F .442
 <7574206d6f6e69746f7220746865206f74686572732e>-.2 F<4974>5.441 E
 <6d696768742072656d696e6420796f75206f662048414c203930303020696e>144
-640.8 Q F2<323030312e>2.88 E F1<47726179>108 657.6 Q F0<696e646963617465
+669.6 Q F2<323030312e>2.88 E F1<47726179>108 686.4 Q F0<696e646963617465
 73207468617420746865207468726561642069732065737461626c697368696e67206120
 6e65>13.78 E 2.5<7763>-.25 G
 <6f6e6e656374696f6e20746f2074686520494d41502073657276>-2.5 E<6572>-.15 E
-<2e>-.55 E F1<507572>108 674.4 Q<706c65>-.1 E F0 .656<69732074686520636f
+<2e>-.55 E F1<507572>108 703.2 Q<706c65>-.1 E F0 .656<69732074686520636f
 6c6f72206f6620616e206163636f756e742073796e6368726f6e697a6174696f6e207468
 726561642074686174206973206d6f6e69746f72696e67207468652070726f6772657373
 206f662074686520666f6c6465727320696e>7.21 F
 <74686174206163636f756e7420286e6f742067656e65726174696e6720616e>144
-686.4 Q 2.5<7949>-.15 G<2f4f292e>-2.5 E F1<4379616e>108 703.2 Q F0<696e
-64696361746573207468617420746865207468726561642069732073796e63696e672061
-20666f6c646572>13.22 E<2e>-.55 E<4a6f686e20476f65727a656e>72 768 Q
-<4a756c792031322c2032303032>151.655 E<33>201.915 E 0 Cg EP
+715.2 Q 2.5<7949>-.15 G<2f4f292e>-2.5 E<4a6f686e20476f65727a656e>72 768
+Q<4a756c792031322c2032303032>151.655 E<33>201.915 E 0 Cg EP
 %%Page: 4 4
 %%BeginPageSetup
 BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E/F1 10/Times-Bold@0 SF<4772>108 84 Q<65656e>-.18 E F0
+113.72 E/F1 10/Times-Bold@0 SF<4379616e>108 84 Q F0<696e6469636174657320
+7468617420746865207468726561642069732073796e63696e67206120666f6c646572>
+13.22 E<2e>-.55 E F1<4772>108 100.8 Q<65656e>-.18 E F0
 <6d65616e732074686174206120666f6c64657227>9.52 E 2.5<736d>-.55 G
 <657373616765206c697374206973206265696e67206c6f616465642e>-2.5 E F1
-<426c7565>108 100.8 Q F0<69732074686520636f6c6f72206f662061206d65737361
+<426c7565>108 117.6 Q F0<69732074686520636f6c6f72206f662061206d65737361
 67652073796e6368726f6e697a6174696f6e20636f6e74726f6c6c657220746872656164
-2e>16.55 E F1<4f72616e6765>108 117.6 Q F0<696e64696361746573207468617420
+2e>16.55 E F1<4f72616e6765>108 134.4 Q F0<696e64696361746573207468617420
 616e2061637475616c206d657373616765206973206265696e6720636f706965642e>144
-129.6 Q F1<52656420284d65616e696e67203229>108 146.4 Q F0<696e6469636174
+146.4 Q F1<52656420284d65616e696e67203229>108 163.2 Q F0<696e6469636174
 657320746861742061206d657373616765206973206265696e672064656c657465642e>
-144 158.4 Q F1 -1.11<5965>108 175.2 S<6c6c6f>1.11 E<77>-.1 E F0<28627269
-676874206f72616e67652920696e646963617465732074686174206d657373616765208d
-61677320617265206265696e672061646465642e>7.77 E F1<50696e6b>108 192 Q F0
+144 175.2 Q F1 -1.11<5965>108 192 S<6c6c6f>1.11 E<77>-.1 E F0<2862726967
+6874206f72616e67652920696e646963617465732074686174206d657373616765208d61
+677320617265206265696e672061646465642e>7.77 E F1<50696e6b>108 208.8 Q F0
 <28627269676874207265642920696e646963617465732074686174206d657373616765
 208d61677320617265206265696e672072656d6f>15.99 E -.15<7665>-.15 G<642e>
-.15 E F1<526564202f20426c61636b20466c617368696e67>108 208.8 Q F0
-<636f72726573706f6e647320746f2074686520636f756e74646f>144 220.8 Q<776e20
+.15 E F1<526564202f20426c61636b20466c617368696e67>108 225.6 Q F0
+<636f72726573706f6e647320746f2074686520636f756e74646f>144 237.6 Q<776e20
 74696d657220746861742072756e73206265747765656e2073796e6368726f6e697a6174
 696f6e732e>-.25 E 1.305<546865206e616d65206f66207468697320696e74657266>
-108 237.6 R 1.305<6163652064657269>-.1 F -.15<7665>-.25 G 3.805<7366>.15
+108 254.4 R 1.305<6163652064657269>-.1 F -.15<7665>-.25 G 3.805<7366>.15
 G 1.305<726f6d206120626974206f6620636f6d707574657220736369656e6365206869
 73746f7279>-3.805 F 6.305<2e45>-.65 G 1.305<726963205261796d6f6e6427>
 -6.305 F<73>-.55 E/F2 10/Times-Italic@0 SF -.35<4a61>3.805 G -.37<7267>
 .35 G 1.305<6f6e2046>.37 F<696c65>-.45 E F0<64658c6e657320626c696e6b>108
-249.6 Q<656e6c69676874732c20696e20706172742c2061733a>-.1 E .132<46726f6e
+266.4 Q<656e6c69676874732c20696e20706172742c2061733a>-.1 E .132<46726f6e
 742d70616e656c20646961676e6f73746963206c6967687473206f6e206120636f6d7075
-746572>144 266.4 R 2.632<2c65>-.4 G .132<73702e20612064696e6f73617572>
+746572>144 283.2 R 2.632<2c65>-.4 G .132<73702e20612064696e6f73617572>
 -2.632 F 2.632<2e4e>-.55 G .632 -.25<6f772074>-2.632 H .132
 <6861742064696e6f73617572732061726520726172652c2074686973207465726d>.25
 F<757375616c6c792072656665727320746f20737461747573206c6967687473206f6e20
-61206d6f64656d2c206e657477>144 278.4 Q
+61206d6f64656d2c206e657477>144 295.2 Q
 <6f726b206875622c206f7220746865206c696b>-.1 E<652e>-.1 E 1.244
-<54686973207465726d2064657269>144 295.2 R -.15<7665>-.25 G 3.744<7366>
-.15 G 1.244<726f6d20746865206c6173742077>-3.744 F 1.244
+<54686973207465726d2064657269>144 312 R -.15<7665>-.25 G 3.744<7366>.15
+G 1.244<726f6d20746865206c6173742077>-3.744 F 1.244
 <6f7264206f66207468652066>-.1 F 1.243
 <616d6f757320626c61636b6c6574746572>-.1 F 1.243
 <2d476f74686963207369676e20696e206d616e676c65642070736575646f2d>-.2 F
 .566<4765726d616e2074686174206f6e6365206772616365642061626f75742068616c
 662074686520636f6d707574657220726f6f6d7320696e2074686520456e676c6973682d
-737065616b696e672077>144 307.2 R .566<6f726c642e204f6e652076>-.1 F<6572>
+737065616b696e672077>144 324 R .566<6f726c642e204f6e652076>-.1 F<6572>
 -.15 E<2d>-.2 E
 <73696f6e2072616e20696e2069747320656e74697265747920617320666f6c6c6f>144
-319.2 Q<77733a>-.25 E F1 -.55<4143>144 336 S
+336 Q<77733a>-.25 E F1 -.55<4143>144 352.8 S
 <4854554e472120414c4c4553204c4f4f4b454e535045455045525321>.55 E F0 1.648
 <44617320636f6d70757465726d616368696e6520697374206e69636874206675657220
-67658c6e676572706f6b>144 352.8 R 1.647
+67658c6e676572706f6b>144 369.6 R 1.647
 <656e20756e64206d697474656e6772616262656e2e>-.1 F 1.647
 <4973742065617379207363686e617070656e20646572>6.647 F .12
-<737072696e67656e7765726b2c20626c6f>144 364.8 R .121
+<737072696e67656e7765726b2c20626c6f>144 381.6 R .121
 <77656e667573656e20756e6420706f7070656e636f726b>-.25 F .121
 <656e206d697420737069747a656e737061726b>-.1 F 2.621<656e2e20497374>-.1 F
 .121<6e696368742066756572206765>2.621 F<7765726b>-.25 E .121
-<656e2062656920646173>-.1 F<64756d706b>144 376.8 Q 2.519
+<656e2062656920646173>-.1 F<64756d706b>144 393.6 Q 2.519
 <6f7066656e2e20446173>-.1 F<7275626265726e65636b>2.519 E .018
 <656e20736963687473656572656e206b>-.1 F .018
 <656570656e2064617320636f7474656e2d7069636b>-.1 F .018
 <656e656e2068616e7320696e2064617320706f636b>-.1 F .018
-<657473206d7573733b>-.1 F<72656c6178>144 388.8 Q<656e20756e642077>-.15 E
+<657473206d7573733b>-.1 F<72656c6178>144 405.6 Q<656e20756e642077>-.15 E
 <61746368656e2064617320626c696e6b>-.1 E<656e6c69636874656e2e>-.1 E F1
-<546b2e56>87 405.6 Q<6572626f73655549>-1 E F0 .503
-<5468697320696e74657266>108 417.6 R .503
+<546b2e56>87 422.4 Q<6572626f73655549>-1 E F0 .503
+<5468697320696e74657266>108 434.4 R .503
 <6163652028666f726d65726c79206b6e6f>-.1 F .503<776e20617320546b2e546b55
 492920697320612067726170686963616c20696e74657266>-.25 F .504
 <61636520746861742070726573656e747320612076>-.1 F .504
 <61726961626c652d73697a65642077696e646f>-.25 F -.65<772e>-.25 G 1.37
-<496e207468652077696e646f>108 429.6 R 2.67 -.65<772c2065>-.25 H 1.37
+<496e207468652077696e646f>108 446.4 R 2.67 -.65<772c2065>-.25 H 1.37
 <6163682063757272656e746c792d65>.65 F -.15<7865>-.15 G 1.37<637574696e67
 207468726561642068617320612073656374696f6e20776865726520697473206e616d65
 20616e642063757272656e742073746174757320617265206469732d>.15 F 2.768
-<706c617965642e2054686973>108 441.6 R<696e74657266>2.768 E .268<61636520
+<706c617965642e2054686973>108 458.4 R<696e74657266>2.768 E .268<61636520
 697320626573742073756974656420746f2070656f706c652072756e6e696e67206f6e20
 736c6f>-.1 F .269<77657220636f6e6e656374696f6e732c20617320796f7520676574
 2061206c6f74206f662064657461696c2c2062>-.25 F<7574>-.2 E .357
-<666f722066>108 453.6 R .356<61737420636f6e6e656374696f6e732c2074686520
+<666f722066>108 470.4 R .356<61737420636f6e6e656374696f6e732c2074686520
 64657461696c206d617920676f20627920746f6f20717569636b6c7920746f2062652075
 736566756c2e>-.1 F .356<50656f706c6520776974682066>5.356 F .356
 <61737420636f6e6e656374696f6e73206d61792077697368>-.1 F
-<746f2075736520546b2e426c696e6b>108 465.6 Q
-<656e6c696768747320696e73746561642e>-.1 E F1<545459>87 482.4 Q
-<2e5454595549>-.92 E F0 .372<5468697320696e74657266>108 494.4 R .372
+<746f2075736520546b2e426c696e6b>108 482.4 Q
+<656e6c696768747320696e73746561642e>-.1 E F1<545459>87 499.2 Q
+<2e5454595549>-.92 E F0 .372<5468697320696e74657266>108 511.2 R .372
 <6163652069732074686520646566>-.1 F .372<61756c7420666f722070656f706c65
 2072756e6e696e6720696e207465726d696e616c732e>-.1 F .372<4974207072696e74
 73206f757420626173696320737461747573206d6573736167657320616e642069732067
 656e2d>5.372 F<6572616c6c7920667269656e646c7920746f20757365206f6e206120
-636f6e736f6c65206f7220787465726d2e>108 506.4 Q F1
-<4e6f6e696e74657261637469>87 523.2 Q -.1<7665>-.1 G<2e4261736963>.1 E F0
-.552<5468697320696e74657266>108 535.2 R .552<6163652069732064657369676e
-656420666f7220736974756174696f6e73207768657265>-.1 F F1
+636f6e736f6c65206f7220787465726d2e>108 523.2 Q F1
+<4e6f6e696e74657261637469>87 540 Q -.1<7665>-.1 G<2e4261736963>.1 E F0
+.552<5468697320696e74657266>108 552 R .552<6163652069732064657369676e65
+6420666f7220736974756174696f6e73207768657265>-.1 F F1
 <4f668d696e65494d4150>3.051 E F0 .551<77696c6c2062652072756e206e6f6e2d61
 7474656e64656420616e642074686520737461747573206f6620697473>3.051 F -.15
-<657865>108 547.2 S .697<637574696f6e2077696c6c206265206c6f676765642e>
-.15 F -1.1<596f>5.697 G 3.197<756d>1.1 G .697
+<657865>108 564 S .697<637574696f6e2077696c6c206265206c6f676765642e>.15
+F -1.1<596f>5.697 G 3.197<756d>1.1 G .697
 <69676874207573652069742c20666f7220696e7374616e63652c20746f206861>-3.197
 F .997 -.15<76652074>-.2 H .697<68652073797374656d2072756e206175746f6d61
 746963616c6c7920616e6420652d6d61696c>.15 F .903<796f75207468652072657375
-6c7473206f66207468652073796e6368726f6e697a6174696f6e2e>108 559.2 R .902
+6c7473206f66207468652073796e6368726f6e697a6174696f6e2e>108 576 R .902
 <54686973207573657220696e74657266>5.903 F .902<616365206973206e6f742063
 617061626c65206f662072656164696e672061207061737377>-.1 F .902
-<6f72642066726f6d20746865>-.1 F -.1<6b65>108 571.2 S
+<6f72642066726f6d20746865>-.1 F -.1<6b65>108 588 S
 <79626f6172643b206163636f756e74207061737377>-.05 E<6f726473206d75737420
 62652073706563698c6564207573696e67206f6e65206f662074686520636f6e8c677572
 6174696f6e208c6c65206f7074696f6e732e>-.1 E F1<4e6f6e696e74657261637469>
-87 588 Q -.1<7665>-.1 G<2e5175696574>.1 E F0 1.622
-<5468697320696e74657266>108 600 R 1.623<6163652069732064657369676e656420
-666f72206e6f6e2d617474656e6465642072756e6e696e6720696e20736974756174696f
-6e73207768657265206e6f726d616c20737461747573206d657373616765732061726520
-6e6f74>-.1 F 3.934<646573697265642e204974>108 612 R 1.434
+87 604.8 Q -.1<7665>-.1 G<2e5175696574>.1 E F0 1.622
+<5468697320696e74657266>108 616.8 R 1.623<6163652069732064657369676e6564
+20666f72206e6f6e2d617474656e6465642072756e6e696e6720696e2073697475617469
+6f6e73207768657265206e6f726d616c20737461747573206d6573736167657320617265
+206e6f74>-.1 F 3.934<646573697265642e204974>108 628.8 R 1.434
 <77696c6c206f7574707574206e6f7468696e672065>3.934 F 1.434
 <7863657074206572726f727320616e6420736572696f75732077>-.15 F 3.934
 <61726e696e67732e204c696b>-.1 F 3.934<654e>-.1 G<6f6e696e74657261637469>
 -3.934 E -.15<7665>-.25 G 1.433<2e42617369632c20746869732075736572>.15 F
-<696e74657266>108 624 Q 1.38<616365206973206e6f742063617061626c65206f66
-2072656164696e672061207061737377>-.1 F 1.38
+<696e74657266>108 640.8 Q 1.38<616365206973206e6f742063617061626c65206f
+662072656164696e672061207061737377>-.1 F 1.38
 <6f72642066726f6d20746865206b>-.1 F -.15<6579>-.1 G 1.38
 <626f6172643b206163636f756e74207061737377>.15 F 1.38
 <6f726473206d7573742062652073706563698c6564>-.1 F<7573696e67206f6e65206f
-662074686520636f6e8c6775726174696f6e208c6c65206f7074696f6e732e>108 636 Q
-/F3 10.95/Times-Bold@0 SF<4558414d504c4553>72 652.8 Q F0
-<4865726520697320616e2065>108 664.8 Q<78616d706c6520636f6e8c677572617469
+662074686520636f6e8c6775726174696f6e208c6c65206f7074696f6e732e>108 652.8
+Q/F3 10.95/Times-Bold@0 SF<4558414d504c4553>72 669.6 Q F0
+<4865726520697320616e2065>108 681.6 Q<78616d706c6520636f6e8c677572617469
 6f6e20666f72206120706172746963756c61726c7920636f6d706c65>-.15 E 2.5
 <7873>-.15 G<6974756174696f6e3b206d6f72652065>-2.5 E
 <78616d706c65732077696c6c206265206164646564206c61746572>-.15 E<2e>-.55 E
-F1<4d554c>87 681.6 Q<5449504c452041>-.92 E
+F1<4d554c>87 698.4 Q<5449504c452041>-.92 E
 <43434f554e54532057495448204d555454>-.55 E F0 .514<546869732065>108
-693.6 R .514<78616d706c652073686f>-.15 F .514<777320796f7520686f>-.25 F
+710.4 R .514<78616d706c652073686f>-.15 F .514<777320796f7520686f>-.25 F
 3.014<7774>-.25 G 3.014<6f73>-3.014 G .514<6574207570>-3.014 F F1
 <4f668d696e65494d4150>3.014 E F0 .513<746f2073796e6368726f6e697a65206d75
 6c7469706c65206163636f756e7473207769746820746865206d757474206d61696c>
-3.014 F<726561646572>108 705.6 Q<2e>-.55 E<5374617274206279206372656174
-696e672061206469726563746f727920746f20686f6c6420796f757220666f6c64657273
-3a>108 729.6 Q<4a6f686e20476f65727a656e>72 768 Q
-<4a756c792031322c2032303032>151.655 E<34>201.915 E 0 Cg EP
+3.014 F<726561646572>108 722.4 Q<2e>-.55 E<4a6f686e20476f65727a656e>72
+768 Q<4a756c792031322c2032303032>151.655 E<34>201.915 E 0 Cg EP
 %%Page: 5 5
 %%BeginPageSetup
 BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E/F1 10/Times-Bold@0 SF<6d6b646972207e2f4d61696c>108 84 Q F0
-<496e20796f7572>108 108 Q/F2 10/Times-Italic@0 SF<7e2f2e6f66>2 E
-<8d696e65696d617072>-.18 E<632c>-.37 E F0<7370656369667920746869733a>2.5
-E F1<6163636f756e7473203d2050>108 120 Q<6572736f6e616c2c2057>-.2 E
-<6f726b>-.75 E F0<4d616b>108 144 Q 2.82<6573>-.1 G .32
-<757265207468617420796f75206861>-2.82 F .62 -.15<76652062>-.2 H .32
-<6f74682061>.15 F F1<5b50>2.821 E<6572736f6e616c5d>-.2 E F0 .321
-<616e642061>2.821 F F1<5b57>2.821 E<6f726b5d>-.75 E F0 .321
+113.72 E<5374617274206279206372656174696e672061206469726563746f72792074
+6f20686f6c6420796f757220666f6c646572733a>108 84 Q/F1 10/Times-Bold@0 SF
+<6d6b646972207e2f4d61696c>108 96 Q F0<496e20796f7572>108 120 Q/F2 10
+/Times-Italic@0 SF<7e2f2e6f66>2 E<8d696e65696d617072>-.18 E<632c>-.37 E
+F0<7370656369667920746869733a>2.5 E F1<6163636f756e7473203d2050>108 132
+Q<6572736f6e616c2c2057>-.2 E<6f726b>-.75 E F0<4d616b>108 156 Q 2.82
+<6573>-.1 G .32<757265207468617420796f75206861>-2.82 F .62 -.15
+<76652062>-.2 H .32<6f74682061>.15 F F1<5b50>2.821 E<6572736f6e616c5d>
+-.2 E F0 .321<616e642061>2.821 F F1<5b57>2.821 E<6f726b5d>-.75 E F0 .321
 <73656374696f6e2c207769746820646966>2.821 F .321
 <666572656e74206c6f63616c666f6c64657220706174686e616d657320616e64>-.25 F
-<656e61626c65>108 156 Q F1<5b6d626e616d65735d2e>2.5 E F0<496e2065616368
+<656e61626c65>108 168 Q F1<5b6d626e616d65735d2e>2.5 E F0<496e2065616368
 206163636f756e742073656374696f6e2c20646f20736f6d657468696e67206c696b>108
-180 Q 2.5<6574>-.1 G<6869733a>-2.5 E F1<6c6f63616c66>108 192 Q
+192 Q 2.5<6574>-.1 G<6869733a>-2.5 E F1<6c6f63616c66>108 204 Q
 <6f6c64657273203d207e2f4d61696c2f50>-.25 E<6572736f6e616c>-.2 E F0
-<416464207468657365206c696e657320746f20796f7572>108 216 Q F2
-<7e2f2e6d75747472>2 E<633a>-.37 E F1<736f7572>108 228 Q
+<416464207468657365206c696e657320746f20796f7572>108 228 Q F2
+<7e2f2e6d75747472>2 E<633a>-.37 E F1<736f7572>108 240 Q
 <6365207e2f706174682d746f2d6d626e616d65732d6d75747472>-.18 E
-<632d6d61696c626f786573>-.18 E -.25<666f>108 240 S<6c646572>.25 E
+<632d6d61696c626f786573>-.18 E -.25<666f>108 252 S<6c646572>.25 E
 <2d686f6f6b2050>-.37 E<6572736f6e616c20736574206672>-.2 E<6f6d3d2279>
 -.18 E<6f7572>-.25 E<656d61696c40706572736f6e616c2e636f6d22>-.18 E -.25
-<666f>108 252 S<6c646572>.25 E<2d686f6f6b2057>-.37 E
+<666f>108 264 S<6c646572>.25 E<2d686f6f6b2057>-.37 E
 <6f726b20736574206672>-.75 E<6f6d3d2279>-.18 E<6f7572>-.25 E
 <656d61696c4077>-.18 E<6f726b2e636f6d22>-.1 E
-<736574206d626f785f747970653d4d61696c646972>108 264 Q<7365742066>108 276
+<736574206d626f785f747970653d4d61696c646972>108 276 Q<7365742066>108 288
 Q<6f6c6465723d24484f4d452f4d61696c>-.25 E
-<7365742073706f6f6c8c6c653d2b50>108 288 Q<6572736f6e616c2f494e424f>-.2 E
-<58>-.4 E F0<5468617427>108 312 Q 2.5<7369>-.55 G<7421>-2.5 E F1<5557>87
-328.8 Q<2d494d41504420414e44205245464552454e434553>-.37 E F0 .494
-<536f6d6520757365727320776974682061205557>108 340.8 R .493
+<7365742073706f6f6c8c6c653d2b50>108 300 Q<6572736f6e616c2f494e424f>-.2 E
+<58>-.4 E F0<5468617427>108 324 Q 2.5<7369>-.55 G<7421>-2.5 E F1<5557>87
+340.8 Q<2d494d41504420414e44205245464552454e434553>-.37 E F0 .494
+<536f6d6520757365727320776974682061205557>108 352.8 R .493
 <2d494d4150442073657276>-.65 F .493<6572206e65656420746f20757365>-.15 F
 F1<4f668d696e65494d415027>2.993 E<73>-.37 E F0 .493<227265666572656e6365
 22206665617475726520746f20676574206174207468656972206d61696c2d>2.993 F
-<626f78>108 352.8 Q .46<65732c2073706563696679696e672061207265666572656e
+<626f78>108 364.8 Q .46<65732c2073706563696679696e672061207265666572656e
 6365206f6620227e2f4d61696c22206f722022236d682f2220646570656e64696e67206f
 6e2074686520636f6e8c6775726174696f6e2e>-.15 F .46<5468652062656c6f>5.46
 F 2.96<7763>-.25 G<6f6e8c677572612d>-2.96 E .465
-<74696f6e2066726f6d20646f637768617440676572662e6f72>108 364.8 R 2.965
+<74696f6e2066726f6d20646f637768617440676572662e6f72>108 376.8 R 2.965
 <6773>-.18 G<686f>-2.965 E .465<7773207573696e672061207265666572656e6365
 206f66204d61696c2c2061206e616d657472616e73207468617420737472697073207468
 65206c656164696e67204d61696c2f206f66>-.25 F<66>-.25 E<696e636f6d696e6720
 666f6c646572206e616d65732c20616e64206120666f6c6465728c6c7465722074686174
 206c696d6974732074686520666f6c646572732073796e63656420746f206a7573742074
-687265652e>108 376.8 Q F1<5b476572665d>108 400.8 Q<6c6f63616c66>108
-412.8 Q<6f6c64657273203d207e2f4d61696c>-.25 E -.18<7265>108 424.8 S
+687265652e>108 388.8 Q F1<5b476572665d>108 412.8 Q<6c6f63616c66>108
+424.8 Q<6f6c64657273203d207e2f4d61696c>-.25 E -.18<7265>108 436.8 S
 <6d6f7465686f7374203d2067657266>.18 E<2e6f72>-.15 E<67>-.1 E
-<73736c203d2079>108 436.8 Q<6573>-.1 E -.18<7265>108 448.8 S
-<6d6f746575736572203d20646f6377686174>.18 E -.18<7265>108 460.8 S
-<666572>.18 E<656e6365203d204d61696c>-.18 E 2.5<2354>108 472.8 S
+<73736c203d2079>108 448.8 Q<6573>-.1 E -.18<7265>108 460.8 S
+<6d6f746575736572203d20646f6377686174>.18 E -.18<7265>108 472.8 S
+<666572>.18 E<656e6365203d204d61696c>-.18 E 2.5<2354>108 484.8 S
 <72696d73206f666620746865207072>-3.24 E
 <6563656564696e67204d61696c206f6e20616c6c207468652066>-.18 E
 <6f6c646572206e616d65732e>-.25 E
-<6e616d657472616e73203d206c616d6264612066>108 484.8 Q<6f6c646572>-.25 E
-<6e616d653a205c>-.15 E -.18<7265>138 496.8 S
+<6e616d657472616e73203d206c616d6264612066>108 496.8 Q<6f6c646572>-.25 E
+<6e616d653a205c>-.15 E -.18<7265>138 508.8 S
 <2e73756228275e4d61696c2f272c2027>.18 E<272c2066>-.63 E<6f6c646572>-.25
-E<6e616d6529>-.15 E 2.5<2359>108 508.8 S<6561682c2079>-3.61 E
+E<6e616d6529>-.15 E 2.5<2359>108 520.8 S<6561682c2079>-3.61 E
 <6f75206861>-.25 E .2 -.1<76652074>-.25 H 2.5<6f6d>.1 G
 <656e74696f6e20746865204d61696c20646972>-2.5 E 2.5<2c65>-.92 G -.1<7665>
--2.65 G 2.5<6e74>.1 G<686f756768206974>-2.5 E 2.5<2377>108 520.8 S
+-2.65 G 2.5<6e74>.1 G<686f756768206974>-2.5 E 2.5<2377>108 532.8 S
 <6f756c64207365656d20696e7475697469>-2.6 E .2 -.1<76652074>-.1 H
 <6861742072>.1 E<65666572>-.18 E<656e63652077>-.18 E
-<6f756c64207472696d2069742e>-.1 E -.25<666f>108 532.8 S
+<6f756c64207472696d2069742e>-.1 E -.25<666f>108 544.8 S
 <6c6465728c6c746572203d206c616d6264612066>.25 E<6f6c646572>-.25 E
 <6e616d653a2066>-.15 E<6f6c646572>-.25 E<6e616d6520696e205b>-.15 E
-<274d61696c2f494e424f>125.5 544.8 Q<58272c>-.4 E
-<274d61696c2f6c6973742f7a61757275732d67656e6572616c272c>125.5 556.8 Q
-<274d61696c2f6c6973742f7a61757275732d6465>125.5 568.8 Q<76272c>-.15 E
-<5d>125.5 580.8 Q<6d6178636f6e6e656374696f6e73203d2031>108 592.8 Q
-<686f6c64636f6e6e656374696f6e6f70656e203d206e6f>108 604.8 Q
-<505954484f4e46494c4520434f4e464947555241>87 621.6 Q
-<54494f4e2046494c45204f5054494f4e>-.95 E F0 -1.1<596f>108 633.6 S 3.495
+<274d61696c2f494e424f>125.5 556.8 Q<58272c>-.4 E
+<274d61696c2f6c6973742f7a61757275732d67656e6572616c272c>125.5 568.8 Q
+<274d61696c2f6c6973742f7a61757275732d6465>125.5 580.8 Q<76272c>-.15 E
+<5d>125.5 592.8 Q<6d6178636f6e6e656374696f6e73203d2031>108 604.8 Q
+<686f6c64636f6e6e656374696f6e6f70656e203d206e6f>108 616.8 Q
+<505954484f4e46494c4520434f4e464947555241>87 633.6 Q
+<54494f4e2046494c45204f5054494f4e>-.95 E F0 -1.1<596f>108 645.6 S 3.495
 <7563>1.1 G .995<616e206861>-3.495 F 1.295 -.15<7665204f>-.2 H -.25
 <668d>.15 G .995<696e65494d4150206c6f6164207570206120507974686f6e208c6c
 65206265666f72652065>.25 F -.25<7661>-.25 G .995<6c756174696e6720746865
 20636f6e8c6775726174696f6e208c6c65206f7074696f6e73207468617420617265>.25
-F<507974686f6e2065>108 645.6 Q 2.5<787072657373696f6e732e2054686973>-.15
+F<507974686f6e2065>108 657.6 Q 2.5<787072657373696f6e732e2054686973>-.15
 F -.15<6578>2.5 G
 <616d706c65206973206261736564206f6e206f6e6520737570706c6965642062792054>
 .15 E<6f6d6d692056>-.8 E
-<697274616e656e20666f72207468697320666561747572652e>-.6 E<496e>108 669.6
+<697274616e656e20666f72207468697320666561747572652e>-.6 E<496e>108 681.6
 Q F2<7e2f2e6f66>2.5 E<8d696e65696d61702e72>-.18 E<63>-.37 E F0 2.5<2c68>
 C 2.5<6561>-2.5 G<646473207468657365206f7074696f6e733a>-2.5 E F1
-<5b67656e6572616c5d>108 693.6 Q
-<707974686f6e8c6c653d7e2f2e6f668d696e65696d61702e7079>108 705.6 Q<5b66>
-108 717.6 Q<6f6f5d>-.25 E -.25<666f>108 729.6 S
-<6c646572736f72743d6d79636d70>.25 E F0<4a6f686e20476f65727a656e>72 768 Q
+<5b67656e6572616c5d>108 705.6 Q
+<707974686f6e8c6c653d7e2f2e6f668d696e65696d61702e7079>108 717.6 Q<5b66>
+108 729.6 Q<6f6f5d>-.25 E F0<4a6f686e20476f65727a656e>72 768 Q
 <4a756c792031322c2032303032>151.655 E<35>201.915 E 0 Cg EP
 %%Page: 6 6
 %%BeginPageSetup
@@ -924,121 +930,118 @@ BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E<5468656e2c20746865>108 84 Q/F1 10/Times-Italic@0 SF<7e2f2e6f66>
-2.5 E<8d696e65696d61702e7079>-.18 E F0
-<8c6c652077696c6c20636f6e7461696e3a>2.5 E/F2 10/Times-Bold@0 SF
-<7072696f726974697a6564203d205b27494e424f>108 108 Q
+113.72 E/F1 10/Times-Bold@0 SF -.25<666f>108 84 S
+<6c646572736f72743d6d79636d70>.25 E F0<5468656e2c20746865>108 108 Q/F2
+10/Times-Italic@0 SF<7e2f2e6f66>2.5 E<8d696e65696d61702e7079>-.18 E F0
+<8c6c652077696c6c20636f6e7461696e3a>2.5 E F1
+<7072696f726974697a6564203d205b27494e424f>108 132 Q
 <58272c2027706572736f6e616c272c2027616e6e6f756e6365272c20276c697374275d>
--.4 E<646566206d79636d7028782c2079293a>108 132 Q -.25<666f>115.5 144 S
+-.4 E<646566206d79636d7028782c2079293a>108 156 Q -.25<666f>115.5 168 S
 2.5<7270>.25 G -.18<7265>-2.5 G<8c7820696e207072696f726974697a65643a>.18
-E<696620782e73746172747377697468287072>125.5 156 Q<658c78293a>-.18 E
--.18<7265>135.5 168 S<747572>.18 E 2.5<6e2d>-.15 G<31>-2.5 E
-<656c69662079>125.5 180 Q<2e73746172747377697468287072>-.7 E<658c78293a>
--.18 E -.18<7265>135.5 192 S<747572>.18 E 2.5<6e2b>-.15 G<31>-2.5 E -.18
-<7265>115.5 204 S<747572>.18 E 2.5<6e63>-.15 G<6d7028782c207929>-2.5 E
-<64656620746573745f6d79636d7028293a>108 228 Q
-<696d706f7274206f732c206f732e70617468>115.5 240 Q -.25<666f>115.5 252 S<
+E<696620782e73746172747377697468287072>125.5 180 Q<658c78293a>-.18 E
+-.18<7265>135.5 192 S<747572>.18 E 2.5<6e2d>-.15 G<31>-2.5 E
+<656c69662079>125.5 204 Q<2e73746172747377697468287072>-.7 E<658c78293a>
+-.18 E -.18<7265>135.5 216 S<747572>.18 E 2.5<6e2b>-.15 G<31>-2.5 E -.18
+<7265>115.5 228 S<747572>.18 E 2.5<6e63>-.15 G<6d7028782c207929>-2.5 E
+<64656620746573745f6d79636d7028293a>108 252 Q
+<696d706f7274206f732c206f732e70617468>115.5 264 Q -.25<666f>115.5 276 S<
 6c646572733d6f732e6c697374646972286f732e706174682e657870616e647573657228
 277e2f646174612f6d61696c2f74764068712e79>.25 E<6f6b2e7574752e8c272929>
--.25 E -.25<666f>115.5 264 S<6c646572732e736f7274286d79636d7029>.25 E
-<7072696e742066>115.5 276 Q<6f6c64657273>-.25 E F0 .402
+-.25 E -.25<666f>115.5 288 S<6c646572732e736f7274286d79636d7029>.25 E
+<7072696e742066>115.5 300 Q<6f6c64657273>-.25 E F0 .402
 <5468697320636f646520736e697070657420696c6c757374726174657320686f>108
-300 R 2.902<7774>-.25 G<6865>-2.902 E F2 -.25<666f>2.902 G
+324 R 2.902<7774>-.25 G<6865>-2.902 E F1 -.25<666f>2.902 G
 <6c646572736f7274>.25 E F0 .402<6f7074696f6e2063616e20626520637573746f6d
 697a65642077697468206120507974686f6e2066756e6374696f6e2066726f6d20746865>
-2.902 F F2<707974686f6e8c6c65>108 312 Q F0<746f20616c>2.5 E -.1<7761>-.1
+2.902 F F1<707974686f6e8c6c65>108 336 Q F0<746f20616c>2.5 E -.1<7761>-.1
 G<79732073796e6368726f6e697a65206365727461696e20666f6c64657273208c727374
-2e>.1 E/F3 10.95/Times-Bold@0 SF<455252>72 328.8 Q<4f5253>-.329 E F0<49
+2e>.1 E/F3 10.95/Times-Bold@0 SF<455252>72 352.8 Q<4f5253>-.329 E F0<49
 6620796f7520676574206f6e65206f6620736f6d65206672657175656e746c792d656e63
 6f756e7465726564206f7220636f6e667573696e67206572726f72732c20706c65617365
-20636865636b20746869732073656374696f6e2e>108 340.8 Q F2<5549442076>87
-357.6 Q<616c6964697479207072>-.1 E<6f626c656d2066>-.18 E<6f722066>-.25 E
-<6f6c646572>-.25 E F0 1.637<494d41502073657276>108 369.6 R 1.637<657273
+20636865636b20746869732073656374696f6e2e>108 364.8 Q F1<5549442076>87
+381.6 Q<616c6964697479207072>-.1 E<6f626c656d2066>-.18 E<6f722066>-.25 E
+<6f6c646572>-.25 E F0 1.637<494d41502073657276>108 393.6 R 1.637<657273
 20757365206120756e6971756520494420285549442920746f20726566657220746f2061
 2073706563698c63206d6573736167652e>-.15 F 1.638
 <54686973206e756d6265722069732067756172616e7465656420746f206265>6.637 F
 1.11<756e6971756520746f206120706172746963756c6172206d65737361676520464f
-52455645522e>108 381.6 R 1.109<4e6f206f74686572206d65737361676520696e20
+52455645522e>108 405.6 R 1.109<4e6f206f74686572206d65737361676520696e20
 7468652073616d6520666f6c6465722077696c6c2065>6.11 F -.15<7665>-.25 G
 3.609<7267>.15 G 1.109<6574207468652073616d65>-3.609 F 2.873
-<5549442e2055494473>108 393.6 R .373<61726520616e20696e7465>2.873 F .373
+<5549442e2055494473>108 417.6 R .373<61726520616e20696e7465>2.873 F .373
 <6772616c2070617274206f66204f66>-.15 F<8d696e65494d415027>-.25 E 2.873
 <7373>-.55 G .373<796e6368726f6e697a6174696f6e20736368656d653b20746865>
 -2.873 F 2.873<7961>-.15 G .373
 <7265207573656420746f206d61746368207570206d65732d>-2.873 F<736167657320
 6f6e20796f757220636f6d707574657220746f206d65737361676573206f6e2074686520
-73657276>108 405.6 Q<6572>-.15 E<2e>-.55 E .108
+73657276>108 429.6 Q<6572>-.15 E<2e>-.55 E .108
 <536f6d6574696d65732c207468652055494473206f6e207468652073657276>108
-422.4 R .108<6572206d69676874206765742072657365742e>-.15 F .108<55737561
+446.4 R .108<6572206d69676874206765742072657365742e>-.15 F .108<55737561
 6c6c7920746869732077696c6c2068617070656e20696620796f752064656c6574652061
-6e64207468656e207265637265617465>5.108 F 3.742<6166>108 434.4 S
+6e64207468656e207265637265617465>5.108 F 3.742<6166>108 458.4 S
 <6f6c646572>-3.742 E 6.242<2e57>-.55 G 1.242
 <68656e20796f7520637265617465206120666f6c646572>-6.242 F 3.742<2c74>-.4
 G 1.242<68652073657276>-3.742 F 1.242<65722077696c6c206f6674656e20737461
-72742074686520554944206261636b2066726f6d20312e>-.15 F<427574>6.243 E F2
+72742074686520554944206261636b2066726f6d20312e>-.15 F<427574>6.243 E F1
 <4f668d696e65494d4150>3.743 E F0 .303<6d69676874207374696c6c206861>108
-446.4 R .603 -.15<76652074>-.2 H .303
+470.4 R .603 -.15<76652074>-.2 H .303
 <686520554944732066726f6d2074686520707265>.15 F .302<76696f757320666f6c
-646572206279207468652073616d65206e616d652073746f7265642e>-.25 F F2
+646572206279207468652073616d65206e616d652073746f7265642e>-.25 F F1
 <4f668d696e65494d4150>5.302 E F0 .302<77696c6c206465746563742074686973>
 2.802 F<636f6e646974696f6e20616e6420736b69702074686520666f6c646572>108
-458.4 Q 5<2e54>-.55 G
+482.4 Q 5<2e54>-.55 G
 <68697320697320474f4f442c206265636175736520697420707265>-5 E -.15<7665>
--.25 G<6e74732064617461206c6f73732e>.15 E -1.1<596f>108 475.2 S 2.853
+-.25 G<6e74732064617461206c6f73732e>.15 E -1.1<596f>108 499.2 S 2.853
 <7563>1.1 G .353<616e208c782069742062792072656d6f>-2.853 F .353<76696e67
 20796f7572206c6f63616c20666f6c64657220616e6420636163686520646174612e>
 -.15 F -.15<466f>5.353 G 2.853<7269>.15 G .353
 <6e7374616e63652c20696620796f757220666f6c646572732061726520756e646572>
--2.853 F F1<7e2f46>2.354 E<6f6c642d>-1.05 E<6572>108 487.2 Q<73>-.1 E F0
+-2.853 F F2<7e2f46>2.354 E<6f6c642d>-1.05 E<6572>108 511.2 Q<73>-.1 E F0
 <616e642074686520666f6c6465722077697468207468652070726f626c656d20697320
 494e424f>2.77 E<582c20796f7527>-.4 E 2.5<6474>-.5 G<79706520746869733a>
--2.5 E F2<726d202d72207e2f46>108 504 Q<6f6c646572732f494e424f>-.25 E<58>
+-2.5 E F1<726d202d72207e2f46>108 528 Q<6f6c646572732f494e424f>-.25 E<58>
 -.4 E
 <726d207e2f2e6f668d696e65696d61702f4163636f756e744e616d652f494e424f>108
-516 Q<58>-.4 E F0<287265706c6163696e67204163636f756e744e616d652077697468
+540 Q<58>-.4 E F0<287265706c6163696e67204163636f756e744e616d652077697468
 20746865206163636f756e74206e616d652061732073706563698c656420696e>108
-532.8 Q F1<7e2f2e6f66>2 E<8d696e65696d617072>-.18 E<6329>-.37 E F0<4e65>
-108 549.6 Q .802<78742074696d6520796f752072756e>-.15 F F2
+556.8 Q F2<7e2f2e6f66>2 E<8d696e65696d617072>-.18 E<6329>-.37 E F0<4e65>
+108 573.6 Q .802<78742074696d6520796f752072756e>-.15 F F1
 <4f668d696e65494d4150>3.302 E<2c>-.92 E F0 .802
 <69742077696c6c2072652d646f>3.302 F .802
 <776e6c6f61642074686520666f6c646572207769746820746865206e65>-.25 F 3.302
 <7755>-.25 G 3.301<4944732e204e6f7465>-3.302 F .801
 <74686174207468652070726f63652d>3.301 F
-<647572652073706563698c65642061626f>108 561.6 Q .3 -.15<76652077>-.15 H
+<647572652073706563698c65642061626f>108 585.6 Q .3 -.15<76652077>-.15 H
 <696c6c206c6f736520616e>.15 E 2.5<796c>-.15 G
 <6f63616c206368616e676573206d61646520746f2074686520666f6c646572>-2.5 E
-<2e>-.55 E .522<536f6d6520494d41502073657276>108 578.4 R .522
+<2e>-.55 E .522<536f6d6520494d41502073657276>108 602.4 R .522
 <657273206172652062726f6b>-.15 F .522
 <656e20616e6420646f206e6f7420737570706f727420554944732070726f7065726c79>
 -.1 F 5.522<2e49>-.65 G 3.022<6679>-5.522 G .522<6f7520636f6e74696e7565
 20746f206765742074686973206572726f7220666f7220616c6c>-3.022 F .067
-<796f757220666f6c646572732065>108 590.4 R -.15<7665>-.25 G 2.566<6e61>
+<796f757220666f6c646572732065>108 614.4 R -.15<7665>-.25 G 2.566<6e61>
 .15 G .066<6674657220706572666f726d696e67207468652061626f>-2.566 F .366
 -.15<76652070>-.15 H .066<726f6365647572652c206974206973206c696b>.15 F
 .066<656c79207468617420796f757220494d41502073657276>-.1 F .066<65722066>
 -.15 F .066<616c6c7320696e746f2074686973206361742d>-.1 F -.15<6567>108
-602.4 S<6f7279>.15 E<2e>-.65 E F2<4f668d696e65494d4150>5.983 E F0 .984
+626.4 S<6f7279>.15 E<2e>-.65 E F1<4f668d696e65494d4150>5.983 E F0 .984
 <697320696e636f6d70617469626c65207769746820737563682073657276>3.483 F
-3.484<6572732e205573696e67>-.15 F F2<4f668d696e65494d4150>3.484 E F0
+3.484<6572732e205573696e67>-.15 F F1<4f668d696e65494d4150>3.484 E F0
 .984<77697468207468656d2077696c6c206e6f742064657374726f>3.484 F<79>-.1 E
-<616e>108 614.4 Q 2.77<796d>-.15 G .27<61696c2c2062>-2.77 F .27<75742061
+<616e>108 638.4 Q 2.77<796d>-.15 G .27<61696c2c2062>-2.77 F .27<75742061
 74207468652073616d652074696d652c2069742077696c6c206e6f742061637475616c6c
 792073796e6368726f6e697a6520697420656974686572>-.2 F 5.269<2e28>-.55 G
 <4f66>-5.269 E .269
 <8d696e65494d41502077696c6c20646574656374207468697320636f6e2d>-.25 F<64
 6974696f6e20616e642061626f7274207072696f7220746f2073796e6368726f6e697a61
-74696f6e29>108 626.4 Q F3 -.438<4f54>72 655.2 S<4845522046524551>.438 E
+74696f6e29>108 650.4 Q F3 -.438<4f54>72 679.2 S<4845522046524551>.438 E
 <55454e544c>-.11 E 2.738<5941>-1.007 G<534b45442051>-2.738 E
 <55455354494f4e53>-.11 E F0 .683
-<54686572652061726520736f6d65206f746865722046>108 667.2 R -.55<4151>-.74
+<54686572652061726520736f6d65206f746865722046>108 691.2 R -.55<4151>-.74
 G 3.184<7374>.55 G .684<686174206d69676874206e6f74208c7420696e746f20616e
 6f746865722073656374696f6e206f66207468697320646f63756d656e742c20616e6420
 746865>-3.184 F 3.184<7961>-.15 G .684<726520656e756d6572>-3.184 F<2d>
--.2 E<6174656420686572652e>108 679.2 Q F2<5768617420706c617466>108 696 Q
-<6f726d7320646f6573204f668d696e65494d41502072756e206f6e3f>-.25 E F0<4974
-2073686f756c642072756e206f6e206d6f737420706c6174666f726d7320737570706f72
-74656420627920507974686f6e2c207768696368206172652071756974652061206665>
-144 708 Q -.65<772e>-.25 G<4a6f686e20476f65727a656e>72 768 Q
+-.2 E<6174656420686572652e>108 703.2 Q<4a6f686e20476f65727a656e>72 768 Q
 <4a756c792031322c2032303032>151.655 E<36>201.915 E 0 Cg EP
 %%Page: 7 7
 %%BeginPageSetup
@@ -1046,367 +1049,370 @@ BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E/F1 10/Times-Bold@0 SF .689
+113.72 E/F1 10/Times-Bold@0 SF<5768617420706c617466>108 84 Q
+<6f726d7320646f6573204f668d696e65494d41502072756e206f6e3f>-.25 E F0<4974
+2073686f756c642072756e206f6e206d6f737420706c6174666f726d7320737570706f72
+74656420627920507974686f6e2c207768696368206172652071756974652061206665>
+144 96 Q -.65<772e>-.25 G F1 .689
 <49276d207573696e67204d7574742e204f7468657220494d41502073796e63207072>
-108 84 R .689<6f6772616d732072>-.18 F<6571756972>-.18 E 3.189<656d>-.18
-G 3.189<6574>-3.189 G 3.189<6f75>-3.189 G .689
+108 112.8 R .689<6f6772616d732072>-.18 F<6571756972>-.18 E 3.189<656d>
+-.18 G 3.189<6574>-3.189 G 3.189<6f75>-3.189 G .689
 <736520736574206d61696c6469725f74726173683d79>-3.189 F .688
 <6573202e20446f2049206e65656420746f>-.1 F
-<646f20746861742077697468204f668d696e65494d41503f>108 96 Q F0<4e6f2e>144
-108 Q F1<4f668d696e65494d4150>7.27 E F0 2.27<697320736d61727420656e6f75
-676820746f208c67757265206f7574206d6573736167652064656c6574696f6e20776974
-686f757420746869732065>4.77 F 2.27<78747261206372757463682e>-.15 F -1.1
-<596f>144 120 S<7527>1.1 E
+<646f20746861742077697468204f668d696e65494d41503f>108 124.8 Q F0<4e6f2e>
+144 136.8 Q F1<4f668d696e65494d4150>7.27 E F0 2.27<697320736d6172742065
+6e6f75676820746f208c67757265206f7574206d6573736167652064656c6574696f6e20
+776974686f757420746869732065>4.77 F 2.27<78747261206372757463682e>-.15 F
+-1.1<596f>144 148.8 S<7527>1.1 E
 <6c6c2067657420746865206265737420726573756c747320696620796f7520646f6e27>
 -.1 E 2.5<7475>-.18 G<736520746869732073657474696e672c20696e2066>-2.5 E
-<6163742e>-.1 E F1<486f>108 136.8 Q 2.5<7764>-.1 G 2.5<6f4973>-2.5 G
+<6163742e>-.1 E F1<486f>108 165.6 Q 2.5<7764>-.1 G 2.5<6f4973>-2.5 G
 <70656369667920746865206e616d6573206f66206d792066>-2.5 E<6f6c646572733f>
--.25 E F0 -1.1<596f>144 148.8 S 3.55<7564>1.1 G 3.55<6f6e>-3.55 G 1.05
+-.25 E F0 -1.1<596f>144 177.6 S 3.55<7564>1.1 G 3.55<6f6e>-3.55 G 1.05
 <6f74206e65656420746f2e>-3.55 F F1<4f668d696e65494d4150>6.05 E F0 1.05<
 697320736d61727420656e6f75676820746f206175746f6d61746963616c6c79208c6775
 7265206f7574207768617420666f6c6465727320617265>3.55 F .679
-<70726573656e74206f6e2074686520494d41502073657276>144 160.8 R .679
+<70726573656e74206f6e2074686520494d41502073657276>144 189.6 R .679
 <657220616e642073796e6368726f6e697a65207468656d2e>-.15 F -1.1<596f>5.679
 G 3.178<7563>1.1 G .678<616e2075736520746865>-3.178 F F1 -.25<666f>3.178
 G<6c6465728c6c746572>.25 E F0<616e64>3.178 E F1 -.25<666f>3.178 G
 <6c6465727472616e73>.25 E F0<636f6e8c6775726174696f6e208c6c65206f707469
 6f6e7320746f2072657175657374206365727461696e20666f6c6465727320616e642072
-656e616d65207468656d20617320746865>144 172.8 Q 2.5<7963>-.15 G
-<6f6d6520696e20696620796f75206c696b>-2.5 E<652e>-.1 E F1<486f>108 189.6
+656e616d65207468656d20617320746865>144 201.6 Q 2.5<7963>-.15 G
+<6f6d6520696e20696620796f75206c696b>-2.5 E<652e>-.1 E F1<486f>108 218.4
 Q 2.5<7763>-.1 G<616e2049207072>-2.5 E -2.3 -.15<65762065>-.18 H
 <6e74206365727461696e2066>.15 E<6f6c64657273206672>-.25 E
-<6f6d206265696e672073796e6365643f>-.18 E F0<55736520746865>144 201.6 Q
+<6f6d206265696e672073796e6365643f>-.18 E F0<55736520746865>144 230.4 Q
 F1 -.25<666f>2.5 G<6c6465728c6c746572>.25 E F0
 <6f7074696f6e20696e2074686520636f6e8c6775726174696f6e208c6c652e>2.5 E F1
-<486f>108 218.4 Q 2.5<7763>-.1 G
+<486f>108 247.2 Q 2.5<7763>-.1 G
 <616e204920616464206f722064656c65746520612066>-2.5 E<6f6c6465723f>-.25 E
-<4f668d696e65494d4150>144 230.4 Q F0 .503
+<4f668d696e65494d4150>144 259.2 Q F0 .503
 <646f6573206e6f742063757272656e746c792070726f>3.003 F .504
 <76696465207468697320666561747572652c2062>-.15 F .504
 <757420696620796f75206372656174652061206e65>-.2 F 3.004<7766>-.25 G .504
-<6f6c646572206f6e2074686520494d4150>-3.004 F<73657276>144 242.4 Q<6572>
+<6f6c646572206f6e2074686520494d4150>-3.004 F<73657276>144 271.2 Q<6572>
 -.15 E 2.5<2c69>-.4 G 2.5<7477>-2.5 G<696c6c2062652063726561746564206c6f
-63616c6c79206175746f6d61746963616c6c79>-2.5 E<2e>-.65 E F1<4172>108
-259.2 Q 2.5<6574>-.18 G<686572>-2.5 E 2.5<6561>-.18 G
+63616c6c79206175746f6d61746963616c6c79>-2.5 E<2e>-.65 E F1<4172>108 288
+Q 2.5<6574>-.18 G<686572>-2.5 E 2.5<6561>-.18 G
 <6e79206f7468657220776172>-2.5 E
 <6e696e6773207468617420492073686f756c642062652061776172>-.15 E 2.5<656f>
--.18 G<663f>-2.5 E F0 -1<5965>144 271.2 S<733b2073656520746865204e4f>1 E
+-.18 G<663f>-2.5 E F0 -1<5965>144 300 S<733b2073656520746865204e4f>1 E
 <5445532073656374696f6e2062656c6f>-.4 E -.65<772e>-.25 G F1
-<5768617420697320746865206d61696c626f78206e616d652072>108 288 Q
+<5768617420697320746865206d61696c626f78206e616d652072>108 316.8 Q
 <65636f7264657220286d626e616d6573292066>-.18 E<6f723f>-.25 E F0 1.019<54
 6865204d757474206d61696c20726561646572206973206e6f742063617061626c65206f
 66206175746f6d61746963616c6c792064657465726d696e696e6720746865206e616d65
-73206f6620796f7572206d61696c626f78>144 300 R<65732e>-.15 E<4f66>144 312
-Q .265<8d696e65494d41502063616e2068656c7020697420286f72206d616e>-.25 F
-2.765<796f>-.15 G .265<74686572292070726f6772616d73206f7574206265207772
-6974696e67207468657365206e616d6573206f757420696e206120666f726d617420796f
-75>-2.765 F<73706563696679>144 324 Q 5<2e53>-.65 G<6565207468652065>-5 E
-<78616d706c65206f66>-.15 E
+73206f6620796f7572206d61696c626f78>144 328.8 R<65732e>-.15 E<4f66>144
+340.8 Q .265<8d696e65494d41502063616e2068656c7020697420286f72206d616e>
+-.25 F 2.765<796f>-.15 G .265<74686572292070726f6772616d73206f7574206265
+2077726974696e67207468657365206e616d6573206f757420696e206120666f726d6174
+20796f75>-2.765 F<73706563696679>144 352.8 Q 5<2e53>-.65 G
+<6565207468652065>-5 E<78616d706c65206f66>-.15 E
 <8d696e65696d61702e636f6e66208c6c6520666f722064657461696c732e>-.25 E F1
-<43616e20492073796e636872>108 340.8 Q<6f6e697a65206d756c7469706c65206163
+<43616e20492073796e636872>108 369.6 Q<6f6e697a65206d756c7469706c65206163
 636f756e74732077697468204f668d696e65494d41503f>-.18 E F0 3.345
-<537572652e204a757374>144 352.8 R .845<6e616d65207468656d20616c6c20696e
+<537572652e204a757374>144 381.6 R .845<6e616d65207468656d20616c6c20696e
 20746865206163636f756e7473206c696e6520696e207468652067656e6572616c207365
 6374696f6e206f662074686520636f6e8c67208c6c652c20616e64206164642061>3.345
-F<706572>144 364.8 Q
+F<706572>144 393.6 Q
 <2d6163636f756e742073656374696f6e20666f722065616368206f6e652e>-.2 E F1
-<446f6573204f668d696e65494d415020737570706f727420504f503f>108 381.6 Q F0
-4.076<4e6f2e20504f50>144 393.6 R 1.576<6973206e6f7420726f62>4.076 F
+<446f6573204f668d696e65494d415020737570706f727420504f503f>108 410.4 Q F0
+4.076<4e6f2e20504f50>144 422.4 R 1.576<6973206e6f7420726f62>4.076 F
 1.576<75737420656e6f75676820746f20646f206120636f6d706c6574656c792072656c
 6961626c65206d756c74692d6d616368696e652073796e6368726f6e697a6174696f6e20
-6c696b>-.2 F<65>-.1 E<4f66>144 405.6 Q<8d696e65494d41502063616e20646f2e>
+6c696b>-.2 F<65>-.1 E<4f66>144 434.4 Q<8d696e65494d41502063616e20646f2e>
 -.25 E<4f66>5 E
 <8d696e65494d41502077696c6c206e6f7420737570706f72742069742e>-.25 E F1
-<446f2079>108 422.4 Q<6f7520737570706f7274206d61696c626f782066>-.25 E
+<446f2079>108 451.2 Q<6f7520737570706f7274206d61696c626f782066>-.25 E
 <6f726d617473206f74686572207468616e204d61696c6469723f>-.25 E F0 .41
-<4e6f742061742070726573656e742e>144 434.4 R .41<5468657265206973206e6f20
+<4e6f742061742070726573656e742e>144 463.2 R .41<5468657265206973206e6f20
 746563686e6963616c20726561736f6e206e6f7420746f3b206a757374206e6f2064656d
 616e64207965742e>5.41 F .409
 <4d61696c6469722069732061207375706572696f7220666f72>5.409 F<2d>-.2 E
-<6d617420616e>144 446.4 Q<7977>-.15 E<6179>-.1 E<2e>-.65 E F1
-<5b746563686e6963616c5d205768>108 463.2 Q 2.5<7961>-.15 G .36 -.18
+<6d617420616e>144 475.2 Q<7977>-.15 E<6179>-.1 E<2e>-.65 E F1
+<5b746563686e6963616c5d205768>108 492 Q 2.5<7961>-.15 G .36 -.18
 <72652079>-2.5 H<6f7572204d61696c646972206d657373616765208c6c656e616d65
-7320736f20687567653f>-.07 E<4f668d696e65494d4150>144 475.2 Q F0 .958
+7320736f20687567653f>-.07 E<4f668d696e65494d4150>144 504 Q F0 .958
 <686173207477>3.458 F 3.458<6f72>-.1 G<656c65>-3.458 E -.25<7661>-.25 G
 .958<6e74207072696e6369706c65733a203129206e65>.25 F -.15<7665>-.25 G
 3.459<726d>.15 G .959
 <6f64696679696e6720796f7572206d6573736167657320696e20616e>-3.459 F 3.459
 <7977>-.15 G .959<617920616e64203229>-3.559 F .493<656e737572696e672031
-3030252072656c6961626c652073796e6368726f6e697a6174696f6e732e>144 487.2 R
+3030252072656c6961626c652073796e6368726f6e697a6174696f6e732e>144 516 R
 .493<496e206f7264657220746f20646f20612072656c6961626c652073796e632c>
 5.493 F F1<4f668d696e65494d4150>2.993 E F0 .493<6d757374206861>2.993 F
--.15<7665>-.2 G 3.094<6177>144 499.2 S .594<617920746f20756e697175656c79
-206964656e74696679206561636820652d6d61696c2e>-3.194 F .595<546872656520
-706965636573206f6620696e666f726d6174696f6e206172652072657175697265642074
-6f20646f20746869733a20796f7572>5.594 F .538<6163636f756e74206e616d652c20
-74686520666f6c646572206e616d652c20616e6420746865206d65737361676520554944
-2e>144 511.2 R .537<546865206163636f756e74206e616d652063616e206265206361
-6c63756c617465642066726f6d>5.537 F 1.081<746865207061746820696e20776869
-636820796f7572206d65737361676573206172652e>144 523.2 R 1.082<5468652066
-6f6c646572206e616d652063616e20757375616c6c792062652061732077656c6c2c2042>
-6.082 F 1.082<555420736f6d65206d61696c>-.1 F<636c69656e7473206d6f>144
-535.2 Q .3 -.15<7665206d>-.15 H<65737361676573206265747765656e20666f6c64
-6572732062792073696d706c79206d6f>.15 E
-<76696e6720746865208c6c652c206c6561>-.15 E
-<76696e6720746865206e616d6520696e746163742e>-.2 E<536f2c>144 552 Q F1
+-.15<7665>-.2 G 3.094<6177>144 528 S .594<617920746f20756e697175656c7920
+6964656e74696679206561636820652d6d61696c2e>-3.194 F .595<54687265652070
+6965636573206f6620696e666f726d6174696f6e2061726520726571756972656420746f
+20646f20746869733a20796f7572>5.594 F .538<6163636f756e74206e616d652c2074
+686520666f6c646572206e616d652c20616e6420746865206d657373616765205549442e>
+144 540 R .537<546865206163636f756e74206e616d652063616e2062652063616c63
+756c617465642066726f6d>5.537 F 1.081<746865207061746820696e207768696368
+20796f7572206d65737361676573206172652e>144 552 R 1.082<54686520666f6c64
+6572206e616d652063616e20757375616c6c792062652061732077656c6c2c2042>6.082
+F 1.082<555420736f6d65206d61696c>-.1 F<636c69656e7473206d6f>144 564 Q .3
+-.15<7665206d>-.15 H<65737361676573206265747765656e20666f6c646572732062
+792073696d706c79206d6f>.15 E<76696e6720746865208c6c652c206c6561>-.15 E
+<76696e6720746865206e616d6520696e746163742e>-.2 E<536f2c>144 580.8 Q F1
 <4f668d696e65494d4150>3.2 E F0 .7
 <6d7573742073746f726520626f746820612055494420666f6c6465722049442e>3.2 F
 .7<54686520666f6c646572204944206973206e656365737361727920736f>5.7 F F1
 <4f668d696e65494d4150>3.2 E F0 .455
-<63616e206465746563742061206d657373616765206d6f>144 564 R -.15<7665>-.15
-G 2.955<6474>.15 G 2.955<6f6164>-2.955 G<6966>-2.955 E .455
+<63616e206465746563742061206d657373616765206d6f>144 592.8 R -.15<7665>
+-.15 G 2.955<6474>.15 G 2.955<6f6164>-2.955 G<6966>-2.955 E .455
 <666572656e7420666f6c646572>-.25 F<2e>-.55 E F1<4f668d696e65494d4150>
 5.455 E F0 .456
 <73746f72657320746865205549442028553d206e756d6265722920616e64>2.955 F<61
 6e206d643573756d206f662074686520666f6c6465726e616d652028464d44353d206e75
-6d6265722920746f2066>144 576 Q<6163696c697461746520746869732e>-.1 E F1
+6d6265722920746f2066>144 604.8 Q<6163696c697461746520746869732e>-.1 E F1
 <5768617420697320746865207370656564206f66204f668d696e65494d415027>108
-592.8 Q 2.5<7373>-.37 G<796e633f>-2.5 E<4f668d696e65494d4150>144 604.8 Q
+621.6 Q 2.5<7373>-.37 G<796e633f>-2.5 E<4f668d696e65494d4150>144 633.6 Q
 F0 -.15<7665>2.891 G .391<7273696f6e7320322e3020616e642061626f>.15 F
 .691 -.15<76652063>-.15 H .391
 <6f6e7461696e2061206d756c746974687265616465642073797374656d2e>.15 F
 2.891<4167>5.391 G .39<6f6f642077>-2.891 F .39<617920746f2065>-.1 F
 <78706572696d656e74>-.15 E<69732062792073657474696e67206d617873796e6361
 63636f756e747320746f203320616e64206d6178636f6e6e656374696f6e7320746f2033
-20696e2065616368206163636f756e7420636c617573652e>144 616.8 Q .381
-<54686973206c657473204f66>144 633.6 R .381<8d696e65494d4150206f70656e20
+20696e2065616368206163636f756e7420636c617573652e>144 645.6 Q .381
+<54686973206c657473204f66>144 662.4 R .381<8d696e65494d4150206f70656e20
 7570206d756c7469706c6520636f6e6e656374696f6e732073696d756c74616e656f7573
 6c79>-.25 F 5.382<2e54>-.65 G .382
 <6861742077696c6c206c65742069742070726f63657373206d756c2d>-5.382 F
 <7469706c6520666f6c6465727320616e64206d65737361676573206174206f6e63652e>
-144 645.6 Q<496e206d6f73742063617365732c20746869732077696c6c20696e637265
+144 674.4 Q<496e206d6f73742063617365732c20746869732077696c6c20696e637265
 61736520706572666f726d616e6365206f66207468652073796e632e>5 E<446f6e27>
-144 662.4 Q 3.104<7473>-.18 G .604
+144 691.2 Q 3.104<7473>-.18 G .604
 <657420746865206e756d62657220746f6f20686967682e>-3.104 F .603<496620796f
 7520646f20746861742c207468696e6773206d696768742061637475616c6c7920736c6f>
 5.604 F 3.103<7764>-.25 G -.25<6f77>-3.103 G 3.103<6e61>.25 G 3.103
 <7379>-3.103 G .603<6f7572206c696e6b2067657473>-3.103 F 2.632
-<7361747572617465642e20416c736f2c>144 674.4 R .132<746f6f206d616e>2.632
+<7361747572617465642e20416c736f2c>144 703.2 R .132<746f6f206d616e>2.632
 F 2.632<7963>-.15 G .132
 <6f6e6e656374696f6e732063616e206361757365206d61696c2073657276>-2.632 F
 .132<65727320746f206861>-.15 F .433 -.15<7665206578>-.2 H<6365737369>.15
 E .433 -.15<7665206c>-.25 H 2.633<6f61642e2041646d696e69737472612d>.15 F
-.507<746f7273206d696768742074616b>144 686.4 R 3.007<6575>-.1 G .507
+.507<746f7273206d696768742074616b>144 715.2 R 3.007<6575>-.1 G .507
 <6e6b696e646c7920746f20746869732c20616e64207468652073657276>-3.007 F
 .506<6572206d6967687420626f6720646f>-.15 F 3.006<776e2e205468657265>-.25
 F .506<617265206d616e>3.006 F 3.006<7976>-.15 G .506
 <61726961626c657320696e20746865>-3.256 F
-<6f7074696d616c2073657474696e673b2065>144 698.4 Q
-<78706572696d656e746174696f6e206d61792068656c702e>-.15 E<416e20696e666f
-726d616c2062656e63686d61726b207969656c647320746865736520726573756c747320
-666f72206d792073657475703a>144 715.2 Q<4a6f686e20476f65727a656e>72 768 Q
-<4a756c792031322c2032303032>151.655 E<37>201.915 E 0 Cg EP
+<6f7074696d616c2073657474696e673b2065>144 727.2 Q
+<78706572696d656e746174696f6e206d61792068656c702e>-.15 E
+<4a6f686e20476f65727a656e>72 768 Q<4a756c792031322c2032303032>151.655 E
+<37>201.915 E 0 Cg EP
 %%Page: 8 8
 %%BeginPageSetup
 BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E<3130206d696e757465732077697468204d61634f532058204d61696c2e6170
-7020226d616e75616c20636163686522>144 84 Q 2.5<356d>144 96 S
+113.72 E<416e20696e666f726d616c2062656e63686d61726b207969656c6473207468
+65736520726573756c747320666f72206d792073657475703a>144 84 Q<3130206d696e
+757465732077697468204d61634f532058204d61696c2e61707020226d616e75616c2063
+6163686522>144 100.8 Q 2.5<356d>144 112.8 S
 <696e75746573207769746820474e5553206167656e742073796e63>-2.5 E
-<3230207365636f6e64732077697468204f66>144 108 Q
-<8d696e65494d415020312e78>-.25 E 2.5<3973>144 120 S
+<3230207365636f6e64732077697468204f66>144 124.8 Q
+<8d696e65494d415020312e78>-.25 E 2.5<3973>144 136.8 S
 <65636f6e64732077697468204f66>-2.5 E<8d696e65494d415020322e78>-.25 E 2.5
-<3373>144 132 S<65636f6e64732077697468204f66>-2.5 E
+<3373>144 148.8 S<65636f6e64732077697468204f66>-2.5 E
 <8d696e65494d415020332e782022636f6c6420737461727422>-.25 E 2.5<3273>144
-144 S<65636f6e64732077697468204f66>-2.5 E
+160.8 S<65636f6e64732077697468204f66>-2.5 E
 <8d696e65494d415020332e78202268656c6420636f6e6e656374696f6e22>-.25 E/F1
-10.95/Times-Bold@0 SF<434f4e464f524d494e472054>72 160.8 Q<4f>-.197 E F0
-32.5<8349>108 172.8 S
+10.95/Times-Bold@0 SF<434f4e464f524d494e472054>72 177.6 Q<4f>-.197 E F0
+32.5<8349>108 189.6 S
 <6e7465726e6574204d657373616765204163636573732050726f746f636f6c2076>
 -32.5 E<657273696f6e20347265>-.15 E<76312028494d415020347265>-.25 E
 <7631292061732073706563698c656420696e2052464332303630>-.25 E 32.5<8343>
-108 189.6 S
+108 206.4 S
 <52414d2d4d44352061732073706563698c656420696e2052464332313935>-32.5 E
-32.5<834d>108 206.4 S 8.92
+32.5<834d>108 223.2 S 8.92
 <61696c6469722061732073706563698c656420696e20687474703a2f2f777777>-32.5
 F<2e716d61696c2e6f72>-.65 E
 <672f716d61696c2d6d616e75616c2d68746d6c2f6d616e352f6d61696c646972>-.18 E
-8.92<2e68746d6c20616e64>-.55 F<687474703a2f2f6372>144 218.4 Q
+8.92<2e68746d6c20616e64>-.55 F<687474703a2f2f6372>144 235.2 Q
 <2e79702e746f2f70726f746f2f6d61696c646972>-.55 E<2e68746d6c2e>-.55 E
-32.5<8353>108 235.2 S<74616e6461726420507974686f6e20322e322e312061732069
-6d706c656d656e746564206f6e20504f5349582d636f6d706c69616e742073797374656d
-732e>-32.5 E F1<4e4f>72 252 Q<544553>-.438 E/F2 10/Times-Bold@0 SF
-<44454c4554494e47204c4f43414c20464f4c44455253>87 264 Q
-<4f668d696e65494d4150>108 276 Q F0 .533<646f65732061207477>3.033 F
+32.5<8353>108 252 S<74616e6461726420507974686f6e20322e322e3120617320696d
+706c656d656e746564206f6e20504f5349582d636f6d706c69616e742073797374656d73
+2e>-32.5 E F1<4e4f>72 268.8 Q<544553>-.438 E/F2 10/Times-Bold@0 SF
+<44454c4554494e47204c4f43414c20464f4c44455253>87 280.8 Q
+<4f668d696e65494d4150>108 292.8 Q F0 .533<646f65732061207477>3.033 F
 <6f2d77>-.1 E .533<61792073796e6368726f6e697a6174696f6e2e>-.1 F .532
 <546861742069732c20696620796f75206d616b>5.532 F 3.032<656163>-.1 G .532
 <68616e676520746f20746865206d61696c206f6e207468652073657276>-3.032 F
 <6572>-.15 E 3.032<2c69>-.4 G<74>-3.032 E .896
-<77696c6c2062652070726f706f67>108 288 R .896
+<77696c6c2062652070726f706f67>108 304.8 R .896
 <6174656420746f20796f7572206c6f63616c20636f70>-.05 F 2.197 -.65
 <792c2061>-.1 H .897<6e6420766973652d76>.65 F 3.397
 <657273612e20536f6d65>-.15 F .897
 <70656f706c65206d69676874207468696e6b20746861742069742077>3.397 F .897
 <6f756c64206265207769736520746f>-.1 F 1.59<6a7573742064656c65746520616c
 6c207468656972206c6f63616c206d61696c20666f6c6465727320706572696f64696361
-6c6c79>108 300 R 6.59<2e49>-.65 G 4.09<6679>-6.59 G 1.59
+6c6c79>108 316.8 R 6.59<2e49>-.65 G 4.09<6679>-6.59 G 1.59
 <6f7520646f20746869732077697468204f66>-4.09 F<8d696e65494d4150>-.25 E
 4.09<2c72>-1.11 G 1.59<656d656d62657220746f20616c736f>-4.09 F<72656d6f>
-108 312 Q 1.67 -.15<76652079>-.15 H 1.37
+108 328.8 Q 1.67 -.15<76652079>-.15 H 1.37
 <6f7572206c6f63616c2073746174757320636163686520287e2f2e6f66>.15 F 1.37
 <8d696e65696d617020627920646566>-.25 F 3.87
 <61756c74292e204f74686572776973652c>-.1 F<4f66>3.87 E 1.37
 <8d696e65494d41502077696c6c2074616b>-.25 F 3.87<6574>-.1 G 1.37
 <68697320617320616e>-3.87 F .416
-<696e74656e74696f6e616c2064656c6574696f6e206f66206d616e>108 324 R 2.916
-<796d>-.15 G .416<6573736167657320616e642077696c6c20696e7465727072657420
-796f757220616374696f6e2061732072657175657374696e67207468656d20746f206265
-2064656c657465642066726f6d>-2.916 F<7468652073657276>108 336 Q
+<696e74656e74696f6e616c2064656c6574696f6e206f66206d616e>108 340.8 R
+2.916<796d>-.15 G .416<6573736167657320616e642077696c6c20696e7465727072
+657420796f757220616374696f6e2061732072657175657374696e67207468656d20746f
+2062652064656c657465642066726f6d>-2.916 F<7468652073657276>108 352.8 Q
 <65722061732077656c6c2e>-.15 E<28496620796f7520646f6e27>5 E 2.5<7475>
 -.18 G<6e6465727374616e6420746869732c20646f6e27>-2.5 E 2.5<7477>-.18 G
 <6f7272793b20796f752070726f6261626c792077>-2.6 E<6f6e27>-.1 E 2.5<7465>
 -.18 G<6e636f756e746572207468697320736974756174696f6e29>-2.5 E F2
-<434f5059494e47204d45535341>87 352.8 Q
+<434f5059494e47204d45535341>87 369.6 Q
 <474553204245545745454e20464f4c44455253>-.55 E F0<4e6f726d616c6c79>108
-364.8 Q 5.858<2c77>-.65 G 3.358<68656e20796f7520636f70>-5.858 F -8.357
+381.6 Q 5.858<2c77>-.65 G 3.358<68656e20796f7520636f70>-5.858 F -8.357
 5.858<7961206d>-.1 H 3.359
 <657373616765206265747765656e20666f6c64657273206f72206164642061206e65>
 -5.858 F 5.859<776d>-.25 G 3.359
 <65737361676520746f206120666f6c646572206c6f63616c6c79>-5.859 F<2c>-.65 E
-F2<4f668d696e65494d4150>108 376.8 Q F0 .853
+F2<4f668d696e65494d4150>108 393.6 Q F0 .853
 <77696c6c206a75737420646f20746865207269676874207468696e672e>3.353 F
 <486f>5.853 E<7765>-.25 E -.15<7665>-.25 G 1.653 -.4<722c2073>.15 H .853
 <6f6d6574696d657320746869732063616e20626520747269636b>.4 F 3.353<792d>
 -.15 G 3.353<2d69>-3.353 G 3.353<6679>-3.353 G .853
 <6f757220494d41502073657276>-3.353 F<6572>-.15 E .29
-<646f6573206e6f742070726f>108 388.8 R .29<766964652074686520534541524348
+<646f6573206e6f742070726f>108 405.6 R .29<766964652074686520534541524348
 20636f6d6d616e642c206f7220646f6573206e6f742072657475726e20736f6d65746869
 6e672075736566756c2c>-.15 F F2<4f668d696e65494d4150>2.79 E F0 .29
 <63616e6e6f74206465746572>2.79 F<2d>-.2 E .174<6d696e6520746865206e65>
-108 400.8 R 2.674<7755>-.25 G .174<4944206f6620746865206d6573736167652e>
+108 417.6 R 2.674<7755>-.25 G .174<4944206f6620746865206d6573736167652e>
 -2.674 F .173
 <536f2c20696e207468657365207261726520696e7374616e6365732c204f66>5.173 F
 .173<8d696e65494d41502077696c6c2075706c6f616420746865206d65737361676520
-746f20746865>-.25 F .64<494d41502073657276>108 412.8 R .64<657220616e64
+746f20746865>-.25 F .64<494d41502073657276>108 429.6 R .64<657220616e64
 2064656c6574652069742066726f6d20796f7572206c6f63616c20666f6c646572>-.15
 F 5.64<2e54>-.55 G .64<68656e2c206f6e20796f7572206e65>-5.64 F .64
 <78742073796e632c20746865206d6573736167652077696c6c2062652072652d646f>
 -.15 F<776e2d>-.25 E 1.473
-<6c6f616465642077697468207468652070726f706572205549442e>108 424.8 R F2
+<6c6f616465642077697468207468652070726f706572205549442e>108 441.6 R F2
 <4f668d696e65494d4150>6.473 E F0<6d616b>3.973 E 1.473
 <65732073757265207468617420746865206d6573736167652077>-.1 F 1.472
 <61732070726f7065726c792075706c6f61646564206265666f7265>-.1 F<64656c6574
 696e672069742c20736f2074686572652073686f756c64206265206e6f207269736b206f
-662064617461206c6f73732e>108 436.8 Q F2<5553452057495448204556>87 453.6
-Q<4f4c5554494f4e>-.45 E F0<4f66>108 465.6 Q
+662064617461206c6f73732e>108 453.6 Q F2<5553452057495448204556>87 470.4
+Q<4f4c5554494f4e>-.45 E F0<4f66>108 482.4 Q
 <8d696e65494d41502063616e2077>-.25 E<6f726b2077697468204576>-.1 E 2.5
 <6f6c7574696f6e2e2054>-.2 F 2.5<6f64>-.8 G 2.5<6f73>-2.5 G
 <6f2c208c72737420636f6e8c6775726520796f7572204f66>-2.5 E
 <8d696e65494d4150206163636f756e7420746f206861>-.25 E -.15<7665>-.2 G<3a>
-.15 E F2<736570203d202f>108 477.6 Q F0 .437
-<696e2069747320636f6e8c6775726174696f6e2e>108 489.6 R .437
+.15 E F2<736570203d202f>108 494.4 Q F0 .437
+<696e2069747320636f6e8c6775726174696f6e2e>108 506.4 R .437
 <5468656e2c20636f6e8c67757265204576>5.437 F .438
 <6f6c7574696f6e20776974682074686520224d61696c646972>-.2 F .438
 <2d666f726d6174206d61696c206469726563746f72696573222073657276>-.2 F .438
 <657220747970652e>-.15 F -.15<466f>5.438 G<72>.15 E .748<74686520706174
 682c20796f752077696c6c206e65656420746f207370656369667920746865206e616d65
-206f662074686520746f702d6c65>108 501.6 R -.15<7665>-.25 G 3.247<6c66>.15
+206f662074686520746f702d6c65>108 518.4 R -.15<7665>-.25 G 3.247<6c66>.15
 G<6f6c646572>-3.247 E F2<696e73696465>3.247 E F0 .747<796f7572204f66>
 3.247 F .747<8d696e65494d41502073746f72616765206c6f63612d>-.25 F 2.5
-<74696f6e2e2059>108 513.6 R<6f7527>-1.1 E<7265206e6f>-.5 E 2.5<7773>-.25
-G<657421>-2.5 E F2<5553452057495448204b4d41494c>87 530.4 Q F0 .68
-<417420746869732074696d652c20492062656c6965>108 542.4 R .98 -.15
+<74696f6e2e2059>108 530.4 R<6f7527>-1.1 E<7265206e6f>-.5 E 2.5<7773>-.25
+G<657421>-2.5 E F2<5553452057495448204b4d41494c>87 547.2 Q F0 .68
+<417420746869732074696d652c20492062656c6965>108 559.2 R .98 -.15
 <76652074>-.25 H<686174>.15 E F2<4f668d696e65494d4150>3.18 E F0 .68
 <6973206e6f7420636f6d70617469626c652077697468204b4d61696c2e>3.18 F .68
 <4b4d61696c2063616e6e6f742077>5.68 F .68<6f726b20696e20616e>-.1 F 3.18
 <796d>-.15 G<6f6465>-3.18 E .559<6f74686572207468616e20746f206d6f>108
-554.4 R .859 -.15<76652061>-.15 H .559<6c6c206d65737361676573206f757420
+571.2 R .859 -.15<76652061>-.15 H .559<6c6c206d65737361676573206f757420
 6f6620616c6c20666f6c6465727320696d6d6564696174656c79>.15 F 3.059<2c77>
 -.65 G .558<68696368202862657369646573206265696e6720616e6e6f>-3.059 F
 .558<79696e6720616e642066756e64612d>-.1 F<6d656e74616c6c792062726f6b>108
-566.4 Q<656e2920697320696e636f6d70617469626c652077697468>-.1 E F2
-<4f668d696e65494d4150>2.5 E<2e>-1.1 E<4d41494c494e47204c495354>87 583.2
-Q F0<546865726520697320616e204f66>108 595.2 Q
+583.2 Q<656e2920697320696e636f6d70617469626c652077697468>-.1 E F2
+<4f668d696e65494d4150>2.5 E<2e>-1.1 E<4d41494c494e47204c495354>87 600 Q
+F0<546865726520697320616e204f66>108 612 Q
 <8d696e65494d4150206d61696c696e67206c6973742061>-.25 E -.25<7661>-.2 G
-<696c61626c652e>.25 E 2.447 -.8<546f2073>108 612 T .847
+<696c61626c652e>.25 E 2.447 -.8<546f2073>108 628.8 T .847
 <75627363726962652c2073656e6420746865207465>.8 F .847<787420225375627363
 726962652220696e20746865207375626a656374206f662061206d61696c20746f206f66>
 -.15 F<8d696e65696d61702d7265717565737440636f6d706c6574652e6f72>-.25 E
 3.348<672e2054>-.18 F<6f>-.8 E
-<706f73742c2073656e6420746865206d65737361676520746f206f66>108 624 Q
+<706f73742c2073656e6420746865206d65737361676520746f206f66>108 640.8 Q
 <8d696e65696d617040636f6d706c6574652e6f72>-.25 E<672e>-.18 E F1 -.11
-<4255>72 640.8 S<4753>.11 E F0 4.42<5265706f727473206f662062>108 652.8 R
+<4255>72 657.6 S<4753>.11 E F0 4.42<5265706f727473206f662062>108 669.6 R
 4.419<7567732073686f756c642062652073656e742076696120652d6d61696c20746f20
 746865>-.2 F F2<4f668d696e65494d4150>6.919 E F0 -.2<6275>6.919 G 4.419
 <672d747261636b696e672073797374656d202842545329206174>.2 F<6f66>108
-664.8 Q<8d696e65696d61704062>-.25 E<7567732e636f6d706c6574652e6f72>-.2 E
+681.6 Q<8d696e65696d61704062>-.25 E<7567732e636f6d706c6574652e6f72>-.2 E
 3.396<676f>-.18 G 3.396<7273>-3.396 G .897
 <75626d6974746564206f6e2d6c696e65207573696e67207468652057>-3.396 F .897
 <656220696e74657266>-.8 F .897<61636520617420687474703a2f2f62>-.1 F
-<7567732e636f6d706c6574652e6f72>-.2 E<672f2e>-.18 E<5468652057>108 676.8
+<7567732e636f6d706c6574652e6f72>-.2 E<672f2e>-.18 E<5468652057>108 693.6
 Q<6562207369746520616c736f206c6973747320616c6c2063757272656e742062>-.8 E
 <7567732c20776865726520796f752063616e20636865636b2074686569722073746174
 7573206f7220636f6e74726962>-.2 E<75746520746f208c78696e67207468656d2e>
--.2 E F1<434f50595249474854>72 693.6 Q F0<4f66>108 705.6 Q
-<8d696e65494d4150>-.25 E 2.5<2c61>-1.11 G
-<6e642074686973206d616e75616c2c2061726520436f70>-2.5 E
-<7972696768742028432920323030322c2032303033204a6f686e20476f65727a656e2e>
--.1 E .287<546869732070726f6772616d206973206672656520736f667477>108
-722.4 R .287<6172653b20796f752063616e20726564697374726962>-.1 F .286<75
-746520697420616e642f6f72206d6f6469667920697420756e6465722074686520746572
-6d73206f662074686520474e552047656e6572616c>-.2 F
-<4a6f686e20476f65727a656e>72 768 Q<4a756c792031322c2032303032>151.655 E
-<38>201.915 E 0 Cg EP
+-.2 E<4a6f686e20476f65727a656e>72 768 Q<4a756c792031322c2032303032>
+151.655 E<38>201.915 E 0 Cg EP
 %%Page: 9 9
 %%BeginPageSetup
 BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 111.22<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150206d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.72 E .766<5075626c6963204c6963656e7365206173207075626c69736865642062
-7920746865204672656520536f667477>108 84 R .766<6172652046>-.1 F .766
+113.72 E/F1 10.95/Times-Bold@0 SF<434f50595249474854>72 84 Q F0<4f66>108
+96 Q<8d696e65494d4150>-.25 E 2.5<2c61>-1.11 G
+<6e642074686973206d616e75616c2c2061726520436f70>-2.5 E
+<7972696768742028432920323030322c2032303033204a6f686e20476f65727a656e2e>
+-.1 E .287<546869732070726f6772616d206973206672656520736f667477>108
+112.8 R .287<6172653b20796f752063616e20726564697374726962>-.1 F .286<75
+746520697420616e642f6f72206d6f6469667920697420756e6465722074686520746572
+6d73206f662074686520474e552047656e6572616c>-.2 F .766<5075626c6963204c69
+63656e7365206173207075626c697368656420627920746865204672656520536f667477>
+108 124.8 R .766<6172652046>-.1 F .766
 <6f756e646174696f6e3b206569746865722076>-.15 F .766<657273696f6e2032206f
 6620746865204c6963656e73652c206f722028617420796f7572>-.15 F
-<6f7074696f6e2920616e>108 96 Q 2.5<796c>-.15 G<617465722076>-2.5 E
+<6f7074696f6e2920616e>108 136.8 Q 2.5<796c>-.15 G<617465722076>-2.5 E
 <657273696f6e2e>-.15 E .58
-<546869732070726f6772616d2069732064697374726962>108 112.8 R .579<757465
+<546869732070726f6772616d2069732064697374726962>108 153.6 R .579<757465
 6420696e2074686520686f706520746861742069742077696c6c2062652075736566756c
 2c2062>-.2 F .579<757420574954484f555420414e592057>-.2 F<415252414e5459>
 -1.2 E 3.079<3b77>-.92 G<6974686f7574>-3.079 E -2.15 -.25<65762065>108
-124.8 T 2.729<6e74>.25 G .229<686520696d706c6965642077>-2.729 F .229
+165.6 T 2.729<6e74>.25 G .229<686520696d706c6965642077>-2.729 F .229
 <617272616e7479206f66204d45524348414e54>-.1 F .229
 <4142494c495459206f72204649544e45535320464f5220412050>-.93 F<4152>-.92 E
 .23<544943554c415220505552504f53452e>-.6 F<536565>5.23 E<74686520474e55
 2047656e6572616c205075626c6963204c6963656e736520666f72206d6f726520646574
-61696c732e>108 136.8 Q -1.1<596f>108 153.6 S 2.77<7573>1.1 G .27
+61696c732e>108 177.6 Q -1.1<596f>108 194.4 S 2.77<7573>1.1 G .27
 <686f756c64206861>-2.77 F .57 -.15<76652072>-.2 H<65636569>.15 E -.15
 <7665>-.25 G 2.77<646163>.15 G<6f70>-2.77 E 2.77<796f>-.1 G 2.77<6674>
 -2.77 G .27<686520474e552047656e6572616c205075626c6963204c6963656e736520
 616c6f6e67207769746820746869732070726f6772616d3b206966206e6f742c20777269
-7465>-2.77 F<746f3a>108 165.6 Q<4672656520536f667477>108 182.4 Q
+7465>-2.77 F<746f3a>108 206.4 Q<4672656520536f667477>108 223.2 Q
 <6172652046>-.1 E<6f756e646174696f6e2c20496e632e>-.15 E<35392054>108
-194.4 Q<656d706c6520506c616365>-.7 E<537569746520333330>108 206.4 Q
-<426f73746f6e2c204d41>108 218.4 Q<30323131312d31333037>5 E<555341>108
-230.4 Q/F1 10.95/Times-Bold@0 SF -.548<4155>72 247.2 S<54484f52>.548 E
-/F2 10/Times-Bold@0 SF<4f668d696e65494d4150>108 259.2 Q<2c>-.92 E F0
-.488<697473206c69627261726965732c20646f63756d656e746174696f6e2c20616e64
-20616c6c20696e636c75646564208c6c65732c2065>2.987 F .488
-<7863657074207768657265206e6f7465642c2077>-.15 F .488
-<6173207772697474656e206279204a6f686e>-.1 F
-<476f65727a656e203c6a676f65727a656e40636f6d706c6574652e6f72>108 271.2 Q
+235.2 Q<656d706c6520506c616365>-.7 E<537569746520333330>108 247.2 Q
+<426f73746f6e2c204d41>108 259.2 Q<30323131312d31333037>5 E<555341>108
+271.2 Q F1 -.548<4155>72 288 S<54484f52>.548 E/F2 10/Times-Bold@0 SF
+<4f668d696e65494d4150>108 300 Q<2c>-.92 E F0 .488<697473206c696272617269
+65732c20646f63756d656e746174696f6e2c20616e6420616c6c20696e636c7564656420
+8c6c65732c2065>2.987 F .488<7863657074207768657265206e6f7465642c2077>
+-.15 F .488<6173207772697474656e206279204a6f686e>-.1 F
+<476f65727a656e203c6a676f65727a656e40636f6d706c6574652e6f72>108 312 Q
 <673e20616e6420636f70>-.18 E<7972696768742069732068656c6420617320737461
 74656420696e2074686520434f505952494748542073656374696f6e2e>-.1 E<4f66>
-108 288 Q<8d696e65494d4150206d617920626520646f>-.25 E<776e6c6f616465642c
-20616e6420696e666f726d6174696f6e20666f756e642c2066726f6d2069747320686f6d
-6570616765207669612065697468657220476f70686572206f7220485454503a>-.25 E
-<676f706865723a2f2f717575782e6f72>108 304.8 Q<672f312f6465>-.18 E -.15
+108 328.8 Q<8d696e65494d4150206d617920626520646f>-.25 E<776e6c6f61646564
+2c20616e6420696e666f726d6174696f6e20666f756e642c2066726f6d2069747320686f
+6d6570616765207669612065697468657220476f70686572206f7220485454503a>-.25
+E<676f706865723a2f2f717575782e6f72>108 345.6 Q<672f312f6465>-.18 E -.15
 <7665>-.25 G<6c2f6f66>.15 E<8d696e65696d6170>-.25 E
-<687474703a2f2f717575782e6f72>108 316.8 Q<672f6465>-.18 E -.15<7665>-.25
-G<6c2f6f66>.15 E<8d696e65696d6170>-.25 E<4f66>108 333.6 Q 2.529
+<687474703a2f2f717575782e6f72>108 357.6 Q<672f6465>-.18 E -.15<7665>-.25
+G<6c2f6f66>.15 E<8d696e65696d6170>-.25 E<4f66>108 374.4 Q 2.529
 <8d696e65494d4150206d617920616c736f20626520646f>-.25 F 2.528
 <776e6c6f61646564207573696e6720537562>-.25 F -.15<7665>-.15 G 5.028
 <7273696f6e2e204164646974696f6e616c6c79>.15 F 5.028<2c74>-.65 G 2.528
 <68652064697374726962>-5.028 F 2.528<7574656420746172>-.2 F 2.528
 <2e677a206d6179206265>-.55 F .717<75706461746564207769746820612073696d70
 6c65202273766e207570646174652220636f6d6d616e643b206974206973207265616479
-20746f20676f2e>108 345.6 R -.15<466f>5.718 G 3.218<7269>.15 G .718
+20746f20676f2e>108 386.4 R -.15<466f>5.718 G 3.218<7269>.15 G .718
 <6e666f726d6174696f6e206f6e2067657474696e67204f66>-3.218 F
-<8d696e65494d4150>-.25 E<7769746820537562>108 357.6 Q -.15<7665>-.15 G
+<8d696e65494d4150>-.25 E<7769746820537562>108 398.4 Q -.15<7665>-.15 G
 <7273696f6e2c20706c656173652076697369743a>.15 E
-<687474703a2f2f73766e2e636f6d706c6574652e6f72>108 374.4 Q<672f>-.18 E F1
-<53454520414c534f>72 391.2 Q F2<6d757474>108 403.2 Q F0<2831292c>A F2
+<687474703a2f2f73766e2e636f6d706c6574652e6f72>108 415.2 Q<672f>-.18 E F1
+<53454520414c534f>72 432 Q F2<6d757474>108 444 Q F0<2831292c>A F2
 <707974686f6e>2.5 E F0<2831292e>A<4a6f686e20476f65727a656e>72 768 Q
 <4a756c792031322c2032303032>151.655 E<39>201.915 E 0 Cg EP
 %%Trailer

diff --git a/offlineimap/head/manual.txt b/offlineimap/head/manual.txt
index 2496b789aaa8e5d7b52622282b179bf21796aa17..4dc914723ef6c82106d3c573e273273f74412c36 100644 (file)
--- a/offlineimap/head/manual.txt
+++ b/offlineimap/head/manual.txt
@@ -126,111 +126,116 @@ CONFIGURATION
        thing you need to run OfflineIMAP.  Full documentation for the configu-
        ration file is included within the sample file.
 
+       OfflineIMAP also ships a file named offlineimap.conf.minimal  that  you
+       can  also  try.   It's  useful if you want to get started with the most
+       basic feature set, and you can read about  other  features  later  with
+       offlineimap.conf.
+
 OPTIONS
-       Most configuration is done via the configuration  file.   Nevertheless,
+       Most  configuration  is done via the configuration file.  Nevertheless,
        there are a few options that you may set for OfflineIMAP.
 
-       -1     Disable  all  multithreading operations and use solely a single-
-              thread sync.  This effectively sets the maxsyncaccounts and  all
+       -1     Disable all multithreading operations and use solely  a  single-
+              thread  sync.  This effectively sets the maxsyncaccounts and all
               maxconnections configuration file variables to 1.
 
        -P profiledir
-              Sets  OfflineIMAP  into  profile  mode.  The program will create
+              Sets OfflineIMAP into profile mode.   The  program  will  create
               profiledir (it must not already exist).  As it runs, Python pro-
-              filing  information about each thread is logged into profiledir.
-              Please note: This option is present for debugging and  optimiza-
-              tion  only,  and  should  NOT be used unless you have a specific
-              reason to do so.  It will  significantly  slow  program  perfor-
-              mance,  may reduce reliability, and can generate huge amounts of
+              filing information about each thread is logged into  profiledir.
+              Please  note: This option is present for debugging and optimiza-
+              tion only, and should NOT be used unless  you  have  a  specific
+              reason  to  do  so.   It will significantly slow program perfor-
+              mance, may reduce reliability, and can generate huge amounts  of
               data.  You must use the -1 option when you use -P.
 
 
        -a accountlist
-              Overrides the accounts section in the  config  file.   Lets  you
-              specify  a particular account or set of accounts to sync without
-              having to edit the config file.  You might use this  to  exclude
-              certain  accounts,  or  to  sync some accounts that you normally
+              Overrides  the  accounts  section  in the config file.  Lets you
+              specify a particular account or set of accounts to sync  without
+              having  to  edit the config file.  You might use this to exclude
+              certain accounts, or to sync some  accounts  that  you  normally
               prefer not to.
 
        -c configfile
-              Specifies a configuration file to use in lieu  of  the  default,
+              Specifies  a  configuration  file to use in lieu of the default,
               ~/.offlineimaprc.
 
        -d debugtype[,debugtype...]
-              Enables  debugging  for  OfflineIMAP.  This is useful if you are
-              trying to track down a malfunction or figure out what  is  going
+              Enables debugging for OfflineIMAP.  This is useful  if  you  are
+              trying  to  track down a malfunction or figure out what is going
               on under the hood.  I suggest that you use this with -1 in order
               to make the results more sensible.
 
-              -d now requires one or more  debugtypes,  separated  by  commas.
-              These  define  what exactly will be debugged, and so far include
+              -d  now  requires  one  or more debugtypes, separated by commas.
+              These define what exactly will be debugged, and so  far  include
               two options: imap and maildir.  The imap option will enable IMAP
               protocol stream and parsing debugging.  Note that the output may
-              contain passwords, so take care to remove that from  the  debug-
-              ging  output  before  sending  it  to  anyone else.  The maildir
+              contain  passwords,  so take care to remove that from the debug-
+              ging output before sending  it  to  anyone  else.   The  maildir
               option will enable debugging for certain Maildir operations.
 
-       -o     Run only once, ignoring any autorefresh setting  in  the  config
+       -o     Run  only  once,  ignoring any autorefresh setting in the config
               file.
 
        -h, --help
               Show summary of options.
 
        -u interface
-              Specifies  an  alternative  user  interface module to use.  This
-              overrides the default specified in the configuration file.   The
-              UI  specified  with  -u  will  be forced to be used, even if its
+              Specifies an alternative user interface  module  to  use.   This
+              overrides  the default specified in the configuration file.  The
+              UI specified with -u will be forced to  be  used,  even  if  its
               isuable() method states that it cannot be.  Use this option with
               care.  The pre-defined options are listed in the USER INTERFACES
               section.
 
 USER INTERFACES
-       OfflineIMAP has a pluggable user interface system that lets you  choose
+       OfflineIMAP  has a pluggable user interface system that lets you choose
        how the program communicates information to you.  There are two graphi-
-       cal interfaces, two terminal interfaces, and two noninteractive  inter-
+       cal  interfaces, two terminal interfaces, and two noninteractive inter-
        faces suitable for scripting or logging purposes.  The ui option in the
-       configuration file specifies the user interface  preferences.   The  -u
+       configuration  file  specifies  the user interface preferences.  The -u
        command-line option can override the configuration file.  The available
        values for the configuration file or command-line are describef in this
        section.
 
    Tk.Blinkenlights or Curses.Blinkenlights
-       This  is  an interface designed to be sleek, fun to watch, and informa-
-       tive of the overall picture of what OfflineIMAP is doing.   I  consider
-       it   to   be   the   best  general-purpose  interface  in  OfflineIMAP.
-       Tk.Blinkenlights contains, by default, a small window  with  a  row  of
-       LEDs  and  a  row  of command buttons.  The total size of the window is
-       very small, so it uses little desktop space,  yet  it  is  quite  func-
-       tional.   There  is  also  an  optional,  toggable, log that shows more
+       This is an interface designed to be sleek, fun to watch,  and  informa-
+       tive  of  the overall picture of what OfflineIMAP is doing.  I consider
+       it  to  be  the  best   general-purpose   interface   in   OfflineIMAP.
+       Tk.Blinkenlights  contains,  by  default,  a small window with a row of
+       LEDs and a row of command buttons.  The total size  of  the  window  is
+       very  small,  so  it  uses  little desktop space, yet it is quite func-
+       tional.  There is also an  optional,  toggable,  log  that  shows  more
        detail about what is happening and is color-coded to match the color of
        the lights.
 
-       Curses.Blinkenlights  is an interface very similar to Tk.Blinkenlights,
-       but is designed to be run in a console window (an xterm, Linux  virtual
-       terminal,  etc.)   Since  it  doesn't have access to graphics, it isn't
+       Curses.Blinkenlights is an interface very similar to  Tk.Blinkenlights,
+       but  is designed to be run in a console window (an xterm, Linux virtual
+       terminal, etc.)  Since it doesn't have access  to  graphics,  it  isn't
        quite as pretty, but it still gets the job done.
 
-       Tk.Blinkenlights is the  only  user  interface  that  has  configurable
+       Tk.Blinkenlights  is  the  only  user  interface  that has configurable
        parameters; see the example offlineimap.conf for more details.
 
-       Each  light  in  the Tk.Blinkenlights or Curses.Blinkenlights interface
-       represents a thread of execution -- that is,  a  particular  task  that
+       Each light in the Tk.Blinkenlights  or  Curses.Blinkenlights  interface
+       represents  a  thread  of  execution -- that is, a particular task that
        OfflineIMAP is performing right now.  The color indicates what task the
        particular thread is performing, and are as follows:
 
        Black  indicates that this light's thread has terminated; it will light
-              up  again  later when new threads start up.  So, black indicates
+              up again later when new threads start up.  So,  black  indicates
               no activity.
 
        Red (Meaning 1)
-              is the color of the main program's thread, which basically  does
+              is  the color of the main program's thread, which basically does
               nothing but monitor the others.  It might remind you of HAL 9000
               in 2001.
 
-       Gray   indicates that the thread is establishing a  new  connection  to
+       Gray   indicates  that  the  thread is establishing a new connection to
               the IMAP server.
 
-       Purple is  the color of an account synchronization thread that is moni-
+       Purple is the color of an account synchronization thread that is  moni-
               toring the progress of the folders in that account (not generat-
               ing any I/O).
 
@@ -250,66 +255,66 @@ USER INTERFACES
        Pink   (bright red) indicates that message flags are being removed.
 
        Red / Black Flashing
-              corresponds  to  the  countdown timer that runs between synchro-
+              corresponds to the countdown timer that  runs  between  synchro-
               nizations.
 
-       The name of this interface derives from a bit of computer science  his-
+       The  name of this interface derives from a bit of computer science his-
        tory.  Eric Raymond's Jargon File defines blinkenlights, in part, as:
 
-              Front-panel  diagnostic  lights  on a computer, esp. a dinosaur.
-              Now that dinosaurs are rare, this term usually refers to  status
+              Front-panel diagnostic lights on a computer,  esp.  a  dinosaur.
+              Now  that dinosaurs are rare, this term usually refers to status
               lights on a modem, network hub, or the like.
 
-              This  term derives from the last word of the famous blackletter-
+              This term derives from the last word of the famous  blackletter-
               Gothic sign in mangled pseudo-German that once graced about half
-              the  computer  rooms  in the English-speaking world. One version
+              the computer rooms in the English-speaking  world.  One  version
               ran in its entirety as follows:
 
               ACHTUNG! ALLES LOOKENSPEEPERS!
 
-              Das computermachine ist nicht  fuer  gefingerpoken  und  mitten-
-              grabben.   Ist  easy schnappen der springenwerk, blowenfusen und
-              poppencorken mit spitzensparken.  Ist nicht  fuer  gewerken  bei
+              Das  computermachine  ist  nicht  fuer gefingerpoken und mitten-
+              grabben.  Ist easy schnappen der springenwerk,  blowenfusen  und
+              poppencorken  mit  spitzensparken.   Ist nicht fuer gewerken bei
               das dumpkopfen.  Das rubbernecken sichtseeren keepen das cotten-
-              pickenen hans in das  pockets  muss;  relaxen  und  watchen  das
+              pickenen  hans  in  das  pockets  muss;  relaxen und watchen das
               blinkenlichten.
 
    Tk.VerboseUI
-       This  interface  (formerly  known  as Tk.TkUI) is a graphical interface
-       that presents a variable-sized window.  In the window, each  currently-
-       executing  thread  has  a section where its name and current status are
-       displayed.  This interface is best suited to people running  on  slower
-       connections,  as you get a lot of detail, but for fast connections, the
-       detail may go by too quickly to be useful.  People  with  fast  connec-
+       This interface (formerly known as Tk.TkUI)  is  a  graphical  interface
+       that  presents a variable-sized window.  In the window, each currently-
+       executing thread has a section where its name and  current  status  are
+       displayed.   This  interface is best suited to people running on slower
+       connections, as you get a lot of detail, but for fast connections,  the
+       detail  may  go  by too quickly to be useful.  People with fast connec-
        tions may wish to use Tk.Blinkenlights instead.
 
    TTY.TTYUI
-       This  interface  is  the  default  for people running in terminals.  It
-       prints out basic status messages and is generally friendly to use on  a
+       This interface is the default for  people  running  in  terminals.   It
+       prints  out basic status messages and is generally friendly to use on a
        console or xterm.
 
    Noninteractive.Basic
        This interface is designed for situations where OfflineIMAP will be run
        non-attended and the status of its execution will be logged.  You might
-       use  it,  for instance, to have the system run automatically and e-mail
-       you the results of the synchronization.  This  user  interface  is  not
+       use it, for instance, to have the system run automatically  and  e-mail
+       you  the  results  of  the synchronization.  This user interface is not
        capable of reading a password from the keyboard; account passwords must
        be specified using one of the configuration file options.
 
    Noninteractive.Quiet
        This interface is designed for non-attended running in situations where
-       normal  status messages are not desired.  It will output nothing except
-       errors and serious  warnings.   Like  Noninteractive.Basic,  this  user
-       interface  is  not  capable  of  reading  a password from the keyboard;
+       normal status messages are not desired.  It will output nothing  except
+       errors  and  serious  warnings.   Like  Noninteractive.Basic, this user
+       interface is not capable of  reading  a  password  from  the  keyboard;
        account passwords must be specified using one of the configuration file
        options.
 
 EXAMPLES
-       Here  is an example configuration for a particularly complex situation;
+       Here is an example configuration for a particularly complex  situation;
        more examples will be added later.
 
    MULTIPLE ACCOUNTS WITH MUTT
-       This example shows you how to set up OfflineIMAP to synchronize  multi-
+       This  example shows you how to set up OfflineIMAP to synchronize multi-
        ple accounts with the mutt mail reader.
 
        Start by creating a directory to hold your folders:
@@ -318,7 +323,7 @@ EXAMPLES
        In your ~/.offlineimaprc, specify this:
        accounts = Personal, Work
 
-       Make  sure  that  you have both a [Personal] and a [Work] section, with
+       Make sure that you have both a [Personal] and a  [Work]  section,  with
        different localfolder pathnames and enable [mbnames].
 
        In each account section, do something like this:
@@ -336,10 +341,10 @@ EXAMPLES
 
    UW-IMAPD AND REFERENCES
        Some users with a UW-IMAPD server need to use OfflineIMAP's "reference"
-       feature  to  get at their mailboxes, specifying a reference of "~/Mail"
+       feature to get at their mailboxes, specifying a reference  of  "~/Mail"
        or "#mh/" depending on the configuration.  The below configuration from
-       docwhat@gerf.org  shows  using  a  reference  of Mail, a nametrans that
-       strips the leading Mail/ off incoming folder names, and a  folderfilter
+       docwhat@gerf.org shows using a reference  of  Mail,  a  nametrans  that
+       strips  the leading Mail/ off incoming folder names, and a folderfilter
        that limits the folders synced to just three.
 
        [Gerf]
@@ -362,8 +367,8 @@ EXAMPLES
        holdconnectionopen = no
 
    PYTHONFILE CONFIGURATION FILE OPTION
-       You  can  have  OfflineIMAP load up a Python file before evaluating the
-       configuration file options that are Python expressions.   This  example
+       You can have OfflineIMAP load up a Python file  before  evaluating  the
+       configuration  file  options that are Python expressions.  This example
        is based on one supplied by Tommi Virtanen for this feature.
 
        In ~/.offlineimap.rc, he adds these options:
@@ -392,69 +397,69 @@ EXAMPLES
           folders.sort(mycmp)
           print folders
 
-       This code snippet illustrates how the foldersort  option  can  be  cus-
-       tomized  with  a Python function from the pythonfile to always synchro-
+       This  code  snippet  illustrates  how the foldersort option can be cus-
+       tomized with a Python function from the pythonfile to  always  synchro-
        nize certain folders first.
 
 ERRORS
-       If you get one of  some  frequently-encountered  or  confusing  errors,
+       If  you  get  one  of  some frequently-encountered or confusing errors,
        please check this section.
 
    UID validity problem for folder
-       IMAP  servers  use  a  unique  ID (UID) to refer to a specific message.
+       IMAP servers use a unique ID (UID) to  refer  to  a  specific  message.
        This number is guaranteed to be unique to a particular message FOREVER.
-       No  other  message in the same folder will ever get the same UID.  UIDs
-       are an integral part of OfflineIMAP's synchronization scheme; they  are
+       No other message in the same folder will ever get the same  UID.   UIDs
+       are  an integral part of OfflineIMAP's synchronization scheme; they are
        used to match up messages on your computer to messages on the server.
 
-       Sometimes,  the  UIDs on the server might get reset.  Usually this will
-       happen if you delete and then recreate a folder.   When  you  create  a
-       folder,  the  server  will  often  start  the  UID  back  from  1.  But
-       OfflineIMAP might still have the UIDs from the previous folder  by  the
-       same  name stored.  OfflineIMAP will detect this condition and skip the
+       Sometimes, the UIDs on the server might get reset.  Usually  this  will
+       happen  if  you  delete  and then recreate a folder.  When you create a
+       folder, the  server  will  often  start  the  UID  back  from  1.   But
+       OfflineIMAP  might  still have the UIDs from the previous folder by the
+       same name stored.  OfflineIMAP will detect this condition and skip  the
        folder.  This is GOOD, because it prevents data loss.
 
-       You can fix it by removing your  local  folder  and  cache  data.   For
-       instance,  if  your folders are under ~/Folders and the folder with the
+       You  can  fix  it  by  removing  your local folder and cache data.  For
+       instance, if your folders are under ~/Folders and the folder  with  the
        problem is INBOX, you'd type this:
 
        rm -r ~/Folders/INBOX
        rm ~/.offlineimap/AccountName/INBOX
 
-       (replacing  AccountName  with  the  account  name   as   specified   in
+       (replacing   AccountName   with   the  account  name  as  specified  in
        ~/.offlineimaprc)
 
-       Next  time you run OfflineIMAP, it will re-download the folder with the
-       new UIDs.  Note that the procedure specified above will lose any  local
+       Next time you run OfflineIMAP, it will re-download the folder with  the
+       new  UIDs.  Note that the procedure specified above will lose any local
        changes made to the folder.
 
-       Some  IMAP servers are broken and do not support UIDs properly.  If you
-       continue to get this error for all your folders even  after  performing
+       Some IMAP servers are broken and do not support UIDs properly.  If  you
+       continue  to  get this error for all your folders even after performing
        the above procedure, it is likely that your IMAP server falls into this
        category.   OfflineIMAP  is  incompatible  with  such  servers.   Using
-       OfflineIMAP  with them will not destroy any mail, but at the same time,
-       it will not actually synchronize it either.  (OfflineIMAP  will  detect
+       OfflineIMAP with them will not destroy any mail, but at the same  time,
+       it  will  not actually synchronize it either.  (OfflineIMAP will detect
        this condition and abort prior to synchronization)
 
 
 OTHER FREQUENTLY ASKED QUESTIONS
-       There  are  some  other FAQs that might not fit into another section of
+       There are some other FAQs that might not fit into  another  section  of
        this document, and they are enumerated here.
 
        What platforms does OfflineIMAP run on?
-              It should run on most platforms supported by Python,  which  are
+              It  should  run on most platforms supported by Python, which are
               quite a few.
 
-       I'm  using  Mutt.  Other  IMAP  sync  programs  require  me  to use set
+       I'm using Mutt.  Other  IMAP  sync  programs  require  me  to  use  set
        maildir_trash=yes . Do I need to do that with OfflineIMAP?
-              No.   OfflineIMAP is smart enough to figure out message deletion
-              without this extra crutch.  You'll get the best results  if  you
+              No.  OfflineIMAP is smart enough to figure out message  deletion
+              without  this  extra crutch.  You'll get the best results if you
               don't use this setting, in fact.
 
        How do I specify the names of my folders?
-              You  do  not  need to.  OfflineIMAP is smart enough to automati-
+              You do not need to.  OfflineIMAP is smart  enough  to  automati-
               cally figure out what folders are present on the IMAP server and
-              synchronize  them.  You can use the folderfilter and foldertrans
+              synchronize them.  You can use the folderfilter and  foldertrans
               configuration file options to request certain folders and rename
               them as they come in if you like.
 
@@ -462,8 +467,8 @@ OTHER FREQUENTLY ASKED QUESTIONS
               Use the folderfilter option in the configuration file.
 
        How can I add or delete a folder?
-              OfflineIMAP  does not currently provide this feature, but if you
-              create a new folder on the  IMAP  server,  it  will  be  created
+              OfflineIMAP does not currently provide this feature, but if  you
+              create  a  new  folder  on  the  IMAP server, it will be created
               locally automatically.
 
        Are there any other warnings that I should be aware of?
@@ -471,55 +476,55 @@ OTHER FREQUENTLY ASKED QUESTIONS
 
        What is the mailbox name recorder (mbnames) for?
               The Mutt mail reader is not capable of automatically determining
-              the names of your mailboxes.  OfflineIMAP can help it  (or  many
-              other)  programs  out be writing these names out in a format you
+              the  names  of your mailboxes.  OfflineIMAP can help it (or many
+              other) programs out be writing these names out in a  format  you
               specify.  See the example offlineimap.conf file for details.
 
        Can I synchronize multiple accounts with OfflineIMAP?
-              Sure.  Just name them all in the accounts line  in  the  general
-              section  of  the  config file, and add a per-account section for
+              Sure.   Just  name  them all in the accounts line in the general
+              section of the config file, and add a  per-account  section  for
               each one.
 
        Does OfflineIMAP support POP?
               No.  POP is not robust enough to do a completely reliable multi-
-              machine  synchronization  like  OfflineIMAP can do.  OfflineIMAP
+              machine synchronization like OfflineIMAP  can  do.   OfflineIMAP
               will not support it.
 
        Do you support mailbox formats other than Maildir?
-              Not at present.  There is no technical reason not  to;  just  no
+              Not  at  present.   There is no technical reason not to; just no
               demand yet.  Maildir is a superior format anyway.
 
        [technical] Why are your Maildir message filenames so huge?
               OfflineIMAP has two relevant principles: 1) never modifying your
-              messages in any way and 2) ensuring 100%  reliable  synchroniza-
-              tions.   In order to do a reliable sync, OfflineIMAP must have a
-              way to uniquely identify each e-mail.  Three pieces of  informa-
-              tion  are  required  to  do  this: your account name, the folder
-              name, and the message UID.  The account name can  be  calculated
-              from  the  path in which your messages are.  The folder name can
-              usually be as well, BUT some mail clients move messages  between
+              messages  in  any way and 2) ensuring 100% reliable synchroniza-
+              tions.  In order to do a reliable sync, OfflineIMAP must have  a
+              way  to uniquely identify each e-mail.  Three pieces of informa-
+              tion are required to do this:  your  account  name,  the  folder
+              name,  and  the message UID.  The account name can be calculated
+              from the path in which your messages are.  The folder  name  can
+              usually  be as well, BUT some mail clients move messages between
               folders by simply moving the file, leaving the name intact.
 
-              So,  OfflineIMAP must store both a UID folder ID.  The folder ID
+              So, OfflineIMAP must store both a UID folder ID.  The folder  ID
               is necessary so OfflineIMAP can detect a message moved to a dif-
-              ferent  folder.   OfflineIMAP  stores the UID (U= number) and an
+              ferent folder.  OfflineIMAP stores the UID (U=  number)  and  an
               md5sum of the foldername (FMD5= number) to facilitate this.
 
        What is the speed of OfflineIMAP's sync?
-              OfflineIMAP versions 2.0 and above contain a multithreaded  sys-
-              tem.   A good way to experiment is by setting maxsyncaccounts to
+              OfflineIMAP  versions 2.0 and above contain a multithreaded sys-
+              tem.  A good way to experiment is by setting maxsyncaccounts  to
               3 and maxconnections to 3 in each account clause.
 
-              This lets OfflineIMAP open up  multiple  connections  simultane-
-              ously.   That  will let it process multiple folders and messages
-              at once.  In most cases, this will increase performance  of  the
+              This  lets  OfflineIMAP  open up multiple connections simultane-
+              ously.  That will let it process multiple folders  and  messages
+              at  once.   In most cases, this will increase performance of the
               sync.
 
-              Don't  set  the  number  too high.  If you do that, things might
-              actually slow down as your link gets saturated.  Also, too  many
-              connections  can  cause  mail  servers  to  have excessive load.
+              Don't set the number too high.  If you  do  that,  things  might
+              actually  slow down as your link gets saturated.  Also, too many
+              connections can cause  mail  servers  to  have  excessive  load.
               Administrators might take unkindly to this, and the server might
-              bog  down.   There  are  many  variables in the optimal setting;
+              bog down.  There are many  variables  in  the  optimal  setting;
               experimentation may help.
 
               An informal benchmark yields these results for my setup:
@@ -532,82 +537,82 @@ OTHER FREQUENTLY ASKED QUESTIONS
               2 seconds with OfflineIMAP 3.x "held connection"
 
 CONFORMING TO
-       o      Internet Message Access Protocol version 4rev1 (IMAP  4rev1)  as
+       o      Internet  Message  Access Protocol version 4rev1 (IMAP 4rev1) as
               specified in RFC2060
 
        o      CRAM-MD5 as specified in RFC2195
 
-       o      Maildir   as   specified  in  http://www.qmail.org/qmail-manual-
+       o      Maildir  as  specified   in   http://www.qmail.org/qmail-manual-
               html/man5/maildir.html and http://cr.yp.to/proto/maildir.html.
 
        o      Standard Python 2.2.1 as implemented on POSIX-compliant systems.
 
 NOTES
    DELETING LOCAL FOLDERS
-       OfflineIMAP  does  a  two-way  synchronization.  That is, if you make a
-       change to the mail on the server, it will be propogated to  your  local
+       OfflineIMAP does a two-way synchronization.  That is,  if  you  make  a
+       change  to  the mail on the server, it will be propogated to your local
        copy, and vise-versa.  Some people might think that it would be wise to
-       just delete all their local mail folders periodically.  If you do  this
-       with  OfflineIMAP,  remember  to  also  remove  your local status cache
-       (~/.offlineimap by default).  Otherwise, OfflineIMAP will take this  as
+       just  delete all their local mail folders periodically.  If you do this
+       with OfflineIMAP, remember to  also  remove  your  local  status  cache
+       (~/.offlineimap  by default).  Otherwise, OfflineIMAP will take this as
        an intentional deletion of many messages and will interpret your action
-       as requesting them to be deleted from the  server  as  well.   (If  you
-       don't  understand  this, don't worry; you probably won't encounter this
+       as  requesting  them  to  be  deleted from the server as well.  (If you
+       don't understand this, don't worry; you probably won't  encounter  this
        situation)
 
    COPYING MESSAGES BETWEEN FOLDERS
-       Normally, when you copy a message between folders or add a new  message
-       to  a  folder  locally, OfflineIMAP will just do the right thing.  How-
+       Normally,  when you copy a message between folders or add a new message
+       to a folder locally, OfflineIMAP will just do the  right  thing.   How-
        ever, sometimes this can be tricky -- if your IMAP server does not pro-
-       vide   the  SEARCH  command,  or  does  not  return  something  useful,
-       OfflineIMAP cannot determine the new UID of the message.  So, in  these
-       rare  instances, OfflineIMAP will upload the message to the IMAP server
-       and delete it from your local folder.  Then, on  your  next  sync,  the
-       message  will  be re-downloaded with the proper UID.  OfflineIMAP makes
-       sure that the message was properly  uploaded  before  deleting  it,  so
+       vide  the  SEARCH  command,  or  does  not  return  something   useful,
+       OfflineIMAP  cannot determine the new UID of the message.  So, in these
+       rare instances, OfflineIMAP will upload the message to the IMAP  server
+       and  delete  it  from  your local folder.  Then, on your next sync, the
+       message will be re-downloaded with the proper UID.   OfflineIMAP  makes
+       sure  that  the  message  was  properly uploaded before deleting it, so
        there should be no risk of data loss.
 
    USE WITH EVOLUTION
-       OfflineIMAP  can  work  with Evolution.  To do so, first configure your
+       OfflineIMAP can work with Evolution.  To do so,  first  configure  your
        OfflineIMAP account to have:
        sep = /
        in its configuration.  Then, configure Evolution with the "Maildir-for-
-       mat  mail  directories"  server  type.   For the path, you will need to
-       specify the name of the top-level folder inside your OfflineIMAP  stor-
+       mat mail directories" server type.  For the  path,  you  will  need  to
+       specify  the name of the top-level folder inside your OfflineIMAP stor-
        age location.  You're now set!
 
    USE WITH KMAIL
-       At  this time, I believe that OfflineIMAP is not compatible with KMail.
-       KMail cannot work in any mode other than to move all  messages  out  of
-       all  folders  immediately,  which (besides being annoying and fundamen-
+       At this time, I believe that OfflineIMAP is not compatible with  KMail.
+       KMail  cannot  work  in any mode other than to move all messages out of
+       all folders immediately, which (besides being  annoying  and  fundamen-
        tally broken) is incompatible with OfflineIMAP.
 
    MAILING LIST
        There is an OfflineIMAP mailing list available.
 
-       To subscribe, send the text "Subscribe" in the subject  of  a  mail  to
-       offlineimap-request@complete.org.    To   post,  send  the  message  to
+       To  subscribe,  send  the  text "Subscribe" in the subject of a mail to
+       offlineimap-request@complete.org.   To  post,  send  the   message   to
        offlineimap@complete.org.
 
 BUGS
        Reports of bugs should be sent via e-mail to the OfflineIMAP bug-track-
-       ing  system (BTS) at offlineimap@bugs.complete.org or submitted on-line
-       using the Web interface at  http://bugs.complete.org/.   The  Web  site
-       also  lists  all current bugs, where you can check their status or con-
+       ing system (BTS) at offlineimap@bugs.complete.org or submitted  on-line
+       using  the  Web  interface  at http://bugs.complete.org/.  The Web site
+       also lists all current bugs, where you can check their status  or  con-
        tribute to fixing them.
 
 COPYRIGHT
-       OfflineIMAP, and  this  manual,  are  Copyright  (C)  2002,  2003  John
+       OfflineIMAP,  and  this  manual,  are  Copyright  (C)  2002,  2003 John
        Goerzen.
 
        This program is free software; you can redistribute it and/or modify it
-       under the terms of the GNU General Public License as published  by  the
-       Free  Software Foundation; either version 2 of the License, or (at your
+       under  the  terms of the GNU General Public License as published by the
+       Free Software Foundation; either version 2 of the License, or (at  your
        option) any later version.
 
-       This program is distributed in the hope that it  will  be  useful,  but
-       WITHOUT  ANY  WARRANTY;  without  even  the  implied  warranty  of MER-
-       CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  General
+       This  program  is  distributed  in the hope that it will be useful, but
+       WITHOUT ANY  WARRANTY;  without  even  the  implied  warranty  of  MER-
+       CHANTABILITY  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
        Public License for more details.
 
        You should have received a copy of the GNU General Public License along
@@ -620,7 +625,7 @@ COPYRIGHT
        USA
 
 AUTHOR
-       OfflineIMAP, its libraries,  documentation,  and  all  included  files,
+       OfflineIMAP,  its  libraries,  documentation,  and  all included files,
        except where noted, was written by John Goerzen <jgoerzen@complete.org>
        and copyright is held as stated in the COPYRIGHT section.
 
@@ -631,7 +636,7 @@ AUTHOR
        http://quux.org/devel/offlineimap
 
        OfflineIMAP may also be downloaded using Subversion.  Additionally, the
-       distributed tar.gz may be updated with a simple "svn  update"  command;
+       distributed  tar.gz  may be updated with a simple "svn update" command;
        it is ready to go.  For information on getting OfflineIMAP with Subver-
        sion, please visit:
 

diff --git a/offlineimap/head/offlineimap.1 b/offlineimap/head/offlineimap.1
index bb6f4a75107d4d5d6ad2424ecc895aa77b2e8b59..c52d3d32f593e2c8040c42e9e5d700e687c2d689 100644 (file)
--- a/offlineimap/head/offlineimap.1
+++ b/offlineimap/head/offlineimap.1
@@ -203,6 +203,14 @@ to run
 .B OfflineIMAP.
 Full documentation for the configuration file is included within the
 sample file.
+.PP
+.B OfflineIMAP
+also ships a file named
+.I offlineimap.conf.minimal
+that you can also try.  It's useful if you want to get started with
+the most basic feature set, and you can read about other features
+later with
+.I offlineimap.conf.
 .\"##################################################
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 

diff --git a/offlineimap/head/offlineimap.py b/offlineimap/head/offlineimap.py
index 2a60b7fb831732d1a1dffe2aa0936abed92d3f8c..b34aa59272f842b6ecdca8821d5b4477668308c4 100644 (file)
--- a/offlineimap/head/offlineimap.py
+++ b/offlineimap/head/offlineimap.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2.2
 # Startup from single-user installation
-# Copyright (C) 2002 John Goerzen
+# Copyright (C) 2002, 2003 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -18,4 +18,4 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from offlineimap import init
-init.startup('3.99.5')
+init.startup('3.99.6')

diff --git a/offlineimap/head/offlineimap/ui/Tk.py b/offlineimap/head/offlineimap/ui/Tk.py
index ba381875a29cf7536bd533886f84ed32c111f53a..c1866df71b75adb9774da14b42fa2a4947f730a4 100644 (file)
--- a/offlineimap/head/offlineimap/ui/Tk.py
+++ b/offlineimap/head/offlineimap/ui/Tk.py
@@ -392,8 +392,8 @@ class LEDThreadFrame:
     def __init__(self, master):
         self.canvas = master.getnewobj()
         self.color = ''
-        self.ovalid = self.canvas.create_oval(5, 5, 10,
-                                              10, fill = 'gray',
+        self.ovalid = self.canvas.create_oval(4, 4, 9,
+                                              9, fill = 'gray',
                                               outline = '#303030')
 
     def setcolor(self, newcolor):

diff --git a/offlineimap/head/offlineimap/version.py b/offlineimap/head/offlineimap/version.py
index a116d2837e5e5c262f2f62caeb9ee5c6c1d13678..c83256ca318b04ba10acdc782b488a49f834d839 100644 (file)
--- a/offlineimap/head/offlineimap/version.py
+++ b/offlineimap/head/offlineimap/version.py
@@ -1,8 +1,8 @@
 productname = 'OfflineIMAP'
-versionstr = "3.99.5"
-revno = long('$Rev: 301 $'[6:-2])
+versionstr = "3.99.6"
+revno = long('$Rev: 327 $'[6:-2])
 revstr = "Rev %d" % revno
-datestr = '$Date: 2003-01-04 19:51:35 -0600 (Sat, 04 Jan 2003) $'
+datestr = '$Date: 2003-01-06 15:37:27 -0600 (Mon, 06 Jan 2003) $'
 
 versionlist = versionstr.split(".")
 major = versionlist[0]
@@ -22,7 +22,7 @@ to distribute it under the conditions laid out in COPYING."""
 
 homepage = "http://www.quux.org/devel/offlineimap"
 homegopher = "gopher://quux.org/1/devel/offlineimap"
-license = """Copyright (C) 2002 John Goerzen <jgoerzen@complete.org>
+license = """Copyright (C) 2002, 2003 John Goerzen <jgoerzen@complete.org>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by