jenkins-bot merged this change.

View Change

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

[doc] Fix script calls in docs

+ narrow dumps url

Change-Id: I040739bd21f9575975d235a2968ad83f6a20294a
---
M pywikibot/fixes.py
M scripts/README.rst
M scripts/blockpageschecker.py
M scripts/fixing_redirects.py
M scripts/imagecopy.py
M scripts/imagecopy_self.py
M scripts/lonelypages.py
M scripts/noreferences.py
M scripts/redirect.py
M scripts/replace.py
M scripts/table2wiki.py
M scripts/template.py
M scripts/templatecount.py
M tests/README.rst
14 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py
index 649bccf..ffa8636 100644
--- a/pywikibot/fixes.py
+++ b/pywikibot/fixes.py
@@ -329,7 +329,7 @@
     },
 
     # some disambiguation stuff for de:
-    # python replace.py -fix:music -subcat:Album
+    # python pwb.py replace -fix:music -subcat:Album
     'music': {
         'regex': False,
         'msg': {
@@ -350,7 +350,7 @@
     },
 
     # format of dates of birth and death, for de:
-    # python replace.py -fix:datum -ref:Vorlage:Personendaten
+    # python pwb.py replace -fix:datum -ref:Vorlage:Personendaten
     'datum': {
         'regex': True,
         'msg': {
@@ -441,7 +441,7 @@
     },
 
     # Corrections for Arabic Wikipedia and any Arabic wiki.
-    #   python replace.py -fix:correct-ar -start:! -always
+    #   python pwb.py replace -fix:correct-ar -start:! -always
 
     'correct-ar': {
         'regex': True,
diff --git a/scripts/README.rst b/scripts/README.rst
index 3e11786..3d0ffa9 100644
--- a/scripts/README.rst
+++ b/scripts/README.rst
@@ -289,4 +289,4 @@
 the various programs, can be retrieved by running the bot with the -help
 parameter, e.g.
 
-    python pwb.py interwiki.py -help
+    python pwb.py interwiki -help
diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index 1ed9115..4b52b26 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -15,7 +15,7 @@
 &params;
 
 -xml              Retrieve information from a local XML dump (pages-articles
-                  or pages-meta-current, see https://download.wikimedia.org).
+                  or pages-meta-current, see https://dumps.wikimedia.org).
                   Argument can also be given as "-xml:filename".
 
 -protectedpages:  Check all the blocked pages; useful when you have not
diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py
index 062571c..bfa8d1c 100755
--- a/scripts/fixing_redirects.py
+++ b/scripts/fixing_redirects.py
@@ -8,7 +8,7 @@
 
 -featured         Run over featured pages (for some wikimedia wikis only)
 
-Run fixing_redirects.py -help to see all the command-line
+Run python pwb.py fixing_redirects -help to see all the command-line
 options -file, -ref, -links, ...
 
 """
diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 09484f1..72c1e5a 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -33,25 +33,25 @@
 
 Work on a single image::
 
-    python pwb.py imagecopy.py -page:Image:<imagename>
+    python pwb.py imagecopy -page:Image:<imagename>
 
 Work on the 100 newest images::
 
-    python pwb.py imagecopy.py -newimages:100
+    python pwb.py imagecopy -newimages:100
 
 Work on all images in a category:<cat>::
 
-    python pwb.py imagecopy.py -cat:<cat>
+    python pwb.py imagecopy -cat:<cat>
 
 Work on all images which transclude a template::
 
-    python pwb.py imagecopy.py -transcludes:<template>
+    python pwb.py imagecopy -transcludes:<template>
 
 Work on a single image and deletes the image when the transfer is complete
 (only works if the user has sysops privilege, otherwise it will be marked for
 deletion)::
 
-    python pwb.py imagecopy.py -page:Image:<imagename> -delete
+    python pwb.py imagecopy -page:Image:<imagename> -delete
 
 By default the bot works on your home wiki (set in user-config)
 """
diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py
index c1f91cc..849e6a9 100644
--- a/scripts/imagecopy_self.py
+++ b/scripts/imagecopy_self.py
@@ -12,15 +12,15 @@
 
 Work on a single file:
 
-    python pwb.py imagecopy.py -page:file:<filename>
+    python pwb.py imagecopy -page:file:<filename>
 
 Work on all images in a category:<cat>:
 
-    python pwb.py imagecopy.py -cat:<cat>
+    python pwb.py imagecopy -cat:<cat>
 
 Work on all images which transclude a template:
 
-    python pwb.py imagecopy.py -transcludes:<template>
+    python pwb.py imagecopy -transcludes:<template>
 
 See pagegenerators.py for more ways to get a list of images.
 By default the bot works on your home wiki (set in user-config)
diff --git a/scripts/lonelypages.py b/scripts/lonelypages.py
index a527687..0f8c4b4 100755
--- a/scripts/lonelypages.py
+++ b/scripts/lonelypages.py
@@ -8,7 +8,7 @@
 &params;
 
 -xml              Retrieve information from a local XML dump (pages-articles
-                  or pages-meta-current, see https://download.wikimedia.org).
+                  or pages-meta-current, see https://dumps.wikimedia.org).
                   Argument can also be given as "-xml:filename".
 
 -page             Only edit a specific page.
diff --git a/scripts/noreferences.py b/scripts/noreferences.py
index 838c244..7aaef7e 100755
--- a/scripts/noreferences.py
+++ b/scripts/noreferences.py
@@ -12,7 +12,7 @@
 &params;
 
     -xml          Retrieve information from a local XML dump (pages-articles
-                  or pages-meta-current, see https://download.wikimedia.org).
+                  or pages-meta-current, see https://dumps.wikimedia.org).
                   Argument can also be given as "-xml:filename".
 
     -namespace:n  Number or name of namespace to process. The parameter can be
diff --git a/scripts/redirect.py b/scripts/redirect.py
index 8928813..59a00c9 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -27,7 +27,7 @@
 and arguments can be:
 
 -xml           Retrieve information from a local XML dump
-               (https://download.wikimedia.org). Argument can also be given as
+               (https://dumps.wikimedia.org). Argument can also be given as
                "-xml:filename.xml". Cannot be used with -fullscan or -moves.
 
 -fullscan      Retrieve redirect pages from live wiki, not from a special page
diff --git a/scripts/replace.py b/scripts/replace.py
index 09e8584..fe56b4c 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -13,7 +13,7 @@
 Furthermore, the following command line parameters are supported:
 
 -xml              Retrieve information from a local XML dump (pages-articles
-                  or pages-meta-current, see https://download.wikimedia.org).
+                  or pages-meta-current, see https://dumps.wikimedia.org).
                   Argument can also be given as "-xml:filename".
 
 -regex            Make replacements using regular expressions. If this argument
@@ -104,7 +104,7 @@
 
 If you want to change templates from the old syntax, e.g. {{msg:Stub}}, to the
 new syntax, e.g. {{Stub}}, download an XML dump file (pages-articles) from
-https://download.wikimedia.org, then use this command:
+https://dumps.wikimedia.org, then use this command:
 
     python pwb.py replace -xml -regex "{{msg:(.*?)}}" "{{\1}}"
 
@@ -127,7 +127,8 @@
 
     python pwb.py replace referer referrer -file:typos.txt -excepttext:HTTP
 
-Please type "replace.py -help | more" if you can't read the top of the help.
+Please type "python pwb.py replace -help | more" if you can't read
+the top of the help.
 """
 #
 # (C) Daniel Herding, 2004-2012
diff --git a/scripts/table2wiki.py b/scripts/table2wiki.py
index fb33807..2cbe443 100644
--- a/scripts/table2wiki.py
+++ b/scripts/table2wiki.py
@@ -19,7 +19,7 @@
                   them on the live wiki.
 
 -xml              Retrieve information from a local XML dump
-                  (pages_current, see https://download.wikimedia.org).
+                  (pages_current, see https://dumps.wikimedia.org).
                   Argument can also be given as "-xml:filename".
                   Searches for pages with HTML tables, and tries to convert
                   them on the live wiki.
diff --git a/scripts/template.py b/scripts/template.py
index e112018..de6db92 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -5,7 +5,8 @@
 
 It also converts the old MediaWiki boilerplate format to the new format.
 
-Syntax: python template.py [-remove] [xml[:filename]] oldTemplate [newTemplate]
+Syntax: python pwb.py template [-remove] [xml[:filename]] oldTemplate \
+            [newTemplate]
 
 Specify the template on the command line. The program will pick up the template
 page, and look for all pages using it. It will then automatically loop over
@@ -28,7 +29,7 @@
              the same effect.
 
 -xml         retrieve information from a local dump
-             (https://download.wikimedia.org). If this argument isn't given,
+             (https://dumps.wikimedia.org). If this argument isn't given,
              info will be loaded from the maintenance page of the live wiki.
              argument can also be given as "-xml:filename.xml".
 
diff --git a/scripts/templatecount.py b/scripts/templatecount.py
index 6b36177..e22c726 100755
--- a/scripts/templatecount.py
+++ b/scripts/templatecount.py
@@ -6,7 +6,7 @@
 It can also be used to simply count the number of pages (rather than
 listing each individually).
 
-Syntax: python templatecount.py command [arguments]
+Syntax: python pwb.py templatecount options templates
 
 Command line options:
 
diff --git a/tests/README.rst b/tests/README.rst
index 1c3601f..5bea4ab 100644
--- a/tests/README.rst
+++ b/tests/README.rst
@@ -101,9 +101,9 @@
 
 ::
 
-    python pwb.py tests/api_tests.py -v
-    python pwb.py tests/site_tests.py -v
-    python pwb.py tests/api_tests.py -v TestParamInfo.test_init
+    python pwb.py tests/api_tests -v
+    python pwb.py tests/site_tests -v
+    python pwb.py tests/api_tests -v TestParamInfo.test_init
 
 env
 ~~~

To view, visit change 440851. To unsubscribe, or for help writing mail filters, visit settings.