Merge branch 'upstream' into gentoo

Conflicts:
	gitosis/run_hook.py
	gitosis/serve.py
	gitosis/test/test_run_hook.py
	gitosis/test/test_serve.py

1 files changed, 9 insertions, 0 deletions

diff --git a/gitweb.conf b/gitweb.conf
index 8fb62d1..32d81b1 100644
--- a/gitweb.conf
+++ b/gitweb.conf
@@ -15,6 +15,15 @@ $projectroot = "/srv/example.com/git/repositories";
 # is already sharing anonymously.
 $export_ok = "git-daemon-export-ok";
 
+# Alternatively, you could set these, to allow exactly the things in
+# projects.list, which in this case is the repos with gitweb=yes
+# in gitosis.conf. This means you don't need daemon=yes, but you
+# can't have repositories hidden but browsable if you know the name.
+# And note gitweb already allows downloading the full repository,
+# so you might as well serve git-daemon too.
+# $export_ok = "";
+# $strict_export = "true";
+
 # A list of base urls where all the repositories can be cloned from.
 # Easier than having per-repository cloneurl files.
 @git_base_url_list = ('git://example.com');