merge latest changes from master

This commit is contained in:
Matthew Wall
2017-03-10 16:33:19 -05:00
parent 1bc8590c03
commit 02e37726d3
18 changed files with 65 additions and 53 deletions

View File

@@ -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