Merge branch 'master' into pub/master

[git.ikiwiki.info.git] / doc / news.mdwn

diff --git a/doc/news.mdwn b/doc/news.mdwn
index 4c813c7bc10cf0a9850008406688cd338fc8b3e5..58413f94c377b2fc8cd4abee77de0c687b5240dc 100644 (file)
--- a/doc/news.mdwn
+++ b/doc/news.mdwn
@@ -1,8 +1,9 @@
-This is where announcements of new releases, features, and other news is
+This is where announcements of new releases, features, and other news are

 posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS
 feed.
 
 posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS
 feed.
 

-[[inline pages="news/* and !*/Discussion" rootpage="news" show="30"]]
+[[!inline pages="news/* and !news/*/* and !news/discussion"
+feedpages="created_after(news/Article_on_Ikiwiki_as_a_BTS)" rootpage="news" show="30"]]

 
 By the way, some other pages with RSS feeds about ikiwiki include
 [[plugins]], [[TODO]] and [[bugs]].
 
 By the way, some other pages with RSS feeds about ikiwiki include
 [[plugins]], [[TODO]] and [[bugs]].