aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-04 04:29:18 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-04 04:29:18 +0000
commit91e416b5f3c54aed844be4291f04e13e678c02bf (patch)
tree7aa1f7fcb359087d8606a4371719b1709a68eecb
parentd9ea7d5b0b8f6d224fa909b11c53607f2ae39fa9 (diff)
downloadikiwiki-91e416b5f3c54aed844be4291f04e13e678c02bf.tar
ikiwiki-91e416b5f3c54aed844be4291f04e13e678c02bf.tar.gz
* Also generate rel=bookmark links for permalinks.
-rw-r--r--IkiWiki/Plugin/meta.pm1
-rw-r--r--debian/changelog1
-rw-r--r--doc/plugins/meta.mdwn3
3 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index adfd688a6..0890830a7 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -62,6 +62,7 @@ sub preprocess (@) { #{{{
}
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).
diff --git a/debian/changelog b/debian/changelog
index 02638688e..c6de974c6 100644
--- 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.
+ * Also generate rel=bookmark links for permalinks.
-- 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 cacb462c9..de04dcdd5 100644
--- 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
- 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 &lt;meta&gt;