From bbe38dcc31e86cb7a1f8f714c5e151d89d9bdab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Sun, 7 Jul 2013 16:49:37 +0200 Subject: [PATCH] Updated INSTALL.md Former-commit-id: 9693d741081ee8af9aa552a282b1cb240dbbd829 --- INSTALL.md | 18 +++++++++--------- README.md | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index e999870..e6b5646 100755 --- a/INSTALL.md +++ b/INSTALL.md @@ -11,7 +11,7 @@ installation routine. # 1 - System requirements -Baïkal is based on PHP 5.3.0, and uses a SQLite3 with PHP PDO. This +Baïkal is based on PHP 5.3.1+, and uses a SQLite3 or MySQL with PHP PDO. This document does not cover the installation of these requirements. ## 1.1 - System requirements for FTP-driven hosting @@ -20,9 +20,9 @@ The following configuration is the minimum required: - an hosted webserver running apache 2 and PHP 5.3.0 -- PHP 5.3.0 or newer with the following extensions: +- PHP 5.3.1 or newer with the following extensions: - PDO and SQLite3 or MySQL - - DOM (php-xml) + - DOM (php-xml) Some extensions can be optionally compiled into PHP. A list of loaded extensions can be checked using the phpinfo() function. @@ -41,9 +41,9 @@ The following configuration is the minimum required: NOTE: tools to create and manage users are command line only. Web-based interfaces will be produced in the future. -- PHP 5.3.0 or newer with the following extensions: +- PHP 5.3.1 or newer with the following extensions: - PDO and SQLite3 or MySQL - - DOM (php-xml) + - DOM (php-xml) Some extensions can be optionally compiled into PHP. A list of loaded extensions can be checked using the phpinfo() function. @@ -163,7 +163,7 @@ In our example, we will assume that the nginx configuration directory is: # h. Restart nginx $ root:/etc/nginx/sites-enabled> /etc/init.d/nginx restart - + #### 3.2.1.3 - Setting up Baïkal In a web browser, navigate to http://dav.mydomain.com and follow the instructions of the initialization web tool @@ -228,8 +228,8 @@ Add a new CardDAV account: Add a new CardDAV account: * in Settings > Mail, Contacts, Calendar > Add an account > Other - * Select "CardDAV" - * Server: dav.mydomain.com/card.php (note: no http:// nor https://, and no trailing slash) + * Select "CardDAV" + * Server: dav.mydomain.com/card.php (note: no http:// nor https://, and no trailing slash) * username: the username you just created (in our example, jerome) * password: the password you just defined @@ -244,7 +244,7 @@ Add a new CalDAV account: # 6 - You're done -You may now create new calendars, new events, new visit cards :) Enjoy. +You may now create new calendars, new events, new contact (: Enjoy. # 7 - Troubleshooting diff --git a/README.md b/README.md index f98ca2e..b96dc7e 100755 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ Go to http://baikal-server.com to get more information about this package, and u # 2. What is Baïkal ? Baïkal is an open source lightweight CalDAV and CardDAV server. It's developped -by Jérôme Schneider and based on the SabreDAV library. Baïkal -is distributed under the GPL license. +by Jérôme Schneider and based on the excellent [http://code.google.com/p/sabredav/](SabreDAV) project. +Baïkal is distributed under the GPL license. To get more info about the GPL license, visit http://www.opensource.org/licenses/gpl-license.php. # 3. Baïkal requirements -Baïkal is based on PHP 5.3.0, and uses a SQLite3 with PHP PDO. For more +Baïkal is based on PHP 5.3.1+, and uses a SQLite3 or MySQL with PHP PDO. For more information regarding these requirements see the INSTALL.md file in this folder. # 4. What should you do if you have a problem ? @@ -48,4 +48,4 @@ Baïkal is developed by Jérôme Schneider. Jérôme Schneider (@jeromeschneider) is admin and lead developer. Many thanks to Daniel Aleksandersen (@zcode) for greatly improving the quality of the project page (http://baikal-server.com). Much appreciated, Daniel :) --- Jérôme Schneider Mon, 21 Aug 2012 12:17:00 +0100 +-- Jérôme Schneider Mon, 21 Aug 2012 12:17:00 +0100