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, 2 insertions, 2 deletions

diff --git a/doc/red2pi.bb b/doc/red2pi.bb
index 03e05aa99..6d15d3afe 100644
--- a/doc/red2pi.bb
+++ b/doc/red2pi.bb
@@ -239,10 +239,10 @@ Cleanup: Remove the directory www/ (Git will not create files and folders in dir
 Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code]

 

 Download the sources of RED from GIT

-[code]pi@pi /var $ sudo git clone https://github.com/friendica/red.git www[/code]

+[code]pi@pi /var $ sudo git clone https://github.com/redmatrix/redmatrix.git www[/code]

 

 Download the sources of the addons from GIT

-[code]pi@pi /var/www $ sudo git clone https://github.com/friendica/red-addons.git addon[/code]

+[code]pi@pi /var/www $ sudo git clone https://github.com/redmatrix/redmatrix-addons.git addon[/code]

 

 Make user www-data the owner of the whole red directory (including subdirectories and files)

 (TODO: This step has to be proofed by the next installation.)