# 
# 
# patch "ChangeLog"
#  from [9da00a4695628a576e96261da856cb7dd73e401c]
#    to [ac36abb7af3502ac08f9bb3b7e97e2c160b584e9]
# 
# patch "netsync.cc"
#  from [8473129fbbfc6f05efcb2471f7cfbce8e89f51ef]
#    to [a30169e91460f2965e213a10687db958b8dea8e3]
# 
# patch "roster.hh"
#  from [3614d0b0e3a0785c61a6401cf22ef559177c805d]
#    to [8cd33968191e5d5c8874f39b3f5a934a90ced19b]
# 
# patch "work.cc"
#  from [4f0a072a9021d19c3f695263fe14fc7a9f4446b8]
#    to [aa552b8a8355ad6c7c39921004f5026535a10345]
# 
# patch "work.hh"
#  from [f75890d7970c1c6f41d9956f19d0b22d8882d2e1]
#    to [c1436ab26917e810efa4a53d5f09a97170c159b0]
# 
============================================================
--- ChangeLog	9da00a4695628a576e96261da856cb7dd73e401c
+++ ChangeLog	ac36abb7af3502ac08f9bb3b7e97e2c160b584e9
@@ -1,5 +1,11 @@ 2006-12-26  Derek Scherger  <address@hidden
 2006-12-26  Derek Scherger  <address@hidden>
 
+	* netsync.cc:
+	* roster.hh:
+	* work.{cc,hh}: fix some comment typos
+	
+2006-12-26  Derek Scherger  <address@hidden>
+
 	* unix/process.cc (is_executable, make_executable, process_spawn,
 	process_spawn, redir, process_wait, process_kill, process_sleep,
 	get_process_id): fix indentation
============================================================
--- netsync.cc	8473129fbbfc6f05efcb2471f7cfbce8e89f51ef
+++ netsync.cc	a30169e91460f2965e213a10687db958b8dea8e3
@@ -67,12 +67,12 @@
 //      information exposure?  Allows anonymous people to probe what branches
 //      a key has access to.)
 //   -- "warning" packet type?
-//   -- Richard Levitte wants, when you (e.g.) request '*' but don't access to
-//      all of it, you just get the parts you have access to (maybe with
-//      warnings about skipped branches).  to do this right, should have a way
-//      for the server to send back to the client "right, you're not getting
-//      the following branches: ...", so the client will not include them in
-//      its merkle trie.
+//   -- Richard Levitte wants, when you (e.g.) request '*' but don't have
+//      access to all of it, you just get the parts you have access to
+//      (maybe with warnings about skipped branches).  to do this right,
+//      should have a way for the server to send back to the client "right,
+//      you're not getting the following branches: ...", so the client will
+//      not include them in its merkle trie.
 //   -- add some sort of vhost field to the client's first packet, saying who
 //      they expect to talk to
 
@@ -170,7 +170,7 @@
 //
 // An "anonymous (source|sink|both) <include_pattern> <exclude_pattern>
 // <hmac key>" command, which identifies the role it wishes to play in the
-// synchronization, the pattern it ishes to sync with, and the HMAC key it
+// synchronization, the pattern it wishes to sync with, and the HMAC key it
 // wishes to use for this session (also encrypted with the server's public
 // key).
 //
@@ -235,7 +235,7 @@
 // This protocol is "raw binary" (non-text) because coding density is
 // actually important here, and each packet consists of very
 // information-dense material that you wouldn't have a hope of typing in,
-// interpreting manually anyways.
+// or interpreting manually anyways.
 //
 
 using std::auto_ptr;
============================================================
--- roster.hh	3614d0b0e3a0785c61a6401cf22ef559177c805d
+++ roster.hh	8cd33968191e5d5c8874f39b3f5a934a90ced19b
@@ -274,7 +274,7 @@ private:
   //
   // FIXME: This _is_ all a little nasty, because this can be a source of
   // abstraction leak -- for instance, roster_merge's contract is that nodes
-  // involved in name-related will be detached in the roster it returns.
+  // involved in name-related conflicts will be detached in the roster it returns.
   // Those nodes really should be allowed to be attached anywhere, or dropped,
   // which is not actually expressible right now.  Worse, whether or not they
   // are in old_locations map is an implementation detail of roster_merge --
============================================================
--- work.cc	4f0a072a9021d19c3f695263fe14fc7a9f4446b8
+++ work.cc	aa552b8a8355ad6c7c39921004f5026535a10345
@@ -736,6 +736,8 @@ editable_working_tree::attach_node(node_
   // middle of an update to avoid clobbering a file, we just end up leaving
   // the working copy in an inconsistent state instead.  so for now, we leave
   // this check down here.
+  // where are "here" and "there" ?!?
+
   if (!workspace_root(dst))
     {
       require_path_is_nonexistent(dst_pth,
============================================================
--- work.hh	f75890d7970c1c6f41d9956f19d0b22d8882d2e1
+++ work.hh	c1436ab26917e810efa4a53d5f09a97170c159b0
@@ -157,7 +157,7 @@ struct workspace
 
   // the "options map" is another administrative file, stored in
   // _MTN/options. it keeps a list of name/value pairs which are considered
-  // "persistent options", associated with a particular the workspace and
+  // "persistent options", associated with a particular workspace and
   // implied unless overridden on the command line. the set of valid keys
   // corresponds exactly to the argument list of these functions.