From: Joey Hess Date: Sun, 20 May 2012 00:35:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/29b00c0f9b85cc7ac5cbbe17927639008dc9e1e4?hp=9ff1edb5b986be7fded254127c1e4893c036ec3c Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__.mdwn b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__.mdwn new file mode 100644 index 000000000..c0b896515 --- /dev/null +++ b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__.mdwn @@ -0,0 +1,3 @@ +Is anyone successfull mirroring feeds from ikiwiki to identi.ca (or another status.net instance)? How did you set up your feed? + +When I try to, identi.ca presents me with an error about no "author ID URI" being found in the feed. Indeed the ikiwiki-generated atom feed only has got a global "author" - I presume identi.ca requires author information in each entry. Is it possible to set up ikiwiki's feed that way? diff --git a/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_1_8a5acbb6234104b607c8c4cf16124ae4._comment b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_1_8a5acbb6234104b607c8c4cf16124ae4._comment new file mode 100644 index 000000000..1d710d153 --- /dev/null +++ b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_1_8a5acbb6234104b607c8c4cf16124ae4._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="Franek" + ip="188.99.178.40" + subject="[[!meta author="..." + date="2012-05-19T14:51:42Z" + content=""" +Adding [[!meta author=\"me\"]] to the entries and/or the feedpage does not help. +"""]] diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn index 2eac0788c..9aa505fa1 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://ftp.netbsd.org/pub/NetBSD/packages/distfiles/wmd-1.0.1.zip). In that zip file +source](http://es.sourceforge.jp/projects/wppluginsj/releases/?package_id=7826). 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 diff --git a/doc/tips/JavaScript_to_add_index.html_to_file:_links/discussion.mdwn b/doc/tips/JavaScript_to_add_index.html_to_file:_links/discussion.mdwn new file mode 100644 index 000000000..3b9f29e77 --- /dev/null +++ b/doc/tips/JavaScript_to_add_index.html_to_file:_links/discussion.mdwn @@ -0,0 +1,2 @@ +Please make this an ikiwiki feature. By that I mean, "server side". Cheers, thanks, --Dave +> After I left this comment, I found that --no-usedirs suits my purposes: I can navigate my local wiki with file:/// urls... Hope this helps someone! diff --git a/doc/todo/Olea.mdwn b/doc/todo/Olea.mdwn new file mode 100644 index 000000000..1db2a7cf5 --- /dev/null +++ b/doc/todo/Olea.mdwn @@ -0,0 +1,4 @@ +[[!meta title="Ismael Olea"]] + +Ismael Olea is ismael@olea.org. +His web page is [here](http://olea.org/diario/). diff --git a/doc/todo/wikiwyg.mdwn b/doc/todo/wikiwyg.mdwn index 839986c7b..b9a7368ea 100644 --- a/doc/todo/wikiwyg.mdwn +++ b/doc/todo/wikiwyg.mdwn @@ -62,3 +62,7 @@ The plugin can be downloaded from > lost my copy of this before merging it. I hope that this plugin will turn > back up. In the meantime, there is a wmd plugin that accomplishes the > same basic task of WSYWIG markdown editing. --[[Joey]] + +>> Seems the new place is now at Github: +>> FYI +>> --[[Olea]] diff --git a/doc/todo/wikiwyg/discussion.mdwn b/doc/todo/wikiwyg/discussion.mdwn index 304b39620..8c5727ace 100644 --- a/doc/todo/wikiwyg/discussion.mdwn +++ b/doc/todo/wikiwyg/discussion.mdwn @@ -176,3 +176,6 @@ Thanks, [[Greg]] >>> it, and at this point, I don't know where to find them anymore! Damn, >>> damn, damn. I suspect I did that right when I was learning git, and >>> screwed up pushing the branch. :-( --[[Joey]] +>>>> Seems the new place is now at Github: +>>>> FYI +>>>> --[[Olea]]