Merge remote-tracking branch 'upstream/master'

1 files changed, 21 insertions, 18 deletions

diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index 2509fd8ca..c5665a1dd 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -52,16 +52,18 @@ var NAVTREEINDEX6 =
 "tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,88,1],
 "tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,88,0],
 "taxonomy_8php.html":[5,0,0,62],
+"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,62,6],
+"taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,62,8],
 "taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,62,0],
 "taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,62,4],
 "taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,62,2],
 "taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,62,1],
-"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,62,5],
-"taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6":[5,0,0,62,7],
-"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,62,9],
-"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,62,8],
+"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,62,7],
+"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,62,11],
+"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,62,10],
+"taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f":[5,0,0,62,9],
+"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,62,5],
 "taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,62,3],
-"taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d":[5,0,0,62,6],
 "template__processor_8php.html":[5,0,0,63],
 "template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,63,3],
 "template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,63,1],
@@ -217,26 +219,27 @@ var NAVTREEINDEX6 =
 "zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,106,0],
 "zot_8php.html":[5,0,0,65],
 "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,65,8],
-"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,65,16],
-"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,65,9],
+"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,65,17],
+"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,65,10],
 "zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,65,5],
-"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,65,11],
+"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,65,12],
 "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,65,2],
 "zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[5,0,0,65,3],
-"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,65,15],
-"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,65,20],
-"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,65,12],
-"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,65,10],
+"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,65,16],
+"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,65,21],
+"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,65,13],
+"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,65,11],
 "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,65,0],
-"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,65,13],
-"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,65,19],
-"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,65,18],
+"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,65,14],
+"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,65,20],
+"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,65,19],
 "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,65,7],
 "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,65,6],
+"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,65,9],
 "zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,65,4],
-"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,65,17],
-"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,65,21],
-"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,65,14],
+"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,65,18],
+"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,65,22],
+"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,65,15],
 "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,65,1],
 "zotfeed_8php.html":[5,0,1,107],
 "zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,107,0]