# HG changeset patch
# User mpm@selenic.com
# Date 1117228196 28800
# Node ID 089594a5bbde8512ef722147f39442d7bdbe397a
# Parent  f25944662097a4f1b9fdd1aa6e4d373e8cb0c9c8# Parent  038e4d8602bdfb31368bf0acddaae4be35c4e182
Pull from Jake's hg docs



diff --git a/README b/README
diff --git a/doc/README b/doc/README
diff --git a/doc/hg.1 b/doc/hg.1
--- a/doc/hg.1
+++ b/doc/hg.1
@@ -69,7 +69,7 @@ indicates a changeset which can be speci
 
 .TP
 repository path
-is either the pathname of a local repository of the URI of a remote repository\&. There are two available URI protocols, hg:// which is fast and the http:// protocol which is much slower but does not require python on the web host\&.
+is either the pathname of a local repository of the URI of a remote repository\&. There are two available URI protocols, http:// which is fast and the old\-http:// protocol which is much slower but does not require python on the web host\&.
 
 .SH "COMMANDS"
 
@@ -181,6 +181,10 @@ this file contains regular expressions (
 \&.hgtags
 this file contains changeset hash values and text tag names (one of each seperated by spaces) that correspond to tagged versions of the repository contents\&.
 
+.TP
+$HOME/\&.hgpaths
+this file contains a mapping from a symbolic name to a repository path (which could be a local path or a remote URI), the format is <symbolic name> <repository path> with each mapping on a seperate line
+
 .SH "BUGS"
 
 
diff --git a/doc/hg.1.html b/doc/hg.1.html
--- a/doc/hg.1.html
+++ b/doc/hg.1.html
@@ -109,9 +109,9 @@ repository path
 <dd>
 
     is either the pathname of a local repository of the URI of a remote
-    repository.  There are two available URI protocols, hg:// which is
-    fast and the http:// protocol which is much slower but does not require
-    python on the web host.
+    repository.  There are two available URI protocols, http:// which is
+    fast and the old-http:// protocol which is much slower but does not
+    require python on the web host.
 
 </dd>
 </dl>
@@ -367,6 +367,16 @@ EDITOR
     contents.
 
 </dd>
+<dt>
+$HOME/.hgpaths
+</dt>
+<dd>
+
+    this file contains a mapping from a symbolic name to a repository path
+    (which could be a local path or a remote URI), the format is
+    &lt;symbolic name&gt; &lt;repository path&gt; with each mapping on a seperate line
+
+</dd>
 </dl>
 <hr />
 <h2>BUGS</h2>
@@ -401,7 +411,7 @@ Public License (GPL).
 <p></p>
 <hr /><p><small>
 Version 0.5<br />
-Last updated 27-May-2005 08:14:25 MDT
+Last updated 27-May-2005 15:07:30 MDT
 </small></p>
 </body>
 </html>
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -52,9 +52,9 @@ revision::
 
 repository path::
     is either the pathname of a local repository of the URI of a remote
-    repository.  There are two available URI protocols, hg:// which is
-    fast and the http:// protocol which is much slower but does not require
-    python on the web host.
+    repository.  There are two available URI protocols, http:// which is
+    fast and the old-http:// protocol which is much slower but does not 
+    require python on the web host.
 
 COMMANDS
 --------
@@ -173,6 +173,11 @@ FILES
     seperated by spaces) that correspond to tagged versions of the repository
     contents.
 
+ $HOME/.hgpaths::
+    this file contains a mapping from a symbolic name to a repository path
+    (which could be a local path or a remote URI), the format is 
+    <symbolic name> <repository path> with each mapping on a seperate line
+
 BUGS
 ----
 Probably lots, please post them to the mailing list (See Resources below)
diff --git a/mercurial/hg.py b/mercurial/hg.py
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py