Merge branch 'master' of https://github.com/WikiTeam/wikiteam

listsofwikis/dokuwiki/dokuinstall.txt

@@ -4957,7 +4957,6 @@ http://www.minkhollow.ca/becker/doku.php
 http://www.minkhollow.ca/mhf/doku.php
 http://www.minkhollow.ca/MHF/doku.php
 http://www.minkhollow.ca/Thesis07/doku.php
-http://www.mirkosertic.de/doku.php
 http://www.mirmer.su/wiki/doku.php
 http://www.mixshare.com/wiki/doku.php
 http://www.mixxx.org/wiki/doku.php

listsofwikis/mediawiki/wikia.py

@@ -55,16 +55,16 @@ def main():
         print dbname
         first = dbname[0]
         # There are one-letter dbnames; the second letter is replaced by an underscore
-        # http://s3.amazonaws.com/wikia_xml_dumps/n/n_/n_pages_full.xml.gz
+        # http://s3.amazonaws.com/wikia_xml_dumps/n/n_/n_pages_full.xml.7z
         try:
             second = dbname[1]
         except:
             second = '_'
         base = 'http://s3.amazonaws.com/wikia_xml_dumps/' + first + '/' \
             + first + second + '/' + dbname
-        full = base + '_pages_full.xml.gz'
+        full = base + '_pages_full.xml.7z'
         print full
-        current = base + '_pages_current.xml.gz'
+        current = base + '_pages_current.xml.7z'
         images = base + '_images.tar'
         try:
             #subprocess.check_call(['wget', '-e', 'robots=off', '--fail', '-nc', '-a', 'wikia.log', full])