# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1291197890 -3600
# Node ID f553024f183285fe84c89b8aed227f5d0457cfac
# Parent  e2b8c7a6ff4d2fa783066c0e79f970ef3590aeeb# Parent  5986f44ea63c600346d925c4d563cb1058e4ebb9
merge with stable

diff -r e2b8c7a6ff4d -r f553024f1832 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Wed Dec 01 11:02:12 2010 +0900
+++ b/doc/hgrc.5.txt	Wed Dec 01 11:04:50 2010 +0100
@@ -203,8 +203,13 @@
 
 ``auth``
 """"""""
-Authentication credentials for HTTP authentication. Each line has
-the following format::
+
+Authentication credentials for HTTP authentication. This section
+allows you to store usernames and passwords for use when logging
+*into* HTTP servers. See the web_ configuration section if you want to
+configure *who* can login to your HTTP server.
+
+Each line has the following format::
 
     <name>.<argument> = <value>
 
@@ -920,7 +925,29 @@
 
 ``web``
 """""""
-Web interface configuration.
+
+Web interface configuration. The settings in this section apply to
+both the builtin webserver (started by :hg:`serve`) and the script you
+run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI
+and WSGI).
+
+The Mercurial webserver does no authentication (it does not prompt for
+usernames and passwords to validate *who* users are), but it does do
+authorization (it grants or denies access for *authenticated users*
+based on settings in this section). You must either configure your
+webserver to do authentication for you, or disable the authorization
+checks.
+
+For a quick setup in a trusted environment, e.g., a private LAN, where
+you want it to accept pushes from anybody, you can use the following
+command line::
+
+    $ hg --config web.allow_push=* --config web.push_ssl=False serve
+
+Note that this will allow anybody to push anything to the server and
+that this should not be used for public servers.
+
+The full set of options is:
 
 ``accesslog``
     Where to output the access log. Default is stdout.
diff -r e2b8c7a6ff4d -r f553024f1832 tests/test-clone.t
--- a/tests/test-clone.t	Wed Dec 01 11:02:12 2010 +0900
+++ b/tests/test-clone.t	Wed Dec 01 11:04:50 2010 +0100
@@ -41,6 +41,12 @@
   checking files
   2 files, 11 changesets, 11 total revisions
 
+Invalid dest '' must abort:
+
+  $ hg clone . ''
+  abort: No such file or directory
+  [255]
+
 No update, with debug option:
 
   $ hg --debug clone -U . ../c
@@ -99,6 +105,12 @@
   checking files
   2 files, 11 changesets, 11 total revisions
 
+Invalid dest '' with --pull must abort (issue2528):
+
+  $ hg clone --pull a ''
+  abort: No such file or directory
+  [255]
+
 Clone to '.':
 
   $ mkdir h