X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3bd73ca92d5760c1c90fa1af37b731765f2ec312..4956623ee6b95c9fc62d8af39d9236ddeb6de8c5:/doc/setup/discussion.mdwn?ds=inline

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 7218db210..807b64131 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -1,3 +1,10 @@
+I just went through the standard procedure described for setup, copied the blog directory from examples into my source directory, ran ikiwiki, and everything seems to have worked, except that none of the 
+[[!meta ... ]] tags get converted. They simply show up in the html files unformatted, with no exclamation point, and with p tags around them. Any ideas? using ikiwiki version 2.40 on freebsd --mjg
+
+> The meta plugin is not enabled by default. It's pulled in by the
+> goodstuff plugin, so add one or the other to the add_plugins line in your
+> config file. --[[Joey]]
+
 Can the instructions for using `ikiwiki-makerepo` be clarified. This
 command wants to create folders in the directory it is run in. Which
 directory should that be - `$SRCDIR?` --Andy
@@ -83,3 +90,31 @@ Curious as to why support for CVS is not built in. --[[Luther]]
 ----
 
 What is the syntax for specifying the adminuser as an openid user?  I've tried a couple things but I'm missing something.   Thanks for any pointers.  -- [[AdamShand]]
+
+> Just put the openid url in there. It has to be the full url with
+> "http://". --[[Joey]]
+
+----
+
+I apologize if this is the incorrect forum for this question, but I am trying to get ikiwiki set up and running with git.  I followed all the directions and all seems to work until I go back and try to make changes.  The steps I am performing:
+
+    cd $SRCDIR  (e.g. ~/ikisrc)
+    vim index.mdwn (add a couple lines)
+    git commit -a -m 'test'
+    git push
+
+I then get a long error message which reads in part "You asked me to pull without telling me which branch you
+want to merge with, and 'branch.master.merge' in your configuration file does not tell me either." From that point on, I get:
+
+    sws@odin:~/dev/ikisrc$ git push
+    To /home/git/repos/myikiwiki.git
+     ! [rejected]        master -> master (non-fast forward)
+    error: failed to push to '/home/git/repos/myikiwiki.git'
+
+If I do a git clone ssh://odin/path/to/$REPOSITORY from another machine and try to edit I get the same error sequence.  What am I doing wrong?
+
+-----
+
+I follow every steps of the setup procedure, change some templates and tried to modify some page through the web but was not able to do so. Every page seems to be locked by the adminuser user. When I remove the adminuser in the setup file, every ran fine. Did I miss something ? What is exactly the adminuser supposed to be allowed to ? Is he the only user allowed to modify pages ?
+
+> This was a bug in ikwiki that was fixed in version 2.44. --[[Joey]]