# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1273244628 -7200
# Node ID 9fa028431957c93c0add964d0f8a47f9a81eb8ee
# Parent  5024748392938e4fe0e1a0b08b3583e90189aeff# Parent  d29bd98ebff695738aec2baf3ee29a5d2a4286cf
Merge with stable

diff -r 502474839293 -r 9fa028431957 mercurial/commands.py
--- a/mercurial/commands.py	Wed May 05 20:21:57 2010 -0500
+++ b/mercurial/commands.py	Fri May 07 17:03:48 2010 +0200
@@ -2900,7 +2900,16 @@
 def serve(ui, repo, **opts):
     """start stand-alone webserver
 
-    Start a local HTTP repository browser and pull server.
+    Start a local HTTP repository browser and pull server. You can use
+    this for ad-hoc sharing and browing of repositories. It is
+    recommended to use a real web server to serve a repository for
+    longer periods of time.
+
+    Please note that the server does not implement access control.
+    This means that, by default, anybody can read from the server and
+    nobody can write to it by default. Set the ``web.allow_push``
+    option to ``*`` to allow everybody to push to the server. You
+    should use a real web server if you need to authenticate users.
 
     By default, the server logs accesses to stdout and errors to
     stderr. Use the -A/--accesslog and -E/--errorlog options to log to