aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-24 13:29:41 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-24 13:29:41 -0400
commit0196e1f9fcfebbf904e59c029e494cb2186793e6 (patch)
treeb153342d429adc6e6b51e263da025d447af7d446
parentfbcb8553df1f6150f2cfb2fd5d81a65e93074ac5 (diff)
downloadikiwiki-0196e1f9fcfebbf904e59c029e494cb2186793e6.tar
ikiwiki-0196e1f9fcfebbf904e59c029e494cb2186793e6.tar.gz
updates
-rw-r--r--IkiWiki/Plugin/git.pm2
-rw-r--r--doc/plugins/pingee.mdwn2
-rw-r--r--doc/users/xma/discussion.mdwn2
3 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index e565f6369..3a8476e7d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -619,7 +619,7 @@ sub rcs_receive () { #{{{
# Avoid chdir when running git here, because the changes
# are in the master git repo, not the srcdir repo.
- # The pre-recieve hook already puts us in the right place.
+ # The pre-receive hook already puts us in the right place.
$no_chdir=1;
my @changes=git_commit_info($oldrev."..".$newrev);
$no_chdir=0;
diff --git a/doc/plugins/pingee.mdwn b/doc/plugins/pingee.mdwn
index d012004f9..6156c235f 100644
--- a/doc/plugins/pingee.mdwn
+++ b/doc/plugins/pingee.mdwn
@@ -3,7 +3,7 @@
This plugin causes ikiwiki to listen for pings, typically delivered from
another ikiwiki instance using the [[pinger]] plugin. When a ping is
-recieved, ikiwiki will update the wiki, the same as if `ikiwiki --refresh`
+received, ikiwiki will update the wiki, the same as if `ikiwiki --refresh`
were ran at the command line.
An url such as the following is used to trigger a ping:
diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn
index c2bb62062..34adbf821 100644
--- a/doc/users/xma/discussion.mdwn
+++ b/doc/users/xma/discussion.mdwn
@@ -14,3 +14,5 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there
> for ikiwiki. --[[Joey]]
> > I'll think about it. It may solve some of my offline-being issues. --[[intrigeri]]
+
+>>>> Now developed! --[[Joey]]