Merge "New hook for filters on Special:Contributions form"

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

diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt
index 899554a..5f9a0b0 100644 (file)
--- a/docs/contenthandler.txt
+++ b/docs/contenthandler.txt
@@ -8,6 +8,7 @@ Built-in content types are:
 
 * wikitext - wikitext, as usual
 * javascript - user provided javascript code
+* json - simple implementation for use by extensions, etc.
 * css - user provided css code
 * text - plain text
 
@@ -18,7 +19,7 @@ ContentHandler::getDefaultModelFor($title) as follows:
 
 * The global setting $wgNamespaceContentModels specifies a content model for the given namespace.
 * The hook ContentHandlerDefaultModelFor may be used to override the page's default model.
-* Pages in NS_MEDIAWIKI and NS_USER default to the CSS or JavaScript model if they end in .js or .css, respectively.
+* Pages in NS_MEDIAWIKI and NS_USER default to the CSS or JavaScript model if they end in .css or .js, respectively.
   Pages in NS_MEDIAWIKI default to the wikitext model otherwise.
 * The hook TitleIsCssOrJsPage may be used to force a page to use the CSS or JavaScript model.
   This is a compatibility feature. The ContentHandlerDefaultModelFor hook should be used instead if possible.