From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 17:29:41 +0000 (-0400)
Subject: updates
X-Git-Tag: 2.68~97
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0196e1f9fcfebbf904e59c029e494cb2186793e6;p=ikiwiki.git

updates
---

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]]