Merge remote-tracking branch 'upstream/dev' into plugin-repo

4 files changed, 17 insertions, 13 deletions

diff --git a/doc/acl_dialog_post.html b/doc/acl_dialog_post.html
index b387ec08e..80b2c68b6 100644
--- a/doc/acl_dialog_post.html
+++ b/doc/acl_dialog_post.html
@@ -3,13 +3,11 @@
 
 <h2>Post Permissions</h2>
 
-<p>Sometimes called Access Control List, or ACL, the permissions set who is able to see your new post.</p>
+<p>The permissions dialog lets you select which channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your <b>Friends</b> group <i>except</i> the friend you are surprising. In this case you "Show" the <b>Friends</b> group but "Don't show" that one person.</p>
 
-<p>Pressing the ACL button (<i class="fa fa-lock"></i> or <i class="fa fa-unlock"></i>) beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your <b>Friends</b> group <i>except</i> the friend you are surprising. In this case you "Show" the <b>Friends</b> group but "Don't show" that one person.</p>
-
-<dl>
-<dt>Tip:</dt>
-<dd>The border color of each channel indicates whether that channel &mdash; or one of the groups it belongs to &mdash; has access to the post. The border color will also indicate when a channel [or group it belongs to] has been expliciyly set to "Don't show".</dd>
+<dl class="text-info dl-terms-large dl-horizontal">
+<dt style="width: 3em;">Tip!</td>
+<dd style="margin-left: 4em;">The border color of each channel indicates whether that channel &mdash; or one of the groups it's a member of &mdash; will have access to the post. The border color will also indicate when a channel, or group it belongs to, has been explicitly set to "Don't show".</dd>
 </dl>
 
 <h3>Why can't I edit a post's permissions after I saved it?</h3>
diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md
index 1ef80d343..fa8a98ff3 100644
--- a/doc/dev-function-overview.md
+++ b/doc/dev-function-overview.md
@@ -1,5 +1,5 @@
-Red development - some useful basic functions
-=============================================
+$Projectname development - some useful basic functions
+======================================================
 
 
 
@@ -17,11 +17,11 @@ Returns authenticated string hash of Red global identifier, if authenticated via
 
 * get_app()
 
-Returns the global app structure ($a).
+Returns the global app structure ($a). No longer used as App is a static class
 
 * App::get_observer()
 
-(App:: is usually assigned to the global $a), so App::get_observer() or App::get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
+returns an xchan structure representing the current viewer if authenticated (locally or remotely).
 
 * get_config($family,$key), get_pconfig($uid,$family,$key)
 
diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb
index 373454440..684fea569 100644
--- a/doc/developer_function_primer.bb
+++ b/doc/developer_function_primer.bb
@@ -1,4 +1,4 @@
-[b]Red development - some useful basic functions[/b]

+[b]$Projectname development - some useful basic functions[/b]

 

 [b]get_account_id()[/b]

 

@@ -18,7 +18,7 @@ Returns the global app structure ($a).
 

 [b]App::get_observer()[/b]

 

-(App:: is usually assigned to the global $a), so $a-&gt;get_observer() or get_app()-&gt;get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).

+returns an xchan structure representing the current viewer if authenticated (locally or remotely).

 

 [b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b]

 

diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index 9331873b4..bb1bffcf0 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -70,6 +70,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/bbcode]bbcode[/zrl]
 	Called when converting bbcode to HTML
 
+[zrl=[baseurl]/help/hook/bb_translate_video]bb_translate_video[/zrl]
+	Called when extracting embedded services from bbcode video elements (rarely used)
+
 [zrl=[baseurl]/help/hook/channel_remove]channel_remove[/zrl]
 	Called when removing a channel
 
@@ -242,8 +245,11 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/hostxrd]hostxrd[/zrl]
 	Called when generating .well-known/hosts-meta for "old webfinger" (used by Diaspora protocol)
 
+[zrl=[baseurl]/help/hook/html2bb_video]html2bb_video[/zrl]
+	Called when using the html2bbcode translation to handle embedded media
+
 [zrl=[baseurl]/help/hook/html2bbcode]html2bbcode[/zrl]
-	Called when using the html2bbcode tranlsation
+	Called when using the html2bbcode translation
 
 [zrl=[baseurl]/help/hook/identity_basic_export]identity_basic_export[/zrl]
 	Called when exporting a channel's basic information for backup or transfer