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

Change subject: Update documentation for isDisambig method
......................................................................


Update documentation for isDisambig method

Change-Id: Ib1a8afba5e934790d48bccd44ab2c1e3edd85619
---
M pywikibot/page.py
1 file changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 25d2779..4cb242a 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -772,17 +772,17 @@
     def isDisambig(self):
         """Return True if this is a disambiguation page, False otherwise.
 
-        Relies on the presence of specific templates, identified in
-        the Family file or on a wiki page, to identify disambiguation
-        pages.
+        By default, it uses the the Disambiguator extension's result. The
+        identification relies on the presense of the __DISAMBIG__ magic word
+        which may also be transcluded.
 
-        By default, loads a list of template names from the Family file;
-        if the value in the Family file is None no entry was made, looks for
+        If the Disambiguator extension isn't activated for the given site,
+        the identification relies on the presence of specific templates.
+        First load a list of template names from the Family file;
+        if the value in the Family file is None or no entry was made, look for
         the list on [[MediaWiki:Disambiguationspage]]. If this page does not
-        exist, take the MediaWiki message.
-
-        'Template:Disambig' is always assumed to be default, and will be
-        appended regardless of its existence.
+        exist, take the MediaWiki message. 'Template:Disambig' is always
+        assumed to be default, and will be appended regardless of its 
existence.
 
         @rtype: bool
         """

-- 
To view, visit https://gerrit.wikimedia.org/r/221362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1a8afba5e934790d48bccd44ab2c1e3edd85619
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Ricordisamoa <ricordisa...@openmailbox.org>
Gerrit-Reviewer: Russell Blau <russb...@imapmail.org>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
Pywikibot-commits mailing list
Pywikibot-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits

Reply via email to