/offlineimap/head: changeset 577

Fixed various doc bugs

diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 57afa5679836a20e36ca2a9bbfe7c3ebfa1a9e51..c5acc18ccb24bcf9bba8ba985c5f4278ccff49f7 100644 (file)
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,8 +1,14 @@
 offlineimap (4.0.3) unstable; urgency=low
 
-  * Fixed version numbers to read 4.0.3.
+  * Fixed version numbers to read 4.0.3.  Closes: #220536.
   * Switched defaults from Python 2.2 to Python 2.3.
-    Closes: #237560.
+    Closes: #237560, #239018.
+  * Fixed description typo.  Closes: #211251.
+  * Fixed nametrans example.  Closes: #252644.
+  * Applied patch from Johannes Berg for mycmp example in manual.
+    Closes: #252645.
+  * Fixed typos in manual.  Closes: #252646.
+  * Regenerated docs.
 
  -- John Goerzen <jgoerzen@complete.org>  Fri,  4 Jun 2004 10:10:00 -0500
 

diff --git a/offlineimap/head/debian/control b/offlineimap/head/debian/control
index 66c52ba7b8575b38e47f4d4df38054d5558a0613..0ba1a1b1fe672b2a21a1a82357f787f02cb8985d 100644 (file)
--- a/offlineimap/head/debian/control
+++ b/offlineimap/head/debian/control
@@ -11,7 +11,7 @@ Depends: python2.3
 Suggests: python2.3-tk
 Description: IMAP/Maildir synchronization and reader support
  OfflineIMAP is a tool to simplify your e-mail reading.  With
- OfflimeIMAP, you can:
+ OfflineIMAP, you can:
  .
   * Read the same mailbox from multiple computers, and have your
     changes (deletions, etc.) be automatically reflected on

diff --git a/offlineimap/head/manual.html b/offlineimap/head/manual.html
index 830fb973014d1c9323ef02d0923a744090b5e91c..5973b9eedf3cffd68e76227975156f94760f35af 100644 (file)
--- a/offlineimap/head/manual.html
+++ b/offlineimap/head/manual.html
@@ -247,7 +247,7 @@ NAME="AEN67"
 CLASS="APPLICATION"
 >OfflineIMAP</SPAN
 > system-wide,
-        or your system adminstrator has done that for you, your task
+        or your system administrator has done that for you, your task
         for setting up <SPAN
 CLASS="APPLICATION"
 >OfflineIMAP</SPAN
@@ -469,7 +469,7 @@ CLASS="COMMAND"
          package.  Then, skip to <A
 HREF="#CONFIGURATION"
 ><I
->Configruation</I
+>Configuration</I
 ></A
 > below.  You will type <B
 CLASS="COMMAND"
@@ -512,7 +512,7 @@ CLASS="COMMAND"
          Next, proceed to <A
 HREF="#CONFIGURATION"
 ><I
->Configruation</I
+>Configuration</I
 ></A
 > below.  You will type <B
 CLASS="COMMAND"
@@ -564,7 +564,7 @@ CLASS="REFSECT1"
 NAME="CONFIGURATION"
 ></A
 ><H2
->Configruation</H2
+>Configuration</H2
 ><P
 >      <SPAN
 CLASS="APPLICATION"
@@ -797,7 +797,7 @@ CLASS="REPLACEABLE"
 ><DD
 ><P
 >Specifies an alternative user interface module
-             to use.  This overrides the defailt specified in the
+             to use.  This overrides the default specified in the
              configuration file.  The pre-defined options are listed in
              the User Interfaces section.</P
 ></DD
@@ -943,7 +943,7 @@ CLASS="CITATION"
 ><DD
 ><P
 >indicates that an actual message is being copied.
-             (We use fuschia for fake messages.)
+             (We use fuchsia for fake messages.)
            </P
 ></DD
 ><DT
@@ -1293,10 +1293,14 @@ CLASS="PROGRAMLISTING"
 
 def mycmp(x, y):
    for prefix in prioritized:
-       if x.startswith(prefix):
-           return -1
-       elif y.startswith(prefix):
-           return +1
+       xsw = x.startswith(prefix)
+       ysw = y.startswith(prefix)
+       if xsw and ysw:
+          return cmp(x, y)
+       elif xsw:
+          return -1
+       elif ysw:
+          return +1
    return cmp(x, y)
 
 def test_mycmp():
@@ -1556,7 +1560,7 @@ CLASS="APPLICATION"
 CLASS="APPLICATION"
 >OfflineIMAP</SPAN
 > can help these programs by writing the names
-           of the folders ni a format you specify.  See the example
+           of the folders in a format you specify.  See the example
            <TT
 CLASS="FILENAME"
 >offlineimap.conf</TT
@@ -1782,7 +1786,7 @@ NAME="AEN499"
 CLASS="APPLICATION"
 >OfflineIMAP</SPAN
 > does a two-way synchronization.  That is, if you
-         make a change to the mail on the server, it will be propogated to your
+         make a change to the mail on the server, it will be propagated 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 <SPAN
@@ -1995,7 +1999,7 @@ CLASS="APPLICATION"
 > starts up (relating to ConfigParser or
        AccountHashGenerator) and the
        configuration file.  This is because the config file format
-       had to change to accomodate new features in 4.0.  Fortunately,
+       had to change to accommodate new features in 4.0.  Fortunately,
        it's not difficult to adjust it to suit.
       </P
 ><P
@@ -2147,6 +2151,69 @@ CLASS="APPLICATION"
 >(1)
       </P
 ></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN585"
+></A
+><H2
+>History</H2
+><P
+>      Detailed history may be found in the file ChangeLog in the
+       <SPAN
+CLASS="APPLICATION"
+>OfflineIMAP</SPAN
+> distribution.  Feature and bug histories may be
+       found in the file debian/changelog which, despite its name, is
+       not really Debian-specific.  This section provides a large
+       overview.
+      </P
+><P
+>      Development on <SPAN
+CLASS="APPLICATION"
+>OfflineIMAP</SPAN
+> began on June 18, 2002.  Version
+       1.0.0 was released three days later on June 21, 2002.  Point
+       releases followed, including speed optimizations and some
+       compatibility fixes.
+      </P
+><P
+>Version 2.0.0 was released on July 3, 2002, and
+       represented the first time the synchronization became
+       multithreaded and, to the best of my knowledge, the first
+       multithreaded IMAP syncrhonizing application in existance.
+       The last 2.0.x release, 2.0.8, was made on July 9.
+      </P
+><P
+>      Version 3.0.0 was released on July 11, 2002, and introduced
+       modular user interfaces and the first GUI interface for
+       <SPAN
+CLASS="APPLICATION"
+>OfflineIMAP</SPAN
+>.  This manual also was introduced with 3.0.0,
+       along with many command-line options.  Version 3.1.0 was
+       released on July 21, adding the Noninteractive user
+       interfaces, profiling support, and several bugfixes.  3.2.0
+       was released on July 24, adding support for the Blinkenlights
+       GUI interface.  <SPAN
+CLASS="APPLICATION"
+>OfflineIMAP</SPAN
+> entered maintenance mode for
+       awhile, as it had reached a feature-complete milestone in my
+       mind.
+      </P
+><P
+>      The 3.99.x branch began in on October 7, 2002, to begin work
+       for 4.0.  The Curses.Blinkenlights interface was added in
+       3.99.6, and many architectural changes were made.
+      </P
+><P
+>      4.0.0 was released on July 18, 2003, including the ability to
+            synchronize directly between two IMAP servers, the first
+            re-architecting of the configuration file to refine the
+            notion of an account, and the new Curses interface.
+      </P
+></DIV
 ></DIV
 ></BODY
 ></HTML

diff --git a/offlineimap/head/manual.pdf b/offlineimap/head/manual.pdf
index bcd6bf99e440a2c1413ec5c35c4c2cc3179b500d..d377ccb6534857db42041e7dd10db1b4860ee6b2 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 d2e4775fdc2b526ccf3e74ea9855c72d85f840ad..e3371bf7ad2e774999d3a38a005b3d6a7a9a8dc5 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: Fri Jul 18 13:52:14 2003
+%%CreationDate: Fri Jun  4 10:26:18 2004
 %%DocumentNeededResources: font Times-Roman
 %%+ font Times-Bold
 %%+ font Times-Italic
@@ -369,11 +369,11 @@ F -.15<7665>-.25 G 1.466
 792061647669636520697320746f20737469636b2077697468206e6f726d616c206d6574
 686f6473206f66206f7065726174696f6e20666f72207468652074696d65206265696e67
 2e>108 633.6 Q F1 -.11<5155>72 650.4 S<49434b205354>.11 E<4152>-.986 E
-<54>-.438 E F0 1.423<496620796f75206861>108 662.4 R 1.722 -.15<76652061>
--.2 H 1.422<6c726561647920696e7374616c6c6564>.15 F F2
-<4f668d696e65494d4150>3.922 E F0 1.422<73797374656d2d776964652c206f7220
-796f75722073797374656d2061646d696e73747261746f722068617320646f6e65207468
-617420666f72>3.922 F .669
+<54>-.438 E F0 1.224<496620796f75206861>108 662.4 R 1.524 -.15<76652061>
+-.2 H 1.224<6c726561647920696e7374616c6c6564>.15 F F2
+<4f668d696e65494d4150>3.724 E F0 1.223<73797374656d2d776964652c206f7220
+796f75722073797374656d2061646d696e6973747261746f722068617320646f6e652074
+68617420666f72>3.724 F .669
 <796f752c20796f7572207461736b20666f722073657474696e67207570>108 674.4 R
 F2<4f668d696e65494d4150>3.169 E F0 .669
 <666f7220746865208c7273742074696d652069732071756974652073696d706c652e>
@@ -396,7 +396,7 @@ F3<2f7573722f73686172>2.755 E<652f646f632f6f66>-.37 E
 <6f752063616e2073696d706c7920636f70>-6.904 F 3.304<7974>-.1 G .803<6869
 73208c6c6520696e746f20796f757220686f6d65206469726563746f727920616e64206e
 616d65206974>-3.304 F<4a6f686e20476f65727a656e>72 768 Q
-<3138204a756c792032303033>152.905 E<31>203.165 E 0 Cg EP
+<3034204a756e652032303034>152.075 E<31>202.335 E 0 Cg EP
 %%Page: 2 2
 %%BeginPageSetup
 BP
@@ -538,8 +538,8 @@ F2<53595354454d2d5749444520494e5354>87 674.4 Q<414c4c41>-.9 E
 <62792073696d706c792072756e6e696e672074686520666f6c6c6f>3.208 F .708
 <77696e6720636f6d2d>-.25 F<6d616e6420617320726f6f743a>108 698.4 Q F2
 <6170742d67657420696e7374616c6c206f668d696e65696d6170>108 715.2 Q F0
-<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>152.905 E
-<32>203.165 E 0 Cg EP
+<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075 E
+<32>202.335 E 0 Cg EP
 %%Page: 3 3
 %%BeginPageSetup
 BP
@@ -594,12 +594,12 @@ F F1<6364>6.316 E F0 3.816<636f6d6d616e642061732061626f>6.316 F 4.116
 -.15<76652061>-.15 H 3.816<6e64207468656e2074797065>.15 F F1
 <2e2f6f668d696e65696d61702e7079>108 331.2 Q F0 2.5<3b74>C<68657265206973
 206e6f20696e7374616c6c6174696f6e2073746570206e6563657373617279>-2.5 E
-<2e>-.65 E/F2 10.95/Times-Bold@0 SF<434f4e46494752>72 348 Q -.657<5541>
--.329 G<54494f4e>-.383 E F1<4f668d696e65494d4150>108 360 Q F0 .509
-<6973207265>3.009 F .508<67756c61746564206279206120636f6e8c677572617469
-6f6e208c6c652074686174206973206e6f726d616c6c792073746f72656420696e>-.15
-F/F3 10/Times-Italic@0 SF<7e2f2e6f66>3.008 E<8d696e65696d617072>-.18 E
-<63>-.37 E F0<2e>A F1<4f668d696e65494d4150>5.508 E F0 .003
+<2e>-.65 E/F2 10.95/Times-Bold@0 SF<434f4e464947555241>72 348 Q
+<54494f4e>-1.04 E F1<4f668d696e65494d4150>108 360 Q F0 .509<6973207265>
+3.009 F .508<67756c61746564206279206120636f6e8c6775726174696f6e208c6c65
+2074686174206973206e6f726d616c6c792073746f72656420696e>-.15 F/F3 10
+/Times-Italic@0 SF<7e2f2e6f66>3.008 E<8d696e65696d617072>-.18 E<63>-.37
+E F0<2e>A F1<4f668d696e65494d4150>5.508 E F0 .003
 <736869707320776974682061208c6c65206e616d6564>108 372 R F3<6f66>2.503 E
 <8d696e65696d61702e636f6e66>-.18 E F0 .003
 <7468617420796f752073686f756c6420636f70>2.503 F 2.503<7974>-.1 G 2.503
@@ -682,8 +682,8 @@ F .506<776e2061206d616c66756e6374696f6e>-.25 F 1.195<6f72208c6775726520
 <756767657374207468617420796f752075736520746869732077697468>-3.695 F F1
 <2d31>3.695 E F0 1.195<746f206d616b>3.695 F 3.695<6574>-.1 G<6865>-3.695
 E<726573756c7473206d6f72652073656e7369626c652e>144 717.6 Q
-<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>152.905 E
-<33>203.165 E 0 Cg EP
+<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075 E
+<33>202.335 E 0 Cg EP
 %%Page: 4 4
 %%BeginPageSetup
 BP
@@ -728,12 +728,12 @@ F1<2d6c>108 160.8 Q F2<8c6c656e616d65>2.5 E F0 .524
 <73657474696e677320696e2074686520636f6e8c6775726174696f6e208c6c652e>2.5
 E F1<2d68>108 230.4 Q<2d2d68656c70>108 247.2 Q F0<53686f>11 E 2.5<7773>
 -.25 G<756d6d617279206f66206f7074696f6e732e>-2.5 E F1<2d75>108 264 Q F2
-<696e74657266616365>2.5 E F0 1.292
-<53706563698c657320616e20616c7465726e617469>144 276 R 1.592 -.15
-<76652075>-.25 H 1.292<73657220696e74657266>.15 F 1.292
-<616365206d6f64756c6520746f207573652e>-.1 F 1.291<54686973206f>6.291 F
--.15<7665>-.15 G 1.291<7272696465732074686520646566>.15 F 1.291
-<61696c742073706563698c656420696e20746865>-.1 F
+<696e74657266616365>2.5 E F0 1.133
+<53706563698c657320616e20616c7465726e617469>144 276 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
 <636f6e8c6775726174696f6e208c6c652e>144 288 Q<546865207072652d64658c6e65
 64206f7074696f6e7320617265206c697374656420696e20746865205573657220496e74
 657266>5 E<616365732073656374696f6e2e>-.1 E/F3 10.95/Times-Bold@0 SF
