typo

[code/myrepos.git] / mr

diff --git a/mr b/mr
index e96a3dccbb62eb5e26f4b41a8d28d8cba193d4b7..a897a5fdde3f3d87158bd05d962d72ac79c131a2 100755 (executable)
--- a/mr
+++ b/mr
@@ -214,18 +214,13 @@ with no number specified. This can greatly speed up operations such as updates.
 It is not recommended for interactive operations.
 
 Note that running more than 10 jobs at a time is likely to run afoul of
 It is not recommended for interactive operations.
 
 Note that running more than 10 jobs at a time is likely to run afoul of

-ssh connection limits. Running between 3 and 5 jobs at a time will yeild
+ssh connection limits. Running between 3 and 5 jobs at a time will yield

 a good speedup in updates without loading the machine too much.
 
 =back
 
 =head1 FILES
 
 a good speedup in updates without loading the machine too much.
 
 =back
 
 =head1 FILES
 

-The ~/.mrlog file contains commands that mr has remembered to run later,
-due to being offline. You can delete or edit this file to remove commands,
-or even to add other commands for 'mr online' to run. If the file is
-present, mr assumes it is in offline mode.
-

 B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
 file in your home directory, and this can in turn chain load .mrconfig files
 from repositories.
 B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
 file in your home directory, and this can in turn chain load .mrconfig files
 from repositories.


@@ -341,6 +336,17 @@ the action that is performed for a given revision control system, you can
 override these rcs specific actions. To add a new revision control system,
 you can just add rcs specific actions for it.
 
 override these rcs specific actions. To add a new revision control system,
 you can just add rcs specific actions for it.
 

+The ~/.mrlog file contains commands that mr has remembered to run later,
+due to being offline. You can delete or edit this file to remove commands,
+or even to add other commands for 'mr online' to run. If the file is
+present, mr assumes it is in offline mode.
+
+=head1 EXTENSIONS
+
+mr can be extended to support things such as unison and git-svn. Some
+files providing such extensions are available in /usr/share/mr/. See
+the documentation in the files for details about using them.
+

 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>
 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>


@@ -1269,7 +1275,7 @@ git_bare_test =
 
 svn_update = svn update "$@"
 git_update = git pull "$@"
 
 svn_update = svn update "$@"
 git_update = git pull "$@"

-bzr_update = bzr merge "$@"
+bzr_update = bzr merge --pull "$@"

 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"