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

Conflicts:
	doc/DerivedTheme1.md
	doc/Developers.md
	doc/Features.md
	doc/Plugins.md
	doc/Privacy.md
	doc/README.md
	doc/Remove-Account.md
	doc/Translations.md
	doc/about.bb
	doc/account_basics.bb
	doc/accounts_profiles_channels_basics.bb
	doc/addons.bb
	doc/addons_gnusocial.bb
	doc/bbcode.html
	doc/campaign.bb
	doc/classRedmatrix_1_1Import_1_1Import-members.html
	doc/classRedmatrix_1_1Import_1_1Import.html
	doc/cloud.bb
	doc/connecting_to_channels.bb
	doc/connecting_to_channels.md
	doc/credits.bb
	doc/de/channels.bb
	doc/de/features.bb
	doc/de/main.bb
	doc/de/registration.bb
	doc/developers.bb
	doc/encryption.bb
	doc/external-resource-links.bb
	doc/extra_features.bb
	doc/faq_admins.bb
	doc/faq_developers.bb
	doc/faq_members.bb
	doc/features.bb
	doc/hidden_configs.bb
	doc/history.md
	doc/html/index.php
	doc/main.bb
	doc/permissions.bb
	doc/plugins.bb
	doc/problems-following-an-update.bb
	doc/profiles.bb
	doc/red2pi.bb
	doc/registration.bb
	doc/roadmap.bb
	doc/sv/main.bb
	doc/what_is_zot.bb
	doc/zot.md

1 files changed, 13 insertions, 13 deletions

diff --git a/doc/main.bb b/doc/main.bb
index 0c5844993..8085f2f2e 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -1,22 +1,22 @@
 [img][baseurl]/assets/hashlogo.png[/img]

 

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

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

 

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

-Hubzilla 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 $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.

 

-[zrl=[baseurl]/help/features][b]Hubzilla Features[/b][/zrl]

+[zrl=[baseurl]/help/features][b]$Projectname Features[/b][/zrl]

 

-The Hubzilla 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 Hubzilla is there to cater to your creativity.

+The $Projectname 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 $Projectname 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 Hubzilla. 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 Hubzilla there is no need for you to authenticate twice, even when accessing another Hubzilla site. Zot is what sets the Hubzilla apart. 

+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]

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

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

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

+[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the $Projectname: 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]

@@ -42,11 +42,11 @@ Zot is the great new communicaton protocol invented especially for the Hubzilla.
 [zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]

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

 [zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]

-[zrl=[baseurl]/help/hidden_configs]Tweaking Hubzilla's Hidden Configurations[/zrl]

+[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]

 [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]

 

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

-[zrl=[baseurl]/help/history]Hubzilla history[/zrl]

+[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]

 [zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]

@@ -79,11 +79,11 @@ Zot is the great new communicaton protocol invented especially for the Hubzilla.
 [url=https://github.com/redmatrix/hubzilla]Main Website[/url]

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

 [url=https://zothub.com/channel/one]Development Channel[/url]

-[url=https://federated.social/channel/postgres]Postgres-specific Hubzilla Admin Support Channel[/url]

+[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url]

 

-[url=[baseurl]/help/credits]Hubzilla Credits[/url]

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

 

-[size=large][b]About This Hubzilla Hub[/b][/size]

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

 [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]