@@ -828,8 +828,8 @@ F1<426c61636b>108 544.8 Q F0 .57
 <657373616765206c697374206973206265696e67206c6f616465642e>-2.5 E F1
 <426c7565>108 693.6 Q F0<69732074686520636f6c6f72206f662061206d65737361
 67652073796e6368726f6e697a6174696f6e20636f6e74726f6c6c657220746872656164
-2e>16.55 E<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>
-152.905 E<34>203.165 E 0 Cg EP
+2e>16.55 E<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>
+152.075 E<34>202.335 E 0 Cg EP
 %%Page: 5 5
 %%BeginPageSetup
 BP
@@ -839,7 +839,7 @@ R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
 113.165 E/F1 10/Times-Bold@0 SF<4f72616e6765>108 84 Q F0<696e6469636174
 6573207468617420616e2061637475616c206d657373616765206973206265696e672063
 6f706965642e>144 96 Q<2857>5 E 2.5<6575>-.8 G
-<7365206675736368696120666f722066>-2.5 E<616b>-.1 E 2.5<656d>-.1 G
+<7365206675636873696120666f722066>-2.5 E<616b>-.1 E 2.5<656d>-.1 G
 <657373616765732e29>-2.5 E F1<52656420286d65616e696e67203229>108 112.8 Q
 F0<696e6469636174657320746861742061206d657373616765206973206265696e6720
 64656c657465642e>144 124.8 Q F1 -1.11<5965>108 141.6 S<6c6c6f>1.11 E 2.5
@@ -969,8 +969,8 @@ F .455 -.15<76652074>-.2 H .155
 <626f6172643b206163636f756e74207061737377>.15 F 1.38
 <6f726473206d7573742062652073706563698c6564>-.1 F<7573696e67206f6e65206f
 662074686520636f6e8c6775726174696f6e208c6c65206f7074696f6e732e>108 708 Q
-<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>152.905 E
-<35>203.165 E 0 Cg EP
+<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075 E
+<35>202.335 E 0 Cg EP
 %%Page: 6 6
 %%BeginPageSetup
 BP
@@ -1066,8 +1066,8 @@ F2<4f668d696e65494d4150>3.004 E F0 1.604 -.55<27732022>D .505<7265666572
 666f6c6465728c6c746572203d206c616d62646120666f6c6465726e616d653a20666f6c
 6465726e616d6520696e205b>108 705.6 Q<274d61696c2f494e424f>123 717.6 Q
 <58272c>-.4 E<274d61696c2f6c6973742f7a61757275732d67656e6572616c272c>123
-729.6 Q<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>
-152.905 E<36>203.165 E 0 Cg EP
+729.6 Q<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>
+152.075 E<36>202.335 E 0 Cg EP
 %%Page: 7 7
 %%BeginPageSetup
 BP
@@ -1100,618 +1100,687 @@ E<7072696f726974697a6564203d205b27494e424f>108 278.4 Q
 <58272c2027706572736f6e616c272c2027616e6e6f756e6365272c2027>-.4 E
 <6c697374275d>-.1 E<646566206d79636d7028782c2079293a>108 302.4 Q
 <666f72207072658c7820696e207072696f726974697a65643a>115.5 314.4 Q
-<696620782e73746172747377697468287072658c78293a>125.5 326.4 Q
-<72657475726e202d31>135.5 338.4 Q<656c69662079>125.5 350.4 Q
-<2e73746172747377697468287072658c78293a>-.65 E<72657475726e202b31>135.5
-362.4 Q<72657475726e20636d7028782c207929>115.5 374.4 Q
-<64656620746573745f6d79636d7028293a>108 398.4 Q
-<696d706f7274206f732c206f732e70617468>115.5 410.4 Q
-<666f6c646572733d6f732e6c697374646972286f732e706174682e65>115.5 422.4 Q<
+<787377203d20782e73746172747377697468287072658c7829>125.5 326.4 Q
+<797377203d2079>125.5 338.4 Q<2e73746172747377697468287072658c7829>-.65
+E<69662078737720616e64207973773a>125.5 350.4 Q
+<72657475726e20636d7028782c207929>133 362.4 Q<656c6966207873773a>125.5
+374.4 Q<72657475726e202d31>133 386.4 Q<656c6966207973773a>125.5 398.4 Q
+<72657475726e202b31>133 410.4 Q<72657475726e20636d7028782c207929>115.5
+422.4 Q<64656620746573745f6d79636d7028293a>108 446.4 Q
+<696d706f7274206f732c206f732e70617468>115.5 458.4 Q
+<666f6c646572733d6f732e6c697374646972286f732e706174682e65>115.5 470.4 Q<
 7870616e647573657228277e2f646174612f6d61696c2f74764068712e796f6b2e757475
-2e8c272929>-.15 E<666f6c646572732e736f7274286d79636d7029>115.5 434.4 Q
-<7072696e7420666f6c64657273>115.5 446.4 Q .565
+2e8c272929>-.15 E<666f6c646572732e736f7274286d79636d7029>115.5 482.4 Q
+<7072696e7420666f6c64657273>115.5 494.4 Q .565
 <5468697320636f646520736e697070657420696c6c757374726174657320686f>108
-463.2 R 3.065<7774>-.25 G<6865>-3.065 E F2<666f6c646572>3.065 E
+511.2 R 3.065<7774>-.25 G<6865>-3.065 E F2<666f6c646572>3.065 E
 <736f7274>-.1 E F0 .565<6f7074696f6e2063616e20626520637573746f6d697a6564
 2077697468206120507974686f6e2066756e6374696f6e2066726f6d20746865>3.065 F
-F2<707974686f6e8c6c65>108 475.2 Q F0<746f20616c>2.5 E -.1<7761>-.1 G<79
+F2<707974686f6e8c6c65>108 523.2 Q F0<746f20616c>2.5 E -.1<7761>-.1 G<79
 732073796e6368726f6e697a65206365727461696e20666f6c64657273208c7273742e>
-.1 E/F3 10.95/Times-Bold@0 SF<455252>72 492 Q<4f5253>-.329 E F0<49662079
+.1 E/F3 10.95/Times-Bold@0 SF<455252>72 540 Q<4f5253>-.329 E F0<49662079
 6f7520676574206f6e65206f6620736f6d65206672657175656e746c792d656e636f756e
 7465726564206f7220636f6e667573696e67206572726f72732c20706c65617365206368
-65636b20746869732073656374696f6e2e>108 504 Q F1<5549442056>87 520.8 Q
+65636b20746869732073656374696f6e2e>108 552 Q F1<5549442056>87 568.8 Q
 <414c4944495459205052>-1.35 E<4f424c454d20464f5220464f4c444552>-.3 E F0
-1.638<494d41502073657276>108 532.8 R 1.637<65727320757365206120756e6971
+1.638<494d41502073657276>108 580.8 R 1.637<65727320757365206120756e6971
 756520494420285549442920746f20726566657220746f20612073706563698c63206d65
 73736167652e>-.15 F 1.637
 <54686973206e756d6265722069732067756172616e7465656420746f206265>6.637 F
 .624<756e6971756520746f206120706172746963756c6172206d657373616765>108
-544.8 R F1 -.25<666f>3.124 G -2.29 -.18<72652076>.25 H<6572>.08 E F0
+592.8 R F1 -.25<666f>3.124 G -2.29 -.18<72652076>.25 H<6572>.08 E F0
 5.624<2e4e>C 3.124<6f6f>-5.624 G .625<74686572206d65737361676520696e2074
 68652073616d6520666f6c6465722077696c6c2065>-3.124 F -.15<7665>-.25 G
 3.125<7267>.15 G .625<6574207468652073616d65205549442e>-3.125 F .659
-<554944732061726520616e20696e7465>108 556.8 R .659
+<554944732061726520616e20696e7465>108 604.8 R .659
 <6772616c2070617274206f66>-.15 F F1<4f668d696e65494d4150>3.159 E F0
 1.759 -.55<27732073>D .659
 <796e6368726f6e697a6174696f6e20736368656d653b20746865>.55 F 3.159<7961>
 -.15 G .658<7265207573656420746f206d61746368207570206d65737361676573>
 -3.159 F<6f6e20796f757220636f6d707574657220746f206d65737361676573206f6e
-207468652073657276>108 568.8 Q<6572>-.15 E<2e>-.55 E .107
+207468652073657276>108 616.8 Q<6572>-.15 E<2e>-.55 E .107
 <536f6d6574696d65732c207468652055494473206f6e207468652073657276>108
-585.6 R .108<6572206d69676874206765742072657365742e>-.15 F .108<55737561
+633.6 R .108<6572206d69676874206765742072657365742e>-.15 F .108<55737561
 6c6c7920746869732077696c6c2068617070656e20696620796f752064656c6574652061
-6e64207468656e207265637265617465>5.108 F 3.743<6166>108 597.6 S
+6e64207468656e207265637265617465>5.108 F 3.743<6166>108 645.6 S
 <6f6c646572>-3.743 E 6.243<2e57>-.55 G 1.243
 <68656e20796f7520637265617465206120666f6c646572>-6.243 F 3.742<2c74>-.4
 G 1.242<68652073657276>-3.742 F 1.242<65722077696c6c206f6674656e20737461
 72742074686520554944206261636b2066726f6d20312e>-.15 F<427574>6.242 E F1
 <4f668d696e65494d4150>3.742 E F0 .302<6d69676874207374696c6c206861>108
-609.6 R .602 -.15<76652074>-.2 H .302
+657.6 R .602 -.15<76652074>-.2 H .302
 <686520554944732066726f6d2074686520707265>.15 F .302<76696f757320666f6c
 646572206279207468652073616d65206e616d652073746f7265642e>-.25 F F1
 <4f668d696e65494d4150>5.303 E F0 .303<77696c6c206465746563742074686973>
 2.803 F<636f6e646974696f6e20616e6420736b69702074686520666f6c646572>108
-621.6 Q 5<2e54>-.55 G
+669.6 Q 5<2e54>-.55 G
 <68697320697320474f4f442c206265636175736520697420707265>-5 E -.15<7665>
--.25 G<6e74732064617461206c6f73732e>.15 E -1.1<596f>108 638.4 S 2.827
+-.25 G<6e74732064617461206c6f73732e>.15 E -1.1<596f>108 686.4 S 2.827
 <7563>1.1 G .327<616e208c782069742062792072656d6f>-2.827 F .327<76696e67
 20796f7572206c6f63616c20666f6c64657220616e6420636163686520646174612e>
 -.15 F -.15<466f>5.327 G 2.827<7269>.15 G .327
 <6e7374616e63652c20696620796f757220666f6c646572732061726520756e646572>
--2.827 F F2<7e2f46>2.826 E<6f6c642d>-1.05 E<6572>108 650.4 Q<73>-.1 E F0
+-2.827 F F2<7e2f46>2.826 E<6f6c642d>-1.05 E<6572>108 698.4 Q<73>-.1 E F0
 <616e642074686520666f6c6465722077697468207468652070726f626c656d20697320
 494e424f>2.5 E<582c20796f7527>-.4 E 2.5<6474>-.5 G<79706520746869733a>
--2.5 E<726d202d72207e2f46>108 674.4 Q<6f6c646572732f494e424f>-.15 E<58>
--.4 E<726d202d72207e2f2e6f66>108 686.4 Q
-<8d696e65696d61702f4163636f756e742d>-.25 E F2<4163636f756e744e616d65>A
-F0<726d202d72207e2f2e6f66>108 698.4 Q
-<8d696e65696d61702f5265706f7369746f72792d>-.25 E F2
-<5265706f7369746f72794e616d65>A F0<284f6620636f757273652c207265706c6163
-65204163636f756e744e616d6520616e64205265706f7369746f72794e616d6520776974
-6820746865206e616d65732061732073706563698c656420696e>108 715.2 Q F2
-<7e2f2e6f66>2.5 E<8d696e65696d617072>-.18 E<63>-.37 E F0<292e>A
-<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>152.905 E
-<37>203.165 E 0 Cg EP
+-2.5 E<726d202d72207e2f46>108 722.4 Q<6f6c646572732f494e424f>-.15 E<58>
+-.4 E<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075
+E<37>202.335 E 0 Cg EP
 %%Page: 8 8
 %%BeginPageSetup
 BP
 %%EndPageSetup
 /F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.165 E<4e65>108 84 Q .747<78742074696d6520796f752072756e>-.15 F/F1 10
-/Times-Bold@0 SF<4f668d696e65494d4150>3.247 E F0 3.247<2c69>C 3.247
-<7477>-3.247 G .748<696c6c2072652d646f>-3.247 F .748
+113.165 E<726d202d72207e2f2e6f66>108 84 Q
+<8d696e65696d61702f4163636f756e742d>-.25 E/F1 10/Times-Italic@0 SF
+<4163636f756e744e616d65>A F0<726d202d72207e2f2e6f66>108 96 Q
+<8d696e65696d61702f5265706f7369746f72792d>-.25 E F1
+<5265706f7369746f72794e616d65>A F0<284f6620636f757273652c207265706c6163
+65204163636f756e744e616d6520616e64205265706f7369746f72794e616d6520776974
+6820746865206e616d65732061732073706563698c656420696e>108 112.8 Q F1
+<7e2f2e6f66>2.5 E<8d696e65696d617072>-.18 E<63>-.37 E F0<292e>A<4e65>108
+129.6 Q .747<78742074696d6520796f752072756e>-.15 F/F2 10/Times-Bold@0 SF
+<4f668d696e65494d4150>3.247 E F0 3.247<2c69>C 3.247<7477>-3.247 G .748
+<696c6c2072652d646f>-3.247 F .748
 <776e6c6f61642074686520666f6c646572207769746820746865206e65>-.25 F 3.248
 <7755>-.25 G 3.248<4944732e204e6f7465>-3.248 F .748
 <74686174207468652070726f63652d>3.248 F
-<647572652073706563698c65642061626f>108 96 Q .3 -.15<76652077>-.15 H
+<647572652073706563698c65642061626f>108 141.6 Q .3 -.15<76652077>-.15 H
 <696c6c206c6f736520616e>.15 E 2.5<796c>-.15 G
 <6f63616c206368616e676573206d61646520746f2074686520666f6c646572>-2.5 E
-<2e>-.55 E .523<536f6d6520494d41502073657276>108 112.8 R .522
+<2e>-.55 E .523<536f6d6520494d41502073657276>108 158.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 .066
-<796f757220666f6c646572732065>108 124.8 R -.15<7665>-.25 G 2.566<6e61>
+<796f757220666f6c646572732065>108 170.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 .067<616c6c7320696e746f2074686973206361742d>-.1 F -.15<6567>108
-136.8 S<6f7279>.15 E<2e>-.65 E F1<4f668d696e65494d4150>5.984 E F0 .984
+182.4 S<6f7279>.15 E<2e>-.65 E F2<4f668d696e65494d4150>5.984 E F0 .984
 <697320696e636f6d70617469626c65207769746820737563682073657276>3.484 F
