Merge branch 'Wikidata' into master.

[lhc/web/wiklou.git] / docs / contenthandler.txt

diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt
index be3f4a7..3561432 100644 (file)
--- a/docs/contenthandler.txt
+++ b/docs/contenthandler.txt
@@ -1,5 +1,5 @@
 The ContentHandler facility adds support for arbitrary content types on wiki pages, instead of relying on wikitext
-for everything. It was introduced in MediaWiki 1.20.
+for everything. It was introduced in MediaWiki 1.21.
 
 Each kind of content ("content model") supported by MediaWiki is identified by unique name. The content model determines
 how a page's content is rendered, compared, stored, edited, and so on.
@@ -67,8 +67,8 @@ Content serialization formats are identified using MIME type like strings. The f
 * text/x-wiki - wikitext
 * text/javascript - for js pages
 * text/css - for css pages
-* text/plain - for future use, e.g. with some plain-html messages.
-* text/html - for future use, e.g. with some plain-html messages.
+* text/plain - for future use, e.g. with plain text messages.
+* text/html - for future use, e.g. with plain html messages.
 * application/vnd.php.serialized - for future use with the api and for extensions
 * application/json - for future use with the api, and for use by extensions
 * application/xml - for future use with the api, and for use by extensions
@@ -165,7 +165,7 @@ There are some new globals that can be used to control the behavior of the Conte
 
 There are some changes in behavior that might be surprising to users:
 
-* Javascript and CSS pages are no longer parsed as wikitext (though pre-safe transform is still applied). Most
+* Javascript and CSS pages are no longer parsed as wikitext (though pre-save transform is still applied). Most
 importantly, this means that links, including categorization links, contained in the code will not work.
 
 * With $wgContentHandlerUseDB = false, pages can not be moved in a way that would change the
@@ -180,5 +180,5 @@ provided a specialized handler for the edit action. This is true for the API as
 unsuspecting recipient. This will also cause client-side diffs to fail.
 
 * File pages provide their own action overrides that do not combine gracefully with any custom handlers defined by a
-ContentHandler. If for example a File page used a content model with a custom move action, this would be overridden by
-WikiFilePage's move handler.
+ContentHandler. If for example a File page used a content model with a custom revert action, this would be overridden by
+WikiFilePage's handler for the revert action.