#
#
# patch "monotone.texi"
#  from [736885d90d3c3b2f66b595e2bd64da8117a7a621]
#    to [deaed1b2274ce7b4f2231d923453aec35042fdb6]
# 
# patch "texinfo.css"
#  from [875ac0427e05332b13348ed5a41a6926fc8401d6]
#    to [7df2014835ae4ed8fb49c72c42932f771a00b530]
#
============================================================
--- monotone.texi	736885d90d3c3b2f66b595e2bd64da8117a7a621
+++ monotone.texi	deaed1b2274ce7b4f2231d923453aec35042fdb6
@@ -33,6 +33,7 @@
 Copyright @copyright{} 2006 Jeronimo Pellegrini @*
 Copyright @copyright{} 2006 Alex Queiroz @*
 Copyright @copyright{} 2006, 2007 William Uther @*
+Copyright @copyright{} 2006, 2007, 2008 Thomas Keller @*
 Copyright @copyright{} 2007, 2008 Stephen Leake @*
 
 This manual is made available under the GNU GPL version 2.0 or
@@ -6336,7 +6337,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate inventory [options]... address@hidden
address@hidden mtn automate inventory address@hidden address@hidden
 
 @table @strong
 @item Arguments:
@@ -6370,8 +6371,8 @@ @section Automation
 
 @itemize
 @item
-7.0 -- added options '--no-ignored', '--no-unknown', '--no-unchanged' and
-'--no-corresponding-renames'
+7.0 -- added options @option{--no-ignored}, @option{--no-unknown},
address@hidden and @option{--no-corresponding-renames}
 @item
 6.0 -- converted to basic_io format (restriction support, various fixes)
 @item
@@ -6728,75 +6729,84 @@ @section Automation
 @code{path}.
 
 @table @option
address@hidden 'path'
-the file or directory path, relative to the workspace root. The file
address@hidden path
+The file or directory path, relative to the workspace root. The file
 either exists in the workspace, or is listed in the base or revision
 manifest.
address@hidden is always output.
 
 @item old_type
-gives the type of the file in the base manifest. ``type'' is
-either @option{file}, @option{directory}, or @option{none}.
address@hidden is output only if it is different from the type in
-the revision manifest or workspace.
+The type of the node in the base manifest.
+``type'' is either @option{file} or @option{directory}.
address@hidden is output for all old nodes (i.e. unchanged or dropped paths
+and rename sources).
 
 @item new_type
-the type of the file in the revision manifest. @option{new_type} is
-output only if it is different from the type in the base manifest or
-workspace.
+The type of the node in the revision manifest.
+``type'' is either @option{file} or @option{directory}.
address@hidden is output for all new nodes (i.e. unchanged or added paths
+and rename targets).
 
 @item fs_type
-the type of the file in the workspace (also called the filesystem).
+The type of the node in the workspace (also called the filesystem).
+``type'' is either @option{file}, @option{directory} or @option{none}
+(if the path does not exist in the file system).
 @option{fs_type} is always output.
 
 @item old_path
-the old path for the file, if it has been renamed in the revision
+The old path for the node, if it has been renamed in the revision
 manifest.
address@hidden is only output for rename targets.
 
 @item new_path
-the new path for the file, if it has been renamed in the revision
+The new path for the node, if it has been renamed in the revision
 manifest.
address@hidden is only output for rename sources.
 
 @item status
 @option{status} is always output. Its value is one or more of:
 
 @table @option
 @item rename_source
-the old name of a file that has been renamed.
address@hidden is part of a rename and denotes the old name of a renamed node.
 
 @item rename_target
-the new name of a file that has been renamed.
address@hidden is part of a rename and denotes the new name of a renamed node.
 
 @item added
-the file is new in the revision manifest (not in the base
-manifest).
address@hidden has been added in the revision manifest, but not existent in the
+base manifest.
 
 @item dropped
-the file is deleted in the revision manifest and the workspace.
address@hidden has been deleted in the revision manifest and the workspace.
 
 @item missing
-the file is deleted in the workspace but not the revision manifest.
address@hidden has been deleted in the workspace, but still exists in the revision
+manifest.
 
 @item ignored
-the file is ignored by monotone.
address@hidden is ignored by monotone.
 
 @item known
-the file exists in the workspace, and in the revision manifest.
address@hidden exists in the workspace, and in the revision manifest.
 
 @item unknown
-the file exists in the workspace, but not in the revision manifest.
address@hidden exists in the workspace, but not in the revision manifest, i.e.
+is unversioned.
 
 @item invalid
-the file exists in the workspace and revision manifest, but with
-different types (one is a directory, the other a file).
address@hidden is versioned and exists in the workspace and revision manifest, but
+with incompatible types (a versioned missing file is replaced by an
+unversioned directory and vice versa).
 @end table
 
 @item changes
    @table @option
    @item content
-   the file contents have changed.
+   The contents of a file have been changed.
 
    @item attrs
-   the file attributes have changed.
+   The attributes of a path (file or directory) have been changed.
 
    @end table
 @end table
@@ -6895,19 +6905,16 @@ @section Automation
 
 none
 
address@hidden Added in:
address@hidden Changes:
 
-1.0
-
address@hidden Modifications:
address@hidden @strong
address@hidden 3.1
-
-Added the 'o' item to the recognized input. This change should not
address@hidden
address@hidden
+3.1 -- Added the 'o' item to the recognized input. This change should not
 break anything.
address@hidden
+1.0 -- Initial version.
address@hidden itemize
 
address@hidden table
-
 @item Purpose:
 
 Allow multiple automate commands to be run from one instance of monotone.
============================================================
--- texinfo.css	875ac0427e05332b13348ed5a41a6926fc8401d6
+++ texinfo.css	7df2014835ae4ed8fb49c72c42932f771a00b530
@@ -19,7 +19,7 @@ div.node hr
 		float: right;
 		height: 0;
 		width: 0;
-		padding: 0; 
+		padding: 0;
 		margin: 0;
 	}
 
@@ -28,7 +28,7 @@ div.node br
 		float: right;
 		height: 0;
 		width: 0;
-		padding: 0; 
+		padding: 0;
 		margin: 0;
 	}
 
@@ -37,7 +37,7 @@ div.node p
 		font-style: italic;
 		font-size: small;
 		margin: 0em;
-		padding: 0em;		
+		padding: 0em;
 		border-bottom: thin solid grey;
 	}
 
@@ -54,33 +54,37 @@ span.command
 
 span.command
 	{
-  		font-family: sans-serif;
+		font-family: sans-serif;
 		font-weight: bold;
 	}
 
 span.option
-	{ 
-  		font-family: sans-serif;
-		font-weight: bold;
-		font-style: italic;
+	{
+		font-family: monospace;
 	}
 
 span.file
-	{ 
-  		font-family: monospace;
+	{
+		font-family: monospace;
 		color: #aa00aa;
 	}
 
-dt 
-	{ 
+dl
+	{
+		margin-top: 0.5em;
+		margin-bottom: 0.5em;
+	}
+
+dt
+	{
 		background-color: #eeeeee;
 	}
 
-dd 
-	{ 
+dd
+	{
 		padding-top: 0.5em;
 		padding-bottom: 1.5em;
-		padding-left: 2em;	
+		padding-left: 2em;
 	}
 
 img
@@ -91,3 +95,4 @@ img
 		clear: both;
 		margin-right: auto;
 	}
+