-3.484<6572732e205573696e67>-.15 F F1<4f668d696e65494d4150>3.484 E F0
+3.484<6572732e205573696e67>-.15 F F2<4f668d696e65494d4150>3.484 E F0
 .984<77697468207468656d2077696c6c206e6f742064657374726f>3.484 F<79>-.1 E
-<616e>108 148.8 Q 2.601<796d>-.15 G .101<61696c2c2062>-2.601 F .101<7574
+<616e>108 194.4 Q 2.601<796d>-.15 G .101<61696c2c2062>-2.601 F .101<7574
 206174207468652073616d652074696d652c2069742077696c6c206e6f74206163747561
 6c6c792073796e6368726f6e697a6520697420656974686572>-.2 F 5.101<2e28>-.55
-G F1<4f668d696e65494d4150>-5.101 E F0 .102
+G F2<4f668d696e65494d4150>-5.101 E F0 .102
 <77696c6c20646574656374207468697320636f6e2d>2.601 F<646974696f6e20616e64
 2061626f7274207072696f7220746f2073796e6368726f6e697a6174696f6e2e29>108
-160.8 Q 6.607<54686973207175657374696f6e20636f6d657320757020667265717565
-6e746c79206f6e20746865>108 177.6 R F1<4f668d696e65494d4150>9.107 E F0
+206.4 Q 6.607<54686973207175657374696f6e20636f6d657320757020667265717565
+6e746c79206f6e20746865>108 223.2 R F2<4f668d696e65494d4150>9.107 E F0
 6.607
 <6d61696c696e67206c697374203c55524c3a687474703a2f2f6c697374732e636f6d2d>
-9.107 F<706c6574652e6f72>108 189.6 Q<672f6f66>-.18 E
+9.107 F<706c6574652e6f72>108 235.2 Q<672f6f66>-.18 E
 <8d696e65696d617040636f6d706c6574652e6f72>-.25 E 8.358<672f3e2e2059>-.18
 F 5.859<6f752063616e208c6e6420612064657461696c65642064697363757373696f6e
 203c55524c3a687474703a2f2f6c697374732e636f6d2d>-1.1 F<706c6574652e6f72>
-108 201.6 Q<672f6f66>-.18 E<8d696e65696d617040636f6d706c6574652e6f72>
+108 247.2 Q<672f6f66>-.18 E<8d696e65696d617040636f6d706c6574652e6f72>
 -.25 E<672f323030332f30342f6d736730303031322e68746d6c2e677a3e206f662074
-68652070726f626c656d2074686572652e>-.18 E/F2 10.95/Times-Bold@0 SF -.438
-<4f54>72 218.4 S<4845522046524551>.438 E<55454e544c>-.11 E 2.738<5941>
+68652070726f626c656d2074686572652e>-.18 E/F3 10.95/Times-Bold@0 SF -.438
+<4f54>72 264 S<4845522046524551>.438 E<55454e544c>-.11 E 2.738<5941>
 -1.007 G<534b45442051>-2.738 E<55455354494f4e53>-.11 E F0 .827
-<54686572652061726520736f6d65206f746865722046>108 230.4 R -.55<4151>-.74
-G 3.327<7374>.55 G .827<686174206d69676874206e6f74208c7420696e746f20616e
-6f746865722073656374696f6e206f662074686520646f63756d656e742c20736f207468
-65>-3.327 F 3.326<7961>-.15 G .826<726520646973637573736564>-3.326 F
-<686572652e>108 242.4 Q F1<5768617420706c617466>108 259.2 Q
+<54686572652061726520736f6d65206f746865722046>108 276 R -.55<4151>-.74 G
+3.327<7374>.55 G .827<686174206d69676874206e6f74208c7420696e746f20616e6f
+746865722073656374696f6e206f662074686520646f63756d656e742c20736f20746865>
+-3.327 F 3.326<7961>-.15 G .826<726520646973637573736564>-3.326 F
+<686572652e>108 288 Q F2<5768617420706c617466>108 304.8 Q
 <6f726d7320646f6573204f668d696e65494d41502072756e206f6e3f>-.25 E F0<4974
 2073686f756c642072756e206f6e206d6f737420706c6174666f726d7320737570706f72
 74656420627920507974686f6e2c207768696368206172652071756974652061206665>
-144 271.2 Q -.65<772e>-.25 G F1 .596<49276d207573696e67204d7574742e>108
-288 R .596<4f7468657220494d41502073796e63207072>5.596 F .596
+144 316.8 Q -.65<772e>-.25 G F2 .596<49276d207573696e67204d7574742e>108
+333.6 R .596<4f7468657220494d41502073796e63207072>5.596 F .596
 <6f6772616d732072>-.18 F<6571756972>-.18 E 3.096<656d>-.18 G 3.096<6574>
 -3.096 G 3.096<6f75>-3.096 G .596
 <73652022736574206d61696c6469725f74726173683d79>-3.096 F 3.096
 <6573222e20446f>-.1 F 3.096<496e>3.096 G<656564>-3.096 E
-<746f20646f20746861742077697468204f668d696e65494d41503f>108 300 Q F0
-<4e6f2e>144 312 Q F1<4f668d696e65494d4150>7.27 E F0 2.27<697320736d6172
-7420656e6f75676820746f208c67757265206f7574206d6573736167652064656c657469
-6f6e20776974686f757420746869732065>4.77 F 2.27<78747261206372757463682e>
--.15 F -1.1<596f>144 324 S<7527>1.1 E
+<746f20646f20746861742077697468204f668d696e65494d41503f>108 345.6 Q F0
+<4e6f2e>144 357.6 Q F2<4f668d696e65494d4150>7.27 E F0 2.27<697320736d61
+727420656e6f75676820746f208c67757265206f7574206d6573736167652064656c6574
+696f6e20776974686f757420746869732065>4.77 F 2.27
+<78747261206372757463682e>-.15 F -1.1<596f>144 369.6 S<7527>1.1 E
 <6c6c2067657420746865206265737420726573756c747320696620796f7520646f6e27>
 -.1 E 2.5<7475>-.18 G<736520746869732073657474696e672c20696e2066>-2.5 E
-<6163742e>-.1 E F1<4927>108 340.8 Q .2 -.1<76652075>-.2 H
+<6163742e>-.1 E F2<4927>108 386.4 Q .2 -.1<76652075>-.2 H
 <7067726164656420616e64206e6f>.1 E 2.5<774f>-.1 G<668d696e65494d41502063
 726173686573207768656e204920737461727420697420757021>-2.5 E<5768>5 E
-<793f>-.15 E F0 -1.1<596f>144 352.8 S 3.366<756e>1.1 G .866<65656420746f
+<793f>-.15 E F0 -1.1<596f>144 398.4 S 3.366<756e>1.1 G .866<65656420746f
 207570677261646520796f757220636f6e8c6775726174696f6e208c6c652e>-3.366 F
 .866<536565205b5852656620746f20555047524144494e472e342e305d206174207468
-6520656e64206f662074686973>5.866 F<6d616e75616c2e>144 364.8 Q F1<486f>
-108 381.6 Q 2.5<7764>-.1 G 2.5<6f4973>-2.5 G
+6520656e64206f662074686973>5.866 F<6d616e75616c2e>144 410.4 Q F2<486f>
+108 427.2 Q 2.5<7764>-.1 G 2.5<6f4973>-2.5 G
 <70656369667920746865206e616d6573206f66206d792066>-2.5 E<6f6c646572733f>
--.25 E F0 -1.1<596f>144 393.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<
+-.25 E F0 -1.1<596f>144 439.2 S 3.55<7564>1.1 G 3.55<6f6e>-3.55 G 1.05
+<6f74206e65656420746f2e>-3.55 F F2<4f668d696e65494d4150>6.05 E F0 1.05<
 697320736d61727420656e6f75676820746f206175746f6d61746963616c6c79208c6775
 7265206f7574207768617420666f6c6465727320617265>3.55 F 1.128
-<70726573656e74206f6e2074686520494d41502073657276>144 405.6 R 1.128
+<70726573656e74206f6e2074686520494d41502073657276>144 451.2 R 1.128
 <657220616e642073796e6368726f6e697a65207468656d2e>-.15 F -1.1<596f>6.128
-G 3.628<7563>1.1 G 1.128<616e2075736520746865>-3.628 F/F3 10
-/Times-Italic@0 SF<666f6c6465728c6c746572>3.628 E F0<616e64>3.627 E F3
-<666f6c6465727472>3.627 E<616e73>-.15 E F0<636f6e8c6775726174696f6e208c
-6c65206f7074696f6e7320746f2072657175657374206365727461696e20666f6c646572
-7320616e642072656e616d65207468656d20617320746865>144 417.6 Q 2.5<7963>
--.15 G<6f6d6520696e20696620796f75206c696b>-2.5 E<652e>-.1 E F1<486f>108
-434.4 Q 2.5<7763>-.1 G<616e2049207072>-2.5 E -2.3 -.15<65762065>-.18 H
+G 3.628<7563>1.1 G 1.128<616e2075736520746865>-3.628 F F1
+<666f6c6465728c6c746572>3.628 E F0<616e64>3.627 E F1<666f6c6465727472>
+3.627 E<616e73>-.15 E F0<636f6e8c6775726174696f6e208c6c65206f7074696f6e
+7320746f2072657175657374206365727461696e20666f6c6465727320616e642072656e
+616d65207468656d20617320746865>144 463.2 Q 2.5<7963>-.15 G
+<6f6d6520696e20696620796f75206c696b>-2.5 E<652e>-.1 E F2<486f>108 480 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 446.4 Q
-F3<666f6c6465728c6c746572>2.5 E F0
-<6f7074696f6e20696e2074686520636f6e8c6775726174696f6e208c6c652e>2.5 E F1
-<486f>108 463.2 Q 2.5<7763>-.1 G
+<6f6d206265696e672073796e6365643f>-.18 E F0<55736520746865>144 492 Q F1
+<666f6c6465728c6c746572>2.5 E F0
+<6f7074696f6e20696e2074686520636f6e8c6775726174696f6e208c6c652e>2.5 E F2
+<486f>108 508.8 Q 2.5<7763>-.1 G
 <616e204920616464206f722064656c65746520612066>-2.5 E<6f6c6465723f>-.25 E
-<4f668d696e65494d4150>144 475.2 Q F0 .503
+<4f668d696e65494d4150>144 520.8 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 487.2 Q<6572>
+<6f6c646572206f6e2074686520494d4150>-3.004 F<73657276>144 532.8 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 504
-Q 2.5<6574>-.18 G<686572>-2.5 E 2.5<6561>-.18 G
+63616c6c79206175746f6d61746963616c6c79>-2.5 E<2e>-.65 E F2<4172>108
+549.6 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 516 S
+-.18 G<663f>-2.5 E F0 -1<5965>144 561.6 S
 <733b2073656520746865204e6f7465732073656374696f6e2062656c6f>1 E -.65
-<772e>-.25 G F1<5768617420697320746865206d61696c626f78206e616d652072>108
-532.8 Q<65636f7264657220286d626e616d6573292066>-.18 E<6f723f>-.25 E F0
+<772e>-.25 G F2<5768617420697320746865206d61696c626f78206e616d652072>108
+578.4 Q<65636f7264657220286d626e616d6573292066>-.18 E<6f723f>-.25 E F0
 .46<536f6d65206d61696c20726561646572732c2073756368206173204d7574742c2061
 7265206e6f742063617061626c65206f66206175746f6d61746963616c6c792064657465
-726d696e696e6720746865206e616d6573206f6620796f7572>144 544.8 R
-<6d61696c626f78>144 556.8 Q<65732e>-.15 E F1<4f668d696e65494d4150>5.21 E
+726d696e696e6720746865206e616d6573206f6620796f7572>144 590.4 R
+<6d61696c626f78>144 602.4 Q<65732e>-.15 E F2<4f668d696e65494d4150>5.21 E
 F0 .21<63616e2068656c702074686573652070726f6772616d73206279207772697469
-6e6720746865206e616d6573206f662074686520666f6c64657273206e69206120666f72
-6d6174>2.71 F<796f752073706563696679>144 568.8 Q 5<2e53>-.65 G
-<6565207468652065>-5 E<78616d706c65>-.15 E F3<6f66>2.5 E
-<8d696e65696d61702e636f6e66>-.18 E F0<666f722064657461696c732e>2.5 E F1
-<43616e20492073796e636872>108 585.6 Q<6f6e697a65206d756c7469706c65206163
+6e6720746865206e616d6573206f662074686520666f6c6465727320696e206120666f72
+6d6174>2.71 F<796f752073706563696679>144 614.4 Q 5<2e53>-.65 G
+<6565207468652065>-5 E<78616d706c65>-.15 E F1<6f66>2.5 E
+<8d696e65696d61702e636f6e66>-.18 E F0<666f722064657461696c732e>2.5 E F2
+<43616e20492073796e636872>108 631.2 Q<6f6e697a65206d756c7469706c65206163
 636f756e74732077697468204f668d696e65494d41503f>-.18 E F0 3.099
-<537572652e204a757374>144 597.6 R .599
-<6e616d65207468656d20616c6c20696e20746865>3.099 F F3<6163636f756e7473>
-3.098 E F0 .598<6c696e6520696e20746865>3.098 F F3 -.1<6765>3.098 G
+<537572652e204a757374>144 643.2 R .599
+<6e616d65207468656d20616c6c20696e20746865>3.099 F F1<6163636f756e7473>
+3.098 E F0 .598<6c696e6520696e20746865>3.098 F F1 -.1<6765>3.098 G
 <6e6572>.1 E<616c>-.15 E F0 .598<73656374696f6e206f662074686520636f6e8c
-6775726174696f6e208c6c652c20616e64>3.098 F<616464206120706572>144 609.6
-Q<2d6163636f756e742073656374696f6e20666f722065616368206f6e652e>-.2 E F1
-<446f6573204f668d696e65494d415020737570706f727420504f503f>108 626.4 Q F0
-4.076<4e6f2e20504f50>144 638.4 R 1.576<6973206e6f7420726f62>4.076 F
-1.576<75737420656e6f75676820746f20646f206120636f6d706c6574656c792072656c
-6961626c65206d756c74692d6d616368696e652073796e6368726f6e697a6174696f6e20
-6c696b>-.2 F<65>-.1 E F1<4f668d696e65494d4150>144 650.4 Q F0
-<63616e20646f2e>2.5 E F1<4f668d696e65494d4150>5 E F0
-<77696c6c206e6f7420737570706f72742069742e>2.5 E F1
+6775726174696f6e208c6c652c20616e64>3.098 F<616464206120706572>144 655.2
+Q<2d6163636f756e742073656374696f6e20666f722065616368206f6e652e>-.2 E F2
+<446f6573204f668d696e65494d415020737570706f727420504f503f>108 672 Q F0
+4.076<4e6f2e20504f50>144 684 R 1.576<6973206e6f7420726f62>4.076 F 1.576<
+75737420656e6f75676820746f20646f206120636f6d706c6574656c792072656c696162
+6c65206d756c74692d6d616368696e652073796e6368726f6e697a6174696f6e206c696b>
+-.2 F<65>-.1 E F2<4f668d696e65494d4150>144 696 Q F0<63616e20646f2e>2.5 E
+F2<4f668d696e65494d4150>5 E F0<77696c6c206e6f7420737570706f72742069742e>
+2.5 E<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075
+E<38>202.335 E 0 Cg EP
+%%Page: 9 9
+%%BeginPageSetup
+BP
+%%EndPageSetup
+/F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
+R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
+113.165 E/F1 10/Times-Bold@0 SF
 <446f6573204f668d696e65494d415020737570706f7274206d61696c626f782066>108
-667.2 Q<6f726d617473206f74686572207468616e204d61696c6469723f>-.25 E F0
-.41<4e6f742061742070726573656e742e>144 679.2 R .41<5468657265206973206e
-6f20746563686e6963616c20726561736f6e206e6f7420746f3b206a757374206e6f2064
-656d616e64207965742e>5.41 F .409
+84 Q<6f726d617473206f74686572207468616e204d61696c6469723f>-.25 E F0 .41
+<4e6f742061742070726573656e742e>144 96 R .41<5468657265206973206e6f2074
+6563686e6963616c20726561736f6e206e6f7420746f3b206a757374206e6f2064656d61
+6e64207965742e>5.41 F .409
 <4d61696c6469722069732061207375706572696f7220666f72>5.409 F<2d>-.2 E
-2.078<6d617420616e>144 691.2 R<7977>-.15 E<6179>-.1 E 7.078<2e48>-.65 G
+2.078<6d617420616e>144 108 R<7977>-.15 E<6179>-.1 E 7.078<2e48>-.65 G
 -.25<6f77>-7.078 G -2.15 -.25<65762065>.25 H -.4<722c>.25 G F1
 <4f668d696e65494d4150>4.978 E F0 2.078
 <63616e2073796e63206265747765656e207477>4.578 F 4.578<6f49>-.1 G 2.079
 <4d41502073657276>-4.578 F 2.079<6572732c20616e6420736f6d6520494d4150>
--.15 F<73657276>144 703.2 Q .54
+-.15 F<73657276>144 120 Q .54
 <65727320737570706f7274206f7468657220666f726d6174732e>-.15 F -1.1<596f>
 5.54 G 3.04<7563>1.1 G .54
 <6f756c6420696e7374616c6c20616e20494d41502073657276>-3.04 F .54
 <6572206f6e20796f7572206c6f63616c206d616368696e6520616e64206861>-.15 F
--.15<7665>-.2 G F1<4f668d696e65494d4150>144 715.2 Q F0
-<73796e6320746f20746861742e>2.5 E<4a6f686e20476f65727a656e>72 768 Q
-<3138204a756c792032303033>152.905 E<38>203.165 E 0 Cg EP
-%%Page: 9 9
-%%BeginPageSetup
-BP
-%%EndPageSetup
-/F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
-R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.165 E/F1 10/Times-Bold@0 SF<5b746563686e6963616c5d205768>108 84 Q
-2.5<7961>-.15 G .36 -.18<72652079>-2.5 H<6f7572204d61696c646972206d6573
-73616765208c6c656e616d657320736f20687567653f>-.07 E
-<4f668d696e65494d4150>144 96 Q F0 .958<686173207477>3.458 F 3.458<6f72>
--.1 G<656c65>-3.458 E -.25<7661>-.25 G .958
+-.15<7665>-.2 G F1<4f668d696e65494d4150>144 132 Q F0
+<73796e6320746f20746861742e>2.5 E F1<5b746563686e6963616c5d205768>108
+148.8 Q 2.5<7961>-.15 G .36 -.18<72652079>-2.5 H<6f7572204d61696c646972
+206d657373616765208c6c656e616d657320736f20687567653f>-.07 E
+<4f668d696e65494d4150>144 160.8 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 108 R
+3030252072656c6961626c652073796e6368726f6e697a6174696f6e732e>144 172.8 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 120 S .594<617920746f20756e697175656c7920
-6964656e74696679206561636820652d6d61696c2e>-3.194 F .595<54687265652070
-6965636573206f6620696e666f726d6174696f6e2061726520726571756972656420746f
-20646f20746869733a20796f7572>5.594 F .538<6163636f756e74206e616d652c2074
-686520666f6c646572206e616d652c20616e6420746865206d657373616765205549442e>
-144 132 R .537<546865206163636f756e74206e616d652063616e2062652063616c63
-756c617465642066726f6d>5.537 F 1.081<746865207061746820696e207768696368
-20796f7572206d65737361676573206172652e>144 144 R 1.082<54686520666f6c64
-6572206e616d652063616e20757375616c6c792062652061732077656c6c2c2042>6.082
-F 1.082<555420736f6d65206d61696c>-.1 F<636c69656e7473206d6f>144 156 Q .3
--.15<7665206d>-.15 H<65737361676573206265747765656e20666f6c646572732062
-792073696d706c79206d6f>.15 E<76696e6720746865208c6c652c206c6561>-.15 E
-<76696e6720746865206e616d6520696e746163742e>-.2 E<536f2c>144 180 Q F1
+-.15<7665>-.2 G 3.094<6177>144 184.8 S .594<617920746f20756e697175656c79
+206964656e74696679206561636820652d6d61696c2e>-3.194 F .595<546872656520
+706965636573206f6620696e666f726d6174696f6e206172652072657175697265642074
+6f20646f20746869733a20796f7572>5.594 F .538<6163636f756e74206e616d652c20
+74686520666f6c646572206e616d652c20616e6420746865206d65737361676520554944
+2e>144 196.8 R .537<546865206163636f756e74206e616d652063616e206265206361
+6c63756c617465642066726f6d>5.537 F 1.081<746865207061746820696e20776869
+636820796f7572206d65737361676573206172652e>144 208.8 R 1.082<5468652066
+6f6c646572206e616d652063616e20757375616c6c792062652061732077656c6c2c2042>
+6.082 F 1.082<555420736f6d65206d61696c>-.1 F<636c69656e7473206d6f>144
+220.8 Q .3 -.15<7665206d>-.15 H<65737361676573206265747765656e20666f6c64
+6572732062792073696d706c79206d6f>.15 E
+<76696e6720746865208c6c652c206c6561>-.15 E
+<76696e6720746865206e616d6520696e746163742e>-.2 E<536f2c>144 244.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 192 R -.15<7665>-.15
-G 2.955<6474>.15 G 2.955<6f6164>-2.955 G<6966>-2.955 E .455
+<63616e206465746563742061206d657373616765206d6f>144 256.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 204 Q<6163696c697461746520746869732e>-.1 E F1
+6d6265722920746f2066>144 268.8 Q<6163696c697461746520746869732e>-.1 E F1
 <5768617420697320746865207370656564206f66204f668d696e65494d415027>108
-220.8 Q 2.5<7373>-.37 G<796e633f>-2.5 E F0<4f66>144 232.8 Q .624
+285.6 Q 2.5<7373>-.37 G<796e633f>-2.5 E F0<4f66>144 297.6 Q .624
 <8d696e65494d41502076>-.25 F .624
 <657273696f6e7320322e3020616e642061626f>-.15 F .924 -.15<76652063>-.15 H
 .624<6f6e7461696e2061206d756c746974687265616465642073797374656d2e>.15 F
 3.124<4167>5.624 G .624<6f6f642077>-3.124 F .623<617920746f2065>-.1 F
-<78706572696d656e74>-.15 E<69732062792073657474696e67>144 244.8 Q/F2 10
+<78706572696d656e74>-.15 E<69732062792073657474696e67>144 309.6 Q/F2 10
 /Times-Italic@0 SF<6d617873796e636163636f756e7473>2.5 E F0
 <746f203320616e64>2.5 E F2<6d6178636f6e6e656374696f6e73>2.5 E F0
 <746f203320696e2065616368206163636f756e7420636c617573652e>2.5 E .381
-<54686973206c657473204f66>144 268.8 R .381<8d696e65494d4150206f70656e20
+<54686973206c657473204f66>144 333.6 R .381<8d696e65494d4150206f70656e20
 7570206d756c7469706c6520636f6e6e656374696f6e732073696d756c74616e656f7573
 6c79>-.25 F 5.382<2e54>-.65 G .382
 <6861742077696c6c206c65742069742070726f63657373206d756c2d>-5.382 F
 <7469706c6520666f6c6465727320616e64206d65737361676573206174206f6e63652e>
-144 280.8 Q<496e206d6f73742063617365732c20746869732077696c6c20696e637265
+144 345.6 Q<496e206d6f73742063617365732c20746869732077696c6c20696e637265
 61736520706572666f726d616e6365206f66207468652073796e632e>5 E<446f6e27>
-144 304.8 Q 3.104<7473>-.18 G .604
+144 369.6 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 316.8 R .132<746f6f206d616e>2.632
+<7361747572617465642e20416c736f2c>144 381.6 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 328.8 R 3.007<6575>-.1 G .507
+.507<746f7273206d696768742074616b>144 393.6 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 340.8 Q
+<6f7074696d616c2073657474696e673b2065>144 405.6 Q
 <78706572696d656e746174696f6e206d61792068656c702e>-.15 E<416e20696e666f
 726d616c2062656e63686d61726b207969656c647320746865736520726573756c747320
-666f72206d792073657475703a>144 364.8 Q 10.9<8331>144 381.6 S 2.5<306d>
+666f72206d792073657475703a>144 429.6 Q 10.9<8331>144 446.4 S 2.5<306d>
 -10.9 G<696e757465732077697468204d61634f532058204d61696c2e61707020226d61
-6e75616c20636163686522>-2.5 E 10.9<8335>144 398.4 S
+6e75616c20636163686522>-2.5 E 10.9<8335>144 463.2 S
 <6d696e75746573207769746820474e5553206167656e742073796e63>-8.4 E 10.9
-<8332>144 415.2 S 2.5<3073>-10.9 G<65636f6e64732077697468204f66>-2.5 E
-<8d696e65494d415020312e78>-.25 E 10.9<8339>144 432 S
+<8332>144 480 S 2.5<3073>-10.9 G<65636f6e64732077697468204f66>-2.5 E
+<8d696e65494d415020312e78>-.25 E 10.9<8339>144 496.8 S
 <7365636f6e64732077697468204f66>-8.4 E<8d696e65494d415020322e78>-.25 E
-10.9<8333>144 448.8 S<7365636f6e64732077697468204f66>-8.4 E
+10.9<8333>144 513.6 S<7365636f6e64732077697468204f66>-8.4 E
 <8d696e65494d415020332e782022636f6c6420737461727422>-.25 E 10.9<8332>144
-465.6 S<7365636f6e64732077697468204f66>-8.4 E
+530.4 S<7365636f6e64732077697468204f66>-8.4 E
 <8d696e65494d415020332e78202268656c6420636f6e6e656374696f6e22>-.25 E/F3
-10.95/Times-Bold@0 SF<434f4e464f524d494e472054>72 482.4 Q<4f>-.197 E F0
-10.9<8349>108 494.4 S
+10.95/Times-Bold@0 SF<434f4e464f524d494e472054>72 547.2 Q<4f>-.197 E F0
+10.9<8349>108 559.2 S
 <6e7465726e6574204d657373616765204163636573732050726f746f636f6c2076>
 -10.9 E<657273696f6e20347265>-.15 E<76312028494d415020347265>-.25 E<7631
 292061732073706563698c656420696e205246433230363020616e642052464333353031>
--.25 E 10.9<8343>108 511.2 S
+-.25 E 10.9<8343>108 576 S
 <52414d2d4d44352061732073706563698c656420696e2052464332313935>-10.9 E
-10.9<834d>108 528 S 9.171<61696c6469722061732073706563698c656420696e2074
-6865204d61696c646972206d616e70616765203c55524c3a687474703a2f2f777777>
+10.9<834d>108 592.8 S 9.171<61696c6469722061732073706563698c656420696e20
+746865204d61696c646972206d616e70616765203c55524c3a687474703a2f2f777777>
 -10.9 F<2e716d61696c2e6f72>-.65 E<672f716d61696c2d6d616e75616c2d>-.18 E
-<68746d6c2f6d616e352f6d61696c646972>122.4 540 Q<2e68746d6c3e20616e642074
-686520716d61696c2077656273697465203c55524c3a687474703a2f2f6372>-.55 E
+<68746d6c2f6d616e352f6d61696c646972>122.4 604.8 Q<2e68746d6c3e20616e6420
+74686520716d61696c2077656273697465203c55524c3a687474703a2f2f6372>-.55 E
 <2e79702e746f2f70726f746f2f6d61696c646972>-.55 E<2e68746d6c3e2e>-.55 E
-10.9<8353>108 556.8 S<74616e6461726420507974686f6e20322e322e312061732069
+10.9<8353>108 621.6 S<74616e6461726420507974686f6e20322e322e312061732069
 6d706c656d656e746564206f6e20504f5349582d636f6d706c69616e742073797374656d
-732e>-10.9 E F3<4e4f>72 573.6 Q<544553>-.438 E F1
-<44454c4554494e47204c4f43414c20464f4c44455253>87 585.6 Q
-<4f668d696e65494d4150>108 597.6 Q F0 .533<646f65732061207477>3.033 F
+732e>-10.9 E F3<4e4f>72 638.4 Q<544553>-.438 E F1
+<44454c4554494e47204c4f43414c20464f4c44455253>87 650.4 Q
+<4f668d696e65494d4150>108 662.4 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 609.6 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
+<6572>-.15 E 3.032<2c69>-.4 G<74>-3.032 E .927
+<77696c6c2062652070726f706167>108 674.4 R .927
+<6174656420746f20796f7572206c6f63616c20636f70>-.05 F 2.228 -.65
+<792c2061>-.1 H .928<6e6420766973652d76>.65 F 3.428
+<657273612e20536f6d65>-.15 F .928
+<70656f706c65206d69676874207468696e6b20746861742069742077>3.428 F .928
 <6f756c64206265207769736520746f>-.1 F 1.332<6a7573742064656c65746520616c
 6c207468656972206c6f63616c206d61696c20666f6c6465727320706572696f64696361
-6c6c79>108 621.6 R 6.331<2e49>-.65 G 3.831<6679>-6.331 G 1.331
+6c6c79>108 686.4 R 6.331<2e49>-.65 G 3.831<6679>-6.331 G 1.331
 <6f7520646f20746869732077697468>-3.831 F F1<4f668d696e65494d4150>3.831 E
 F0 3.831<2c72>C 1.331<656d656d62657220746f20616c736f>-3.831 F<72656d6f>
