web commit by RecaiOktas: UTF-8 test (conclusion)

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 14455106014d23a2e7f9b39467921bf79dbae2ea..b58392fd5277985919cc6d6749ed7df82e7f11eb 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -26,7 +26,7 @@ Some of ikiwiki's features:
 
 * support for other file types
 
 
 * support for other file types
 

-  ikiwiki also supports files of any other type, including raw html, text,
+  ikiwiki also supports files of any other type, including plain text,

   images, etc. These are not converted to wiki pages, they are just copied
   unchanged by ikiwiki as it builds your wiki. So you can check in an image,
   program, or other special file and link to it from your wiki pages.
   images, etc. These are not converted to wiki pages, they are just copied
   unchanged by ikiwiki as it builds your wiki. So you can check in an image,
   program, or other special file and link to it from your wiki pages.


@@ -41,7 +41,7 @@ Some of ikiwiki's features:
   matching a specified [[GlobList]] will be displayed as a weblog within
   the blog page. And an RSS feed can be generated to follow the blog.
 
   matching a specified [[GlobList]] will be displayed as a weblog within
   the blog page. And an RSS feed can be generated to follow the blog.
 

-  Ikiwikit's own [[TODO]] and [[news]] pages are good examples of some of
+  Ikiwiki's own [[TODO]], [[news]], and [[plugins]] pages are good examples of some of

   the flexible ways that this can be used.
 
 * Fast compiler
   the flexible ways that this can be used.
 
 * Fast compiler


@@ -97,9 +97,6 @@ Some of ikiwiki's features:
   shown in the file to resolve the conflict, so if you're already familiar
   with that there's no new commit marker syntax to learn.
 
   shown in the file to resolve the conflict, so if you're already familiar
   with that there's no new commit marker syntax to learn.
 

-  For all the gory details of how ikiwiki handles this behind the scenes,
-  see [[commit-internals]].
-

 * page locking
 
   Wiki admins can lock pages so that only other admins can edit them.
 * page locking
 
   Wiki admins can lock pages so that only other admins can edit them.