From f114eb080df781121deec2c7846cfba016208fae Mon Sep 17 00:00:00 2001
From: Matthew Wall <mwall>
Date: Sun, 23 Nov 2014 15:36:57 +0000
Subject: [PATCH] adjust remaining TODO items.  direct users to customizing
 guide instead of loading weewx.conf with tutorial stuff.

---
 TODO.txt   | 19 +++++++++++++------
 setup.py   |  7 -------
 weewx.conf | 36 +++++++-----------------------------
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 0e37301f..799e394e 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,12 +4,6 @@ Quick start guide
 
 Test restful extensions (again).
 
-The station hardware configuration process could be improved. 
-  - Nowhere is it listed what driver to use.
-  - Docs need to be updated with the new two-step process.
-  - Perhaps the configuration routine could be made interactive? It would
-    scan the "drivers" subdirectory and offer up the choices...
-
 Move schemas to the extension that uses them.
 
 Should the archive file be backed up before adding the daily summaries?
@@ -17,6 +11,12 @@ Should the archive file be backed up before adding the daily summaries?
   
 Check whether $alltime still works.
 
+Test new setup.py on debian deb upgrades
+Test new extension installer on debian
+Test new setup.py on redhat rpm installs and upgrades
+Test new extension installer on redhat
+Test new setup.py on suse rpm installs and upgrades
+Test new extension installer on suse
 
 
 --------------------  Nice to do (V3.1?)  --------------------------- 
@@ -63,6 +63,13 @@ Jul 30 08:55:22 hummingbird weewx[959]:     ****  Exiting.
 
 --------------------  DONE  --------------------------- 
 
+The station hardware configuration process could be improved. 
+  - Nowhere is it listed what driver to use.
+  - Docs need to be updated with the new two-step process.
+  - Perhaps the configuration routine could be made interactive? It would
+    scan the "drivers" subdirectory and offer up the choices...
+(23nov14 mwall)
+
 Include setup.py in the installation (also setup.cfg)
 (22nov14 mwall)
 
diff --git a/setup.py b/setup.py
index edd2e211..675cd0dd 100755
--- a/setup.py
+++ b/setup.py
@@ -649,12 +649,6 @@ def mkdir(dirpath):
 # FIXME: make drivers load even if serial not installed?  what about pyusb?
 #        perhaps bail out gracefully, leaving a generic installation.
 
-# FIXME: test this on setup.py upgrades
-
-# FIXME: test this on debian installs and upgrades
-
-# FIXME: test this on redhat installs and upgrades
-
 def do_cfg():
     import optparse
     description = "configure the configuration file"
@@ -937,7 +931,6 @@ def get_conf_filename():
 #==============================================================================
 
 # FIXME: consider start/stop of weewx as part of the process
-# FIXME: design something to handle paths for included files in skins
 
 class Logger(object):
     def __init__(self, verbosity=0):
diff --git a/weewx.conf b/weewx.conf
index ec69cbf0..5911d04c 100644
--- a/weewx.conf
+++ b/weewx.conf
@@ -140,39 +140,17 @@ version = 3.0.0a1
     # The database binding to be used in the reports
     data_binding = wx_binding
     
-    # Each subsection represents a report you wish to run:
+    # Each subsection represents a report you wish to run.
+
     [[StandardReport]]
-    
+        # The StandardReport uses the Standard skin, which includes many
+        # template files.  See the customizing guide to change the units,
+        # change plot types and line colors, modify the fonts, display
+        # additional sensor data, and many other customizations.
+
         # What skin this report should be based on:
         skin = Standard
 
-        # You can override values in the skin configuration file here.  For
-        # example, uncomment the following lines to display metric units
-        # throughout the report, regardless of what is defined in the skin.
-        #
-        #[[[Units]]]
-        #    [[[[Groups]]]]
-        #        group_altitude     = meter
-        #        group_degree_day   = degree_C_day
-        #        group_pressure     = mbar
-        #        group_radiation    = watt_per_meter_squared
-        #        group_rain         = mm
-        #        group_rainrate     = mm_per_hour
-        #        group_speed        = meter_per_second
-        #        group_speed2       = meter_per_second2
-        #        group_temperature  = degree_C
-    
-    # Here is an example where we create a custom report, still using the
-    # standard skin, but where the image size is overridden, and the results
-    # are put in a separate subdirectory 'public_html/big'
-    #
-    #[[BigReport]]
-    #    skin = Standard
-    #    HTML_ROOT = public_html/big
-    #    [[[ImageGenerator]]]
-    #        image_width = 600
-    #        image_height = 360
-
     [[FTP]]
         skin = Ftp