aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md47
1 files changed, 27 insertions, 20 deletions
diff --git a/README.md b/README.md
index 98bd5e331..a1b3e1cbf 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,28 @@
-CKEditor WYSIWYG plugin
-========================
-
-Configuration options
-----------------------
-CKEditor configuration is set in the view js/ckeditor. The configuration object
-is elgg.ckeditor.config. A plugin can modify the configuration object by registering
-a function to run before the ckeditor.init function on the 'init', 'system' hook.
-This is where toolbar options and the skin are set.
-
-Content CSS
-------------
-The content CSS is stored in the view css/wysiwyg. This view is extended by the
-css/elements/reset and css/elements/typography views so that content appears the
-same when editing and viewing. It also contains all the CSS applied to the
-elgg-output class for the same reason (see the typography view).
-
-Hints
-------------
- * If your theme does not use borders with tables, enable the CKEditor showborders plugin.
+Lorea
+=====
+(Re-)Taking the Networks!
+
+The [lorea](https://lorea.org) code aims at providing individuals and teams with privacy-aware, security-conscious, and user-controlled-data collaborative tools over the Web, and around it.
+
+The main application is based on [Elgg](http://elgg.org), a PHP-based social networking platform. Lorea extends it with plugins to provide better privacy features, including strong encryption, *OStatus-based federation* with other Lorea/Elgg installations and OStatus-compliant projects, etc.
+
+It also integrates other popular technologies such as [DokuWiki](http://www.dokuwiki.org), [Etherpad](http://etherpad.org), [XMPP](http://xmpp.org), etc., and provides *GPG-encrypted mailing-lists* to groups.
+
+### Installation
+
+Our code is divided in two git repositories: elgg and lorea-plugins. You can get it using the following commands.
+
+<pre>
+$ git clone git://gitorious.org/lorea/elgg.git
+$ cd elgg
+$ git remote add lorea-plugins git://gitorious.org/lorea/lorea-plugins.git
+$ git pull lorea-plugins master
+</pre>
+
+You can update the code to the latest release using:
+
+<pre>
+$ git pull origin master
+$ git pull lorea-plugins master
+</pre>