-108 633.6 Q 1.527 -.15<76652079>-.15 H 1.228
+108 698.4 Q 1.527 -.15<76652079>-.15 H 1.228
 <6f7572206c6f63616c207374617475732063616368652028>.15 F F2<7e2f2e6f66>A
 <8d696e65696d6170>-.18 E F0 1.228<627920646566>3.728 F 3.728
 <61756c74292e204f74686572776973652c>-.1 F F1<4f668d696e65494d4150>3.728
 E F0 1.228<77696c6c2074616b>3.728 F 3.728<6574>-.1 G 1.228
 <68697320617320616e>-3.728 F .416
-<696e74656e74696f6e616c2064656c6574696f6e206f66206d616e>108 645.6 R
+<696e74656e74696f6e616c2064656c6574696f6e206f66206d616e>108 710.4 R
 2.916<796d>-.15 G .416<6573736167657320616e642077696c6c20696e7465727072
 657420796f757220616374696f6e2061732072657175657374696e67207468656d20746f
-2062652064656c657465642066726f6d>-2.916 F<7468652073657276>108 657.6 Q
+2062652064656c657465642066726f6d>-2.916 F<7468652073657276>108 722.4 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 F1
-<4d554c>87 674.4 Q<5449504c4520494e5354>-.92 E<414e434553>-.9 E
-<4f668d696e65494d4150>108 686.4 Q F0 .604
+-.18 G<6e636f756e746572207468697320736974756174696f6e29>-2.5 E
+<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075 E
+<39>202.335 E 0 Cg EP
+%%Page: 10 10
+%%BeginPageSetup
+BP
+%%EndPageSetup
+/F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
+R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
+113.165 E/F1 10/Times-Bold@0 SF<4d554c>87 84 Q<5449504c4520494e5354>-.92
+E<414e434553>-.9 E<4f668d696e65494d4150>108 96 Q F0 .604
 <6973206e6f742064657369676e656420746f206861>3.104 F .904 -.15<76652073>
 -.2 H -2.15 -.25<65762065>.15 H .605<72616c20696e7374616e6365732028666f
 7220696e7374616e63652c20612063726f6e206a6f6220616e6420616e20696e74657261
 637469>.25 F .905 -.15<76652069>-.25 H -1.9 -.4<6e76206f>.15 H<63612d>.4
-E 1.142<74696f6e292072756e206f>108 698.4 R -.15<7665>-.15 G 3.642<7274>
-.15 G 1.141
-<68652073616d65206d61696c626f782073696d756c74616e656f75736c79>-3.642 F
-6.141<2e49>-.65 G 3.641<7477>-6.141 G 1.141<696c6c20706572666f726d206120
-636865636b206f6e207374617274757020616e642061626f727420696620616e6f746865
-72>-3.641 F F1<4f668d696e65494d4150>108 710.4 Q F0 .339
+E 1.142<74696f6e292072756e206f>108 108 R -.15<7665>-.15 G 3.642<7274>.15
+G 1.141<68652073616d65206d61696c626f782073696d756c74616e656f75736c79>
+-3.642 F 6.141<2e49>-.65 G 3.641<7477>-6.141 G 1.141<696c6c20706572666f
+726d206120636865636b206f6e207374617274757020616e642061626f72742069662061
+6e6f74686572>-3.641 F F1<4f668d696e65494d4150>108 120 Q F0 .339
 <697320616c72656164792072756e6e696e672e>2.839 F .339<496620796f75206e65
 656420746f207363686564756c652073796e6368726f6e697a6174696f6e732c20706c65
-6173652075736520746865>5.339 F F2<6175746f72>2.84 E<656672>-.37 E
-<657368>-.37 E F0<7365742d>2.84 E
-<74696e677320726174686572207468616e2063726f6e2e>108 722.4 Q
+6173652075736520746865>5.339 F/F2 10/Times-Italic@0 SF<6175746f72>2.84 E
+<656672>-.37 E<657368>-.37 E F0<7365742d>2.84 E
+<74696e677320726174686572207468616e2063726f6e2e>108 132 Q
 <416c7465726e617469>5 E -.15<7665>-.25 G<6c79>.15 E 2.5<2c79>-.65 G
 <6f752063616e207365742061207365706172617465>-2.5 E F2<6d65746164617461>
 2.5 E F0<6469726563746f727920666f72206561636820696e7374616e63652e>2.5 E
-<4a6f686e20476f65727a656e>72 768 Q<3138204a756c792032303033>152.905 E
-<39>203.165 E 0 Cg EP
-%%Page: 10 10
-%%BeginPageSetup
-BP
-%%EndPageSetup
-/F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
-R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.165 E/F1 10/Times-Bold@0 SF<434f5059494e47204d45535341>87 84 Q
+F1<434f5059494e47204d45535341>87 148.8 Q
 <474553204245545745454e20464f4c44455253>-.55 E F0<4e6f726d616c6c79>108
-96 Q 5.859<2c77>-.65 G 3.359<68656e20796f7520636f70>-5.859 F 5.859
+160.8 Q 5.859<2c77>-.65 G 3.359<68656e20796f7520636f70>-5.859 F 5.859
 <79616d>-.1 G 3.359
 <657373616765206265747765656e20666f6c64657273206f72206164642061206e65>
 -5.859 F 5.859<776d>-.25 G 3.358
 <65737361676520746f206120666f6c646572206c6f63616c6c79>-5.859 F<2c>-.65 E
-F1<4f668d696e65494d4150>108 108 Q F0 .853
+F1<4f668d696e65494d4150>108 172.8 Q F0 .853
 <77696c6c206a75737420646f20746865207269676874207468696e672e>3.352 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 120 R .29<76696465207468652053454152434820
-636f6d6d616e642c206f7220646f6573206e6f742072657475726e20736f6d657468696e
-672075736566756c2c>-.15 F F1<4f668d696e65494d4150>2.79 E F0 .29
+<646f6573206e6f742070726f>108 184.8 R .29<766964652074686520534541524348
+20636f6d6d616e642c206f7220646f6573206e6f742072657475726e20736f6d65746869
+6e672075736566756c2c>-.15 F F1<4f668d696e65494d4150>2.79 E F0 .29
 <63616e6e6f74206465746572>2.79 F<2d>-.2 E .173<6d696e6520746865206e65>
-108 132 R 2.673<7755>-.25 G .173<4944206f6620746865206d6573736167652e>
+108 196.8 R 2.673<7755>-.25 G .173<4944206f6620746865206d6573736167652e>
 -2.673 F .173
 <536f2c20696e207468657365207261726520696e7374616e6365732c204f66>5.173 F
 .174<8d696e65494d41502077696c6c2075706c6f616420746865206d65737361676520
-746f20746865>-.25 F .64<494d41502073657276>108 144 R .64<657220616e6420
-64656c6574652069742066726f6d20796f7572206c6f63616c20666f6c646572>-.15 F
-5.64<2e54>-.55 G .64<68656e2c206f6e20796f7572206e65>-5.64 F .64
+746f20746865>-.25 F .64<494d41502073657276>108 208.8 R .64<657220616e64
+2064656c6574652069742066726f6d20796f7572206c6f63616c20666f6c646572>-.15
+F 5.64<2e54>-.55 G .64<68656e2c206f6e20796f7572206e65>-5.64 F .64
 <78742073796e632c20746865206d6573736167652077696c6c2062652072652d646f>
 -.15 F<776e2d>-.25 E 1.472
-<6c6f616465642077697468207468652070726f706572205549442e>108 156 R F1
+<6c6f616465642077697468207468652070726f706572205549442e>108 220.8 R F1
 <4f668d696e65494d4150>6.473 E F0<6d616b>3.973 E 1.473
 <65732073757265207468617420746865206d6573736167652077>-.1 F 1.473
 <61732070726f7065726c792075706c6f61646564206265666f7265>-.1 F<64656c6574
 696e672069742c20736f2074686572652073686f756c64206265206e6f207269736b206f
-662064617461206c6f73732e>108 168 Q F1<5553452057495448204556>87 184.8 Q
-<4f4c5554494f4e>-.45 E<4f668d696e65494d4150>108 196.8 Q F0 .192
+662064617461206c6f73732e>108 232.8 Q F1<5553452057495448204556>87 249.6
+Q<4f4c5554494f4e>-.45 E<4f668d696e65494d4150>108 261.6 Q F0 .192
 <63616e2077>2.692 F .192<6f726b2077697468204576>-.1 F 2.691
 <6f6c7574696f6e2e2054>-.2 F 2.691<6f64>-.8 G 2.691<6f73>-2.691 G .191
 <6f2c208c72737420636f6e8c6775726520796f7572>-2.691 F F1
 <4f668d696e65494d4150>2.691 E F0 .191<6163636f756e7420746f206861>2.691 F
--.15<7665>-.2 G F1 .191<736570203d>2.841 F<2f>108 208.8 Q F0 .029
+-.15<7665>-.2 G F1 .191<736570203d>2.841 F<2f>108 273.6 Q F0 .029
 <696e2069747320636f6e8c6775726174696f6e2e>2.529 F .029
 <5468656e2c20636f6e8c67757265204576>5.029 F .029
 <6f6c7574696f6e20776974682074686520224d61696c646972>-.2 F .03
 <2d666f726d6174206d61696c206469726563746f72696573222073657276>-.2 F .03
 <657220747970652e>-.15 F -.15<466f>5.03 G<72>.15 E .57<7468652070617468
 2c20796f752077696c6c206e65656420746f207370656369667920746865206e616d6520
-6f662074686520746f702d6c65>108 220.8 R -.15<7665>-.25 G 3.069<6c66>.15 G
+6f662074686520746f702d6c65>108 285.6 R -.15<7665>-.25 G 3.069<6c66>.15 G
 <6f6c646572>-3.069 E F1<696e73696465>3.069 E F0<796f7572>3.069 E F1
 <4f668d696e65494d4150>3.069 E F0 .569<73746f72616765206c6f63612d>3.069 F
-2.5<74696f6e2e2059>108 232.8 R<6f7527>-1.1 E<7265206e6f>-.5 E 2.5<7773>
--.25 G<657421>-2.5 E F1<5553452057495448204b4d41494c>87 249.6 Q F0 .417
-<417420746869732074696d652c20492062656c6965>108 261.6 R .717 -.15
+2.5<74696f6e2e2059>108 297.6 R<6f7527>-1.1 E<7265206e6f>-.5 E 2.5<7773>
+-.25 G<657421>-2.5 E F1<5553452057495448204b4d41494c>87 314.4 Q F0 .417
+<417420746869732074696d652c20492062656c6965>108 326.4 R .717 -.15
 <76652074>-.25 H<686174>.15 E F1<4f668d696e65494d4150>2.917 E F0 .418<77
 697468204d61696c64697273206973206e6f7420636f6d70617469626c65207769746820
 4b4d61696c2e>2.917 F .418<4b4d61696c2063616e6e6f742077>5.418 F<6f726b>
--.1 E .159<696e20616e>108 273.6 R 2.659<796d>-.15 G .159
+-.1 E .159<696e20616e>108 338.4 R 2.659<796d>-.15 G .159
 <6f6465206f74686572207468616e20746f206d6f>-2.659 F .458 -.15<76652061>
 -.15 H .158<6c6c206d65737361676573206f7574206f6620616c6c20666f6c64657273
 20696d6d6564696174656c79>.15 F 2.658<2c77>-.65 G .158
 <68696368202862657369646573206265696e6720616e6e6f>-2.658 F<79696e67>-.1
-E<616e642066756e64616d656e74616c6c792062726f6b>108 285.6 Q
+E<616e642066756e64616d656e74616c6c792062726f6b>108 350.4 Q
 <656e2920697320696e636f6d70617469626c652077697468>-.1 E F1
-<4f668d696e65494d4150>2.5 E F0<2e>A<486f>108 302.4 Q<7765>-.25 E -.15
+<4f668d696e65494d4150>2.5 E F0<2e>A<486f>108 367.2 Q<7765>-.25 E -.15
 <7665>-.25 G 1.222 -.4<722c20492068>.15 H -2.25 -.2<61762065>.4 H .423
 <6d616465204b4d61696c2076>3.123 F .423<657273696f6e20332077>-.15 F .423
 <6f726b2077656c6c2077697468>-.1 F F1<4f668d696e65494d4150>2.923 E F0
 .423<627920696e7374616c6c696e6720616e20494d41502073657276>2.923 F .423
-<6572206f6e206d79>-.15 F<6c6f63616c206d616368696e652c206861>108 314.4 Q
+<6572206f6e206d79>-.15 F<6c6f63616c206d616368696e652c206861>108 379.2 Q
 <76696e67>-.2 E F1<4f668d696e65494d4150>2.5 E F0<73796e6320746f20746861
 742c20616e6420706f696e74696e67204b4d61696c206174207468652073616d65207365
-7276>2.5 E<6572>-.15 E<2e>-.55 E F1<4d41494c494e47204c495354>87 331.2 Q
-F0 .522<546865726520697320616e204f66>108 343.2 R .522
+7276>2.5 E<6572>-.15 E<2e>-.55 E F1<4d41494c494e47204c495354>87 396 Q F0
+.522<546865726520697320616e204f66>108 408 R .522
 <8d696e65494d4150206d61696c696e67206c6973742061>-.25 F -.25<7661>-.2 G
 3.022<696c61626c652e2054>.25 F 3.022<6f73>-.8 G .522
 <75627363726962652c2073656e6420746865207465>-3.022 F .521
 <787420225375627363726962652220696e20746865207375626a656374206f662061>
--.15 F 3.086<6d61696c20746f206f66>108 355.2 R
+-.15 F 3.086<6d61696c20746f206f66>108 420 R
 <8d696e65696d61702d7265717565737440636f6d706c6574652e6f72>-.25 E 5.586
 <672e2054>-.18 F 5.587<6f70>-.8 G 3.087
 <6f73742c2073656e6420746865206d65737361676520746f206f66>-5.587 F
 <8d696e65696d617040636f6d706c6574652e6f72>-.25 E<672e>-.18 E<4172636869>
