diff options
| author | Joey Hess <joey@kitenet.net> | 2012-05-29 13:43:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-29 13:43:37 -0400 |
| commit | 73136f100f627e5982e06a2841e8cd086c38ef7f (patch) | |
| tree | 7f4cd472ad2096f19c5ff5aae66e09a5d00b6ff1 /doc | |
| parent | 41aee342747c1f06d526c8851c6fc7f11b455e41 (diff) | |
| parent | 8eb8755aebbe12825de076b6eac9639805d79354 (diff) | |
| download | ikiwiki-73136f100f627e5982e06a2841e8cd086c38ef7f.tar ikiwiki-73136f100f627e5982e06a2841e8cd086c38ef7f.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_3_317f1202a3da1bfc845d4becbac4bba8._comment | 10 | ||||
| -rw-r--r-- | doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_3_317f1202a3da1bfc845d4becbac4bba8._comment b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_3_317f1202a3da1bfc845d4becbac4bba8._comment new file mode 100644 index 000000000..6bda93433 --- /dev/null +++ b/doc/forum/Anyone_mirroring_ikiwiki_inline_feed_to_identi.ca__63__/comment_3_317f1202a3da1bfc845d4becbac4bba8._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="Franek" + ip="92.74.26.119" + subject="kind of solved, but another problem comes up" + date="2012-05-26T19:31:19Z" + content=""" +The templates atompage.tmpl and/or atomitem.tmpl appear to be what would have to be altered to satisfy identi.ca. I did that on my system, just hard-coding a <uri> element into <author> for testing. In one respect, it worked: identi.ca does not complain about the missing author uri any more. In another, it did not, another error comes up now: \"Internal server error\" and something like \"could not add feed\". + +I do not know where to go from this very unspecific error message. I guess I am going to try something like twitterfeed.com, for now. +"""]] diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index baad063ef..ca9cb532c 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -80,6 +80,11 @@ and decided this time it was really needed to implement this feature. >>>>>> Ping? I've merged 3.20110321 in my `mirrorlist` branch and >>>>>> checked it still works properly. --[[intrigeri]] +>>>>>>> Joey: ping? I've rebased my `mirrorlist` branch on top of +>>>>>>> 3.20120419, and checked it still works properly. I really +>>>>>>> would like to see this functionality merged in time +>>>>>>> for Wheezy. --[[intrigeri]] + >>>>> concerning goto/cgiurl, what about having that as the default in >>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and >>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases? |