X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=wikiwriteaccess.mdwn;h=9b98f9dd28bee77a923dd85f25d3f3908871089a;hb=8dd999485b28111a872ca56371eae9a0face3944;hp=a217deb97ede43a3f7848d2caa62324ef78cc320;hpb=7d4ba3c04557a156c3091239cb78271abb211e0a;p=notmuch-wiki

diff --git a/wikiwriteaccess.mdwn b/wikiwriteaccess.mdwn
index a217deb..9b98f9d 100644
--- a/wikiwriteaccess.mdwn
+++ b/wikiwriteaccess.mdwn
@@ -1,24 +1,35 @@
+[[!img notmuch-logo.png alt="Notmuch logo" class="left"]]
 # Wiki Write Access
 
 This website is a wiki maintained using
 [ikiwiki](http://ikiwiki.info). You can pull and push changes using
-the following URL using
-[this](http://git.cworth.org/git/notmuch-wiki?a=commit;h=023952dcb7cbf5d4bd9c8ba2c79bac11d54af1d4)
-ssh key:
+the following URL:
 
     git://notmuchmail.org/git/notmuch-wiki
 
-Eventually, you will be able to push and pull without authentication,
-but until then, you can use the key by copying it to ~/.ssh and adding
-a few lines to ~/.ssh/config:
+Clone the wiki branch with:
 
-    Host *.notmuchmail.org
-        IdentityFile ~/.ssh/notmuch_wiki.key
+    git clone git://notmuchmail.org/git/notmuch-wiki
 
-Checkout the branch with:
+Then you can edit the wiki locally, commit the changes with:
 
-    git clone git://notmuchmail.org/git/notmuch-wiki
+    git add ...
+    git commit
+
+and push back to the wiki:
+
+    git push
+
+
+The syntax used on the pages is [markdown](http://daringfireball.net/projects/markdown/syntax). In order to preview your modifications you can copy and paste the page in this [online preview](http://daringfireball.net/projects/markdown/dingus).
+
+## License
+
+We are in the process of updating the wiki license. By pushing to the repository
+you agree that all of your contributions to the notmuch wiki will be dual
+licensed under:
 
-Push to the wiki with:
+- [CC-BY-SA-3.0](http://creativecommons.org/licenses/by-sa/3.0/) <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" />
 
-    git push anongit@git.notmuchmail.org:/git/notmuch-wiki
\ No newline at end of file
+- [The GNU General Public License](http://www.gnu.org/licenses/gpl.txt), either
+  version 3.0 or at your option any later version.