# HG changeset patch
# User mpm@selenic.com
# Date 1124516866 28800
# Node ID 5730e90c025bdc96b5d58b72c770253d0f75c129
# Parent  3e11d50386490be64ed7b4c6c702a7de54d49dd8
Doc updates for push, pull, hooks, local tags, and ssh options



diff -r 3e11d5038649 -r 5730e90c025b doc/hg.1.txt
--- a/doc/hg.1.txt	Fri Aug 19 21:36:57 2005 -0800
+++ b/doc/hg.1.txt	Fri Aug 19 21:47:46 2005 -0800
@@ -283,6 +283,16 @@
     or URL and adds them to the local repository. By default, this
     does not update the copy of the project in the working directory.
 
+    Valid URLs are of the form:
+
+      local/filesystem/path
+      http://[user@]host[:port][/path]
+      https://[user@]host[:port][/path]
+      ssh://[user@]host[:port][/path]
+
+    SSH requires an accessible shell account on the destination
+    machine and a copy of hg in the remote path.
+      
     options:
     -u, --update   update the working directory to tip after pull
 
@@ -294,12 +304,23 @@
     destination is local this is identical to a pull in that directory
     from the current one.
 
-    The other currently available push method is SSH. This requires an
-    accessible shell account on the destination machine and a copy of
-    hg in the remote path. Destinations are specified in the following
-    form:
+    By default, push will refuse to run if it detects the result would
+    increase the number of remote heads. This generally indicates the
+    the client has forgotten to sync and merge before pushing.
+
+    Valid URLs are of the form:
 
-      ssh://[user@]host[:port]/path
+      local/filesystem/path
+      ssh://[user@]host[:port][/path]
+      
+    SSH requires an accessible shell account on the destination
+    machine and a copy of hg in the remote path.
+
+    options:
+
+    -f, --force  force update
+    -e, --ssh    specify ssh command to use
+    --remotecmd  specify hg command to run on the remote side
 
 rawcommit [-p -d -u -F -m -l]::
     Lowlevel commit, for use in helper scripts.
diff -r 3e11d5038649 -r 5730e90c025b doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Fri Aug 19 21:36:57 2005 -0800
+++ b/doc/hgrc.5.txt	Fri Aug 19 21:47:46 2005 -0800
@@ -70,6 +70,8 @@
   commit;;
     Run after a changeset has been created. Passed the ID of the newly
     created changeset.
+  changegroup;;
+    Run after a changegroup has been added via push or pull.
 
 http_proxy::
   Used to access web-based Mercurial repositories through a HTTP
@@ -90,11 +92,6 @@
   symbolic name, and the right gives the directory or URL that is the
   location of the repository.
 
-tags::
-  Tags that are local to a repository and not distributed or version
-  controlled.  The left side is the tag name, and the right is the
-  ID of the changeset to identify.
-
 ui::
   User interface controls.
   debug;;
@@ -114,6 +111,11 @@
     <fred@example.com>".  Default is $EMAIL or username@hostname.
   verbose;;
     Increase the amount of output printed.  True or False.  Default is False.
+  ssh;;
+    command to use for SSH connections. Default is 'ssh'.
+  remotecmd;;
+    command to use for remote push operations. Default is 'hg'.
+
 
 web::
   Web interface configuration.