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 ed933ae548ca31777cef5773e6e127510faa9a89..cf9c2e338a1311e83797a37d7b6f7ec96b5dd342 100644 (file)
--- a/doc/tips/distributed_wikis.mdwn
+++ b/doc/tips/distributed_wikis.mdwn
@@ -6,10 +6,10 @@ git, let's explore some possibilities for distributed wikis.
 ## a wiki mirror
 
 The simplest possibility is setting up a mirror. If a wiki exposes its git
 ## a wiki mirror
 
 The simplest possibility is setting up a mirror. If a wiki exposes its git

-repository and has the [[plugin/pinger]] plugin enabled, then anyone can
+repository and has the [[plugins/pinger]] plugin enabled, then anyone can

 set up a mirror that will automatically be kept up-to-date with the origin
 wiki. Just clone the git repo, configure ikiwiki to use it, enable the
 set up a mirror that will automatically be kept up-to-date with the origin
 wiki. Just clone the git repo, configure ikiwiki to use it, enable the

-[[plugin/pingee]] plugin in your configuration, and edit the origin wiki,
+[[plugins/pingee]] plugin in your configuration, and edit the origin wiki,

 adding a ping directive for your mirror:
 
        \[[!ping from="http://thewiki.com/"
 adding a ping directive for your mirror:
 
        \[[!ping from="http://thewiki.com/"


@@ -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
 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
 
 
 ## branching a wiki