merged incoming

diff --cc includes/WikiPage.php
index 99b5d96,5168d06..a71267b
--- 1/includes/WikiPage.php
--- 2/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@@ -1663,9 -1663,8 +1663,8 @@@ class WikiPage extends Page 
         *
         * @deprecated in 1.WD: use prepareContentForEdit instead.
         */
 -      public function prepareTextForEdit( $text, $revid = null, User $user = null ) {  #FIXME: use prepareContentForEdit() instead #XXX: who uses this?!
 -              #TODO: log use of deprecated function
 +      public function prepareTextForEdit( $text, $revid = null, User $user = null ) {
 +              wfDeprecated( __METHOD__, '1.WD' );
- 
                $content = ContentHandler::makeContent( $text, $this->getTitle() );
                return $this->prepareContentForEdit( $content, $revid , $user );
        }