From 2e562dc78e746298c2b5c8a4d1ba0128d558d58e Mon Sep 17 00:00:00 2001
From: Tom Keffer <tkeffer>
Date: Sat, 8 Feb 2014 00:44:13 +0000
Subject: [PATCH] v2.6.0

---
 bin/weewx/__init__.py |  2 +-
 docs/changes.txt      | 12 ++++++------
 docs/customizing.htm  |  2 +-
 docs/upgrading.htm    |  2 +-
 docs/usersguide.htm   |  2 +-
 weewx.conf            |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/weewx/__init__.py b/bin/weewx/__init__.py
index 61183be7..5ba43cf3 100644
--- a/bin/weewx/__init__.py
+++ b/bin/weewx/__init__.py
@@ -8,7 +8,7 @@
 """Package weewx, containing modules specific to the weewx runtime engine."""
 import time
 
-__version__="2.6.0b2"
+__version__="2.6.0"
 
 # Holds the program launch time in unix epoch seconds:
 # Useful for calculating 'uptime.'
diff --git a/docs/changes.txt b/docs/changes.txt
index 97367951..b37255a6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,7 +1,7 @@
 weewx change history
 --------------------
 
-2.6.0 MM/DD/YY
+2.6.0 02/08/14
 
 Changed the RESTful architecture so RESTful services are now first-class
 weewx services. This should simplify the installation of 3rd party
@@ -11,6 +11,9 @@ Broke up service_list, the very long list of services to be run, into
 five separate lists. This will allow services to be grouped together,
 according to when they should be run.
 
+Defined a structure for packaging customizations into extensions, and added
+an installer for those extensions to setup.py.
+
 Changed the default time and date labels to use locale dependent formatting.
 The defaults should now work in most locales, provided you set the
 environment variable LANG before running weewx.
@@ -30,7 +33,7 @@ to fix embedded strings found in the sqlite archive database.
 
 Font handles are now cached in order to work around a memory leak in PIL.
 
-Now does garbage collection every 10th time through the main loop.
+Now does garbage collection every 3 hours through the main loop.
 
 Image margins now scale with image and font sizes.
 
@@ -60,10 +63,7 @@ Minor cleanup to Standard skin for better out-of-the-box behavior:
 Failure to set an archive interval when using bar plots no longer results
 in an exception.
 
-Change to skin directory before invoking cheetah on any templates.
-
-Defined a structure for packaging customizations into extensions, and added
-an installer for those extensions to setup.py.
+Change to skin directory before invoking Cheetah on any templates.
 
 
 2.5.1 12/30/13
diff --git a/docs/customizing.htm b/docs/customizing.htm
index 7380e50b..9ed9af69 100644
--- a/docs/customizing.htm
+++ b/docs/customizing.htm
@@ -23,7 +23,7 @@ table#stattypes td {
     </a>
     <h1 class="title">Customizing weewx<br />
       <span class="version">
-        Version: 2.6.0b2
+        Version: 2.6.0
       </span>
 
     <h1>Table of Contents</h1>
diff --git a/docs/upgrading.htm b/docs/upgrading.htm
index e917383e..7d997289 100644
--- a/docs/upgrading.htm
+++ b/docs/upgrading.htm
@@ -15,7 +15,7 @@
     </a>
     <h1 class="title">Upgrading <span class="code">weewx</span><br/>
       <span class='version'>
-Version: 2.6.0b2
+Version: 2.6.0
       </span>
     </h1>
 
diff --git a/docs/usersguide.htm b/docs/usersguide.htm
index 1d6891f3..9a7cc75a 100644
--- a/docs/usersguide.htm
+++ b/docs/usersguide.htm
@@ -33,7 +33,7 @@ function showtab(tab,id) {
   </a>
   <h1 class="title">User's Guide to the weewx Weather System<br />
     <span class='version'>
-Version: 2.6.0b2
+Version: 2.6.0
     </span>
   </h1>
 
diff --git a/weewx.conf b/weewx.conf
index fbffb70f..9c016a0a 100644
--- a/weewx.conf
+++ b/weewx.conf
@@ -18,7 +18,7 @@ WEEWX_ROOT = /home/weewx
 socket_timeout = 20
 
 # Do not modify this - it is used by setup.py when installing and updating.
-version = 2.6.0b2
+version = 2.6.0
 
 ##############################################################################