From 1bbfcf2b783cb824cf012cba5bd2594e5ecea957 Mon Sep 17 00:00:00 2001
From: gnosygnu <gnosygnu@gmail.com>
Date: Sun, 29 May 2016 20:01:13 -0400
Subject: [PATCH] $version_number

---
 home/wiki/Blog.html                       | 33 ++++++++++++++-----
 home/wiki/Blog/2016-05.html               | 33 ++++++++++++++-----
 home/wiki/Dashboard/Wiki_maintenance.html | 40 +++++++++++++++++++++--
 3 files changed, 85 insertions(+), 21 deletions(-)

diff --git a/home/wiki/Blog.html b/home/wiki/Blog.html
index 358ca85fc..2f25cc24d 100644
--- a/home/wiki/Blog.html
+++ b/home/wiki/Blog.html
@@ -52,30 +52,45 @@
       </div>
       <ul>
         <li class="toclevel-1 tocsection-1">
-          <a href="#Release:_NONE_.282016-05-24_11:00_Tue.29"><span class="tocnumber">1</span> <span class="toctext">Release: NONE (2016-05-24 11:00 Tue)</span></a>
+          <a href="#Release:_NONE_.282016-05-29_20:00_Sun.29"><span class="tocnumber">1</span> <span class="toctext">Release: NONE (2016-05-29 20:00 Sun)</span></a>
         </li>
         <li class="toclevel-1 tocsection-2">
-          <a href="#Release:_NONE_.282016-05-22_20:00_Sun.29"><span class="tocnumber">2</span> <span class="toctext">Release: NONE (2016-05-22 20:00 Sun)</span></a>
+          <a href="#Release:_NONE_.282016-05-24_11:00_Tue.29"><span class="tocnumber">2</span> <span class="toctext">Release: NONE (2016-05-24 11:00 Tue)</span></a>
         </li>
         <li class="toclevel-1 tocsection-3">
-          <a href="#Release:_NONE_.282016-05-15_19:45_Sun.29"><span class="tocnumber">3</span> <span class="toctext">Release: NONE (2016-05-15 19:45 Sun)</span></a>
+          <a href="#Release:_NONE_.282016-05-22_20:00_Sun.29"><span class="tocnumber">3</span> <span class="toctext">Release: NONE (2016-05-22 20:00 Sun)</span></a>
         </li>
         <li class="toclevel-1 tocsection-4">
-          <a href="#Release:_NONE_.282016-05-08_19:45_Sun.29"><span class="tocnumber">4</span> <span class="toctext">Release: NONE (2016-05-08 19:45 Sun)</span></a>
+          <a href="#Release:_NONE_.282016-05-15_19:45_Sun.29"><span class="tocnumber">4</span> <span class="toctext">Release: NONE (2016-05-15 19:45 Sun)</span></a>
         </li>
         <li class="toclevel-1 tocsection-5">
-          <a href="#Release:_v3.5.1.1_.282016-05-01_20:25_Sun.29"><span class="tocnumber">5</span> <span class="toctext">Release: v3.5.1.1 (2016-05-01 20:25 Sun)</span></a> 
+          <a href="#Release:_NONE_.282016-05-08_19:45_Sun.29"><span class="tocnumber">5</span> <span class="toctext">Release: NONE (2016-05-08 19:45 Sun)</span></a>
+        </li>
+        <li class="toclevel-1 tocsection-6">
+          <a href="#Release:_v3.5.1.1_.282016-05-01_20:25_Sun.29"><span class="tocnumber">6</span> <span class="toctext">Release: v3.5.1.1 (2016-05-01 20:25 Sun)</span></a> 
           <ul>
-            <li class="toclevel-2 tocsection-6">
-              <a href="#.28Desktop.29_Minor_parser_fixes_for_English_Wiktionary"><span class="tocnumber">5.1</span> <span class="toctext">(Desktop) Minor parser fixes for English Wiktionary</span></a>
-            </li>
             <li class="toclevel-2 tocsection-7">