-108 367.2 Q -.15<7665>-.25 G 2.5<7361>.15 G<72652061>-2.5 E -.25<7661>
--.2 G<696c61626c65206174>.25 E
-<3c55524c3a687474703a2f2f6c697374732e636f6d706c6574652e6f72>110.5 379.2
-Q<672f6f66>-.18 E<8d696e65696d617040636f6d706c6574652e6f72>-.25 E
-<672f3e2e>-.18 E F1 -.1<4255>87 396 S<4753>.1 E F0 4.42
-<5265706f727473206f662062>108 408 R 4.419<7567732073686f756c642062652073
-656e742076696120652d6d61696c20746f20746865>-.2 F F1
+108 432 Q -.15<7665>-.25 G 2.5<7361>.15 G<72652061>-2.5 E -.25<7661>-.2
+G<696c61626c65206174>.25 E
+<3c55524c3a687474703a2f2f6c697374732e636f6d706c6574652e6f72>110.5 444 Q
+<672f6f66>-.18 E<8d696e65696d617040636f6d706c6574652e6f72>-.25 E
+<672f3e2e>-.18 E F1 -.1<4255>87 460.8 S<4753>.1 E F0 4.42
+<5265706f727473206f662062>108 472.8 R 4.419<7567732073686f756c6420626520
+73656e742076696120652d6d61696c20746f20746865>-.2 F F1
 <4f668d696e65494d4150>6.919 E F0 -.2<6275>6.919 G 4.419
-<672d747261636b696e672073797374656d202842545329206174>.2 F<6f66>108 420
-Q<8d696e65696d61704062>-.25 E<7567732e636f6d706c6574652e6f72>-.2 E 6.395
-<676f>-.18 G 6.395<7273>-6.395 G 3.895<75626d6974746564206f6e6c696e6520
-7573696e67207468652077656220696e74657266>-6.395 F 3.895
+<672d747261636b696e672073797374656d202842545329206174>.2 F<6f66>108
+484.8 Q<8d696e65696d61704062>-.25 E<7567732e636f6d706c6574652e6f72>-.2 E
+6.395<676f>-.18 G 6.395<7273>-6.395 G 3.895<75626d6974746564206f6e6c696e
+65207573696e67207468652077656220696e74657266>-6.395 F 3.895
 <616365203c55524c3a687474703a2f2f62>-.1 F<7567732e636f6d2d>-.2 E
-<706c6574652e6f72>108 432 Q<672f3e2e>-.18 E<5468652057>108 448.8 Q
+<706c6574652e6f72>108 496.8 Q<672f3e2e>-.18 E<5468652057>108 513.6 Q
 <6562207369746520616c736f206c6973747320616c6c2063757272656e742062>-.8 E<
 7567732c20776865726520796f752063616e20636865636b207468656972207374617475
 73206f7220636f6e74726962>-.2 E<75746520746f208c78696e67207468656d2e>-.2
-E/F2 10.95/Times-Bold@0 SF<555047524144494e472054>72 465.6 Q 2.738<4f34>
+E/F3 10.95/Times-Bold@0 SF<555047524144494e472054>72 530.4 Q 2.738<4f34>
 -.197 G<2e30>-2.738 E F0 .291
-<496620796f752061726520757067726164696e672066726f6d20612076>108 477.6 R
+<496620796f752061726520757067726164696e672066726f6d20612076>108 542.4 R
 .291<657273696f6e206f66>-.15 F F1<4f668d696e65494d4150>2.791 E F0 .291<
 7072696f7220746f20332e39392e31322c20796f752077696c6c208c6e64207468617420
-796f752077696c6c20676574206572726f7273>2.791 F<7768656e>108 489.6 Q F1
+796f752077696c6c20676574206572726f7273>2.791 F<7768656e>108 554.4 Q F1
 <4f668d696e65494d4150>3.939 E F0 1.439
 <737461727473207570202872656c6174696e6720746f20436f6e8c6750>3.939 F
 1.439<6172736572206f72204163636f756e744861736847656e657261746f722920616e
-642074686520636f6e8c6775726174696f6e>-.15 F 3.19<8c6c652e2054686973>108
-501.6 R .69<697320626563617573652074686520636f6e8c67208c6c6520666f726d61
-742068616420746f206368616e676520746f206163636f6d6f64617465206e65>3.19 F
-3.19<7766>-.25 G .69<6561747572657320696e20342e302e>-3.19 F -.15<466f>
-5.69 G<7274756e6174656c79>.15 E<2c>-.65 E<697427>108 513.6 Q 2.5<736e>
--.55 G<6f7420646966>-2.5 E
+642074686520636f6e8c6775726174696f6e>-.15 F 2.733<8c6c652e2054686973>108
+566.4 R .232<697320626563617573652074686520636f6e8c67208c6c6520666f726d
+61742068616420746f206368616e676520746f206163636f6d6d6f64617465206e65>
+2.733 F 2.732<7766>-.25 G .232<6561747572657320696e20342e302e>-2.732 F
+-.15<466f>5.232 G<7274756e6174656c79>.15 E<2c>-.65 E<697427>108 578.4 Q
+2.5<736e>-.55 G<6f7420646966>-2.5 E
 <8c63756c7420746f2061646a75737420697420746f20737569742e>-.25 E .505<4669
 727374207468696e6720796f75206e65656420746f20646f2069732073746f7020616e>
-108 530.4 R 3.006<7972>-.15 G<756e6e696e67>-3.006 E F1
+108 595.2 R 3.006<7972>-.15 G<756e6e696e67>-3.006 E F1
 <4f668d696e65494d4150>3.006 E F0 .506
 <696e7374616e63652c206d616b696e672073757265208c727374207468617420697427>
 3.006 F 3.006<7373>-.55 G .506<796e63656420616c6c>-3.006 F .21
-<796f7572206d61696c2e>108 542.4 R .21
-<5468656e2c206d6f6469667920796f7572>5.21 F/F3 10/Times-Italic@0 SF
-<7e2f2e6f66>2.71 E<8d696e65696d617072>-.18 E<63>-.37 E F0 2.709
-<8c6c652e2059>2.71 F<6f7527>-1.1 E .209<6c6c206e65656420746f2073706c6974
-2075702065616368206163636f756e742073656374696f6e20286d616b>-.1 F 2.709
-<6573>-.1 G<757265>-2.709 E .559<74686174206974206e6f>108 554.4 R 3.059
-<7773>-.25 G .559
+<796f7572206d61696c2e>108 607.2 R .21
+<5468656e2c206d6f6469667920796f7572>5.21 F F2<7e2f2e6f66>2.71 E
+<8d696e65696d617072>-.18 E<63>-.37 E F0 2.709<8c6c652e2059>2.71 F
+<6f7527>-1.1 E .209<6c6c206e65656420746f2073706c697420757020656163682061
+63636f756e742073656374696f6e20286d616b>-.1 F 2.709<6573>-.1 G<757265>
+-2.709 E .559<74686174206974206e6f>108 619.2 R 3.059<7773>-.25 G .559
 <7461727473207769746820224163636f756e7420222920696e746f207477>-3.059 F
 3.059<6f52>-.1 G .56<65706f7369746f72792073656374696f6e7320286f6e652066
 6f7220746865206c6f63616c207369646520616e6420616e6f7468657220666f72207468
-65>-3.059 F 1.493<72656d6f746520736964652e29>108 566.4 R 1.493
-<53656520746865208c6c6573>6.493 F F3<6f66>3.992 E
+65>-3.059 F 1.493<72656d6f746520736964652e29>108 631.2 R 1.493
+<53656520746865208c6c6573>6.493 F F2<6f66>3.992 E
 <8d696e65696d61702e636f6e66>-.18 E<2e6d696e696d616c>-.15 E F0<616e64>
-3.992 E F3<6f66>3.992 E<8d696e65696d61702e636f6e66>-.18 E F0 1.492
+3.992 E F2<6f66>3.992 E<8d696e65696d61702e636f6e66>-.18 E F0 1.492
 <696e207468652064697374726962>3.992 F 1.492
 <7574696f6e20696620796f75206e656564>-.2 F
-<6d6f726520617373697374616e63652e>108 578.4 Q F1<4f668d696e65494d4150>
-108 595.2 Q F0 4.292 -.55<27732073>D 3.192<7461747573206469726563746f72
-7920617265612068617320616c736f206368616e6765642e>.55 F 3.193
+<6d6f726520617373697374616e63652e>108 643.2 Q F1<4f668d696e65494d4150>
+108 660 Q F0 4.292 -.55<27732073>D 3.192<7461747573206469726563746f7279
+20617265612068617320616c736f206368616e6765642e>.55 F 3.193
 <5468657265666f72652c20796f752073686f756c642064656c6574652065>8.193 F
--.15<7665>-.25 G 3.193<72797468696e6720696e>.15 F<7e2f2e6f66>108 607.2 Q
-<8d696e65696d61702061732077656c6c20617320796f7572206c6f63616c206d61696c
-20666f6c646572732e>-.25 E .878<5768656e20796f75207374617274207570>108
-624 R F1<4f668d696e65494d4150>3.378 E F0 .877
+-.15<7665>-.25 G 3.193<72797468696e6720696e>.15 F<7e2f2e6f66>108 672 Q<
+8d696e65696d61702061732077656c6c20617320796f7572206c6f63616c206d61696c20
+666f6c646572732e>-.25 E .878<5768656e20796f75207374617274207570>108
+688.8 R F1<4f668d696e65494d4150>3.378 E F0 .877
 <342e302c2069742077696c6c2072652d646f>3.377 F .877
 <776e6c6f616420616c6c20796f7572206d61696c2066726f6d207468652073657276>
 -.25 F .877<657220616e64207468656e20796f752063616e>-.15 F
-<636f6e74696e7565207573696e67206974206c696b>108 636 Q 2.5<656e>-.1 G
-<6f726d616c2e>-2.5 E F2<434f50595249474854>72 652.8 Q F0<4f66>108 664.8
-Q<8d696e65494d4150>-.25 E 2.5<2c61>-1.11 G
+<636f6e74696e7565207573696e67206974206c696b>108 700.8 Q 2.5<656e>-.1 G
+<6f726d616c2e>-2.5 E<4a6f686e20476f65727a656e>72 768 Q
+<3034204a756e652032303034>152.075 E<3130>197.335 E 0 Cg EP
+%%Page: 11 11
+%%BeginPageSetup
+BP
+%%EndPageSetup
+/F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
+R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
+113.165 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 .286<546869732070726f6772616d206973206672656520736f667477>108
-681.6 R .286<6172653b20796f752063616e20726564697374726962>-.1 F .287<75
+112.8 R .286<6172653b20796f752063616e20726564697374726962>-.1 F .287<75
 746520697420616e642f6f72206d6f6469667920697420756e6465722074686520746572
 6d73206f662074686520474e552047656e6572616c>-.2 F .766<5075626c6963204c69
 63656e7365206173207075626c697368656420627920746865204672656520536f667477>
-108 693.6 R .766<6172652046>-.1 F .766
+108 124.8 R .766<6172652046>-.1 F .766
 <6f756e646174696f6e3b206569746865722076>-.15 F .766<657273696f6e2032206f
 6620746865204c6963656e73652c206f722028617420796f7572>-.15 F
-<6f7074696f6e2920616e>108 705.6 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 .579
-<546869732070726f6772616d2069732064697374726962>108 722.4 R .579<757465
+<546869732070726f6772616d2069732064697374726962>108 153.6 R .579<757465
 6420696e2074686520686f706520746861742069742077696c6c2062652075736566756c
 2c2062>-.2 F .58<757420574954484f555420414e592057>-.2 F<415252414e5459>
--1.2 E 3.08<3b77>-.92 G<6974686f7574>-3.08 E<4a6f686e20476f65727a656e>72
-768 Q<3138204a756c792032303033>152.905 E<3130>198.165 E 0 Cg EP
-%%Page: 11 11
-%%BeginPageSetup
-BP
-%%EndPageSetup
-/F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
-R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
-113.165 E -2.15 -.25<65762065>108 84 T 2.73<6e74>.25 G .23
-<686520696d706c6965642077>-2.73 F .229
+-1.2 E 3.08<3b77>-.92 G<6974686f7574>-3.08 E -2.15 -.25<65762065>108
+165.6 T 2.73<6e74>.25 G .23<686520696d706c6965642077>-2.73 F .229
 <617272616e7479206f66204d45524348414e54>-.1 F .229
 <4142494c495459206f72204649544e45535320464f5220412050>-.93 F<4152>-.92 E
 .229<544943554c415220505552504f53452e>-.6 F<536565>5.229 E<74686520474e
 552047656e6572616c205075626c6963204c6963656e736520666f72206d6f7265206465
-7461696c732e>108 96 Q -1.1<596f>108 112.8 S 2.77<7573>1.1 G .27
+7461696c732e>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<746f20746865204672656520536f667477>108 124.8 Q<6172652046>
+7465>-2.77 F<746f20746865204672656520536f667477>108 206.4 Q<6172652046>
 -.1 E<6f756e646174696f6e2c20496e632e2c2035392054>-.15 E
 <656d706c6520506c6163652c205375697465203333302c20426f73746f6e2c204d41>
--.7 E<30323131312d3133303720555341>5 E<696d61706c6962>108 141.6 Q<2e70>
+-.7 E<30323131312d3133303720555341>5 E<696d61706c6962>108 223.2 Q<2e70>
 -.4 E 2.692<7963>-.1 G .192
 <6f6d65732066726f6d2074686520507974686f6e206465>-2.692 F 2.692<7674>-.25
 G .192<72656520616e64206973206c6963656e73656420756e64657220746865204750
 4c2d636f6d70617469626c6520505346206c6963656e736520617320737461746564>
--2.692 F<696e20746865208c6c65>108 153.6 Q/F1 10/Times-Italic@0 SF
-<434f50595249474854>2.5 E F0<696e20746865>2.5 E/F2 10/Times-Bold@0 SF
+-2.692 F<696e20746865208c6c65>108 235.2 Q/F2 10/Times-Italic@0 SF
+<434f50595249474854>2.5 E F0<696e20746865>2.5 E/F3 10/Times-Bold@0 SF
 <4f668d696e65494d4150>2.5 E F0<64697374726962>2.5 E<7574696f6e2e>-.2 E
-/F3 10.95/Times-Bold@0 SF -.548<4155>72 170.4 S<54484f52>.548 E F2
-<4f668d696e65494d4150>108 182.4 Q F0 2.922<2c69>C .422<7473206c69627261
-726965732c20646f63756d656e746174696f6e2c20616e6420616c6c20696e636c756465
-64208c6c65732c2065>-2.922 F .422
+F1 -.548<4155>72 252 S<54484f52>.548 E F3<4f668d696e65494d4150>108 264 Q
+F0 2.922<2c69>C .422<7473206c69627261726965732c20646f63756d656e74617469
+6f6e2c20616e6420616c6c20696e636c75646564208c6c65732c2065>-2.922 F .422
 <7863657074207768657265206e6f7465642c2077>-.15 F .423
 <6173207772697474656e206279204a6f686e>-.1 F
-<476f65727a656e203c6a676f65727a656e40636f6d706c6574652e6f72>108 194.4 Q
+<476f65727a656e203c6a676f65727a656e40636f6d706c6574652e6f72>108 276 Q
 <673e20616e6420636f70>-.18 E<7972696768742069732068656c6420617320737461
