Merge "resources: Switch oojs to the version optimised for environments with jQuery"

[lhc/web/wiklou.git] / includes / content / ContentHandler.php

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index b5b4d13..1343858 100644 (file)
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -460,7 +460,7 @@ abstract class ContentHandler {
         * Apply import transformation (per default, returns $blob unchanged).
         * This gives subclasses an opportunity to transform data blobs on import.
         *
-        * @singe 1.24
+        * @since 1.24
         *
         * @param string $blob
         * @param string|null $format
@@ -837,7 +837,7 @@ abstract class ContentHandler {
         * @return mixed String containing deletion reason or empty string, or
         *    boolean false if no revision occurred
         *
-        * @XXX &$hasHistory is extremely ugly, it's here because
+        * @todo &$hasHistory is extremely ugly, it's here because
         * WikiPage::getAutoDeleteReason() and Article::generateReason()
         * have it / want it.
         */