Merge branch 'master' into dependency-types

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index ff341d2ccd0670cb0bbb77d28321adb6b11bf1a5..3925d78ef41089dd3cc5dc1c93f957adff6bc340 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -16,6 +16,10 @@ changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
 ikiwiki can be run from a [[post-commit]] hook to update your wiki
 immediately whenever you commit a change using the RCS.
 
+It's even possible to securely let
+[[anonymous_users_git_push_changes|tips/untrusted_git_push]]
+to the wiki.
+
 Note that ikiwiki does not require a RCS to function. If you want to
 run a simple wiki without page history, it can do that too.
 
@@ -142,7 +146,8 @@ authentication, or other methods implemented via plugins.
 
 Thanks to subpages, every page can easily and automatically have a
 /Discussion subpage. By default, these links are included in the
-[[templates]] for each page.
+[[templates]] for each page. If you prefer blog-syle
+[[plugins/comments]], that is available too.
 
 ### Edit controls
 
@@ -161,6 +166,11 @@ Well, sorta. Rather than implementing YA history browser, it can link to
 ikiwiki can use the xapian search engine to add powerful
 full text [[plugins/search]] capabilities to your wiki.
 
+### Translation via po files
+
+The [[plugins/po]] plugin allows translating individual wiki pages using
+standard `po` files.
+
 ### [[w3mmode]]
 
 Can be set up so that w3m can be used to browse a wiki and edit pages