Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index cdaf3d4e2d75d8304da13cb278e7ce70c6d6b9d7..e7f47f5a02af12099d61a72859c02d699cbd5d8d 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -1,9 +1,9 @@
-Ikiwiki is developed in a git repository and can be checked out 
-like this:
+Ikiwiki, and this documentation wiki, are developed in a git repository and
+can be checked out like this:

 
 [[!template id=note text="""
 You can push changes back to ikiwiki's git repository over the `git://`
 
 [[!template id=note text="""
 You can push changes back to ikiwiki's git repository over the `git://`

-transport, to update the wiki, if you'd like, instead of editing it on the
+transport, to update this wiki, if you'd like, instead of editing it on the

 web. Changes that could not be made via the web will be automatically
 rejected.
 """]]
 web. Changes that could not be made via the web will be automatically
 rejected.
 """]]


@@ -20,7 +20,8 @@ There is also a mirror [on github](http://github.com/joeyh/ikiwiki/tree/master).
 
 Commits to this git repository are fed into [CIA](http://cia.vc), and can
 be browsed, subscribed to etc on its
 
 Commits to this git repository are fed into [CIA](http://cia.vc), and can
 be browsed, subscribed to etc on its

-[project page](http://cia.vc/stats/project/ikiwiki).
+[project page](http://cia.vc/stats/project/ikiwiki). They're also fed into
+[twitter](http://twitter.com/ikiwiki).

 
 ## branches
 
 
 ## branches