summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-09-19 20:15:38 -0400
committerJoey Hess <joey@kitenet.net>2010-09-19 20:15:38 -0400
commit012300404e86578e24ab3f07ded9f1ba89c39b2a (patch)
treeeb24531fc11af67b58343daf4b68cb5fa66130fa
parent8063b960ade41a089d859b655ff26fb61fb18d3f (diff)
parent2745dfee60fa890ed0ecb8f53528e8a8a0803066 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/bugs/cutpaste.pm:_missing_filter_call.mdwn14
-rw-r--r--doc/tips/html5.mdwn3
2 files changed, 16 insertions, 1 deletions
diff --git a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn
index 475880f0a..f7138cba0 100644
--- a/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn
+++ b/doc/bugs/cutpaste.pm:_missing_filter_call.mdwn
@@ -39,3 +39,17 @@ function.
> constraints, without removing cutpaste's ability to have forward pastes
> of text cut laster in the page. (That does seems like an increasingly
> bad idea..) --[[Joey]]
+
+> > OK -- so the FOO/BAR thing was only a very stripped-down example, of
+> > course, and the real thing is being observed with the
+> > *[[plugins/contrib/getfield]]* plugin. This one needs to run *before*
+> > `preprocess`ing, for its `{{$page#field}}` syntax is (a) meant to be usable
+> > inside ikiwiki directives, and (b) the field values are meant to still be
+> > `preprocess`ed before being embedded. That's why it's using the `filter`
+> > hook instead of `sanitize`.
+
+> > Would adding another kind of hook be a way to fix this? My idea is that
+> > *cut* (and others) would then take their data not during `scan`ning, but
+> > *after* `filter`ing.
+
+> > --[[tschwinge]]
diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
index 945efc4bc..8fbbb2ebb 100644
--- a/doc/tips/html5.mdwn
+++ b/doc/tips/html5.mdwn
@@ -15,7 +15,8 @@ No care is taken to add backwards compatability hacks for browsers that
are not html5 aware (like MSIE). If you want to include the javascript with
those hacks, you can edit `page.tmpl` to do so.
[Dive Into HTML5](http://diveintohtml5.org/) is a good reference for
-current compatability issues and workarounds with html5.
+current compatability issues and workarounds with html5. And a remotely-loadable
+JS shiv for enabling HTML5 elements in IE is available through [html5shiv at Google Code](http://code.google.com/p/html5shiv/).
---