From: Joey Hess Date: Tue, 22 May 2012 19:21:17 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20120629~54 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7f8706dfdb35e28bf81857dba01541c2958f62a6?hp=29b00c0f9b85cc7ac5cbbe17927639008dc9e1e4 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_2_155e5823860a91989647ede8b5c9224a._comment b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_2_155e5823860a91989647ede8b5c9224a._comment new file mode 100644 index 000000000..6c709b3f0 --- /dev/null +++ b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_2_155e5823860a91989647ede8b5c9224a._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="Franek" + ip="188.99.178.40" + subject="Further enquiries" + date="2012-05-20T10:46:07Z" + content=""" +I did some more experiments setting not only \"[[!meta author=...\", but also \"authorurl\" globally and per-entry in various combinations, with no success. As far as I could see, \"authorurl\" had no effect on the atom feed whatsoever. + +It seems that identi.ca wants a feed to have an field with a subfield, as described here: [[http://www.atomenabled.org/developers/syndication/#person]] . Is there a way to achieve this with ikiwiki inline-feeds? + +I also found two old and unresolved status.net bugreports on the matter: + +[[http://status.net/open-source/issues/2840]] + +[[http://status.net/open-source/issues/2839]] +"""]] diff --git a/doc/forum/Error:___34__do__34___parameter_missing.mdwn b/doc/forum/Error:___34__do__34___parameter_missing.mdwn new file mode 100644 index 000000000..402217e82 --- /dev/null +++ b/doc/forum/Error:___34__do__34___parameter_missing.mdwn @@ -0,0 +1,13 @@ +Hi + +I'm stuck with a «Error: "do" parameter missing» message I can't fix. + +I'm using ikiwiki 3.20100815.7 on a debian 6.0.4 system. + +Error redirection is obvisously configured, also the dot cgi thing. + +You can test it at http://wikimix.cc/thisuridoesntexist + +The procedure of creating a reference to a new page gives the same error. + +Any clue? diff --git a/doc/forum/Error:___34__do__34___parameter_missing/comment_1_3a51c303ba1670f1567f323349b53837._comment b/doc/forum/Error:___34__do__34___parameter_missing/comment_1_3a51c303ba1670f1567f323349b53837._comment new file mode 100644 index 000000000..a01a33468 --- /dev/null +++ b/doc/forum/Error:___34__do__34___parameter_missing/comment_1_3a51c303ba1670f1567f323349b53837._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 1" + date="2012-05-22T13:46:20Z" + content=""" +Did you enable the [[plugins/404]] plugin? + +Which web server? That plugin is meant to work with Apache 2; in +principle it should be possible to make it work with other web servers, +but it'll need some setup. + +The 404 plugin relies on your web server giving IkiWiki some extra +information about 404s; lighttpd doesn't currently provide enough +information for IkiWiki to detect 404s reliably, for instance. +"""]] diff --git a/doc/forum/Parent_Links_all_link_to_root.mdwn b/doc/forum/Parent_Links_all_link_to_root.mdwn new file mode 100644 index 000000000..b9c4c8e1a --- /dev/null +++ b/doc/forum/Parent_Links_all_link_to_root.mdwn @@ -0,0 +1,18 @@ +My parent links all link to the root instead of to the appropriate index.mdwn. Is this a sign of a broken link pre-compile? Is there some setting that controls this? + + +\ + +\root\/ + +\level1\/ + +\level2\/ + +\ + + +Thanks, +Sean + +ikiwiki version 3.20100722 - Pretty plain Jane install diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn index 9aa505fa1..7202aece6 100644 --- a/doc/plugins/wmd.mdwn +++ b/doc/plugins/wmd.mdwn @@ -5,7 +5,7 @@ [[mdwn]]. This plugin makes WMD be used for editing pages in the wiki. To use the plugin, you will need to install WMD. Download the [WMD -source](http://es.sourceforge.jp/projects/wppluginsj/releases/?package_id=7826). In that zip file +source](https://code.google.com/p/pagedown/). In that zip file you'll find a few example html files, a readme and `wmd` directory. Create a 'wmd' subdirectory in the ikiwiki `underlaydir` directory (ie `sudo mkdir /usr/share/ikiwiki/wmd`). Move the `wmd` directory into the directory you