merge

1 files changed, 19 insertions, 19 deletions

diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index 795c1fe0a..4724c718b 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,14 +1,5 @@
 var NAVTREEINDEX3 =
 {
-"dir__fns_8php.html":[5,0,0,23],
-"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,23,2],
-"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,23,0],
-"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,23,1],
-"dir_aae29906d7bfc07d076125f669c8352e.html":[5,0,0,1],
-"dir_b2f003339c516cc00c8cadcafbe82f13.html":[5,0,3],
-"dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1],
-"dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0],
-"dir_d795dfe8933002397556cc7aa16eca15.html":[5,0,3,1,1],
 "dirfind_8php.html":[5,0,1,16],
 "dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,16,1],
 "dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,16,0],
@@ -90,8 +81,8 @@ var NAVTREEINDEX3 =
 "fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,27,0],
 "full_8php.html":[5,0,3,0,1],
 "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0],
-"functions.html":[4,3,0],
 "functions.html":[4,3,0,0],
+"functions.html":[4,3,0],
 "functions_0x5f.html":[4,3,0,1],
 "functions_0x61.html":[4,3,0,2],
 "functions_0x62.html":[4,3,0,3],
@@ -141,8 +132,8 @@ var NAVTREEINDEX3 =
 "globals_0x77.html":[5,1,0,24],
 "globals_0x78.html":[5,1,0,25],
 "globals_0x7a.html":[5,1,0,26],
-"globals_func.html":[5,1,1],
 "globals_func.html":[5,1,1,0],
+"globals_func.html":[5,1,1],
 "globals_func_0x61.html":[5,1,1,1],
 "globals_func_0x62.html":[5,1,1,2],
 "globals_func_0x63.html":[5,1,1,3],
@@ -213,13 +204,14 @@ var NAVTREEINDEX3 =
 "html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,34,2],
 "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,34,1],
 "identity_8php.html":[5,0,0,35],
-"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,35,1],
-"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,35,2],
-"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,35,3],
-"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,35,5],
-"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,35,0],
-"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,35,4],
-"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,35,6],
+"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,35,2],
+"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,35,3],
+"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,35,0],
+"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,35,4],
+"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,35,6],
+"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,35,1],
+"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,35,5],
+"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,35,7],
 "import_8php.html":[5,0,1,33],
 "import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,33,1],
 "import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,33,0],
@@ -249,5 +241,13 @@ var NAVTREEINDEX3 =
 "include_2api_8php.html#a8b25a186bd0893f51aa72a62f655735e":[5,0,0,5,39],
 "include_2api_8php.html#a9160288b7ac220635942d8dc209b78c3":[5,0,0,5,10],
 "include_2api_8php.html#a970b02c06dea8b229aa3d5fff9cf4705":[5,0,0,5,8],
-"include_2api_8php.html#aa0d6b29fff0344a8e67f3507a6d01410":[5,0,0,5,34]
+"include_2api_8php.html#aa0d6b29fff0344a8e67f3507a6d01410":[5,0,0,5,34],
+"include_2api_8php.html#aa1bddb580510e70cc1a7b7381667f1a3":[5,0,0,5,28],
+"include_2api_8php.html#aa40bae797bcd9ccacffdce5a3b5a1afa":[5,0,0,5,23],
+"include_2api_8php.html#aa49741342ad8ba285737eea1209a37e1":[5,0,0,5,25],
+"include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d":[5,0,0,5,51],
+"include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f":[5,0,0,5,29],
+"include_2api_8php.html#aa9dc5350b26d6c7727d6c4b641ecba18":[5,0,0,5,3],
+"include_2api_8php.html#ab1ecb58954f722444bfe03233345cb1b":[5,0,0,5,17],
+"include_2api_8php.html#abe8e929e93f7ab134b1cb1fb30f19a76":[5,0,0,5,48]
 };