Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	mod/item.php

1 files changed, 7 insertions, 9 deletions

diff --git a/doc/main.bb b/doc/main.bb
index 506f228e4..89cbd7c9b 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -1,7 +1,5 @@
 [img][baseurl]/assets/hashlogo.png[/img]

 

-[size=large][b]$Projectname Documentation[/b][/size]

-

 [zrl=[baseurl]/help/about][b]What is the $Projectname?[/b][/zrl]

 $Projectname is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.

 

@@ -13,7 +11,7 @@ Think of standalone family communication platforms, distributed online communiti
 [zrl=[baseurl]/help/what_is_zot][b]Got Zot? Well, you should.[/b][/zrl]

 Zot is the great new communicaton protocol invented especially for the $Projectname. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside the $Projectname there is no need for you to authenticate twice, even when accessing another $Projectname site. Zot is what sets the $Projectname apart. 

 

-[size=large][b]Getting Started[/b][/size]

+[h3]Getting Started[/h3]

 [zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]

 [zrl=[baseurl]/help/registration]Account Registration[/zrl]

 [zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the $Projectname: accounts, profiles and channels in short[/zrl]

@@ -26,7 +24,7 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 [zrl=[baseurl]/help/cloud]Cloud Storage[/zrl]

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

 

-[size=large][b]Members Help[/b][/size]

+[h3]Members Help[/h3]

 [zrl=[baseurl]/help/tags_and_mentions]Tags and Mentions[/zrl]

 [zrl=[baseurl]/help/webpages]Web Pages[/zrl]

 [zrl=[baseurl]/help/bbcode]BBcode reference for posts and comments[/zrl]

@@ -37,7 +35,7 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 [zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl]

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

 

-[size=large][b]Administrators Help[/b][/size]

+[h3]Administrators Help[/h3]

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

 [zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]

 [zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]

@@ -46,7 +44,7 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]

 [zrl=[baseurl]/help/service_classes]Service Classes[/zrl]

 

-[size=large][b]Technical Documentation[/b][/size]

+[h3]Technical Documentation[/h3]

 [zrl=[baseurl]/help/history]$Projectname history[/zrl]

 [zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl]

 [zrl=[baseurl]/help/zot]An introduction to Zot[/zrl]

@@ -72,10 +70,10 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]

 [zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl]

 

-[size=large][b]Frequently Asked Questions For Developers[/b][/size]

+[h3]Frequently Asked Questions For Developers[/h3]

 [zrl=[baseurl]/help/faq_developers]FAQ For Developers[/zrl]

 

-[size=large][b]External Resources[/b][/size]

+[h3]External Resources[/h3]

 [zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]

 [url=https://github.com/redmatrix/hubzilla]Main Website[/url]

 [url=https://github.com/redmatrix/hubzilla-addons]Addon Website[/url]

@@ -84,7 +82,7 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 

 [url=[baseurl]/help/credits]$Projectname Credits[/url]

 

-[size=large][b]About This $Projectname Hub[/b][/size]

+[h3]About This $Projectname Hub[/h3]

 [zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]

 [zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]

 [zrl=[baseurl]/siteinfo/json]Detailed Technical Hub Information in JSON format(/siteinfo/json)[/zrl]