Merge remote branch 'upstream/master'

1 files changed, 6 insertions, 7 deletions

diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js
index 18a8d5c4d..d70828864 100644
--- a/doc/html/search/all_63.js
+++ b/doc/html/search/all_63.js
@@ -11,9 +11,8 @@ var searchData=
   ['chanlink_5fcid',['chanlink_cid',['../text_8php.html#a85e3a4851c16674834010d8419a5d7ca',1,'text.php']]],
   ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]],
   ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]],
-  ['chanman_2ephp',['chanman.php',['../mod_2chanman_8php.html',1,'']]],
-  ['chanman_2ephp',['chanman.php',['../include_2chanman_8php.html',1,'']]],
-  ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]],
+  ['chanman_2ephp',['chanman.php',['../chanman_8php.html',1,'']]],
+  ['chanman_5fremove_5feverything_5ffrom_5fnetwork',['chanman_remove_everything_from_network',['../chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b',1,'chanman.php']]],
   ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]],
   ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]],
   ['channel_5finit',['channel_init',['../channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc',1,'channel.php']]],
@@ -62,7 +61,7 @@ var searchData=
   ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.php']]],
   ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]],
   ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]],
-  ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]],
+  ['childexists',['childExists',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a964b13fde1a5da6f76b51ca5519234dc',1,'RedMatrix::RedDAV::RedDirectory']]],
   ['choklet_2ephp',['choklet.php',['../choklet_8php.html',1,'']]],
   ['clean_5furls',['clean_urls',['../boot_8php.html#ab79b8b4555cae20d03f8200666d89d63',1,'boot.php']]],
   ['clear',['clear',['../classCache.html#ab14d0f4bdf7116a94d545c574b38f568',1,'Cache']]],
@@ -100,11 +99,11 @@ var searchData=
   ['compare_5fpermissions',['compare_permissions',['../items_8php.html#a0790a4550b829e85504af548623002ca',1,'items.php']]],
   ['completeurl',['completeurl',['../parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a',1,'parse_url.php']]],
   ['config_2emd',['config.md',['../config_8md.html',1,'']]],
+  ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2blogga_2php_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html',1,'']]],
   ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]],
-  ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]],
   ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]],
   ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]],
   ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]],
@@ -151,8 +150,8 @@ var searchData=
   ['create_5faccount',['create_account',['../account_8php.html#a141fe579c351c78209d425473f978eb5',1,'account.php']]],
   ['create_5fidentity',['create_identity',['../identity_8php.html#a345f4c943d84de502ec6e72d2c813945',1,'identity.php']]],
   ['create_5fsys_5fchannel',['create_sys_channel',['../identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05',1,'identity.php']]],
-  ['createdirectory',['createDirectory',['../classRedDirectory.html#a986936910f0216887a25e28916c166c7',1,'RedDirectory']]],
-  ['createfile',['createFile',['../classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0',1,'RedDirectory']]],
+  ['createdirectory',['createDirectory',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#aca0e8d574ea66a0e210f571700663c62',1,'RedMatrix::RedDAV::RedDirectory']]],
+  ['createfile',['createFile',['../classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a58e750256cdc2f0f79fbe8d5463ffefe',1,'RedMatrix::RedDAV::RedDirectory']]],
   ['cronhooks_2ephp',['cronhooks.php',['../cronhooks_8php.html',1,'']]],
   ['cronhooks_5frun',['cronhooks_run',['../cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca',1,'cronhooks.php']]],
   ['cropimage',['cropImage',['../classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e',1,'photo_driver\cropImage()'],['../classphoto__gd.html#ab2232d775c8bacf66773a03308105f0c',1,'photo_gd\cropImage()'],['../classphoto__imagick.html#a2f33a03a89497a2b2768e29736d4a8a4',1,'photo_imagick\cropImage()']]],