Merge https://github.com/friendica/red into pending_merge

3 files changed, 14 insertions, 12 deletions

diff --git a/doc/Privacy.md b/doc/Privacy.md
index 9519651eb..2709f47aa 100644
--- a/doc/Privacy.md
+++ b/doc/Privacy.md
@@ -64,7 +64,7 @@ A decentralized identity has a lot of advantages and gives you al lot of interes
 
 The RedMatrix is a global network which is inclusive of all religions and cultures. This does not imply that every member of the network feels the same way you do on contentious issues, and some people may be STRONGLY opposed to the content you post. In general, if you wish to post something that you know may nor be universally acceptable, the best approach is to restrict the audience using privacy controls to a small circle of friends. 
 
-The RedMatrix as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the RedMatrix as a network cannot block it from being posted.
+The RedMatrix as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. Please check (periodically) the [Terms of Service](help/TermsOfService) of your hub to learn about any rules or guidelines. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the RedMatrix as a network cannot block it from being posted.
 
 The RedMatrix RECOMMENDS that hub administrators provide a grace period of 1-2 days between warning an account holder of content that needs to be removed and physically removing or disabling the account. This will give the content owner an opportunity to export their channel meta-data and import it to another site. In rare cases the content may be of such a nature to justify the immediate termination of the account. This is a hub decision, not a RedMatrix decision. 
 
diff --git a/doc/main.bb b/doc/main.bb
index b5eeeccb1..c9984b1f6 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -1,21 +1,21 @@
 [img][baseurl]/assets/hashlogo.png[/img]

 

-[size=large][b]Red Matrix Documentation[/b][/size]

+[size=large][b]RedMatrix Documentation[/b][/size]

 

-[zrl=[baseurl]/help/about][b]What is the Red Matrix?[/b][/zrl]

-Red Matrix 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.

+[zrl=[baseurl]/help/about][b]What is the RedMatrix?[/b][/zrl]

+RedMatrix 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.

 

-[zrl=[baseurl]/help/features][b]Red Matrix Features[/b][/zrl]

-The Red Matrix is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis. 

-Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the Red Matrix is there to cater to your creativity.

+[zrl=[baseurl]/help/features][b]RedMatrix Features[/b][/zrl]

+The RedMatrix is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis. 

+Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the RedMatrix is there to cater to your creativity.

 

 [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 Red Matrix. 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 Red Matrix there is no need for you to authenticate twice, even when accessing another Red Matrix site. Zot is what sets the Red Matrix apart. 

+Zot is the great new communicaton protocol invented especially for the RedMatrix. 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 RedMatrix there is no need for you to authenticate twice, even when accessing another RedMatrix site. Zot is what sets the RedMatrix apart. 

 

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

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

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

-[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the Red Matrix: accounts, profiles and channels in short[/zrl]

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

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

 [zrl=[baseurl]/help/channels]Channels[/zrl]

 [zrl=[baseurl]/help/roles]Permission roles and Channel types[/zrl]

@@ -75,5 +75,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri
 [url=https://zothub.com/channel/one]Development Channel[/url]

 

 [url=[baseurl]/help/credits]RedMatrix Credits[/url]

-[size=large][b]About This Red Matrix Site[/b][/size]

-[zrl=[baseurl]/siteinfo] [baseurl]/siteinfo[/zrl]

+
+[size=large][b]About This RedMatrix Hub[/b][/size]

+[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]
+[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]

diff --git a/doc/registration.bb b/doc/registration.bb
index c507a86a6..072e82bf2 100644
--- a/doc/registration.bb
+++ b/doc/registration.bb
@@ -12,7 +12,7 @@ Enter a password of your choice, and repeat it in the second box to ensure it wa
 

 [b]Terms Of Service[/b]

 

-Click the link to read the site's terms of service. Once you've read them, tick the box in the register form to confirm.

+Click the link to read the site's [zrl=[baseurl]/help/TermsOfService]Terms of Service[/zrl]. Once you've read them, tick the box in the register form to confirm.

 

 [b]Register[/b]