-74656420696e2074686520434f505952494748542073656374696f6e2e>-.1 E F2
-<4f668d696e65494d4150>108 211.2 Q F0 3.804<6d617920626520646f>6.304 F
+74656420696e2074686520434f505952494748542073656374696f6e2e>-.1 E F3
+<4f668d696e65494d4150>108 292.8 Q F0 3.804<6d617920626520646f>6.304 F
 3.803<776e6c6f616465642c20616e6420696e666f726d6174696f6e20666f756e642c20
 66726f6d2069747320686f6d6570616765207669612065697468657220476f70686572>
--.25 F<3c55524c3a676f706865723a2f2f717575782e6f72>108 223.2 Q
+-.25 F<3c55524c3a676f706865723a2f2f717575782e6f72>108 304.8 Q
 <672f312f6465>-.18 E -.15<7665>-.25 G<6c2f6f66>.15 E<8d696e65696d61703e
 206f722048545450203c55524c3a687474703a2f2f717575782e6f72>-.25 E
 <672f6465>-.18 E -.15<7665>-.25 G<6c2f6f66>.15 E<8d696e65696d61703e2e>
--.25 E F2<4f668d696e65494d4150>108 240 Q F0 2.276
+-.25 E F3<4f668d696e65494d4150>108 321.6 Q F0 2.276
 <6d617920616c736f20626520646f>4.775 F 2.276
 <776e6c6f61646564207573696e6720537562>-.25 F -.15<7665>-.15 G 4.776
 <7273696f6e2e204164646974696f6e616c6c79>.15 F 4.776<2c74>-.65 G 2.276
 <68652064697374726962>-4.776 F 2.276<7574656420746172>-.2 F 2.276
 <2e677a206d6179206265>-.55 F .718<75706461746564207769746820612073696d70
 6c65202273766e207570646174652220636f6d6d616e643b206974206973207265616479
-20746f20676f2e>108 252 R -.15<466f>5.717 G 3.217<7269>.15 G .717
+20746f20676f2e>108 333.6 R -.15<466f>5.717 G 3.217<7269>.15 G .717
 <6e666f726d6174696f6e206f6e2067657474696e67204f66>-3.217 F
-<8d696e65494d4150>-.25 E<7769746820537562>108 264 Q -.15<7665>-.15 G
+<8d696e65494d4150>-.25 E<7769746820537562>108 345.6 Q -.15<7665>-.15 G
 <7273696f6e2c20706c656173652076697369742074686520636f6d706c6574652e6f72>
 .15 E 2.5<6753>-.18 G<7562>-2.5 E -.15<7665>-.15 G<7273696f6e2070616765
 203c55524c3a687474703a2f2f73766e2e636f6d706c6574652e6f72>.15 E<672f3e2e>
--.18 E F3<53454520414c534f>72 280.8 Q F2<6d757474>108 292.8 Q F0
-<2831292c>A F2<707974686f6e>2.5 E F0<283129>A<4a6f686e20476f65727a656e>
-72 768 Q<3138204a756c792032303033>152.905 E<3131>198.165 E 0 Cg EP
+-.18 E F1<53454520414c534f>72 362.4 Q F3<6d757474>108 374.4 Q F0
+<2831292c>A F3<707974686f6e>2.5 E F0<283129>A F1<48495354>72 391.2 Q
+<4f52>-.197 E<59>-.383 E F0 1.143<44657461696c656420686973746f7279206d61
+7920626520666f756e6420696e20746865208c6c65204368616e67654c6f6720696e2074
+6865>108 403.2 R F3<4f668d696e65494d4150>3.644 E F0<64697374726962>3.644
+E 3.644<7574696f6e2e2046656174757265>-.2 F 1.144<616e642062>3.644 F
+<7567>-.2 E .729<686973746f72696573206d617920626520666f756e6420696e2074
+6865208c6c652064656269616e2f6368616e67656c6f672077686963682c206465737069
+746520697473206e616d652c206973206e6f74207265616c6c792044656269616e2d7370
+6563698c632e>108 415.2 R<546869732073656374696f6e2070726f>108 427.2 Q
+<76696465732061206c6172>-.15 E<6765206f>-.18 E -.15<7665>-.15 G
+<72766965>.15 E -.65<772e>-.25 G<4465>108 444 Q -.15<7665>-.25 G 1.37
+<6c6f706d656e74206f6e>.15 F F3<4f668d696e65494d4150>3.87 E F0<6265>3.87
+E -.05<6761>-.15 G 3.87<6e6f>.05 G 3.87<6e4a>-3.87 G 1.37
+<756e652031382c20323030322e>-3.87 F -1.11<5665>6.37 G 1.37
+<7273696f6e20312e302e302077>1.11 F 1.37
+<61732072656c65617365642074687265652064617973206c61746572206f6e>-.1 F
+<4a756e652032312c20323030322e>108 456 Q
+<506f696e742072656c656173657320666f6c6c6f>5 E<7765642c20696e636c7564696e
+67207370656564206f7074696d697a6174696f6e7320616e6420736f6d6520636f6d7061
+746962696c697479208c78>-.25 E<65732e>-.15 E -1.11<5665>108 472.8 S .31
+<7273696f6e20322e302e302077>1.11 F .309<61732072656c6561736564206f6e204a
+756c7920332c20323030322c20616e6420726570726573656e74656420746865208c7273
+742074696d65207468652073796e6368726f6e697a6174696f6e20626563616d65206d75
+6c2d>-.1 F 1.393<7469746872656164656420616e642c20746f207468652062657374
+206f66206d79206b6e6f>108 484.8 R 1.394<776c656467652c20746865208c727374
+206d756c7469746872656164656420494d41502073796e6372686f6e697a696e67206170
+706c69636174696f6e20696e>-.25 F -.15<6578>108 496.8 S 2.5
+<697374616e63652e20546865>.15 F
+<6c61737420322e302e782072656c656173652c20322e302e382c2077>2.5 E
+<6173206d616465206f6e204a756c7920392e>-.1 E -1.11<5665>108 513.6 S .098
+<7273696f6e20332e302e302077>1.11 F .097<61732072656c6561736564206f6e204a
+756c792031312c20323030322c20616e6420696e74726f6475636564206d6f64756c6172
+207573657220696e74657266>-.1 F .097
+<6163657320616e6420746865208c7273742047554920696e746572>-.1 F<2d>-.2 E
+-.1<6661>108 525.6 S 2.193<636520666f72>.1 F F3<4f668d696e65494d4150>
+4.693 E F0 7.193<2e54>C 2.193<686973206d616e75616c20616c736f2077>-7.193
+F 2.193<617320696e74726f6475636564207769746820332e302e302c20616c6f6e6720
+77697468206d616e>-.1 F 4.694<7963>-.15 G<6f6d6d616e642d6c696e65>-4.694 E
+2.591<6f7074696f6e732e2056>108 537.6 R .091
+<657273696f6e20332e312e302077>-1.11 F .091<61732072656c6561736564206f6e
+204a756c792032312c20616464696e6720746865204e6f6e696e74657261637469>-.1 F
+.39 -.15<76652075>-.25 H .09<73657220696e74657266>.15 F .09
+<616365732c2070726f8c6c696e6720737570706f72742c>-.1 F 1.078
+<616e64207365>108 549.6 R -.15<7665>-.25 G 1.078<72616c2062>.15 F
+<75678c78>-.2 E 3.578<65732e20332e322e30>-.15 F -.1<7761>3.578 G 3.578
+<7372>.1 G 1.078<656c6561736564206f6e204a756c792032342c20616464696e6720
+737570706f727420666f722074686520426c696e6b>-3.578 F 1.078
+<656e6c69676874732047554920696e74657266>-.1 F<6163652e>-.1 E F3
+<4f668d696e65494d4150>108 561.6 Q F0 .498
+<656e7465726564206d61696e74656e616e6365206d6f646520666f722061>2.998 F
+.498<7768696c652c206173206974206861642072656163686564206120666561747572
+652d636f6d706c657465206d696c6573746f6e6520696e206d79>-.15 F<6d696e642e>
+108 573.6 Q .447<54686520332e39392e78206272616e6368206265>108 590.4 R
+-.05<6761>-.15 G 2.947<6e69>.05 G 2.947<6e6f>-2.947 G 2.947<6e4f>-2.947
+G .447<63746f62657220372c20323030322c20746f206265>-2.947 F .448
+<67696e2077>-.15 F .448<6f726b20666f7220342e302e>-.1 F .448
+<546865204375727365732e426c696e6b>5.448 F .448
+<656e6c696768747320696e74657266>-.1 F<616365>-.1 E -.1<7761>108 602.4 S
+2.5<7361>.1 G<6464656420696e20332e39392e362c20616e64206d616e>-2.5 E 2.5
+<7961>-.15 G
+<72636869746563747572616c206368616e6765732077657265206d6164652e>-2.5 E
+1.946<342e302e302077>108 619.2 R 1.946<61732072656c6561736564206f6e204a
+756c792031382c20323030332c20696e636c7564696e6720746865206162696c69747920
+746f2073796e6368726f6e697a65206469726563746c79206265747765656e207477>-.1
+F 4.446<6f49>-.1 G<4d4150>-4.446 E<73657276>108 631.2 Q 1.371<6572732c20
+746865208c7273742072652d617263686974656374696e67206f662074686520636f6e8c
+6775726174696f6e208c6c6520746f2072658c6e6520746865206e6f74696f6e206f6620
+616e206163636f756e742c20616e6420746865206e65>-.15 F<77>-.25 E
+<43757273657320696e74657266>108 643.2 Q<6163652e>-.1 E
+<4a6f686e20476f65727a656e>72 768 Q<3034204a756e652032303034>152.075 E
+<3131>197.335 E 0 Cg EP
 %%Trailer
 end
 %%EOF

diff --git a/offlineimap/head/manual.txt b/offlineimap/head/manual.txt
index 0cbedf15a825eae08d962f706aad1fe5ed38a9e2..9bbd430c6628e3b98e75f7edadaa9c56b5ecaadd 100644 (file)
--- a/offlineimap/head/manual.txt
+++ b/offlineimap/head/manual.txt
@@ -70,7 +70,7 @@ DESCRIPTION
 
 QUICK START
        If  you  have already installed OfflineIMAP system-wide, or your system
-       adminstrator  has  done  that  for  you,  your  task  for  setting   up
+       administrator  has  done  that  for  you,  your  task  for  setting  up
        OfflineIMAP  for  the first time is quite simple.  You just need to set
        up your configuration file, make your folder directory, and run it!
 
@@ -182,7 +182,7 @@ INSTALLATION
        above  and  then  type  ./offlineimap.py; there is no installation step
        necessary.
 
-CONFIGRUATION
+CONFIGURATION
        OfflineIMAP is regulated by  a  configuration  file  that  is  normally
        stored  in  ~/.offlineimaprc.   OfflineIMAP  ships  with  a  file named
        offlineimap.conf that you should copy to that location and  then  edit.
@@ -254,7 +254,7 @@ OPTIONS
 
        -u interface
               Specifies an alternative user interface  module  to  use.   This
-              overrides  the defailt specified in the configuration file.  The
+              overrides  the default specified in the configuration file.  The
               pre-defined options are listed in the User Interfaces section.
 
 USER INTERFACES
@@ -308,8 +308,8 @@ USER INTERFACES
 
        Blue   is the color of a message synchronization controller thread.
 
-       Orange indicates that an actual  message  is  being  copied.   (We  use
-              fuschia for fake messages.)
+       Orange indicates that an actual message is being copied.  (We use fuch-
+              sia for fake messages.)
 
        Red (meaning 2)
               indicates that a message is being deleted.
@@ -471,10 +471,14 @@ EXAMPLES
 
        def mycmp(x, y):
           for prefix in prioritized:
-              if x.startswith(prefix):
-                  return -1
-              elif y.startswith(prefix):
-                  return +1
+              xsw = x.startswith(prefix)
+              ysw = y.startswith(prefix)
+              if xsw and ysw:
+                 return cmp(x, y)
+              elif xsw:
+                 return -1
+              elif ysw:
+                 return +1
           return cmp(x, y)
 
        def test_mycmp():
@@ -573,7 +577,7 @@ OTHER FREQUENTLY ASKED QUESTIONS
        What is the mailbox name recorder (mbnames) for?
               Some mail readers, such as Mutt, are not  capable  of  automati-
               cally  determining the names of your mailboxes.  OfflineIMAP can
-              help these programs by writing the names of  the  folders  ni  a
+              help these programs by writing the names of  the  folders  in  a
               format  you  specify.   See  the  example  offlineimap.conf  for
               details.
 
@@ -596,35 +600,36 @@ OTHER FREQUENTLY ASKED QUESTIONS
 
        [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
-              folders by simply moving the file, leaving the name intact.
-
-              So, OfflineIMAP must store both a UID folder ID.  The folder  ID
+              messages   in   any   way   and   2)   ensuring   100%  reliable
+              synchronizations.  In order to do a reliable  sync,  OfflineIMAP
+              must  have a way to uniquely identify each e-mail.  Three pieces
+              of information are required to do this: your account  name,  the
+              folder  name, and the message UID.  The account name can be cal-
+              culated 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
               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:
@@ -647,7 +652,7 @@ CONFORMING TO
 
        o CRAM-MD5 as specified in RFC2195
 
-       o Maildir     as     specified     in     the      Maildir      manpage
+       o Maildir      as      specified     in     the     Maildir     manpage
          <URL:http://www.qmail.org/qmail-manual-html/man5/maildir.html>    and
          the qmail website <URL:http://cr.yp.to/proto/maildir.html>.
 
@@ -655,133 +660,166 @@ CONFORMING TO
 
 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 propagated 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)
 
    MULTIPLE INSTANCES
-       OfflineIMAP  is not designed to have several instances (for instance, a
-       cron job and an interactive  invocation)  run  over  the  same  mailbox
-       simultaneously.   It  will  perform  a  check  on  startup and abort if
-       another OfflineIMAP is already running.  If you need to  schedule  syn-
-       chronizations,  please  use  the autorefresh settings rather than cron.
-       Alternatively, you can set  a  separate  metadata  directory  for  each
+       OfflineIMAP is not designed to have several instances (for instance,  a
+       cron  job  and  an  interactive  invocation)  run over the same mailbox
+       simultaneously.  It will perform  a  check  on  startup  and  abort  if
+       another  OfflineIMAP  is already running.  If you need to schedule syn-
+       chronizations, please use the autorefresh settings  rather  than  cron.
+       Alternatively,  you  can  set  a  separate  metadata directory for each
        instance.
 
    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  account  to have sep = / in its configuration.  Then, con-
-       figure Evolution with  the  "Maildir-format  mail  directories"  server
+       OfflineIMAP  can  work  with Evolution.  To do so, first configure your
+       OfflineIMAP account to have sep = / in its configuration.   Then,  con-
+       figure  Evolution  with  the  "Maildir-format  mail directories" server
        type.  For the path, you will need to specify the name of the top-level
        folder inside your OfflineIMAP storage location.  You're now set!
 
    USE WITH KMAIL
