merge latest changes from master

2026-04-19 00:56:54 -04:00 · 2017-03-10 16:33:19 -05:00
parent 1bc8590c03
commit 02e37726d3
18 changed files with 65 additions and 53 deletions
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -118,16 +118,14 @@ chance of data spikes caused by RS232 line contention.  Thanks lionel.sylvie!

 The observation windGustDir has been removed from wmr100, wmr200, te923, and
 fousb drivers.  These drivers were simply assigning windGustDir to windDir,
-since none of the hardware reports an actual windGustDir.  For hardware that
-does not report a windGustDir, weewx will calculate windGustDir at each archive
-interval when it accumulates an archive record.
+since none of the hardware reports an actual windGustDir.

 Calculation of aggregates over a period of one day or longer can now
 respect any change in archive interval. To take advantage of this
 feature, you will have to apply an update to your daily
 summaries. This can be done using the tool wee_database, option
--update. The only reason to do this is you plan on changing your
-archive interval. Otherwise, you can ignore.  Fixes issue #61.
+--update. Refer to the ‘Changes to daily summaries’ section in the
+Upgrade Guide to determine whether you should update or not. Fixes issue #61.

 Max value of windSpeed for the day is now the max archive value of windSpeed.
 Formerly, it was the max LOOP value. If you wish to patch your older
--- a/docs/customizing.htm
+++ b/docs/customizing.htm
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -4357,7 +4357,7 @@ UV      = UV Index</pre>
        This is the list of search list objects that will be scanned by
        the template engine, looking for tags. See the section <em><a
          href="#defining_new_tags">Defining new tags</a></em> and the <a
-          href="http://cheetahtemplate.org/docs/users_guide_html/users_guide.html">Cheetah
+          href="http://pythonhosted.org/Cheetah/users_guide">Cheetah
          documentation</a> for details on search lists. If no <span
          class="config_option">search_list</span> is specified, a
        default list will be used. The default list is:
--- a/docs/debian.htm
+++ b/docs/debian.htm
@@ -77,7 +77,7 @@ sudo rm -r /var/www/html/weewx</pre>

 <h2>Layout</h2>
 <p>The installation will result in the following layout:</p>
-<table class='locations' style='width: 50%'>
+<table class='locations' style='width: auto;'>
    <tr>
        <td align='right'>executable:</td>
        <td class='tty'>/usr/bin/weewxd</td>
--- a/docs/devnotes.htm
+++ b/docs/devnotes.htm
@@ -108,7 +108,7 @@ Version: 3.7
                go in the code to go instead in a configuration file.
            </li>
            <li>A powerful templating engine. The
-                <a href="http://www.cheetahtemplate.org/">Cheetah</a> module
+                <a href="http://pythonhosted.org/Cheetah/">Cheetah</a> module
                was chosen for generating html and other types of files from
                templates. Cheetah
                allows <em>search list extensions</em> to be defined, making it easy to extend weeWX with new template
--- a/docs/macos.htm
+++ b/docs/macos.htm
@@ -95,7 +95,7 @@ sudo rm /Library/LaunchDaemons/com.weewx.weewxd.plist</pre>

 <h2>Layout</h2>
 <p>The instructions above will result in the following layout:</p>
-<table class='locations' style="width:50%">
+<table class='locations' style="width: auto;">
    <tr>
        <td align='right'>executable:</td>
        <td class='tty'>/Users/Shared/weewx/bin/weewxd</td>
--- a/docs/readme.htm
+++ b/docs/readme.htm
@@ -25,15 +25,19 @@ Version: 3.7

 <div class="content">

-        <dl>
-            <dt><a href="apt-get.htm">Quick-Start</a></dt>
-            <dd>
-                If you use a Debian-based system, such as Ubuntu, Mint, or
-                Raspian, then you may want to follow this "quick start" guide.
-                It will help you do a basic install to get you started, which
-                you can then refine. Alternatively, you can follow the more
-                complete directions in the User's Guide.
-            </dd>
+    <dl>
+        <dt>Quick-Start</dt>
+        <dd>
+            Follow the installation instructions for a basic install, which
+            you can then refine. For detailed instructions, see the
+            User's Guide.
+            <p>
+            <a href="debian.htm">Instructions for Debian, Ubuntu, Mint, Raspbian</a><br/>
+            <a href="redhat.htm">Instructions for Redhat, Centos, Fedora</a><br/>
+            <a href="suse.htm">Instructions for SUSE, OpenSUSE</a><br/>
+            <a href="macos.htm">Instructions for MacOS</a><br/>
+            </p>
+        </dd>

            <dt><a href="usersguide.htm">User&#39;s Guide</a></dt>
            <dd>
@@ -93,8 +97,8 @@ Version: 3.7
            <dd>List of the changes in each release.</dd>

            <dt><a href="http://weewx.com/hwcmp.html">Hardware Comparison</a></dt>
-            <dd>Are you looking for a weather station? Are you considering
-                building your own station? This table lists the sensors,
+            <dd>Are you looking for a weather station? Would you like to
+                build your own station? This table lists the sensors,
                configurations, and specifications for various
                types of weather-related hardware.
            </dd>
--- a/docs/redhat.htm
+++ b/docs/redhat.htm
@@ -96,7 +96,7 @@ sudo rm -r /var/www/html/weewx</pre>

 <h2>Layout</h2>
 <p>The installation will result in the following layout:</p>
-<table class='locations' style='width: 50%'>
+<table class='locations' style='width: auto;'>
    <tr>
        <td align='right'>executable: </td>
        <td class='tty'>/usr/bin/weewxd</td>
--- a/docs/setup.htm
+++ b/docs/setup.htm
@@ -238,7 +238,7 @@ sudo rm /etc/init.d/weewx</pre>
 <p>The installation will place weeWX in the
    <span class="code">/home/weewx</span> directory with the following
    layout: </p>
-<table class='locations' style="width:50%">
+<table class='locations' style="width: auto;">
    <tr>
        <td align='right'>executable:</td>
        <td class='tty'>/home/weewx/bin/weewxd</td>
--- a/docs/suse.htm
+++ b/docs/suse.htm
@@ -93,7 +93,7 @@ sudo rm -r /var/www/html/weewx</pre>

 <h2>Layout</h2>
 <p>The installation will result in the following layout:</p>
-<table class='locations' style="width:50%">
+<table class='locations' style="width: auto;">
    <tr>
        <td align='right'>executable: </td>
        <td class='tty'>/usr/bin/weewxd</td>
--- a/docs/utilities.htm
+++ b/docs/utilities.htm
@@ -340,13 +340,13 @@ Usage: wee_database --help
       wee_database --check-strings
       wee_database --fix-strings [--dry-run]
       wee_database --drop-daily
-       wee_database --rebuild-daily
-            [--date=YYYY-mm-dd | --from=YYYY-mm-dd --to=YYYY-mm-dd]
+       wee_database --rebuild-daily [--date=YYYY-mm-dd |
+                                     --from=YYYY-mm-dd --to=YYYY-mm-dd]

 Description:

-Manipulate the weeWX database. Most of these operations are handled automatically
-by weeWX, but they may be useful in special cases.
+Manipulate the weeWX database. Most of these operations are handled
+automatically by weeWX, but they may be useful in special cases.

 Options:
  -h, --help            show this help message and exit