Merge commit 'upstream/master'

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

diff --git a/doc/news.mdwn b/doc/news.mdwn
index 93dfaf6a283effdf44050d3377800c45623e8089..58413f94c377b2fc8cd4abee77de0c687b5240dc 100644 (file)
--- a/doc/news.mdwn
+++ b/doc/news.mdwn
@@ -1,5 +1,9 @@
-This is where annoucements of new releases, features, and other news is posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS feed.
+This is where announcements of new releases, features, and other news are
+posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS
+feed.

 
 

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

 
 

-[[inline pages="news/* !*/Discussion" rootpage="news" show="30"]]
\ No newline at end of file
+By the way, some other pages with RSS feeds about ikiwiki include
+[[plugins]], [[TODO]] and [[bugs]].