merge madness

55 files changed, 156 insertions, 67 deletions

diff --git a/doc/AdvancedSearch.md b/doc/AdvancedSearch.md
index 5a9a5a3bc..df4a87482 100644
--- a/doc/AdvancedSearch.md
+++ b/doc/AdvancedSearch.md
@@ -51,7 +51,4 @@ Example:
     name="charlie brown" and country=canada and not gender=female
 
 
-
-
-
- 
+#include doc/macros/main_footer.bb;
diff --git a/doc/Hooks.md b/doc/Hooks.md
index 350068314..d7998a8e7 100644
--- a/doc/Hooks.md
+++ b/doc/Hooks.md
@@ -133,3 +133,5 @@ Hooks - Complete List
 * $a->module . '_pre_' . $selname
 * $a->module . '_pre_' . $selname
 
+#include doc/macros/main_footer.bb;
+
diff --git a/doc/about.bb b/doc/about.bb
index aa4fde54d..bd91970f6 100644
--- a/doc/about.bb
+++ b/doc/about.bb
@@ -20,5 +20,5 @@ Along the way, Red offers a number of unique goodies:
 

 [b]Privacy:[/b]  Red identities (Zot IDs) can be deleted, backed up/downloaded, and cloned.  The user is in full control of their data. Should you decide to delete all your content and erase your Zot ID, all you have to do is click on a link and it's immediately deleted from the hub.  No questions, no fuss. 

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

 

diff --git a/doc/account_basics.bb b/doc/account_basics.bb
index 3c5d28fbc..a8fd6e5fd 100644
--- a/doc/account_basics.bb
+++ b/doc/account_basics.bb
@@ -31,3 +31,5 @@ See Also
 [zrl=[baseurl]/help/permissions]Permissions[/zrl]

 [zrl=[baseurl]/help/profiles]Profiles[/zrl]

 [zrl=[baseurl]/help/remove_account]Remove Account[/zrl]

+

+#include doc/macros/main_footer.bb;

diff --git a/doc/accounts.bb b/doc/accounts.bb
index bf57f1234..7c0378504 100644
--- a/doc/accounts.bb
+++ b/doc/accounts.bb
@@ -1,4 +1,4 @@
 This one still needs to be written.
 
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
 
diff --git a/doc/accounts_profiles_channels_basics.bb b/doc/accounts_profiles_channels_basics.bb
index f803f25e9..c064e99f1 100644
--- a/doc/accounts_profiles_channels_basics.bb
+++ b/doc/accounts_profiles_channels_basics.bb
@@ -15,5 +15,5 @@ Unlike other services Red Matrix offers you the advantage of creating [i]many mo
 During the registration you created your first [i]channel[/i]. Yes, besides several profiles you are able to have several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have created one channel. You can use this one for the public, to communicate with people about every day life. But perhaps you are an avid book reader and many people are bored by that. So  you open a [i]second channel[/i] just for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of posts, with a new profile (... or new profile[i]s[/i] ...) and completely different contacts. Some connections might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just switch between both of them just like you would in real life switch when talking to people you meet on the street or people you meet specially to talk about books. You can even connect to yourself, or better: to your other channel. :)
 [i]Think of a channel as different spaces dedicated to different topics where you meet with different people.[/i]
 
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
 
diff --git a/doc/addons.bb b/doc/addons.bb
index a4b76929b..726b437ed 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -1,5 +1,5 @@
 * [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl]
 
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
 
 
diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb
index 664f1df39..339add5a9 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/addons_gnusocial.bb
@@ -60,5 +60,5 @@ If you don't choose this option, you will have an option to send a post to your
 
 If all goes well, you have just cross-posted your RedMatrix post to your account on a GNUsocial instance.
 
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/addons_footer.bb;
 
diff --git a/doc/api_functions.bb b/doc/api_functions.bb
index ade6efd42..c9d90c716 100644
--- a/doc/api_functions.bb
+++ b/doc/api_functions.bb
@@ -129,5 +129,5 @@ Red proposed API extensions to the Twitter API
     api/albums/destroy (R),J

     api/friends/permissions (R),J

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

 

