Merge branch '2.0RC'

1 files changed, 15 insertions, 0 deletions

diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index d190166f0..52af9608c 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -145,6 +145,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/cron_weekly]cron_weekly[/zrl]
 	Called when weekly scheduled tasks are executed
 
+[zrl=[baseurl]/help/hook/crypto_methods]crypto_methods[/zrl]
+	Called when generating a list of crypto algorithms in the locally preferred order
+
 [zrl=[baseurl]/help/hook/directory_item]directory_item[/zrl]
 	Called when generating a directory listing for display
 
@@ -239,6 +242,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/get_features]get_features[/zrl]
 	Called when get_features() is called
 
+[zrl=[baseurl]/help/hook/get_photo]get_photo[/zrl]
+	Called when photo content (except for profile photos) is fetched in mod_photo
+
 [zrl=[baseurl]/help/hook/get_profile_photo]get_profile_photo[/zrl]
 	Called when local profile photo content is fetched in mod_photo
 
@@ -320,6 +326,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/magic_auth]magic_auth[/zrl]
 	Called when processing a magic-auth sequence
 
+[zrl=[baseurl]/help/hook/markdown_to_bb]markdown_to_bb[/zrl]
+	Called when processing markdown conversion
+
 [zrl=[baseurl]/help/hook/match_webfinger_location]match_webfinger_location[/zrl]
 	Called when processing webfinger requests
 
@@ -380,6 +389,12 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/oembed_probe]oembed_probe[/zrl]
 	Called when performing an oembed content lookup
 
+[zrl=[baseurl]/help/hook/other_encapsulate]other_encapsulate[/zrl]
+	Called when encrypting content for which the algorithm is unknown (see also crypto_methods)
+
+[zrl=[baseurl]/help/hook/other_unencapsulate]other_unencapsulate[/zrl]
+	Called when decrypting content for which the algorithm is unknown (see also crypto_methods)
+
 [zrl=[baseurl]/help/hook/page_content_top]page_content_top[/zrl]
 	Called when we generate a webpage (before calling the module content function)