Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
index 5dce2cb6f..50df9e392 100644
--- a/doc/what_is_zot.bb
+++ b/doc/what_is_zot.bb
@@ -1,6 +1,6 @@
 [b]What is Zot?[/b]

 

-Zot is the protocol that powers the Red Matrix, providing three core capabilities: Communications, Identity, and Access Control.

+Zot is the protocol that powers the $Projectname, providing three core capabilities: Communications, Identity, and Access Control.

 

 The functionality it provides can also be described as follows: 

 

@@ -39,7 +39,7 @@ You cannot be silenced. You cannot be removed from the matrix, unless you yourse
 

 [b][size=20]Access Control[/size][/b]

 

-Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. 

+Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the $Projectname. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. 

 

 Currently, the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities, such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control.

 

@@ -55,7 +55,7 @@ For more detailed, technical information about Zot, check out the following link
 

  - [url=https://github.com/friendica/red/wiki/zot]Zot development specification[/url]

 

- - [url=https://github.com/redmatrix/redmatrix/blob/master/include/zot.php]Zot reference implementation in PHP[/url]

+ - [url=https://github.com/redmatrix/hubzilla/blob/master/include/zot.php]Zot reference implementation in PHP[/url]

 

 

 #include doc/macros/main_footer.bb;