diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 11:33:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 11:34:49 -0400 |
| commit | d5e65e582a34ae2494fee493ddcb2b959e4a4bce (patch) | |
| tree | 14bf1f7a604406ecb98523eda42c2e864321e1d0 /doc/sandbox | |
| parent | d13200f92b74aa3d4e315809c78f1c2ec6c925a7 (diff) | |
| parent | e3a84952715cdd625258e1695cb74898006c31f3 (diff) | |
Merge commit 'smcv/prefix'
Conflicts:
doc/news/version_2.49.mdwn
Also fixed the newest news file (and my wikiannounce script).
Diffstat (limited to 'doc/sandbox')
| -rw-r--r-- | doc/sandbox/test_nested_inlines.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/sandbox/test_nested_inlines.mdwn b/doc/sandbox/test_nested_inlines.mdwn index e8ef805c9..0e6074fbd 100644 --- a/doc/sandbox/test_nested_inlines.mdwn +++ b/doc/sandbox/test_nested_inlines.mdwn @@ -1,3 +1,3 @@ Testing nested inlines: -[[inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]] +[[!inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]] |