# 
# patch "ChangeLog"
#  from [38ba832803f530f4b665ac67bd921dbc5bdc6894]
#    to [54073c6fe47f02b9eccaac4f8c10adf34948db2b]
# 
# patch "monotone.texi"
#  from [5cc1a931d274bc7d3f0cc95fc932162506011cb6]
#    to [f14d034d11da26fc318f8f0d47cca3cdd63230b8]
# 
========================================================================
--- ChangeLog	38ba832803f530f4b665ac67bd921dbc5bdc6894
+++ ChangeLog	54073c6fe47f02b9eccaac4f8c10adf34948db2b
@@ -1,6 +1,12 @@
+2005-10-03  Nathaniel Smith  <address@hidden>
+
+	* monotone.texi (Automation): Clean up formatting and description
+	of 'automate inventory' sample output.
+
 2005-10-02  Marcel van der Boom  <address@hidden>
 
-	* commands.cc (CMD(checkout)): Check for non-existant checkout dir earlier, so we can fail earlier 
+	* commands.cc (CMD(checkout)): Check for non-existant checkout dir
+	earlier, so we can fail earlier.
 
 2005-09-30  Nathaniel Smith  <address@hidden>
 
========================================================================
--- monotone.texi	5cc1a931d274bc7d3f0cc95fc932162506011cb6
+++ monotone.texi	f14d034d11da26fc318f8f0d47cca3cdd63230b8
@@ -5018,9 +5018,11 @@
 
 @item Sample output:
 
+All basic status codes:
+
 @verbatim
   M 0 0 missing
- AP 0 0 added patched
+ AP 0 0 added
 D   0 0 dropped
 R   1 0 renamed-from-this
  R  0 1 renamed-to-this
@@ -5028,57 +5030,81 @@
     0 0 unchanged
   U 0 0 unknown
   I 0 0 ignored
address@hidden verbatim
 
-# swapped but not moved
+Two files swapped:
 
-RRP 1 2 unchanged
-RRP 2 1 original
address@hidden
+RR  1 2 unchanged
+RR  2 1 original
address@hidden verbatim
 
-# swapped and moved
+Recorded with monotone that two files were swapped, but they were not
+actually swapped in the filesystem.  Thus they both appear as patched:
 
-RR  1 2 unchanged
-RR  2 1 original
address@hidden
+RRP 1 2 unchanged
+RRP 2 1 original
address@hidden verbatim
 
-# rename foo bar; add foo
+Rename @file{foo} to @file{bar}; add new file @file{foo}:
 
address@hidden
 RAP 1 0 foo
  R  0 1 bar
address@hidden verbatim
 
-# rotated but not moved dropped -> missing -> original -> dropped
+Rotated files @file{foo} -> @file{bar} -> @file{baz} -> @file{foo}:
 
-RRP 1 3 dropped
-RRP 2 1 missing
-RRP 3 2 original
address@hidden
+RR  1 3 foo
+RR  2 1 bar
+RR  3 2 baz
address@hidden verbatim
 
-# rotated and moved
+Recorded the rotation of files @file{foo} -> @file{bar} -> @file{baz} ->
address@hidden, but the actual files in the working directory were not
+moved, so monotone interprets all files as having been patched:
 
-RR  1 3 dropped
-RR  2 1 missing
-RR  3 2 original
address@hidden
+RRP 1 3 foo
+RRP 2 1 bar
+RRP 3 2 baz
address@hidden verbatim
 
-# dropped but not removed and thus unknown
+Dropped but not removed and thus unknown:
 
address@hidden
 D U 0 0 dropped
address@hidden verbatim
 
-# added but removed and thus missing
+Added a non-existent file which is thus missing:
 
address@hidden
  AM 0 0 added
address@hidden verbatim
 
-# renamed but not moved and thus unknown source and missing target
+Recorded a rename, but not moved in the filesystem, and thus unknown
+source and missing target:
 
address@hidden
 R U 1 0 original
  RM 0 1 renamed
address@hidden verbatim
 
-# moved but not renamed and thus missing source and unknown target
+Moved in the filesystem but no rename recorded, and thus missing source
+and unknown target:
 
address@hidden
   M 0 0 original
   U 0 0 renamed
address@hidden verbatim
 
-# renamed and patched
+Renamed and patched:
 
address@hidden
 R   1 0 original
  RP 0 1 renamed
-
 @end verbatim
 
 @item Output format: