This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit d0ac4dabe82bc684614cbbd93bed440e9859b775 Author: mathieu.doray@ifremer.fr <unknown> Date: Mon Feb 8 16:33:44 2016 +0100 From scmwebeditor -- dfg --- src/site/en/rst/usage.rst.vm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/site/en/rst/usage.rst.vm b/src/site/en/rst/usage.rst.vm index 422b17e..fc224e0 100644 --- a/src/site/en/rst/usage.rst.vm +++ b/src/site/en/rst/usage.rst.vm @@ -33,7 +33,7 @@ The application can be run in two different ways: - the *portable application*, which does not require a server - the *server-borne application* which requires to install *EchoBase* on a *tomcat* or *jetty* server. -How to use the portable Echobase? +How to use the portable (embedded) Echobase? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To use the portable Echobase, you just need to install java on your computer. @@ -126,22 +126,21 @@ _______________________________________ - the console should display startup messages and logs - When the application is launched, the internet browser should display the login page. -Utilisateurs -____________ +Users +_____ -Par défaut, deux utilisateurs sont fournis dans la base embarquée : +By default, two users are created in the portable database: -- admin / admin (avec des droits d'administration) -- user / user (pour la consultation) +- admin / admin (with administration rights) +- user / user (with data query rights) -Configuration base de travail -_____________________________ +Working database configuration +______________________________ -Une configuration de base de travail est aussi crée automatiquement vers une -base de type *H2* stoquée dans le répertoire *db* avec les identifiants suivants : +A working database configuration is also created by default, pointing toward an *H2* database located in the *db* folder, with the following credentials: - login: *sa* -- mot de passe: *sa* +- password: *sa* Utiliser la version mode serveur ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.