-              <a href="#Next_release:_v3.5.2"><span class="tocnumber">5.2</span> <span class="toctext">Next release: v3.5.2</span></a>
+              <a href="#.28Desktop.29_Minor_parser_fixes_for_English_Wiktionary"><span class="tocnumber">6.1</span> <span class="toctext">(Desktop) Minor parser fixes for English Wiktionary</span></a>
+            </li>
+            <li class="toclevel-2 tocsection-8">
+              <a href="#Next_release:_v3.5.2"><span class="tocnumber">6.2</span> <span class="toctext">Next release: v3.5.2</span></a>
             </li>
           </ul>
         </li>
       </ul>
     </div>
+    <h2>
+      <span class="mw-headline" id="Release:_NONE_.282016-05-29_20:00_Sun.29">Release: NONE (2016-05-29 20:00 Sun)</span>
+    </h2>
+    <p>
+      This week is also a no show for releases. I'm planning to make a release next week to handle a few parser issues. I'm also going to try to have the desktop app start reading the HTML databases.
+    </p>
+    <p>
+      As I'm still working on the wiki downloader, image dumps outside of English Wikipedia will be on hold for a while. If you want a copy, please drop me an email, or post an issue.
+    </p>
+    <p>
+      Thanks.
+    </p>
     <h2>
       <span class="mw-headline" id="Release:_NONE_.282016-05-24_11:00_Tue.29">Release: NONE (2016-05-24 11:00 Tue)</span>
     </h2>
diff --git a/home/wiki/Blog/2016-05.html b/home/wiki/Blog/2016-05.html
index d2c897411..f6c4dbe76 100644
--- a/home/wiki/Blog/2016-05.html
+++ b/home/wiki/Blog/2016-05.html
@@ -52,30 +52,45 @@
       </div>
       <ul>
         <li class="toclevel-1 tocsection-1">
-          <a href="#Release:_NONE_.282016-05-24_11:00_Tue.29"><span class="tocnumber">1</span> <span class="toctext">Release: NONE (2016-05-24 11:00 Tue)</span></a>
+          <a href="#Release:_NONE_.282016-05-29_20:00_Sun.29"><span class="tocnumber">1</span> <span class="toctext">Release: NONE (2016-05-29 20:00 Sun)</span></a>
         </li>
         <li class="toclevel-1 tocsection-2">
-          <a href="#Release:_NONE_.282016-05-22_20:00_Sun.29"><span class="tocnumber">2</span> <span class="toctext">Release: NONE (2016-05-22 20:00 Sun)</span></a>
+          <a href="#Release:_NONE_.282016-05-24_11:00_Tue.29"><span class="tocnumber">2</span> <span class="toctext">Release: NONE (2016-05-24 11:00 Tue)</span></a>
         </li>
         <li class="toclevel-1 tocsection-3">
-          <a href="#Release:_NONE_.282016-05-15_19:45_Sun.29"><span class="tocnumber">3</span> <span class="toctext">Release: NONE (2016-05-15 19:45 Sun)</span></a>
+          <a href="#Release:_NONE_.282016-05-22_20:00_Sun.29"><span class="tocnumber">3</span> <span class="toctext">Release: NONE (2016-05-22 20:00 Sun)</span></a>
         </li>
         <li class="toclevel-1 tocsection-4">
-          <a href="#Release:_NONE_.282016-05-08_19:45_Sun.29"><span class="tocnumber">4</span> <span class="toctext">Release: NONE (2016-05-08 19:45 Sun)</span></a>
+          <a href="#Release:_NONE_.282016-05-15_19:45_Sun.29"><span class="tocnumber">4</span> <span class="toctext">Release: NONE (2016-05-15 19:45 Sun)</span></a>
         </li>
         <li class="toclevel-1 tocsection-5">
-          <a href="#Release:_v3.5.1.1_.282016-05-01_20:25_Sun.29"><span class="tocnumber">5</span> <span class="toctext">Release: v3.5.1.1 (2016-05-01 20:25 Sun)</span></a> 
+          <a href="#Release:_NONE_.282016-05-08_19:45_Sun.29"><span class="tocnumber">5</span> <span class="toctext">Release: NONE (2016-05-08 19:45 Sun)</span></a>
+        </li>
+        <li class="toclevel-1 tocsection-6">
+          <a href="#Release:_v3.5.1.1_.282016-05-01_20:25_Sun.29"><span class="tocnumber">6</span> <span class="toctext">Release: v3.5.1.1 (2016-05-01 20:25 Sun)</span></a> 
           <ul>