-       At this time, I believe that OfflineIMAP with Maildirs is not  compati-
-       ble  with  KMail.  KMail cannot work in any mode other than to move all
-       messages out of all folders immediately, which (besides being  annoying
+       At  this time, I believe that OfflineIMAP with Maildirs is not compati-
+       ble with KMail.  KMail cannot work in any mode other than to  move  all
+       messages  out of all folders immediately, which (besides being annoying
        and fundamentally broken) is incompatible with OfflineIMAP.
 
-       However,  I  have  made  KMail  version 3 work well with OfflineIMAP by
-       installing an IMAP server on my local machine, having OfflineIMAP  sync
+       However, I have made KMail version 3  work  well  with  OfflineIMAP  by
+       installing  an IMAP server on my local machine, having OfflineIMAP sync
        to that, and pointing KMail at the same server.
 
    MAILING LIST
        There is an OfflineIMAP mailing list available.  To subscribe, send the
-       text "Subscribe" in the subject of a mail  to  offlineimap-request@com-
-       plete.org.   To  post,  send  the  message to offlineimap@complete.org.
+       text  "Subscribe"  in the subject of a mail to offlineimap-request@com-
+       plete.org.  To post,  send  the  message  to  offlineimap@complete.org.
        Archives are available at
         <URL:http://lists.complete.org/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 online
+       ing system (BTS) at offlineimap@bugs.complete.org or  submitted  online
        using the web interface <URL:http://bugs.complete.org/>.
 
-       The Web site also lists all current bugs, where  you  can  check  their
+       The  Web  site  also  lists all current bugs, where you can check their
        status or contribute to fixing them.
 
 UPGRADING TO 4.0
-       If  you  are  upgrading from a version of OfflineIMAP prior to 3.99.12,
-       you will find that you will  get  errors  when  OfflineIMAP  starts  up
-       (relating  to  ConfigParser or AccountHashGenerator) and the configura-
-       tion file.  This is because the config file format  had  to  change  to
-       accomodate  new  features  in  4.0.  Fortunately, it's not difficult to
+       If you are upgrading from a version of OfflineIMAP  prior  to  3.99.12,
+       you  will  find  that  you  will  get errors when OfflineIMAP starts up
+       (relating to ConfigParser or AccountHashGenerator) and  the  configura-
+       tion  file.   This  is  because the config file format had to change to
+       accommodate new features in 4.0.  Fortunately, it's  not  difficult  to
        adjust it to suit.
 
-       First thing you need to do is stop any  running  OfflineIMAP  instance,
-       making  sure  first  that it's synced all your mail.  Then, modify your
-       ~/.offlineimaprc file.  You'll need to split up  each  account  section
+       First  thing  you  need to do is stop any running OfflineIMAP instance,
+       making sure first that it's synced all your mail.   Then,  modify  your
+       ~/.offlineimaprc  file.   You'll  need to split up each account section
        (make sure that it now starts with "Account ") into two Repository sec-
-       tions (one for the local side and another for the  remote  side.)   See
-       the  files offlineimap.conf.minimal and offlineimap.conf in the distri-
+       tions  (one  for  the local side and another for the remote side.)  See
+       the files offlineimap.conf.minimal and offlineimap.conf in the  distri-
        bution if you need more assistance.
 
-       OfflineIMAP's status directory area has also changed.   Therefore,  you
-       should  delete  everything in ~/.offlineimap as well as your local mail
+       OfflineIMAP's  status  directory area has also changed.  Therefore, you
+       should delete everything in ~/.offlineimap as well as your  local  mail
        folders.
 
-       When you start up OfflineIMAP 4.0, it will re-download  all  your  mail
+       When  you  start  up OfflineIMAP 4.0, it will re-download all your mail
        from the server and then you can continue using it like normal.
 
 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
        with this program; if not, write to the Free Software Foundation, Inc.,
        59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-       imaplib.py comes from the Python dev tree and  is  licensed  under  the
-       GPL-compatible  PSF  license  as  stated  in  the file COPYRIGHT in the
+       imaplib.py  comes  from  the  Python dev tree and is licensed under the
+       GPL-compatible PSF license as stated  in  the  file  COPYRIGHT  in  the
        OfflineIMAP distribution.
 
 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.
 
        OfflineIMAP may be downloaded, and information found, from its homepage
-       via  either  Gopher <URL:gopher://quux.org/1/devel/offlineimap> or HTTP
+       via either Gopher <URL:gopher://quux.org/1/devel/offlineimap>  or  HTTP
        <URL: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    the    complete.org    Subversion    page
+       sion,    please    visit    the    complete.org     Subversion     page
        <URL:http://svn.complete.org/>.
 
 SEE ALSO
        mutt(1), python(1)
 
+HISTORY
+       Detailed  history may be found in the file ChangeLog in the OfflineIMAP
+       distribution.  Feature and bug histories  may  be  found  in  the  file
+       debian/changelog  which,  despite  its  name, is not really Debian-spe-
+       cific.  This section provides a large overview.
 
+       Development on OfflineIMAP began on June 18, 2002.  Version  1.0.0  was
+       released  three  days later on June 21, 2002.  Point releases followed,
+       including speed optimizations and some compatibility fixes.
 
-John Goerzen                     18 July 2003                   OFFLINEIMAP(1)
+       Version 2.0.0 was released on July 3, 2002, and represented  the  first
+       time  the  synchronization  became multithreaded and, to the best of my
+       knowledge, the first multithreaded IMAP  syncrhonizing  application  in
+       existance.  The last 2.0.x release, 2.0.8, was made on July 9.
+
+       Version  3.0.0  was  released  on July 11, 2002, and introduced modular
+       user interfaces and the first GUI interface for OfflineIMAP.  This man-
+       ual  also  was  introduced  with  3.0.0,  along  with many command-line
+       options.  Version 3.1.0 was released on July 21, adding the Noninterac-
+       tive  user  interfaces, profiling support, and several bugfixes.  3.2.0
+       was released on July 24,  adding  support  for  the  Blinkenlights  GUI
+       interface.   OfflineIMAP entered maintenance mode for awhile, as it had
+       reached a feature-complete milestone in my mind.
+
+       The 3.99.x branch began in on October 7, 2002, to begin work  for  4.0.
+       The Curses.Blinkenlights interface was added in 3.99.6, and many archi-
+       tectural changes were made.
+
+       4.0.0 was released on July 18, 2003, including the ability to  synchro-
+       nize  directly  between  two IMAP servers, the first re-architecting of
+       the configuration file to refine the notion of an account, and the  new
+       Curses interface.
+
+
+
+John Goerzen                     04 June 2004                   OFFLINEIMAP(1)

diff --git a/offlineimap/head/offlineimap.1 b/offlineimap/head/offlineimap.1
index 2d9eacb93d244952af4cbc760669faa860c1fd85..41fbc92600ea1081fd39fbe1cadcd9da282e4bc5 100644 (file)
--- a/offlineimap/head/offlineimap.1
+++ b/offlineimap/head/offlineimap.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "OFFLINEIMAP" "1" "25 July 2003" "John Goerzen" "OfflineIMAP Manual"
+.TH "OFFLINEIMAP" "1" "04 June 2004" "John Goerzen" "OfflineIMAP Manual"
 
 .SH NAME
 OfflineIMAP \- Powerful IMAP/Maildir synchronization and reader support
@@ -83,7 +83,7 @@ methods of operation for the time being.
 .SH "QUICK START"
 .PP
 If you have already installed \fBOfflineIMAP\fR system-wide,
-or your system adminstrator has done that for you, your task
+or your system administrator has done that for you, your task
 for setting up \fBOfflineIMAP\fR for the first time is quite
 simple.  You just need to set up your configuration file, make
 your folder directory, and run it!
@@ -308,7 +308,7 @@ Show summary of options.
 .TP
 \fB-u \fIinterface\fB\fR
 Specifies an alternative user interface module
-to use.  This overrides the defailt specified in the
+to use.  This overrides the default specified in the
 configuration file.  The pre-defined options are listed in
 the User Interfaces section.
 .SH "USER INTERFACES"
@@ -375,7 +375,7 @@ is the color of a message synchronization controller thread.
 .TP
 \fBOrange\fR
 indicates that an actual message is being copied.
-(We use fuschia for fake messages.)
+(We use fuchsia for fake messages.)
 .TP
 \fBRed (meaning 2)\fR
 indicates that a message is being deleted.
@@ -562,10 +562,14 @@ prioritized = ['INBOX', 'personal', 'announce', 'list']
 
 def mycmp(x, y):
    for prefix in prioritized:
-       if x.startswith(prefix):
-           return -1
-       elif y.startswith(prefix):
-           return +1
+       xsw = x.startswith(prefix)
+       ysw = y.startswith(prefix)
+       if xsw and ysw:
+          return cmp(x, y)
+       elif xsw:
+          return -1
+       elif ysw:
+          return +1
    return cmp(x, y)
 
 def test_mycmp():
@@ -673,7 +677,7 @@ Yes; see the Notes section below.
 Some mail readers, such as Mutt, are not capable
 of automatically determining the names of your mailboxes.
 \fBOfflineIMAP\fR can help these programs by writing the names
-of the folders ni a format you specify.  See the example
+of the folders in a format you specify.  See the example
 \fIofflineimap.conf\fR for details.
 .TP
 \fBCan I synchronize multiple accounts with OfflineIMAP?\fR
@@ -769,7 +773,7 @@ Standard Python 2.2.1 as implemented on POSIX-compliant systems.
 .SS "DELETING LOCAL FOLDERS"
 .PP
 \fBOfflineIMAP\fR does a two-way synchronization.  That is, if you
-make a change to the mail on the server, it will be propogated to your
+make a change to the mail on the server, it will be propagated 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 \fBOfflineIMAP\fR, remember to also remove your local status
@@ -846,7 +850,7 @@ If you are upgrading from a version of \fBOfflineIMAP\fR prior to
 \fBOfflineIMAP\fR starts up (relating to ConfigParser or
 AccountHashGenerator) and the
 configuration file.  This is because the config file format
-had to change to accomodate new features in 4.0.  Fortunately,
+had to change to accommodate new features in 4.0.  Fortunately,
 it's not difficult to adjust it to suit.
 .PP
 First thing you need to do is stop any running \fBOfflineIMAP\fR

diff --git a/offlineimap/head/offlineimap.conf b/offlineimap/head/offlineimap.conf
index c69c362cf47249167f5c546ffeba8ae478e7ab7c..3de35fa354aaea63c7ca23152d0ba9d7e5e92882 100644 (file)
--- a/offlineimap/head/offlineimap.conf
+++ b/offlineimap/head/offlineimap.conf
@@ -286,7 +286,7 @@ holdconnectionopen = no
 # filtered out by folderfilter below.  Failure to follow this rule
 # will result in undefined behavior
 #
-# nametrans = lambda foldername: re.sub('^INBOX.', '', foldername)
+# nametrans = lambda foldername: re.sub('^INBOX\.', '', foldername)
 
 # You can specify which folders to sync.  You can do it several ways.
 # I'll provide some examples.  The folderfilter operates on the

diff --git a/offlineimap/head/offlineimap.sgml b/offlineimap/head/offlineimap.sgml
index 86c5a5e0a30560c43aa53417615ed3662b503d16..18e2a07dcbcdf6aca0e4f4dcd4169d20be982a8e 100644 (file)
--- a/offlineimap/head/offlineimap.sgml
+++ b/offlineimap/head/offlineimap.sgml
@@ -10,7 +10,7 @@
     <refentryinfo>
       <address><email>jgoerzen@complete.org</email></address>
       <author><firstname>John</firstname><surname>Goerzen</surname></author>
-      <date> $Date: 2003-07-25 15:41:35 -0500 (Fri, 25 Jul 2003) $ </date>
+      <date> $Date: 2004-06-04 10:26:30 -0500 (Fri, 04 Jun 2004) $ </date>
     </refentryinfo>
 
     <refmeta>
@@ -124,7 +124,7 @@
     <refsect1>
       <title>Quick Start</title>
       <para>If you have already installed &OfflineIMAP; system-wide,
-        or your system adminstrator has done that for you, your task
+        or your system administrator has done that for you, your task
         for setting up &OfflineIMAP; for the first time is quite
         simple.  You just need to set up your configuration file, make
         your folder directory, and run it!
@@ -395,7 +395,7 @@ cd offlineimap-x.y.z</ProgramListing>
          </varlistentry>
          <varlistentry><term>-u <replaceable>interface</replaceable></term>
            <listitem><para>Specifies an alternative user interface module
-             to use.  This overrides the defailt specified in the
+             to use.  This overrides the default specified in the
              configuration file.  The pre-defined options are listed in
              the User Interfaces section.</para>
            </listitem>
@@ -485,7 +485,7 @@ cd offlineimap-x.y.z</ProgramListing>
          <varlistentry>
            <term>Orange</term>
            <listitem><para>indicates that an actual message is being copied.
-             (We use fuschia for fake messages.)
+             (We use fuchsia for fake messages.)
            </para></listitem>
          </varlistentry>
          <varlistentry>
@@ -709,10 +709,14 @@ foldersort=mycmp</programlisting>
 
 def mycmp(x, y):
    for prefix in prioritized:
-       if x.startswith(prefix):
-           return -1
-       elif y.startswith(prefix):
-           return +1
+       xsw = x.startswith(prefix)
+       ysw = y.startswith(prefix)
+       if xsw and ysw:
+          return cmp(x, y)
+       elif xsw:
+          return -1
+       elif ysw:
+          return +1
    return cmp(x, y)
 
 def test_mycmp():
@@ -863,7 +867,7 @@ rm -r ~/.offlineimap/Repository-<replaceable>RepositoryName</></programlisting>
          <listitem><para>Some mail readers, such as Mutt, are not capable
            of automatically determining the names of your mailboxes.
            &OfflineIMAP; can help these programs by writing the names
-           of the folders ni a format you specify.  See the example
+           of the folders in a format you specify.  See the example
            <filename>offlineimap.conf</filename> for details.
          </para></listitem>
        </varlistentry>
@@ -962,7 +966,7 @@ rm -r ~/.offlineimap/Repository-<replaceable>RepositoryName</></programlisting>
       <refsect2>
        <title>Deleting Local Folders</title>
        <para>&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
+         make a change to the mail on the server, it will be propagated 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
@@ -1065,7 +1069,7 @@ rm -r ~/.offlineimap/Repository-<replaceable>RepositoryName</></programlisting>
        &OfflineIMAP; starts up (relating to ConfigParser or
        AccountHashGenerator) and the
        configuration file.  This is because the config file format
-       had to change to accomodate new features in 4.0.  Fortunately,
+       had to change to accommodate new features in 4.0.  Fortunately,
        it's not difficult to adjust it to suit.
       </para>
       <para>