From: Joey Hess Date: Tue, 5 Feb 2008 20:59:42 +0000 (-0500) Subject: Merge branch 'master' into prefix-directives X-Git-Tag: 2.40~152 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f92505d78b82c6ac146e43054ebd12441575a602 Merge branch 'master' into prefix-directives --- f92505d78b82c6ac146e43054ebd12441575a602 diff --cc debian/NEWS index eefc12acb,c3ed55c03..908cfdb15 --- a/debian/NEWS +++ b/debian/NEWS @@@ -1,36 -1,26 +1,59 @@@ - ikiwiki (2.21) unstable; urgency=low ++ikiwiki (2.31) unstable; urgency=low + + ikiwiki now has an new syntax for preprocessor directives, using the + prefix '!': + + [[!directive ...]] + + This new syntax no longer relies on spaces to distinguish between + wikilinks and preprocessor directives. Thus, wikilinks can use spaces + in their link text, and preprocessor directives without arguments (such + as "toc") need not use a trailing space. + + To enable the new syntax, set prefix_directives to true in your ikiwiki + config. For backward compatibility with existing wikis, + prefix_directives currently defaults to false. In ikiwiki 3.0, + prefix_directives will default to true, and wikis which have not yet + converted to the new syntax will need to set prefix_directives to false + in their setup files. + + To convert your wiki to the new syntax, ikiwiki provides a new script + ikiwiki-transition. It will convert preprocessor directives in + all files given on the command line. To convert an entire wiki: + + find wikidir/ -type f -name '*.mdwn' -print0 | xargs -0 ikiwiki-transition prefix_directives + + Even with prefix_directives disabled, ikiwiki now allows an optional '!' + prefix on preprocessor directives (but still requires a space). Thus, a + directive which uses a '!' prefix and contains a space will work with + ikiwiki 2.21 and newer, regardless of the value of prefix_directives. + This allows the underlay to work with all ikiwikis. + + -- Josh Triplett Sat, 26 Jan 2008 16:26:47 -0800 + + ikiwiki (2.30) unstable; urgency=low + + Ever feel that ikiwiki's handling of RecentChanges wasn't truely in the + spirit of a wiki compiler? Well, that's changed. The RecentChanges page is + now a static page, not a CGI. Users can subscribe to its rss/atom feeds. + Custom RecentChanges pages can be easily set up that display only changes + to a subset of pages, or only changes by a subset of users. + + All wikis need to be rebuilt on upgrade to this version. If you listed your + wiki in /etc/ikiwiki/wikilist this will be done automatically when the + Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild. + + With this excellent new RecentChanges support, the mail notification system - is showing its age (and known to be variously buggy and underimplemented for ++ is its age (and known to be variously buggy and underimplemented for + various VCSes), and so ikiwiki's support for sending commit mails is REMOVED + from this version. If you were subscribed to commit mails, you should be + able to accomplish the same thing by subscribing to a RecentChanges feed. + + The "svnrepo" and "notify" fields in setup files are no longer used, and + silently ignored. You may want to remove them from your setup file. + + -- Joey Hess Tue, 29 Jan 2008 17:18:31 -0500 + ikiwiki (2.20) unstable; urgency=low The template plugin has begin to htmlize the variables passed to templates. diff --cc debian/changelog index e81cc21ad,b32c7ad51..397ecca1b --- a/debian/changelog +++ b/debian/changelog @@@ -14,14 -55,33 +55,39 @@@ ikiwiki (2.30) unstable; urgency=lo [ Josh Triplett ] * Add trailing comma to commented-out umask in sample ikiwiki.setup, so that uncommenting it does not break the setup file. + * Add new preprocessor directive syntax¸ using a '!' prefix. Add a + prefix_directives option to the setup file to turn this syntax on; + currently defaults to false, for backward compatibility. Support + optional '!' prefix even with prefix_directives off, and use that in + the underlay to support either setting of prefix_directives. Add NEWS + entry with migration information. - -- Joey Hess Fri, 11 Jan 2008 15:09:37 -0500 + [ Joey Hess ] + * inline: The template can check for FIRST and LAST, which will be + set for the first and last inlined page. Useful for templates that build + tables and the like. + * prettydate,ddate: Don't ignore time formats passed to displaytime + function. + * Pages with extensions starting with "_" are internal-use, and will + not be rendered or web-edited, or matched by normal pagespecs. + * Add "internal()" pagespec that matches internal-use pages. + * RecentChanges is now a static html page, that's updated whenever a commit + is made to the wiki. It's built as a blog using inline, so it can have + an rss feed that users can subscribe to. + * Removed support for sending commit notification mails. Along with it went + the svnrepo and notify settings, though both will be ignored if left in + setup files. Also gone with it is the "user()" pagespec. + * Add refresh hook. + * meta: Add pagespec functions to match against title, author, authorurl, + license, and copyright. This can be used to create custom RecentChanges. + * meta: To support the pagespec functions, metadata about pages has to be + retained as pagestate. + * Fix encoding bug when pagestate values contained spaces. + * Add support for bzr, written by Jelmer Vernooij. Thanks also to bma for + his independent work on bzr support. + * Copyright file updates. + + -- Joey Hess Sat, 02 Feb 2008 17:41:57 -0500 ikiwiki (2.20) unstable; urgency=low