Merge with stable

This commit is contained in:
Martin Geisler 2010-07-03 02:06:07 +02:00
commit 03193efb11
3 changed files with 7 additions and 4 deletions

View File

@ -1,4 +1,5 @@
# An example WSGI for use with mod_wsgi, edit as necessary
# See http://mercurial.selenic.com/wiki/modwsgi for more information
# Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config"

View File

@ -7,17 +7,18 @@
'''discover and advertise repositories on the local network
Zeroconf enabled repositories will be announced in a network without
Zeroconf-enabled repositories will be announced in a network without
the need to configure a server or a service. They can be discovered
without knowing their actual IP address.
To allow other people to discover your repository using run "hg serve"
in your repository::
To allow other people to discover your repository using run
:hg:`serve` in your repository::
$ cd test
$ hg serve
You can discover zeroconf enabled repositories by running "hg paths"::
You can discover Zeroconf-enabled repositories by running
:hg:`paths`::
$ hg paths
zc-test = http://example.com:8000/test

View File

@ -1,6 +1,7 @@
#!/usr/bin/env python
#
# An example hgweb CGI script, edit as necessary
# See also http://mercurial.selenic.com/wiki/PublishingRepositories
# Path to repo or hgweb config to serve (see 'hg help hgweb')
config = "/path/to/repo/or/config"