aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2017-02-01 17:08:46 -0500
committerAndrew Manning <tamanning@zoho.com>2017-02-01 17:08:46 -0500
commit61407ad6c833b67398736e04742f8e6ca0c17a2a (patch)
treec0290a76fea464e1e1bcf5aea1e3a99d82518420 /doc
parentd3d540a28b2dd0b4958d129cceeba162c271302b (diff)
parentec037abf92be6ac6495cabcd5d64821655f39e37 (diff)
downloadvolse-hubzilla-61407ad6c833b67398736e04742f8e6ca0c17a2a.tar.gz
volse-hubzilla-61407ad6c833b67398736e04742f8e6ca0c17a2a.tar.bz2
volse-hubzilla-61407ad6c833b67398736e04742f8e6ca0c17a2a.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'doc')
-rw-r--r--doc/hook/get_default_export_sections10
-rw-r--r--doc/hook/identity_basic_export.bb9
-rw-r--r--doc/hooklist.bb3
-rw-r--r--doc/tags_and_mentions.bb4
4 files changed, 26 insertions, 0 deletions
diff --git a/doc/hook/get_default_export_sections b/doc/hook/get_default_export_sections
new file mode 100644
index 000000000..09b146643
--- /dev/null
+++ b/doc/hook/get_default_export_sections
@@ -0,0 +1,10 @@
+[h3]get_default_export_sections[/h3]
+
+The get_default_export_sections call returns the basic functional groups of data to export using channel_export_basic().
+
+The hook is passed an array
+ [
+ 'sections' => [ 'channel', 'connections', 'config', 'apps', 'chatrooms', 'events', 'webpages', 'mail', 'wikis' ]
+ ]
+
+If you desire the export to contain three months of items, add 'items' to the 'sections' array
diff --git a/doc/hook/identity_basic_export.bb b/doc/hook/identity_basic_export.bb
index 3f4e88799..71329ba1e 100644
--- a/doc/hook/identity_basic_export.bb
+++ b/doc/hook/identity_basic_export.bb
@@ -1 +1,10 @@
[h2]identity_basic_export[/h2]
+
+Called when exporting data for a channel
+Passed array contains
+
+ [
+ 'channel_id' => channel_id being exported
+ 'sections' => array of functional export sections which are being exported
+ 'data' => the export data array which has been generated
+ ]
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index c965b7c44..59d370117 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -242,6 +242,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
[zrl=[baseurl]/help/hook/get_best_language]get_best_language[/zrl]
called when choosing the preferred language for the page
+[zrl=[baseurl]/help/hook/get_default_export_sections]get_default_export_sections[/zrl]
+ Called to get the default list of functional data groups to export in identity_basic_export()
+
[zrl=[baseurl]/help/hook/get_features]get_features[/zrl]
Called when get_features() is called
diff --git a/doc/tags_and_mentions.bb b/doc/tags_and_mentions.bb
index 29dfe0fbe..c4f240631 100644
--- a/doc/tags_and_mentions.bb
+++ b/doc/tags_and_mentions.bb
@@ -49,6 +49,10 @@ Topical tags are indicated by preceding the tag name with the # character. This
Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #[zrl=https://friendicared.net/search?tag=2012-elections]2012-elections[/zrl].
+[b]Bookmarks[/b]
+
+Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generatd automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks.
+
[b]Spaces in Tags and Mentions[/b]