diff --git a/doc/bbcode.html b/doc/bbcode.html
index 97a0bbc6c..0f070eaa2 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -66,8 +66,8 @@
 <li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional <br />
 <li>[qr]text to post[/qr] - create a QR code.<br />
 <br />
-Return to the <a href="/help/main">Main documentation page[/a]
 
+#include doc/macros/main_footer.bb;
 </div>
 
 
diff --git a/doc/campaign.bb b/doc/campaign.bb
index f3d23baa6..b05846a0b 100644
--- a/doc/campaign.bb
+++ b/doc/campaign.bb
@@ -233,5 +233,5 @@ Raising more than our initial goal of funds, will speed up our development effor
 

 Awesome. We'd be more than happy to chat. You can find us {HERE}

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

 

diff --git a/doc/channels.bb b/doc/channels.bb
index 42253a664..82b70630c 100644
--- a/doc/channels.bb
+++ b/doc/channels.bb
@@ -26,5 +26,5 @@ The &quot;Matrix&quot; page contains all recent posts from across the matrix, ag
 

 As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for &quot;Can write to my &quot;public&quot; file storage&quot; than a personal account. For more information, see the permissions section.

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

 

diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb
index 5bf5b3163..60d84005e 100644
--- a/doc/checking_account_quota_usage.bb
+++ b/doc/checking_account_quota_usage.bb
@@ -14,4 +14,4 @@ Visit the following URL in your browser:
 Example:

 [observer.baseurl]/filestorage/[observer.webname]

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

diff --git a/doc/cloud.bb b/doc/cloud.bb
index e71da78e8..92b97a21c 100644
--- a/doc/cloud.bb
+++ b/doc/cloud.bb
@@ -24,4 +24,4 @@ See: [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl]
 

 When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit &quot;filestorage/{{username}}&quot;; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a &quot;personal&quot; or &quot;private&quot; folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for &quot;family&quot; and &quot;friends&quot; with permission granted to appropriate collections of channels.

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

diff --git a/doc/cloud_desktop_clients.bb b/doc/cloud_desktop_clients.bb
index 557acb472..2f099527f 100644
--- a/doc/cloud_desktop_clients.bb
+++ b/doc/cloud_desktop_clients.bb
@@ -18,4 +18,4 @@
 

 Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms.  

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
+#include doc/macros/cloud_footer.bb;

diff --git a/doc/comanche.bb b/doc/comanche.bb
index d329cc34b..19a74833e 100644
--- a/doc/comanche.bb
+++ b/doc/comanche.bb
@@ -28,10 +28,10 @@ Currently there are three layout templates, unless your site provides additional
 			edgestwo - two column layout with fixed side margins

 			edgesthree - three column layout with fixed side margins

 			full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar

-
-	redable
-	 
-	A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column.
+

+	redable

+	 

+	A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column.

 

 [/code]

 

@@ -45,11 +45,11 @@ To choose a layout template, use the 'template' tag.
 To choose the "choklet" template with the "three" flavour:

 

 [code]

-	[template=three]choklet[/template]
-[/code]
-	
-Or the "redable" (sic) template:
-
+	[template=three]choklet[/template]

+[/code]

+	

+Or the "redable" (sic) template:

+

 [code]

 	[template]redable[/template]

 [/code]

@@ -188,4 +188,4 @@ The 'comment' tag is used to delimit comments. These comments will not appear on
 	[/region]

 [/code]

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

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;

