wording

[ikiwiki.git] / doc / git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 6cbc1e489a491953753c9ea985fcb4da033de676..afe6ed7a805679dca5746b04fe3d6116484cfd54 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -1,5 +1,12 @@
-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://`
+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.
+"""]]
 
        git clone git://git.ikiwiki.info/
 
@@ -9,6 +16,8 @@ Or like this if your firewall only passes http traffic (slow):
 
 The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki).
 
+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
 [project page](http://cia.vc/stats/project/ikiwiki).
@@ -25,12 +34,12 @@ Some of the branches included in the main repository include:
   work with the current *master* branch again.
 * `html` is an unfinished attempt at making ikiwiki output HTML 4.01
   instead of xhtml.
-
-* `prefix-directives` changes the preprocessor directive syntax.
-  Passes all test cases; pending merge.
-
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
+* `darcs` is being used to add darcs support.
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
+* `debian-stable` is used for updates to the old version included in
+  Debian's stable release, and `debian-testing` is used for updates to
+  Debian's testing release.