From 02bb594ac7c92795b9333f9c891c53a0639d31b8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 20 Dec 2011 21:26:57 +0000 Subject: [PATCH] Revert r106521: creates lots of long, unwrappable lines in help output --- includes/api/ApiComparePages.php | 2 +- includes/api/ApiDelete.php | 4 ++-- includes/api/ApiEditPage.php | 14 ++++++-------- includes/api/ApiEmailUser.php | 2 +- includes/api/ApiFileRevert.php | 4 ++-- includes/api/ApiFormatBase.php | 5 +---- includes/api/ApiHelp.php | 15 ++++++++++----- includes/api/ApiImport.php | 4 ++-- includes/api/ApiLogout.php | 2 +- includes/api/ApiPurge.php | 2 +- includes/api/ApiUpload.php | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index 7328902436..6c22f18d8f 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -120,7 +120,7 @@ class ApiComparePages extends ApiBase { public function getExamples() { return array( - 'api.php?action=compare&fromrev=1&torev=2' => 'Creates a diff between revision 1 and 2', + 'api.php?action=compare&fromrev=1&torev=2', ); } diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index fe53b02b0c..6d9a3004bd 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -268,8 +268,8 @@ class ApiDelete extends ApiBase { public function getExamples() { return array( - 'api.php?action=delete&title=Main%20Page&token=123ABC' => 'Deletes the Main Page', - 'api.php?action=delete&title=Main%20Page&token=123ABC&reason=Preparing%20for%20move' => 'Deletes the Main Page with the reason "Preparing for move"', + 'api.php?action=delete&title=Main%20Page&token=123ABC', + 'api.php?action=delete&title=Main%20Page&token=123ABC&reason=Preparing%20for%20move' ); } diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 216468cc99..f45f9fde6f 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -502,14 +502,12 @@ class ApiEditPage extends ApiBase { public function getExamples() { return array( - - 'api.php?action=edit&title=Test&summary=test%20summary&text=article%20content&basetimestamp=20070824123454&token=%2B\\' - => 'Edit a page (anonymous user)', - - 'api.php?action=edit&title=Test&summary=NOTOC&minor=&prependtext=__NOTOC__%0A&basetimestamp=20070824123454&token=%2B\\' - => 'Prepend __NOTOC__ to a page (anonymous user)', - 'api.php?action=edit&title=Test&undo=13585&undoafter=13579&basetimestamp=20070824123454&token=%2B\\' - => 'Undo r13579 through r13585 with autosummary (anonymous user)', + 'Edit a page (anonymous user):', + ' api.php?action=edit&title=Test&summary=test%20summary&text=article%20content&basetimestamp=20070824123454&token=%2B\\', + 'Prepend __NOTOC__ to a page (anonymous user):', + ' api.php?action=edit&title=Test&summary=NOTOC&minor=&prependtext=__NOTOC__%0A&basetimestamp=20070824123454&token=%2B\\', + 'Undo r13579 through r13585 with autosummary (anonymous user):', + ' api.php?action=edit&title=Test&undo=13585&undoafter=13579&basetimestamp=20070824123454&token=%2B\\', ); } diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php index 004ca73601..5a01ae9776 100644 --- a/includes/api/ApiEmailUser.php +++ b/includes/api/ApiEmailUser.php @@ -133,7 +133,7 @@ class ApiEmailUser extends ApiBase { public function getExamples() { return array( - 'api.php?action=emailuser&target=WikiSysop&text=Content' => 'Sends an email to the User "WikiSysop" with the text "Content"', + 'api.php?action=emailuser&target=WikiSysop&text=Content' ); } diff --git a/includes/api/ApiFileRevert.php b/includes/api/ApiFileRevert.php index 7ef1da0af1..0a21680954 100644 --- a/includes/api/ApiFileRevert.php +++ b/includes/api/ApiFileRevert.php @@ -171,8 +171,8 @@ class ApiFileRevert extends ApiBase { public function getExamples() { return array( - 'api.php?action=filerevert&filename=Wiki.png&comment=Revert&archivename=20110305152740!Wiki.png&token=+\\' - => 'Revert Wiki.png to the version of 20110305152740', + 'Revert Wiki.png to the version of 20110305152740:', + ' api.php?action=filerevert&filename=Wiki.png&comment=Revert&archivename=20110305152740!Wiki.png&token=+\\', ); } diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index 7a53b64105..a0138ac366 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -286,10 +286,7 @@ See complete documentation, or } public function getExamples() { - return array( - 'api.php?action=query&meta=siteinfo&siprop=namespaces&format=' . $this->getModuleName() - => "Formats the query result in the {$this->getModuleName()} format", - ); + return 'api.php?action=query&meta=siteinfo&siprop=namespaces&format=' . $this->getModuleName(); } public function getHelpUrls() { diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php index 97da786b1e..d94132a59d 100644 --- a/includes/api/ApiHelp.php +++ b/includes/api/ApiHelp.php @@ -136,11 +136,16 @@ class ApiHelp extends ApiBase { public function getExamples() { return array( - 'api.php?action=help' => 'Whole help page', - 'api.php?action=help&modules=protect' => 'Module (action) help page', - 'api.php?action=help&querymodules=categorymembers' => 'Query (list) modules help page', - 'api.php?action=help&querymodules=info' => 'Query (prop) modules help page', - 'api.php?action=help&querymodules=siteinfo' => 'Query (meta) modules help page', + 'Whole help page:', + ' api.php?action=help', + 'Module (action) help page:', + ' api.php?action=help&modules=protect', + 'Query (list) modules help page:', + ' api.php?action=help&querymodules=categorymembers', + 'Query (prop) modules help page:', + ' api.php?action=help&querymodules=info', + 'Query (meta) modules help page:', + ' api.php?action=help&querymodules=siteinfo', ); } diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index ade9f1f3fd..d38aaf8d5a 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -154,8 +154,8 @@ class ApiImport extends ApiBase { public function getExamples() { return array( - 'api.php?action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&namespace=100&fullhistory=&token=123ABC' - => 'Import [[meta:Help:Parserfunctions]] to namespace 100 with full history', + 'Import [[meta:Help:Parserfunctions]] to namespace 100 with full history:', + ' api.php?action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&namespace=100&fullhistory=&token=123ABC', ); } diff --git a/includes/api/ApiLogout.php b/includes/api/ApiLogout.php index 0e4ae5378f..f530e87522 100644 --- a/includes/api/ApiLogout.php +++ b/includes/api/ApiLogout.php @@ -64,7 +64,7 @@ class ApiLogout extends ApiBase { public function getExamples() { return array( - 'api.php?action=logout' => 'Logs the current user out', + 'api.php?action=logout' ); } diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php index 6bf5cb8f25..d2e0777744 100644 --- a/includes/api/ApiPurge.php +++ b/includes/api/ApiPurge.php @@ -149,7 +149,7 @@ class ApiPurge extends ApiBase { public function getExamples() { return array( - 'api.php?action=purge&titles=Main_Page|API' => 'Purges the "Main Page" and the "API" page', + 'api.php?action=purge&titles=Main_Page|API' ); } diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index e8fc52ade1..0ac7fb42a6 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -646,10 +646,10 @@ class ApiUpload extends ApiBase { public function getExamples() { return array( - 'api.php?action=upload&filename=Wiki.png&url=http%3A//upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png' - => 'Upload from a URL', - 'api.php?action=upload&filename=Wiki.png&filekey=filekey&ignorewarnings=1' - => 'Complete an upload that failed due to warnings', + 'Upload from a URL:', + ' api.php?action=upload&filename=Wiki.png&url=http%3A//upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png', + 'Complete an upload that failed due to warnings:', + ' api.php?action=upload&filename=Wiki.png&filekey=filekey&ignorewarnings=1', ); } -- 2.20.1