Mercurial > hg
changeset 11505:e5dd08f3fa03
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 03 Jul 2010 02:06:07 +0200 |
| parents | deb5d02ae91c (current diff) 6bfb76cb8873 (diff) |
| children | 48e549d7c6ae |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/hgweb.wsgi Thu Jul 01 19:27:03 2010 -0300 +++ b/contrib/hgweb.wsgi Sat Jul 03 02:06:07 2010 +0200 @@ -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"
--- a/hgext/zeroconf/__init__.py Thu Jul 01 19:27:03 2010 -0300 +++ b/hgext/zeroconf/__init__.py Sat Jul 03 02:06:07 2010 +0200 @@ -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
--- a/hgweb.cgi Thu Jul 01 19:27:03 2010 -0300 +++ b/hgweb.cgi Sat Jul 03 02:06:07 2010 +0200 @@ -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"