Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / tips / distributed_wikis.mdwn

diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index 3d9f3198666ce787bdffb0935a29e33bdd6c404f..cf9c2e338a1311e83797a37d7b6f7ec96b5dd342 100644 (file)
--- a/doc/tips/distributed_wikis.mdwn
+++ b/doc/tips/distributed_wikis.mdwn
@@ -26,7 +26,8 @@ And if someone edits a page on your mirror, it will "git push origin",
 committing the changes back to the origin git repository, and updating the
 origin mirror. Assuming you can push to that git repository. If you can't,
 and you want a mirror, and not a branch, you should disable web edits on
-your mirror.
+your mirror. (You could also point the cgiurl for your mirror at the origin
+wiki.)
 
 ## branching a wiki