* Also generate rel=bookmark links for permalinks.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index adfd688a6aeece5cdf1f55b8578727ffbc111369..0890830a77d2a3f9be4329df4fb7f6a92e129a7d 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -62,6 +62,7 @@ sub preprocess (@) { #{{{
        }
        elsif ($key eq 'permalink') {
                $permalink{$page}=$value;
        }
        elsif ($key eq 'permalink') {
                $permalink{$page}=$value;

+               $meta{$page}.="<link rel=\"bookmark\" href=\"".encode_entities($value)."\" />\n";

        }
        else {
                $meta{$page}.="<meta name=\"".encode_entities($key).
        }
        else {
                $meta{$page}.="<meta name=\"".encode_entities($key).

diff --git a/debian/changelog b/debian/changelog
index 02638688e1cc1846dde7749e4963f21e760afe06..c6de974c67513a58e13857c34c7cd4dbfef22732 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (1.16) UNRELEASED; urgency=low
   * Various CSS and formatting changes.
   * Encode link and guid urls in rss feeds to avoid illegal utf8 slipping in.
   * Add xhtml files to the default prune regexp.
   * Various CSS and formatting changes.
   * Encode link and guid urls in rss feeds to avoid illegal utf8 slipping in.
   * Add xhtml files to the default prune regexp.

+  * Also generate rel=bookmark links for permalinks.

 
  -- Joey Hess <joeyh@debian.org>  Thu,  3 Aug 2006 22:35:11 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Thu,  3 Aug 2006 22:35:11 -0400
 

diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index cacb462c9564e8f2efdb55f270c3a191f27be4d1..de04dcdd533a6a38a4021ef6721d403c3d8f5421 100644 (file)
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -38,7 +38,8 @@ You can use any field names you like, but here are some predefined ones:
 
 * permalink
 
 
 * permalink
 

-  Specifies the permalink to the page, for use in RSS feeds.
+  Specifies a perminent link to the page, if different than the page
+  generated by ikiwiki.

 
 If the field is not treated specially (as the link and title fields are),
 the metadata will be written to the generated html page as a <meta>
 
 If the field is not treated specially (as the link and title fields are),
 the metadata will be written to the generated html page as a <meta>