aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-17 11:20:43 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-17 11:20:43 +0200
commite465a321681ba12ee340868fb255e6c63337241f (patch)
tree96e3cd3b9fd71118a4c0d20546526d76d74194f7
parent61e4ee753dd0e823c47a5cf2e485f7f69fb4d125 (diff)
parent811cfc56d5f8ef16e72bd407b2113e05959d8732 (diff)
downloadvolse-hubzilla-e465a321681ba12ee340868fb255e6c63337241f.tar.gz
volse-hubzilla-e465a321681ba12ee340868fb255e6c63337241f.tar.bz2
volse-hubzilla-e465a321681ba12ee340868fb255e6c63337241f.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rw-r--r--doc/features.bb6
-rw-r--r--version.inc2
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/features.bb b/doc/features.bb
index 31e614ebf..56563c2c2 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -4,13 +4,11 @@
TL;DR
-Redmatrix provides distributed web publishing with [b]decentralised permissions[/b].
+Redmatrix provides distributed web publishing and social communications with [b]decentralised permissions[/b].
So what exactly are "decentralised permissions"? They give me the ability to share something on my website (photos, media, files, webpages, etc.) with specific people on completely different websites - but not necessarily [i]everybody[/i] on those websites; and they do not need a password on my website and do not need to login to my website to view the things I've shared with them. They have one password on their own website and "magic authentication" between affiliated websites in the network. Also, as it is decentralised, there is no third party which has the ability to bypass permissions and see everything in the network.
-Redmatrix is an open source webserver application written originally in PHP/MySQL and is compatible with many shared hosting as well as dedicated VPS environments; and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools.
-
-Redmatrix can be used as a social networking application (indeed many people use it primarily for this purpose), and it has a blend of features and abilities which make it far more suited for that task than many other server based "social networks", especially amongst those classified as "decentralised"; (most of which aren't much more than "chat with pictures and persistence"). It is however, [i]primarily[/i] a web publishing platform with permissions. The ability to perform social networking is just another feature which helps to make it interesting and generally useful amongst content publishers and their audiences alike.
+Redmatrix is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools.
[b][size=24]Redmatrix Features[/size][/b]
diff --git a/version.inc b/version.inc
index 274fa1b46..7760578a4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-15.1003
+2015-04-16.1004