Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 6 insertions, 5 deletions

diff --git a/doc/main.bb b/doc/main.bb
index 1fd234420..bb1de0e67 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -6,6 +6,7 @@
 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]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.

 

@@ -63,20 +64,20 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix
 [zrl=[baseurl]/help/api_functions]API functions[/zrl]

 [zrl=[baseurl]/help/api_posting]Posting to the red# using the API[/zrl]

 [zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl]

-[zrl=[baseurl]/doc/html/]Code Reference (doxygen generated - sets cookies)[/zrl]

+[zrl=[baseurl]/doc/html/]Code Reference (Doxygen generated - sets cookies)[/zrl]

 [zrl=[baseurl]/help/to_do_doco]To-Do list for the Red Documentation Project[/zrl]

 [zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl]

 [zrl=[baseurl]/help/roadmap]Version 3 roadmap[/zrl]

 [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl]

-[zrl=[baseurl]/help/dev_beginner]Sep-for-step manual for beginning 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]

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

 

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

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

-[url=https://github.com/friendica/red]Main Website[/url]

-[url=https://github.com/friendica/red-addons]Addon Website[/url]

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

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

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

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

 

@@ -85,4 +86,4 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix
 [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]

-[zrl=[baseurl]/siteinfo_json]Detailed Technical Hub Information (/siteinfo_json)[/zrl]

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