Merge branch 'master' into revert

master
Joey Hess 2010-10-06 14:36:13 -04:00
commit 9366c5efd3
1 changed files with 14 additions and 0 deletions

View File

@ -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]]