Merge remote branch 'upstream/master'

1 files changed, 62 insertions, 62 deletions

diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js
index 63e14776a..3d7ba4b21 100644
--- a/doc/html/navtreeindex8.js
+++ b/doc/html/navtreeindex8.js
@@ -1,6 +1,11 @@
 var NAVTREEINDEX8 =
 {
-"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,111,0],
+"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,110,0],
+"sitelist_8php.html":[6,0,1,111],
+"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[6,0,1,111,0],
+"smarty_8php.html":[6,0,0,71],
+"smilies_8php.html":[6,0,1,112],
+"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,112,0],
 "socgraph_8php.html":[6,0,0,72],
 "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,72,0],
 "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,72,6],
@@ -11,28 +16,28 @@ var NAVTREEINDEX8 =
 "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[6,0,0,72,2],
 "socgraph_8php.html#af175807406d94407a5e11742a3287746":[6,0,0,72,5],
 "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[6,0,0,72,3],
-"sources_8php.html":[6,0,1,112],
-"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,112,0],
-"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,112,1],
+"sources_8php.html":[6,0,1,113],
+"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,113,0],
+"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,113,1],
 "spam_8php.html":[6,0,0,73],
 "spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,73,1],
 "spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,73,0],
-"sslify_8php.html":[6,0,1,113],
-"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,113,0],
-"starred_8php.html":[6,0,1,114],
-"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,114,0],
-"subthread_8php.html":[6,0,1,115],
-"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,115,0],
-"suggest_8php.html":[6,0,1,116],
-"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,116,0],
-"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,116,1],
+"sslify_8php.html":[6,0,1,114],
+"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,114,0],
+"starred_8php.html":[6,0,1,115],
+"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,115,0],
+"subthread_8php.html":[6,0,1,116],
+"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,116,0],
+"suggest_8php.html":[6,0,1,117],
+"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,117,0],
+"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,117,1],
 "system__unavailable_8php.html":[6,0,0,74],
 "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[6,0,0,74,0],
-"tagger_8php.html":[6,0,1,117],
-"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,117,0],
-"tagrm_8php.html":[6,0,1,118],
-"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,118,1],
-"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,118,0],
+"tagger_8php.html":[6,0,1,118],
+"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,118,0],
+"tagrm_8php.html":[6,0,1,119],
+"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,119,1],
+"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,119,0],
 "taxonomy_8php.html":[6,0,0,75],
 "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,75,9],
 "taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,75,0],
@@ -162,14 +167,14 @@ var NAVTREEINDEX8 =
 "theme_2mytheme_2php_2default_8php.html":[6,0,3,1,2,0,0],
 "theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,1,2,0,0,0],
 "theme_2redbasic_2php_2theme__init_8php.html":[6,0,3,1,3,0,3],
-"thing_8php.html":[6,0,1,119],
-"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,119,0],
-"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,119,1],
+"thing_8php.html":[6,0,1,120],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,120,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,120,1],
 "todo.html":[3],
-"toggle__mobile_8php.html":[6,0,1,120],
-"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,120,0],
-"toggle__safesearch_8php.html":[6,0,1,121],
-"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,121,0],
+"toggle__mobile_8php.html":[6,0,1,121],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,121,0],
+"toggle__safesearch_8php.html":[6,0,1,122],
+"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,122,0],
 "tpldebug_8php.html":[6,0,2,8],
 "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,8,0],
 "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,8,1],
@@ -183,16 +188,16 @@ var NAVTREEINDEX8 =
 "typohelper_8php.html":[6,0,2,10],
 "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,10,0],
 "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,10,1],
-"uexport_8php.html":[6,0,1,122],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,122,0],
-"update__channel_8php.html":[6,0,1,123],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,123,0],
-"update__display_8php.html":[6,0,1,124],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,124,0],
-"update__network_8php.html":[6,0,1,125],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,125,0],
-"update__search_8php.html":[6,0,1,126],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,126,0],
+"uexport_8php.html":[6,0,1,123],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,123,0],
+"update__channel_8php.html":[6,0,1,124],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,124,0],
+"update__display_8php.html":[6,0,1,125],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,125,0],
+"update__network_8php.html":[6,0,1,126],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,126,0],
+"update__search_8php.html":[6,0,1,127],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,127,0],
 "updatetpl_8py.html":[6,0,2,11],
 "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,11,5],
 "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,11,2],
@@ -220,34 +225,29 @@ var NAVTREEINDEX8 =
 "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[6,0,3,1,3,0,0,0],
 "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,3,0,0,1],
 "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,3,0,0,2],
-"view_8php.html":[6,0,1,127],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,127,0],
-"viewconnections_8php.html":[6,0,1,128],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,128,1],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,128,0],
-"viewsrc_8php.html":[6,0,1,129],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,129,0],
-"vote_8php.html":[6,0,1,130],
-"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,130,2],
-"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,130,0],
-"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,130,1],
-"wall__attach_8php.html":[6,0,1,131],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,131,0],
-"wall__upload_8php.html":[6,0,1,132],
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,132,0],
-"webfinger_8php.html":[6,0,1,133],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,133,0],
-"webpages_8php.html":[6,0,1,134],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,134,0],
-"wfinger_8php.html":[6,0,1,135],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,135,0],
+"view_8php.html":[6,0,1,128],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,128,0],
+"viewconnections_8php.html":[6,0,1,129],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,129,1],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,129,0],
+"viewsrc_8php.html":[6,0,1,130],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,130,0],
+"vote_8php.html":[6,0,1,131],
+"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,131,2],
+"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,131,0],
+"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,131,1],
+"wall__attach_8php.html":[6,0,1,132],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,132,0],
+"wall__upload_8php.html":[6,0,1,133],
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,133,0],
+"webfinger_8php.html":[6,0,1,134],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,134,0],
+"webpages_8php.html":[6,0,1,135],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,135,0],
+"wfinger_8php.html":[6,0,1,136],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,136,0],
 "widedarkness_8php.html":[6,0,3,1,0,2,10],
 "widgets_8php.html":[6,0,0,78],
 "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,78,11],
-"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[6,0,0,78,26],
-"widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3":[6,0,0,78,3],
-"widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b":[6,0,0,78,8],
-"widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091":[6,0,0,78,9],
-"widgets_8php.html#a313a8d10ab81c71357c12e67e4d7efd5":[6,0,0,78,16],
-"widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013":[6,0,0,78,18]
+"widgets_8php.html#a0d404276fedc59f5038cf5c085028326":[6,0,0,78,26]
 };