* (bug 12257) Update some documentation files

Patch by Alexandre Emsenhuber

diff --git a/HISTORY b/HISTORY
index 9686663..e95ca18 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -5089,10 +5089,10 @@ For notes on 1.3.x and older releases, see HISTORY.
 === Online documentation ===
 
 Documentation for both end-users and site administrators is currently being
-built up on Meta-Wikipedia, and is covered under the GNU Free Documentation
+built up on MediaWiki.org, and is covered under the GNU Free Documentation
 License:
 
-  http://meta.wikipedia.org/wiki/Help:Contents
+  http://www.mediawiki.org/
 
 
 === Mailing list ===
@@ -5100,10 +5100,10 @@ License:
 A MediaWiki-l mailing list has been set up distinct from the Wikipedia
 wikitech-l list:
 
-  http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
+  http://lists.wikimedia.org/mailman/listinfo/mediawiki-l
 
 A low-traffic announcements-only list is also available:
-  http://mail.wikipedia.org/mailman/listinfo/mediawiki-announce
+  http://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
 
 It's highly recommended that you sign up for one of these lists if you're
 going to run a public MediaWiki, so you can be notified of security fixes.

diff --git a/README b/README
index e3a387e..ff3116f 100644 (file)
--- a/README
+++ b/README
@@ -75,7 +75,7 @@ Please report bugs and make feature requests in our Bugzilla system:
 
 Documentation and discussion on new features may be found at:
 
-  http://www.mediawiki.org/wiki/Help:FAQ
+  http://www.mediawiki.org/wiki/Manual:FAQ
   http://www.mediawiki.org/wiki/Documentation
   http://www.mediawiki.org/wiki/Development
 
@@ -100,4 +100,4 @@ Developer discussion takes place at:
   http://lists.wikimedia.org/mailman/listinfo/wikitech-l
 
 There is also a development and support channel #mediawiki on
-irc.freenode.net, and an unoffical support forum at www.mwusers.com.
\ No newline at end of file
+irc.freenode.net, and an unoffical support forum at www.mwusers.com.

diff --git a/UPGRADE b/UPGRADE
index fb600ff..5be0014 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -11,7 +11,7 @@ for information and workarounds to common issues.
 == Overview ==
 
 Comprehensive documentation on upgrading to the latest version of the software
-is available at http://www.mediawiki.org/wiki/Manual:Upgrading_MediaWiki.
+is available at http://www.mediawiki.org/wiki/Manual:Upgrading.
 
 === Consult the release notes ===
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index feb14e9..853833a 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -480,32 +480,32 @@ $newRev: Revision object of the "new" revision
 $article: article (object) being viewed
 $oldid: oldid (int) being viewed
 
-'EditPage::attemptSave': called before an article is
-saved, that is before insertNewArticle() is called
-&$editpage_Obj: the current EditPage object
+'EditFilter': Perform checks on an edit
+$editor: Edit form (see includes/EditPage.php)
+$text: Contents of the edit box
+$section: Section being edited
+&$error: Error message to return
 
-'EditPage::showEditForm:initial': before showing the edit form
+'EditFilterMerged': Post-section-merge edit filter
 $editor: EditPage instance (object)
+$text: content of the edit box
+$error: error message to return
 
 'EditFormPreloadText': Allows population of the edit form when creating new pages
 &$text: Text to preload with
 &$title: Title object representing the page being created
 
+'EditPage::attemptSave': called before an article is
+saved, that is before insertNewArticle() is called
+&$editpage_Obj: the current EditPage object
+
 'EditPage::showEditForm:fields': allows injection of form field into edit form
 &$editor: the EditPage instance for reference
 &$out: an OutputPage instance to write to
 return value is ignored (should always return true)
 
-'EditFilter': Perform checks on an edit
-$editor: Edit form (see includes/EditPage.php)
-$text: Contents of the edit box
-$section: Section being edited
-&$error: Error message to return
-
-'EditFilterMerged': Post-section-merge edit filter
+'EditPage::showEditForm:initial': before showing the edit form
 $editor: EditPage instance (object)
-$text: content of the edit box
-$error: error message to return
 
 Return false to halt editing; you'll need to handle error messages, etc. yourself.
 Alternatively, modifying $error and returning true will cause the contents of $error
@@ -557,6 +557,11 @@ $file : Image object representing the file that was uploaded
 'GetBlockedStatus': after loading blocking status of an user from the database
 $user: user (object) being checked
 
+'GetFullURL': modify fully-qualified URLs used in redirects/export/offsite data
+$title: Title object of page
+$url: string value as output (out parameter, can modify)
+$query: query options passed to Title::getFullURL()
+
 'GetInternalURL': modify fully-qualified URLs used for squid cache purging
 $title: Title object of page
 $url: string value as output (out parameter, can modify)
@@ -571,11 +576,6 @@ $title: Title object of page
 $url: string value as output (out parameter, can modify)
 $query: query options passed to Title::getLocalURL()
 
-'GetFullURL': modify fully-qualified URLs used in redirects/export/offsite data
-$title: Title object of page
-$url: string value as output (out parameter, can modify)
-$query: query options passed to Title::getFullURL()
-
 'getUserPermissionsErrors': Add a permissions error when permissions errors are checked for.
        Use instead of userCan for most cases. Return false if the user can't do it,
        and populate $result with the reason in the form of array( messagename, param1, param2 )
@@ -615,6 +615,14 @@ $password: The password entered by the user
 &$result: Set this and return false to override the internal checks
 $user: User the password is being validated for
 
+'LanguageGetMagic': Use this to define synonyms of magic words depending of the language
+$magicExtensions: associative array of magic words synonyms
+$lang: laguage code (string)
+
+'LanguageGetSpecialPageAliases': Use to define aliases of special pages names depending of the language
+$specialPageAliases: associative array of magic words synonyms
+$lang: laguage code (string)
+
 'LinksUpdateConstructed': At the end of LinksUpdate() is contruction.
 &$linksUpdate: the LinkUpdate object
 
@@ -687,6 +695,9 @@ $request: $wgRequest
 $title: title of the message (string)
 $message: value (string), change it to the message you want to define
 
+'MonoBookTemplateToolboxEnd': Called by Monobook skin after toolbox links have been rendered (useful for adding more)
+$tools: array of tools
+
 'OutputPageBeforeHTML': a page has been processed by the parser and
 the resulting HTML is about to be displayed.  
 $parserOutput: the parserOutput (object) that corresponds to the page 

diff --git a/locale/README b/locale/README
index 0437488..ab9773c 100644 (file)
--- a/locale/README
+++ b/locale/README
@@ -1 +1 @@
-This directory is for .po files generated by ./maintenance/lang2po.php
+This directory is for .po files generated by ./maintenance/language/lang2po.php