jenkins-bot has submitted this change and it was merged.

Change subject: Fix some misspellings ......................................................................

Fix some misspellings

Change-Id: I6a32f8a2a7b7eac39756af859b4f383dc6bb9330 --- M README-conversion.txt M pywikibot/bot.py M pywikibot/cosmetic_changes.py M pywikibot/site.py M scripts/archivebot.py M scripts/checkimages.py M scripts/cosmetic_changes.py M scripts/interwiki.py M scripts/welcome.py 9 files changed, 15 insertions(+), 15 deletions(-)

Approvals: XZise: Looks good to me, approved jenkins-bot: Verified

diff --git a/README-conversion.txt b/README-conversion.txt index dd6c1c7..8422499 100644 --- a/README-conversion.txt +++ b/README-conversion.txt @@ -135,7 +135,7 @@ namespace. Any references to "userlib.User" can be replaced by "pywikibot.User", but the old form is retained for backwards-compatibility.

-The following changes have occured in the User object: +The following changes have occurred in the User object:

- contributions(): returns a pywikibot.Timestamp object instead of a Mediawiki one

diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 041c5c9..feaa3d5 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -829,8 +829,8 @@ if m: pywikibot.output(u'Pywikibot r%s' % m.group(1)) else: - # Version ID not availlable on SVN repository. - # Maybe these informations should be imported from version.py + # Version ID not available on SVN repository. + # Maybe this information should be imported from version.py pywikibot.output(u'Pywikibot SVN repository') pywikibot.output(u'Python %s' % sys.version)

@@ -1358,7 +1358,7 @@

class CreatingPageBot(CurrentPageBot):

- """A CurrentPageBot class which only treats not exisiting pages.""" + """A CurrentPageBot class which only treats nonexistent pages."""

def treat(self, page): """Treat page if doesn't exist.""" diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index bced95d..57a2c78 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -278,7 +278,7 @@ new_text = self._change(text) except Exception as e: if self.ignore == CANCEL_PAGE: - pywikibot.warning(u'Skipped "{0}", because an error occured.'.format(self.title)) + pywikibot.warning(u'Skipped "{0}", because an error occurred.'.format(self.title)) pywikibot.exception(e) return False else: diff --git a/pywikibot/site.py b/pywikibot/site.py index ac0c761..12eb996 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2401,7 +2401,7 @@ never from the cache. @type force: bool @return: A tuple containing the major, minor version number and any - text after that. If an error occured (0, 0, 0) is returned. + text after that. If an error occurred (0, 0, 0) is returned. @rtype: int, int, str """ try: diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 6c48ccb..1e82623 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -11,7 +11,7 @@ Then goes through all pages (unless a specific page specified using options) and archives old discussions. This is done by breaking a page into threads, then scanning each thread for timestamps. Threads older than a specified -treshold are then moved to another page (the archive), which can be named +threshold are then moved to another page (the archive), which can be named either basing on the thread's name or then name can contain a counter which will be incremented when the archive reaches a certain size.

@@ -213,7 +213,7 @@ Return a regex that matches to variations of the template title.

It supports the transcluding variant as well as localized namespaces and - case-insensitivity depending on the namspace. + case-insensitivity depending on the namespace.

@param tpl_page: The template page @type tpl_page: Page @@ -680,7 +680,7 @@ archiver.run() time.sleep(10) except Exception: - pywikibot.error(u'Error occured while processing page %s' % pg) + pywikibot.error(u'Error occurred while processing page %s' % pg) pywikibot.exception(tb=True)

diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 28d6ade..267eb23 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1709,7 +1709,7 @@ elif arg.startswith('-start'): if len(arg) == 6: firstPageTitle = pywikibot.input( - u'From witch page do you want to start?') + u'From which page do you want to start?') elif len(arg) > 6: firstPageTitle = arg[7:] firstPageTitle = firstPageTitle.split(":")[1:] diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index cf4553f..c7e1934 100644 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -18,7 +18,7 @@ the predefined message texts with original and replacements inserted.

--ignore: Ignores if an error occured and either skips the page or +-ignore: Ignores if an error occurred and either skips the page or only that method. It can be set to 'page' or 'method'.

&warning; @@ -80,7 +80,7 @@ pywikibot.output("Page %s is locked?!" % self.current_page.title(asLink=True)) except pywikibot.EditConflict: - pywikibot.output("An edit conflict has occured at %s." + pywikibot.output("An edit conflict has occurred at %s." % self.current_page.title(asLink=True))

diff --git a/scripts/interwiki.py b/scripts/interwiki.py index fbb6280..5f5ffb2 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2174,7 +2174,7 @@ try: page = next(self.pageGenerator) except IOError: - pywikibot.output(u'IOError occured; skipping') + pywikibot.output(u'IOError occurred; skipping') continue if page in globalvar.skip: pywikibot.output(u'Skipping: %s is in the skip list' % page) diff --git a/scripts/welcome.py b/scripts/welcome.py index cbd3dca..b77d9e2 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -676,7 +676,7 @@ 'welcome-updating')) return True except pywikibot.EditConflict: - pywikibot.output(u'An edit conflict has occured. Pausing for ' + pywikibot.output(u'An edit conflict has occurred. Pausing for ' u'10 seconds before continuing.') time.sleep(10)

@@ -789,7 +789,7 @@ self.welcomed_users.append(users) except pywikibot.EditConflict: showStatus(4) - pywikibot.output(u'An edit conflict has occured, ' + pywikibot.output(u'An edit conflict has occurred, ' u'skipping this user.')

if globalvar.makeWelcomeLog and \