sync abook entries from redmatrix

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

Conflicts:
	include/items.php

4 files changed, 1 insertions, 35 deletions

diff --git a/doc/credits.bb b/doc/credits.bb
index 4923bdadc..5459c7d7a 100644
--- a/doc/credits.bb
+++ b/doc/credits.bb
@@ -1,7 +1,6 @@
 [b]Credits[/b]
 
 Mike Macgirvin
-Thomas Willingham
 Fabio Comuni
 Simon L'nu
 marijus
diff --git a/doc/debian_install.bb b/doc/debian_install.bb
deleted file mode 100644
index e8f4a7bd3..000000000
--- a/doc/debian_install.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-[b]Installing On Debian[/b]

-

-While following the instructions for any other installation will work on Debian, for this platform we also provide an install script 

-which can be [url=http://gitweb.whogotzot.com/debian-install-script]downloaded here[/url]

-

-[b]THIS SCRIPT IS MEANT TO BE RUN ON A NEW OR JUST REINSTALLED SERVER[/b]

-

-Some programs such as Apache & Samba are removed by this script.

-

-Note, this script will use Nginx as the webserver.  It will also install PHP and MySQL from the DotDeb repository.  The DotDeb is not an official Debian repository, though it is maintained by Debian developers.

-

-The file setup-debian.sh has to be on your server.

-

-For the initial setup git may not be installed on your server, to install git:

-

-[code]apt-get install git[/code]

-

-If wget is installed try

-

-[code]wget http://git.beardyunixer.com/debian-install-script/blob/HEAD:/debian-setup.sh[/code]

-

-To install wget:

-[code]apt-get install wget[/code]

-

-For intitial server setup run

-[code]bash setup-debian.sh all[/code]

-

-To install Red for domain example.com, after the initial server setup run

-

-[code]bash setup-debian.sh red example.com[/code]

-

-#include doc/macros/main_footer.bb;

diff --git a/doc/main.bb b/doc/main.bb
index 89cbd7c9b..d71f819b2 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -37,7 +37,6 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 

 [h3]Administrators Help[/h3]

 [zrl=[baseurl]/help/install]Install[/zrl]

-[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 $Projectname's Hidden Configurations[/zrl]

diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb
index e2ba11e3e..3bc7e9a51 100644
--- a/doc/problems-following-an-update.bb
+++ b/doc/problems-following-an-update.bb
@@ -20,7 +20,7 @@ If you're using php5-fpm, this problem is usually resolved with [code]service ph
 

 Symptoms:  

 

-1) [zrl=https://beardyunixer.com/page/jargon/wsod]White Screen Of Death[/zrl].  This is most prevalent on the settings and admin pages.

+1) White Screen Of Death.  This is most prevalent on the settings and admin pages.

 

 2) Missing icons, tabs, menus or features.