# 
# patch "ChangeLog"
#  from [6bc2188e8f00c4c0041ba4c63ff39c3024905ec4]
#    to [fbf57c7c14ead2a49facb984e69619cdce902243]
# 
# patch "NEWS"
#  from [106c13bdcd530b49c45d767173017431b172a515]
#    to [542980b88bf5ccbb9d66b70a313f41a4896c0241]
# 
# patch "UPGRADE"
#  from [486bc602ad817c4decd4afd0adb0a6be37889796]
#    to [49b7cc4201d9f3019ec320ad318f99abbe423b3c]
# 
===============================================
--- ChangeLog	6bc2188e8f00c4c0041ba4c63ff39c3024905ec4
+++ ChangeLog	fbf57c7c14ead2a49facb984e69619cdce902243
@@ -1,5 +1,10 @@
 2005-08-08  Nathaniel Smith  <address@hidden>
 
+	* NEWS: First-pass for 0.22 release.
+	* UPGRADE: Likewise.
+
+2005-08-08  Nathaniel Smith  <address@hidden>
+
 	* Makefile.am (BOTAN_SOURCES): Add botan headers.
 	* po/monotone.pot: Regenerate.
 
===============================================
--- NEWS	106c13bdcd530b49c45d767173017431b172a515
+++ NEWS	542980b88bf5ccbb9d66b70a313f41a4896c0241
@@ -1,3 +1,21 @@
+????????????????????????????
+
+        0.22 release.  bug fixes, ui improvements, new crypto library.
+
+        - switch from crypto++ to botan as underlying crypto library.
+          this should not cause any user-visible changes; let us know
+          if it does.  special thanks to Matt Johnston
+          <address@hidden>, Kaushik Veeraraghavan
+          <address@hidden>, Matthew Gregan
+          <address@hidden>.
+        - incompatible change to netsync permission hooks: the
+          get_netsync_anonymous_read_permitted hook has been removed;
+          instead, get_netsync_read_permitted will be called with a
+          key name of nil.  server administrators should update/review
+          their configuration
+        - many small improvements to error messages, fixes of minor
+          annoyances, etc.
+
 Sun Jul 17 16:48:26 PDT 2005
 
         0.21 release.  bug fixes, performance improvements, and ui
===============================================
--- UPGRADE	486bc602ad817c4decd4afd0adb0a6be37889796
+++ UPGRADE	49b7cc4201d9f3019ec320ad318f99abbe423b3c
@@ -1,7 +1,9 @@
 upgrading monotone to 0.21
 ==========================
 
 if you are upgrading from:
+  - 0.21 or earlier: hooks governing netsync read permission have
+    changed again; see NEWS for 0.22.
   - 0.20 or earlier: you need to run 'db migrate' against each of your
     databases.
   - 0.19 or earlier: there are incompatible command line and server