diff --git a/doc/credits.bb b/doc/credits.bb
new file mode 100644
index 000000000..d13b99bdd
--- /dev/null
+++ b/doc/credits.bb
@@ -0,0 +1,76 @@
+[b]Credits[/b]
+
+Mike Macgirvin
+Thomas Willingham
+Fabio Comuni
+Simon L'nu
+marijus
+Tobias Diekershoff
+fabrixxm
+tommy tomson
+Simon
+zottel
+Christian Vogeley
+jeroenpraat
+Michael Vogel
+erik
+Zach Prezkuta
+Paolo T
+Michael Meer
+Michael
+Abinoam P. Marques Jr
+Tobias Hößl
+Alexander Kampmann
+Olaf Conradi
+Paolo Tacconi
+tobiasd
+Devlon Duthie
+Zvi ben Yaakov (a.k.a rdc)
+Alexandre Hannud Abdo
+Olivier Migeot
+Chris Case
+Klaus Weidenbach
+Michael Johnston
+olivierm
+Vasudev Kamath
+pixelroot
+Max Weller
+duthied
+Martin Schmitt
+Sebastian Egbers
+Erkan Yilmaz
+sasiflo
+Stefan Parviainen
+Haakon Meland Eriksen
+Oliver Hartmann (23n)
+Erik Lundin
+habeascodice
+sirius
+Charles
+Tony Baldwin
+Hauke Zuehl
+Keith Fernie
+toclimb
+Daniel Frank
+Matthew Exon
+Michal Supler
+Tobias Luther
+U-SOUND\mike
+mrjive
+nostupidzone
+tonnerkiller
+Antoine G
+Christian Drechsler
+Ludovic Grossard
+RedMatrixCanada
+Stanislav Lechev [0xAF]
+aweiher
+bufalo1973
+dsp1986
+felixgilles
+ike
+maase2
+mycocham
+ndurchx
+pafcu
+Simó Albert i Beltran
diff --git a/doc/dav_dolphin.bb b/doc/dav_dolphin.bb
index 4429303d3..a1ebba394 100644
--- a/doc/dav_dolphin.bb
+++ b/doc/dav_dolphin.bb
@@ -6,4 +6,4 @@ When prompted for a username and password, enter your username (the first part o
 

 Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication.

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
+#include doc/macros/cloud_footer.bb;

diff --git a/doc/dav_konqueror.bb b/doc/dav_konqueror.bb
index f44c11fb2..79108e1d0 100644
--- a/doc/dav_konqueror.bb
+++ b/doc/dav_konqueror.bb
@@ -8,4 +8,5 @@ Additionally, if one has authenticated at a different hub during their normal br
 

 This functionality is normally restricted to the web interface, and is not available to any desktop software other than KDE.

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
+#include doc/macros/cloud_footer.bb;

+

diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb
index 62edc09d0..d8cb2e08e 100644
--- a/doc/dav_mount.bb
+++ b/doc/dav_mount.bb
@@ -82,5 +82,5 @@ If that still doesn't work, disable the cache.  Note that this has a performance
 

 If it [i]still[/i] doesn't work, there is one more thing you can try.  (This one is caused by a bug in older versions of dav2fs itself, so updating to a new version may also help).  Enable weak etag dropping by setting [code]drop_weak_etags 1[/code].  Unmount and remount your filesystem to apply the changes.

 

+#include doc/macros/cloud_footer.bb;

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

diff --git a/doc/dav_nautilus.bb b/doc/dav_nautilus.bb
index d3c478aa0..51663b6de 100644
--- a/doc/dav_nautilus.bb
+++ b/doc/dav_nautilus.bb
@@ -6,4 +6,4 @@
 4. You will be prompted for your username (same as above) and password

 5. Your personal DAV directory will be shown in the window

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
+#include doc/macros/cloud_footer.bb;

diff --git a/doc/dav_nemo.bb b/doc/dav_nemo.bb
index a2553c1d5..2c88b0782 100644
--- a/doc/dav_nemo.bb
+++ b/doc/dav_nemo.bb
@@ -15,5 +15,5 @@ Fill the dialog
 - Passwort: yourpasswort

 

 Once open you can set a bookmark.

- 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
+

+#include doc/macros/cloud_footer.bb; 

diff --git a/doc/dav_windows.bb b/doc/dav_windows.bb
index 600944b68..0eaffd4d0 100644
--- a/doc/dav_windows.bb
+++ b/doc/dav_windows.bb
@@ -8,4 +8,4 @@ RedDav using Windows 7 graphical user interface wizard:
 5. Type your Red account's user name. IMPORTANT - NO at-sign or domain name.

 6. Type your Red password

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file
+#include doc/macros/cloud_footer.bb;

diff --git a/doc/debian_install.bb b/doc/debian_install.bb
index f441025ae..f4e901dc6 100644
--- a/doc/debian_install.bb
+++ b/doc/debian_install.bb
@@ -29,4 +29,4 @@ To install Red for domain example.com, after the initial server setup run
 

 [code]bash setup-debian.sh red example.com[/code]

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md
index 3cda8f7c4..ecf9186ca 100644
--- a/doc/dev-function-overview.md
+++ b/doc/dev-function-overview.md
@@ -48,5 +48,5 @@ Returns the translated variant of $string for the current language or $string (d
 Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set.
 If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0;
 
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
 
diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb
index 144664615..3d5fe82a9 100644
--- a/doc/developer_function_primer.bb
+++ b/doc/developer_function_primer.bb
@@ -44,4 +44,4 @@ Returns the translated variant of $string for the current language or $string (d
 

 Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0;

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/developers.bb b/doc/developers.bb
index a29a848e0..18e39c4ea 100644
--- a/doc/developers.bb
+++ b/doc/developers.bb
@@ -64,4 +64,4 @@ In the interests of consistency we adopt the following code styling. We may acce
 

 [li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li]

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
index 70dfd2fcc..29eabce74 100644
--- a/doc/external-resource-links.bb
+++ b/doc/external-resource-links.bb
@@ -19,6 +19,6 @@
 [*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]

 

 [b]Utilities[/b]

-[*][url=http://beardyunixer.com:1234/?p=debian-install-script;a=tree]Debian Install Script[/url]

+[*][url=http://gitweb.whogotzot.com/debian-install-script]Debian Install Script[/url]

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/extra_features.bb b/doc/extra_features.bb
index 372ac6bbe..2e877375e 100644
--- a/doc/extra_features.bb
+++ b/doc/extra_features.bb
@@ -94,4 +94,4 @@ Ability to mark special posts with a star indicator
 

 Provide a personal tag cloud on your channel page

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb
index 1679ec246..60c1be5a8 100644
--- a/doc/faq_admins.bb
+++ b/doc/faq_admins.bb
@@ -45,4 +45,4 @@ valid SSL certificate rather than disabling port 443.
 
 [/ul]
 
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
index 192dcb5c5..61843648a 100644
--- a/doc/faq_developers.bb
+++ b/doc/faq_developers.bb
@@ -1,6 +1,5 @@
 [size=large][b]Frequently Asked Questions For Developers[/b][/size]
 
-(...) still needs to be written (...)
 
 [ul]
 [*][b]What does $a mean?[/b]
@@ -26,3 +25,7 @@ function foo() {
 }
 [/code]
 [/ul]
+
+
+#include doc/macros/main_footer.bb;
+
diff --git a/doc/faq_users.bb b/doc/faq_members.bb
index aac4a114c..a089b8b0c 100644
--- a/doc/faq_users.bb
+++ b/doc/faq_members.bb
@@ -12,6 +12,4 @@ You have probably disabled third party cookies.  You need to enable them for rem
 There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. 
 [/ul]
 
-
-
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/features.bb b/doc/features.bb
index 388f9bc91..fc977fcc1 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -108,4 +108,4 @@ Similar to any other modern blogging system, social network, or a micro-blogging
 [b][color=white]Previewing[/color][/b] 

 Post can be previewed prior to sending.

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
+#include doc/macros/main_footer.bb;

diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb
index aa87fba69..029a6eb77 100644
--- a/doc/git_for_non_developers.bb
+++ b/doc/git_for_non_developers.bb
@@ -68,4 +68,4 @@ git request-pull master https://example.com/project
 

 And simply send the output to the project maintainer.

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 0fc04b766..7b7a688c4 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -100,4 +100,6 @@ This document assumes you're an administrator.
         the main logs as well.
     [b]system > hide_in_statistics[/b]
         Tell the red statistics servers to completely hide this hub in hub lists.
-	
\ No newline at end of file
+	
+#include doc/macros/main_footer.bb;
+
diff --git a/doc/install.bb b/doc/install.bb
index 1a35537aa..e68b4a230 100644
--- a/doc/install.bb
+++ b/doc/install.bb
@@ -1 +1,4 @@
 #include install/INSTALL.txt;

+

+#include doc/macros/main_footer.bb;

+

diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb
index b44095d3d..50aedd0e2 100644
--- a/doc/intro_for_developers.bb
+++ b/doc/intro_for_developers.bb
@@ -109,4 +109,4 @@ At that point, if you need to add javascript or css files, add them to /js or /c
 

 Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory.

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb
new file mode 100644
index 000000000..f6b687a23
--- /dev/null
+++ b/doc/macros/addons_footer.bb
@@ -0,0 +1,2 @@
+Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl]
+Return to the [zrl=[baseurl]/help/addons]Main documentation[/zrl]
diff --git a/doc/macros/cloud_footer.bb b/doc/macros/cloud_footer.bb
new file mode 100644
index 000000000..798cc9ea6
--- /dev/null
+++ b/doc/macros/cloud_footer.bb
@@ -0,0 +1,2 @@
+Return to the [zrl=[baseurl]/help/cloud]Cloud documentation[/zrl]
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
diff --git a/doc/macros/main_footer.bb b/doc/macros/main_footer.bb
new file mode 100644
index 000000000..08f671ded
--- /dev/null
+++ b/doc/macros/main_footer.bb
@@ -0,0 +1 @@
+Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
diff --git a/doc/macros/troubleshooting_footer.bb b/doc/macros/troubleshooting_footer.bb
new file mode 100644
index 000000000..c7603a62b
--- /dev/null
+++ b/doc/macros/troubleshooting_footer.bb
@@ -0,0 +1,2 @@
+[zrl=[baseurl]/help/troubleshooting]Troubleshooting documentation[/zrl]
+[zrl=[baseurl]/help/troubleshooting]Documentation Main Page[/zrl]
diff --git a/doc/main.bb b/doc/main.bb
index 06559c327..5502db67d 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -36,7 +36,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri
 [zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl]

 

 [size=large][b]Frequently Asked Questions For Members[/b][/size]

-[zrl=[baseurl]/help/faq_users]FAQ For Members[/zrl]

+[zrl=[baseurl]/help/faq_members]FAQ For Members[/zrl]

 

 [size=large][b]For Hub Administrators[/b][/size]

 [zrl=[baseurl]/help/install]Install[/zrl]

diff --git a/doc/permissions.bb b/doc/permissions.bb
index c893ed84f..232ea9e96 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -107,4 +107,4 @@ The connection edit screen offers a slider to select a degree of friendship with
 

 The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature.

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/plugins.bb b/doc/plugins.bb
index 7709976c4..06801eb20 100644
--- a/doc/plugins.bb
+++ b/doc/plugins.bb
@@ -261,4 +261,4 @@ The Red Matrix has _install and _uninstall functions but these are used differen
 

 Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different.

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb
index 0b2c2e11a..a8a764cf1 100644
--- a/doc/problems-following-an-update.bb
+++ b/doc/problems-following-an-update.bb
@@ -34,4 +34,5 @@ Redbasic uses a few javascript libraries that are done differently, or entirely
 

 Should you report an issue with the theme developers then?  No.  Theme developers use their themes.  Chances are, they know.  Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed.  There are two workarounds for this situation.  Firstly, you can temporarily use Redbasic.  Secondly, most themes are open source too - open a pull request and make yourself a friend.

 

-Return to the [url=[baseurl]/help/troubleshooting]Troubleshooting documentation page[/url]
\ No newline at end of file
+#include doc/macros/troubleshooting_footer.bb;

+

diff --git a/doc/profiles.bb b/doc/profiles.bb
index 63b161962..5fcf5245a 100644
--- a/doc/profiles.bb
+++ b/doc/profiles.bb
@@ -32,4 +32,4 @@ On the directory page, you may search for people with published profiles. Curren
 

 On your Connnections page and in the directory there is a link to &quot;Suggestions&quot; or &quot;Channel Suggestions&quot;, respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance.

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/red2pi.bb b/doc/red2pi.bb
index 4ca58a382..d05cc57dd 100644
--- a/doc/red2pi.bb
+++ b/doc/red2pi.bb
@@ -342,4 +342,4 @@ Save and exit.
 Follow the instructions here:

 [url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url]

 

-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]

+#include doc/macros/main_footer.bb;

diff --git a/doc/registration.bb b/doc/registration.bb
index 0aaa679c2..c507a86a6 100644
--- a/doc/registration.bb
+++ b/doc/registration.bb
@@ -31,4 +31,5 @@ See Also
 [zrl=[baseurl]/help/permissions]Permissions[/zrl]

 [zrl=[baseurl]/help/remove_account]Remove Account[/zrl]

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

+

diff --git a/doc/remove_account.bb b/doc/remove_account.bb
index adc08d8f9..feb3f249a 100644
--- a/doc/remove_account.bb
+++ b/doc/remove_account.bb
@@ -24,6 +24,4 @@ This is irreversible.
 

 All your channels will be deleted. If you have identity clones on other sites this only removes by default the channels instances which exists on this site.

 

-

-

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/schema_development.bb b/doc/schema_development.bb
index 2890d5454..c92536d7a 100644
--- a/doc/schema_development.bb
+++ b/doc/schema_development.bb
@@ -73,4 +73,4 @@ theme are as follows:
 [li] sloppy_photos

 	Determins whether photos are &quot;sloppy&quot; or aligned.  Set or unset (1 or '')[/li]

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/tags_and_mentions.bb b/doc/tags_and_mentions.bb
index 477fbe291..d638492bb 100644
--- a/doc/tags_and_mentions.bb
+++ b/doc/tags_and_mentions.bb
@@ -66,5 +66,4 @@ will tag Robert Johnson, but we can only match one space. If the name was "Blind
 [/code]

 

 are both equivalent.  

-

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb
index f5572c6ed..d71b5f576 100644
--- a/doc/troubleshooting.bb
+++ b/doc/troubleshooting.bb
@@ -3,4 +3,4 @@
 [li][zrl=[baseurl]/help/technical_faq]Technical FAQ[/zrl][/li]

 [li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li]

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

+#include doc/macros/main_footer.bb;

diff --git a/doc/webpages.bb b/doc/webpages.bb
index 2bf7af762..780bde45c 100644
--- a/doc/webpages.bb
+++ b/doc/webpages.bb
@@ -10,6 +10,5 @@ The &quot;page link title&quot; box allows a user to specify the &quot;pagelinkt
 

 Beneath the page creation box, a list of existing pages will appear with an &quot;edit&quot; link.  Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages.

 

-If you are the admin of a site, you can specify a channel whose webpages we will use at key points around the site.  Presently, the only place this is implemented is the home page.  If you specify the channel &quot;admin&quot; and then the channel called &quot;admin&quot; creates a webpage called &quot;home&quot;, we will display it's content on your websites home page.  We expect this functionality to be extended to other areas in future.

+#include doc/macros/main_footer.bb;

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]

diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
index 0e59d2d4c..67c0159e3 100644
--- a/doc/what_is_zot.bb
+++ b/doc/what_is_zot.bb
@@ -58,4 +58,4 @@ For more detailed, technical information about Zot, check out the following link
  - [url=https://github.com/friendica/red/blob/master/include/zot.php]Zot reference implementation in PHP[/url]

 

 

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file
+#include doc/macros/main_footer.bb;