diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/news/version_3.20100518.mdwn | 6 | ||||
| -rw-r--r-- | doc/news/version_3.20100722.mdwn | 25 | ||||
| -rw-r--r-- | doc/plugins/po.mdwn | 21 | ||||
| -rw-r--r-- | doc/templates/links.mdwn | 4 | ||||
| -rw-r--r-- | doc/tipjar.mdwn | 3 |
5 files changed, 52 insertions, 7 deletions
diff --git a/doc/news/version_3.20100518.mdwn b/doc/news/version_3.20100518.mdwn deleted file mode 100644 index f622a4be9..000000000 --- a/doc/news/version_3.20100518.mdwn +++ /dev/null @@ -1,6 +0,0 @@ -ikiwiki 3.20100518 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * page.tmpl: Accidentially broke po plugin's otherlanguages list styling - when modifying for html5; now fixed. - * Fix a bug that prevented matching deleted comments, and so did not update - pages that had contained them."""]]
\ No newline at end of file diff --git a/doc/news/version_3.20100722.mdwn b/doc/news/version_3.20100722.mdwn new file mode 100644 index 000000000..27ed1fd4d --- /dev/null +++ b/doc/news/version_3.20100722.mdwn @@ -0,0 +1,25 @@ +ikiwiki 3.20100722 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * img: Add a margin around images displayed by this directive. + * comments: Added commentmoderation directive for easy linking to the + comment moderation queue. + * aggregate: Write timestamp next aggregation can happen to + .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs. + * Add --changesetup mode that allows easily changing options in a + setup file. + * openid: Fix handling of utf-8 nicknames. + * Clarified what the filter hook should be passed: Only be the raw, + complete text of a page. Not a snippet, or data read in from an + unrelated file. + * template: Do not pass filled in template through filter hook. + Avoids causing breakage in po plugin. + * color, comments, conditional, cutpaste, more, sidebar, toggle: Also + avoid unnecessary calls to filter hook. + * po: needstranslation() pagespec can have a percent specified. + * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have + the caching problem that was added to work around). Closes: #[588623](http://bugs.debian.org/588623) + * Made much more robust in cases where multiple source files produce + conflicting files/directories in the destdir. + * Updated French translation from Philippe Batailler. Closes: #[589423](http://bugs.debian.org/589423) + * po: Fix selflink display on tranlsated pages. (intrigeri) + * Avoid showing 'Add a comment' link at the bottom of the comment post form."""]]
\ No newline at end of file diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index c36414c8e..9426ec9c5 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -301,6 +301,25 @@ to an array to support this. (If twere done, twere best done quickly.) >>>> no way to really sanely represent complex data structures in web >>>> setup. --[[Joey]] +>>>>> Implemented using the pipe separator, fixed the po.t test suite +>>>>> accordingly. Please have a look. --[[intrigeri]] + +>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? + +>>>>>>> I've no clear opinion on this one. --[[intrigeri]] + +>>>>>> Also, the compatability code for HASH is not really needed, +>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] + +>>>>>>> The compatibility code is there to support the +>>>>>>> `po_slave_languages => {fr => 'Français'}` format that has +>>>>>>> been supported for ages. It's not there to support the +>>>>>>> intermediate array of hash-like pairs I proposed in the +>>>>>>> meantime. +>>>>>>> +>>>>>>> By the way, could you please have a look to the rest of my po +>>>>>>> branch? (bb22e8c4a..d98296d1db0) --[[intrigeri]] + Pagespecs --------- @@ -351,7 +370,7 @@ and then committed again. The second commit makes this change: Same thing happens when a change to an existing page triggers a po file update. --[[Joey]] -> * The s/utf-8/UTF-8 part is fixed in my po branch. +> * The s/utf-8/UTF-8 part has been fixed. > * The ENCODING\n part is due to an inconsistency in po4a, which > I've just send a patch for. --[[intrigeri]] diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn index 2b18bceb2..b7c3028cd 100644 --- a/doc/templates/links.mdwn +++ b/doc/templates/links.mdwn @@ -8,5 +8,9 @@ <li>[[Users|IkiWikiUsers]]</li> <li>[[SiteMap]]</li> <li>[[Contact]]</li> +<li>[[TipJar]]</li> </ul> +<a href="http://flattr.com/thing/39811/ikiwiki"> +<img src="http://api.flattr.com/button/button-compact-static-100x17.png" +alt="Flattr this" title="Flattr this" /></a> </div> diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn index b725a2eff..ae612e129 100644 --- a/doc/tipjar.mdwn +++ b/doc/tipjar.mdwn @@ -5,6 +5,9 @@ choose. If you'd like to fund development of a specific feature, see the <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=joey%40kitenet%2enet&item_name=ikiwiki&no_shipping=1&cn=Comments%3f&tax=0¤cy_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8"><img src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" alt="donate with PayPal" /></a> +<script type="text/javascript">var flattr_url = 'http://ikiwiki.info';</script> +<script src="http://api.flattr.com/button/load.js" type="text/javascript"></script> + Thanks to the following people for their kind contributions: * James Westby |