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

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