# 
# 
# patch "ChangeLog"
#  from [65c8b4eff828bd4b016d00717ed0763bb03f1e1f]
#    to [cb4b6a0a1d87c65d9ed3518cd9b9fc096ebbee4c]
# 
# patch "NEWS"
#  from [9fdd060acd36732fdcae7ed74ad127da8acd0703]
#    to [8d2354635c0468efea24cd26e5f934ef290557dc]
# 
============================================================
--- ChangeLog	65c8b4eff828bd4b016d00717ed0763bb03f1e1f
+++ ChangeLog	cb4b6a0a1d87c65d9ed3518cd9b9fc096ebbee4c
@@ -1,3 +1,8 @@
+2006-12-21  Thomas Keller  <address@hidden>
+
+	* NEWS: refined some sections and added notes about
+        fixes in automate inventory and the localization code
+
 2006-12-19  Thomas Keller  <address@hidden>
 
 	* monotone.texi: added missing documentation for
============================================================
--- NEWS	9fdd060acd36732fdcae7ed74ad127da8acd0703
+++ NEWS	8d2354635c0468efea24cd26e5f934ef290557dc
@@ -37,10 +37,10 @@ xxx Dec xx xx:xx:xx UTC 2006
 
 	New features
 
-	- automate content_diff
+	- "mtn automate content_diff"
 
-	- automate get_file_of (same as get_file, but expects a
-	  file path and optionally a revision)
+	- "mtn automate get_file_of" (same as get_file, but expects 
+	  a file path and optionally a revision)
 
 	- "mtn import" command
 
@@ -57,6 +57,12 @@ xxx Dec xx xx:xx:xx UTC 2006
 	- bug in "automate stdio" that would result in monotone
 	  garbling its input in some circumstances fixed
 
+	- "mtn annotate file" and "mtn log file" are generally much
+	  faster now, dependant on the number of revisions that
+	  changed the file. Both commands as well as "mtn automate
+	  toposort" make use of data called "heights" caching the
+	  topological order of all revisions.
+
 	- spawn_redirected hook function now understands a blank
 	  filename to mean not to redirect that stream
 
@@ -67,13 +73,18 @@ xxx Dec xx xx:xx:xx UTC 2006
 
 	- another compile fix for gcc3
 
+	- bug in localization code where option strings where not
+	  always properly translated
 
+
 	Other
 
 	- botan library upgraded to 1.6.0
 
 	- accommodate changes in boost 1.34
 
+	- documentation for "mtn automate get_option"
+
 	- notes/ directory