Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 10 deletions

diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js
index 712a915e0..f1cd4b7f2 100644
--- a/doc/html/search/all_66.js
+++ b/doc/html/search/all_66.js
@@ -14,14 +14,9 @@ var searchData=
   ['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]],
   ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
   ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]],
-  ['file_5ftag_5fdecode',['file_tag_decode',['../text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'text.php']]],
-  ['file_5ftag_5fencode',['file_tag_encode',['../text_8php.html#a3299482ac20e9d79453048dd52881d37',1,'text.php']]],
-  ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../text_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'text.php']]],
-  ['file_5ftag_5ffile_5fto_5flist',['file_tag_file_to_list',['../text_8php.html#a544fc13c1798371e5a5984b5482108f8',1,'text.php']]],
-  ['file_5ftag_5flist_5fto_5ffile',['file_tag_list_to_file',['../text_8php.html#abb55ec0142207aeec3d90b25ed4d7266',1,'text.php']]],
-  ['file_5ftag_5fsave_5ffile',['file_tag_save_file',['../text_8php.html#a30311fd46e05be0e2cc466118641a4ed',1,'text.php']]],
-  ['file_5ftag_5funsave_5ffile',['file_tag_unsave_file',['../text_8php.html#a48f6d04513d26270e10e9b7d153f7526',1,'text.php']]],
-  ['file_5ftag_5fupdate_5fpconfig',['file_tag_update_pconfig',['../text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81',1,'text.php']]],
+  ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
+  ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
+  ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
   ['fileas_5fwidget',['fileas_widget',['../contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b',1,'contact_widgets.php']]],
   ['filename',['filename',['../namespacefriendica-to-smarty-tpl.html#a5f9bf7a67d955c0d6be70a82097611c5',1,'friendica-to-smarty-tpl']]],
   ['filer_2ephp',['filer.php',['../filer_8php.html',1,'']]],
@@ -46,8 +41,8 @@ var searchData=
   ['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]],
   ['flip',['flip',['../classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832',1,'photo_driver\flip()'],['../classphoto__gd.html#a44cedef376044018702d9355ddc813ce',1,'photo_gd\flip()'],['../classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393',1,'photo_imagick\flip()']]],
   ['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]],
-  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
   ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
+  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
   ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]],
   ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]],
   ['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]],
@@ -57,9 +52,10 @@ var searchData=
   ['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]],
   ['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]],
   ['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]],
+  ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]],
   ['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]],
   ['format_5fnotification',['format_notification',['../include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3',1,'notify.php']]],
-  ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'text.php']]],
+  ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'taxonomy.php']]],
   ['fpostit_2ephp',['fpostit.php',['../fpostit_8php.html',1,'']]],
   ['fresh_2emd',['fresh.md',['../fresh_8md.html',1,'']]],
   ['friendica',['Friendica',['../namespaceFriendica.html',1,'']]],