Make database.xml valid

[grauphel.git] / README.rst

diff --git a/README.rst b/README.rst
index 7fd2d4e45e46516a5d638d3ddda952f844d7391b..d6fdf1ca8c8708e61cd2f00fc69fb53bf27b8de9 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -91,13 +91,18 @@ __ http://pecl.php.net/package/oauth
 Installation
 ============
 
+.. note::
+   grauphel needs to be activated for all users.
+   It will not work with the "enable only for specific groups" setting.
+
 App store installation
 ======================
-Installation via the app store does not work currently, see
-https://github.com/cweiske/grauphel/issues/26
-
-If one day it works, you can use the ownCloud "Apps" app, select
-"Productivity" and install grauphel with a single click.
+#. Log into owncloud as administrator
+#. Goto "Apps"
+#. Enable experimental apps in the settings
+#. Click "Productivity"
+#. Look for "grauphel - Tomboy sync server"
+#. Click "Activate"
 
 
 Manual installation
@@ -105,12 +110,13 @@ Manual installation
 
 #. SSH onto your web server
 #. Navigate to the owncloud ``apps`` directory, often in ``/var/www/owncloud/apps``
-#. Download the latest release from http://cweiske.de/grauphel.htm and extract it.
+#. Download the latest release from http://cweiske.de/grauphel.htm#download
+   and extract it.
    For example::
 
-     $ wget http://cweiske.de/download/grauphel/grauphel-0.6.1.tar.bz2
-     $ tar xjvf grauphel-0.6.1.tar.bz2
-     $ rm grauphel-0.6.1.tar.bz2
+     $ wget http://cweiske.de/download/grauphel/grauphel-0.6.4.tar.gz
+     $ tar xjvf grauphel-0.6.4.tar.gz
+     $ rm grauphel-0.6.4.tar.gz
 
    You do have a directory ``/var/www/owncloud/apps/grauphel`` now.
 #. Using your browser, login as administrator into ownCloud and click
@@ -126,12 +132,24 @@ You have to install the PHP PECL oauth extension now.
 On Debian 7, do the following::
 
   $ apt-get install libpcre3-dev php-pear php5-dev
-  $ pecl install oauth
+  $ pecl install oauth-1.2.3
   $ echo 'extension=oauth.so' > /etc/php5/conf.d/oauth.ini
   $ /etc/init.d/apache2 restart
 
 Reload the ownCloud page in your browser now.
 
+.. note::
+   ``oauth-1.2.3`` is only needed on PHP 5.x
+   For PHP 7 simply use ``pecl install oauth``.
+
+
+========
+Download
+========
+.. LATESTRELEASE
+
+See `grauphel downloads page <http://cweiske.de/grauphel-download.htm>`_
+for all released versions.
 
 ======
 Author
@@ -191,5 +209,9 @@ To release a new version, do the following:
    The file will be in ``dist/``
 #. Test the release on a server
 #. Tag the release in git
-#. Upload the release to http://cweiske.de/grauphel.htm
+#. Upload the release to http://cweiske.de/grauphel.htm with::
+
+     $ cd ~/Dev/html/cweiske.de
+     $ ./scripts/update-grauphel.sh
+
 #. Link the new release on https://apps.owncloud.com/content/show.php?content=166654