-            <li class="toclevel-2 tocsection-6">
-              <a href="#.28Desktop.29_Minor_parser_fixes_for_English_Wiktionary"><span class="tocnumber">5.1</span> <span class="toctext">(Desktop) Minor parser fixes for English Wiktionary</span></a>
-            </li>
             <li class="toclevel-2 tocsection-7">
-              <a href="#Next_release:_v3.5.2"><span class="tocnumber">5.2</span> <span class="toctext">Next release: v3.5.2</span></a>
+              <a href="#.28Desktop.29_Minor_parser_fixes_for_English_Wiktionary"><span class="tocnumber">6.1</span> <span class="toctext">(Desktop) Minor parser fixes for English Wiktionary</span></a>
+            </li>
+            <li class="toclevel-2 tocsection-8">
+              <a href="#Next_release:_v3.5.2"><span class="tocnumber">6.2</span> <span class="toctext">Next release: v3.5.2</span></a>
             </li>
           </ul>
         </li>
       </ul>
     </div>
+    <h2>
+      <span class="mw-headline" id="Release:_NONE_.282016-05-29_20:00_Sun.29">Release: NONE (2016-05-29 20:00 Sun)</span>
+    </h2>
+    <p>
+      This week is also a no show for releases. I'm planning to make a release next week to handle a few parser issues. I'm also going to try to have the desktop app start reading the HTML databases.
+    </p>
+    <p>
+      As I'm still working on the wiki downloader, image dumps outside of English Wikipedia will be on hold for a while. If you want a copy, please drop me an email, or post an issue.
+    </p>
+    <p>
+      Thanks.
+    </p>
     <h2>
       <span class="mw-headline" id="Release:_NONE_.282016-05-24_11:00_Tue.29">Release: NONE (2016-05-24 11:00 Tue)</span>
     </h2>
diff --git a/home/wiki/Dashboard/Wiki_maintenance.html b/home/wiki/Dashboard/Wiki_maintenance.html
index 90707e678..05479d069 100644
--- a/home/wiki/Dashboard/Wiki_maintenance.html
+++ b/home/wiki/Dashboard/Wiki_maintenance.html
@@ -123,7 +123,7 @@
           n
         </td>
         <td class='cell_center'>
-          2016-03-05
+          2016-05-01
         </td>
         <td class='cell_center'>
           2016-03-05
@@ -989,6 +989,40 @@
           <button class='options_button' id='xowa_srh_upgrade' onclick='upgrade_search("simple.wikibooks.org")'>Search</button>
         </td>
       </tr>
+      <tr>
+        <td>
+          simple.wikipedia.org.merge
+        </td>
+        <td class='cell_center'>
+          n
+        </td>
+        <td class='cell_center'>
+          2016-05-01
+        </td>
+        <td class='cell_center'>
+        </td>
+        <td class='cell_center'>
+          &lt;&lt;NULL&gt;&gt;
+        </td>
+        <td class='cell_center'>
+          sqlite3
+        </td>
+        <td class='cell_center'>
+          v2
+        </td>
+        <td class='cell_center'>
+          v1
+        </td>
+        <td class='cell_center'>
+          <button class='options_button' id='xowa_wiki_import' onclick='import_wiki("simple.wikipedia.org.merge")'>Import</button>
+        </td>
+        <td class='cell_center'>
+          <button class='options_button' id='xowa_ctg_upgrade' onclick='upgrade_category("simple.wikipedia.org.merge")'>Category</button>
+        </td>
+        <td class='cell_center'>
+          <button class='options_button' id='xowa_srh_upgrade' onclick='upgrade_search("simple.wikipedia.org.merge")'>Search</button>
+        </td>
+      </tr>
       <tr>
         <td>
           simple.wikipedia.org
@@ -997,7 +1031,7 @@
           n
         </td>
         <td class='cell_center'>
-          2016-03-05
+          2016-05-01
         </td>
         <td class='cell_center'>
           2016-03-05
@@ -1172,7 +1206,7 @@
           n
         </td>
         <td class='cell_center'>
-          2016-04-07
+          2016-05-01
         </td>
         <td class='cell_center'>
           2016-03-05