aboutsummaryrefslogtreecommitdiffstats
path: root/doc/connecting_to_channels.bb
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-29 03:39:07 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-29 03:39:07 -0700
commitbc02b933727da7a000d43d2d7d495f066616dc81 (patch)
treee590b70757edb94655872f5b992f143cead61eb3 /doc/connecting_to_channels.bb
parentfc12123329133cea39f27615a7c24c57e5b4a35d (diff)
parent7d9f785758ee6e4c19838e532f9930e227e95fc6 (diff)
downloadvolse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.gz
volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.tar.bz2
volse-hubzilla-bc02b933727da7a000d43d2d7d495f066616dc81.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/connecting_to_channels.bb')
-rw-r--r--doc/connecting_to_channels.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb
index a067b6cf2..901565ad3 100644
--- a/doc/connecting_to_channels.bb
+++ b/doc/connecting_to_channels.bb
@@ -16,4 +16,4 @@ You may also connect with any channel by visiting the &quot;Connections&quot; pa
Some channels are designated &quot;Premium Channels&quot; and may require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;