# # # patch "ChangeLog" # from [1afdefa6ff3558d215cb6b2135c7a3525b3e1e9f] # to [94fe7697ee7246cc4a287082ea329cd7aa81b1fa] # # patch "monotone.texi" # from [796fad813ada035e4368422394e781eb97d212ca] # to [76eeb435b2a929791c4e5e306450ef8ef48a3da2] # ============================================================ --- ChangeLog 1afdefa6ff3558d215cb6b2135c7a3525b3e1e9f +++ ChangeLog 94fe7697ee7246cc4a287082ea329cd7aa81b1fa @@ -1,3 +1,7 @@ +2006-03-08 Matthew Gregan + + * monotone.texi: Spelling fixes. + 2006-03-08 Nathaniel Smith * tests/t_disapprove_branch.at: I'm an idiot. ============================================================ --- monotone.texi 796fad813ada035e4368422394e781eb97d212ca +++ monotone.texi 76eeb435b2a929791c4e5e306450ef8ef48a3da2 @@ -431,7 +431,7 @@ the IDs of other revisions -- causes the set of revisions to join together into a historical @i{chain of events}, somewhat like a ``linked list''. Each revision in the chain has a unique ID, which includes address@hidden reference} all the revisions preceeding it. Even if you undo a address@hidden reference} all the revisions preceding it. Even if you undo a changeset, and return to a previously-visited manifest ID during the course of your edits, each revision will incorporate the ID of its predecessor, thus forming a new unique ID for each point in history. @@ -1398,7 +1398,7 @@ The output of this command tells Jim that his edits, so far, constitute only the addition of some files. In the output we can see -one pecularity of monotone's changeset format. The pecularity is that +one peculiarity of monotone's changeset format. The peculiarity is that when monotone records a ``new file'', it actually records two separate events: the addition of an empty file to the workspace, and a patch of that file from empty to its intended contents. @@ -1941,8 +1941,8 @@ @item Beth synced with Jim @end enumerate -The result of this ordering is that Jim's work entirely preceeded -Abe's work, which entirely preceeded Beth's work. Moreover, each +The result of this ordering is that Jim's work entirely preceded +Abe's work, which entirely preceded Beth's work. Moreover, each worker was fully informed of the ``up-stream'' worker's actions, and produced purely derivative, ``down-stream'' work: @@ -2399,11 +2399,11 @@ @code{--bind=localhost:1234}. This causes the monotone process to listen only to port 1234 on the loopback interface 127.0.0.1, which is not accessible from the network, so Jim doesn't expose an open port to the -rest of the world until he's satisifed with the permissions +rest of the world until he's satisfied with the permissions configuration. You can cause monotone to listen on all interfaces on port 1234 by leaving out the address part like @code{--bind=:1234}. -When he's satisified the server is set up correctly, Jim does an initial +When he's satisfied the server is set up correctly, Jim does an initial @command{sync} with the new database, filling it with all the revision history currently on his laptop. While Jim has been busy setting up the server, Abe and Beth have kept working; the server will catch up with @@ -3179,7 +3179,7 @@ @end group @end smallexample -Each stanze of the @file{.mt-attrs} file assigns attributes to a file in +Each stanza of the @file{.mt-attrs} file assigns attributes to a file in your workspace. The first line of each stanza is @code{file} followed by the quoted name of the file you want to assign attributes to. Each subsequent line is the name of an attribute, followed by a @@ -3229,7 +3229,7 @@ .doc, and so on. Starting with monotone 0.20, the @code{manual_merge} attribute is automatically set at add time for all ``binary'' files, i.e. all files -for wich the @code{binary_file} hook returns true. +for which the @code{binary_file} hook returns true. Currently, this means all files with extension gif, jpeg, png, bz2, gz and zip, plus files containing at least one of the following bytes: @@ -4353,7 +4353,7 @@ @smallexample @group $ monotone list certs 4a96 -monotone: expandeding partial id '4a96' +monotone: expanding partial id '4a96' monotone: expanded to '4a96a230293456baa9c6e7167cafb3c5b52a8e7f' ----------------------------------------------------------------- Key : graydon@@pobox.com @@ -5708,7 +5708,7 @@ @item Output format: -All stanzas are formatted by basic_io. Stanzas are seperated +All stanzas are formatted by basic_io. Stanzas are separated by a blank line. Values will be escaped, '\' to '\\' and '"' to '\"'. @@ -5776,11 +5776,11 @@ is the output of the command. This will never exceed 1024 bytes. If a command produces more than 1024 bytes of output, it will be split into -multiple peices, with all but the last having the field set to 'm'. +multiple pieces, with all but the last having the field set to 'm'. @item Error conditions: -If a badly formatted command is recieved, prints an error message to +If a badly formatted command is received, prints an error message to standard error and exits with nonzero status. Errors in the commands run through this interface do not affect the exit status. Instead, the field in the output is set to 2, and the output of the command becomes @@ -5864,7 +5864,7 @@ @item Output format: -All stanzas are formatted by basic_io. Stanzas are seperated +All stanzas are formatted by basic_io. Stanzas are separated by a blank line. Values will be escaped, '\' to '\\' and '"' to '\"'. @@ -6128,7 +6128,7 @@ @item note_netsync_revision_received (@var{new_id}, @var{revision}, @var{certs}) -Called by monotone after the revision @var{new_id} is recieved through +Called by monotone after the revision @var{new_id} is received through netsync. @var{revision} is the text of the revision, what would be given by "monotone cat revision @var{new_id}". @var{certs} is a lua table containing one subtable for each