Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/forum/Cannot_write_to_commitlock.mdwn b/doc/forum/Cannot_write_to_commitlock.mdwn
new file mode 100644 (file)
index 0000000..a5d4bf4
--- /dev/null
+++ b/doc/forum/Cannot_write_to_commitlock.mdwn
@@ -0,0 +1,17 @@
+I am following the laptop wiki with git tip page. I have set up my local and remote wiki as suggested. However, when I try to push my local changes back to the server I get the following error:
+
+Writing objects: 100% (4/4), 359 bytes, done.
+Total 4 (delta 2), reused 0 (delta 0)
+cannot write to /home/ian/ianbarton/.ikiwiki/commitlock: No such file or directory
+To ian@wilkesley.org:~/ikiwiki/ianbarton.git
+   5cf9054..16a871d  master -> master
+
+The relevnt bit of my setup file is:
+
+git_wrapper => '/home/ian/ianbarton.git/hooks/post-commit',
+
+Now ~/ianbarton/.ikiwiki exists and is owned and writable by me. I have tried touching commitlock and also removing lock and commitlock before pushing. Any suggestions for further trouble shooting?
+
+Ian.
+
+

diff --git a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
index 0c96196470bc6ddfe045574066720e430a11b8af..35ceae59b5f1749bcf399e38e6463da4396c5584 100644 (file)
--- a/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
+++ b/doc/forum/cleaning_up_discussion_pages_and_the_like.mdwn
@@ -9,5 +9,3 @@ That's also what I think: such discussions or comments on [[forum]] discussion
 pages, or generally on all pages' [[Discussion]] subpages, can be removed if
 either they're simply not valid / interesting / ... anymore, or if they've been
 used to improve the *real* documentation.  --[[tschwinge]]
-
-test

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a98abf578b39e217661029c253eb3fbaa1c6f556..f6ab34653987ed5912105d5ae5997eafc9687013 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -127,6 +127,7 @@ Personal sites and blogs
 * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Weakish Jiang's Homepage](http://weakish.pigro.net)
+* [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 
 Please feel free to add your own ikiwiki site!