aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-06 14:36:13 -0400
committerJoey Hess <joey@kitenet.net>2010-10-06 14:36:13 -0400
commit9366c5efd38a4c1c7f5d4506982b9bda20eb9ada (patch)
treeab2cf5310a85c8cd84b2f0df82914975b348f5bb
parent06b28dddecce8d27c0b556c883b8721aee1d3dc9 (diff)
parent8728a79226896b2909f60753dc17978c065cfc57 (diff)
downloadikiwiki-9366c5efd38a4c1c7f5d4506982b9bda20eb9ada.tar
ikiwiki-9366c5efd38a4c1c7f5d4506982b9bda20eb9ada.tar.gz
Merge branch 'master' into revert
-rw-r--r--doc/todo/inline_raw_files.mdwn14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn
index b5a525ac0..645ab89b7 100644
--- a/doc/todo/inline_raw_files.mdwn
+++ b/doc/todo/inline_raw_files.mdwn
@@ -15,3 +15,17 @@ usage
=====
\[[!inline pagenames="somefile.txt" template="raw" feeds="no"]]
+
+
+> But inline already supports raw files in two ways:
+>
+> * setting raw=yes will cause a page to be inlined raw without
+> using any template, as if it were part of the page at the location
+> of the inline
+> * otherwise, the file becomes an enclosure in the rss feed, for use with
+> podcasting.
+>
+> So I don't see the point of your patch. Although since your text
+> editor seems to like to make lots of whitespace changes, it's possible
+> I missed something in the large quantity of noise introduced by it.
+> --[[Joey]]