From 8f369ed71c7da2a26285b13eb652e580efa4f3ca Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 10 Dec 2012 20:29:00 +0100 Subject: [PATCH] Updated INSTALL and README for 1.3 release. Use 'openslides' command instead of 'python start.py' for Linux/MacOS install instruction. --- INSTALL.txt | 24 ++++++++++++------------ README.txt | 21 ++++++++++----------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 076e088c0..f57e7f00e 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -87,21 +87,21 @@ II. Installation on GNU/Linux and MacOSX using the sources $ sudo apt-get install git $ git clone git://github.com/OpenSlides/OpenSlides.git OpenSlides - 3. Setup a virtual environment with virtualenv: + 3. Setup a virtual environment with virtualenv (optional): - Go to the (extracted/cloned) root directory of OpenSlides - and create virtualenv environment: + You can setup a virtual environment to install OpenSlides as + non-root user. + + E. g. for Ubuntu run: + $ sudo apt-get install python-virtualenv + + To setup and activate the virtual environment go to the + (extracted/cloned) root directory of OpenSlides and run: $ virtualenv .venv - - For virtualenv >= 1.7 use instead: - $ virtualenv --system-site-packages .venv - - 4. Activate the virtual environment: - $ source .venv/bin/activate - 5. Install the required python-packages: + 4. Install the required python-packages: $ pip install django django-mptt @@ -111,7 +111,7 @@ II. Installation on GNU/Linux and MacOSX using the sources If requirements reportlab or PIL still missing (see 1.): $ pip install reportlab pil - 6. Start OpenSlides server and open URL in your default browser: + 5. Start OpenSlides server and open URL in your default browser: $ python start.py @@ -124,7 +124,7 @@ II. Installation on GNU/Linux and MacOSX using the sources Use 'python start.py --help' to show all start options. - 7. Restart OpenSlides: + 6. Restart OpenSlides: To restart OpenSlides after closing the terminal activate the virtual environment (see 4.) before starting the server (see 6.). diff --git a/README.txt b/README.txt index 6a3f12f91..28f0a358d 100644 --- a/README.txt +++ b/README.txt @@ -2,13 +2,13 @@ English README file for OpenSlides ================================== -This is OpenSlides, version 1.3-rc1 (2012-11-27). +This is OpenSlides, version 1.3 (2012-12-10). What is OpenSlides? =================== -OpenSlides is a free, web-based presentation system for displaying and -controlling of agenda, applications and elections of an assembly. +OpenSlides is a free web-based presentation and assembly system for +displaying and controlling of agenda, motions and elections of an assembly. See http://openslides.org for more information. @@ -24,8 +24,9 @@ list or read the OpenSlides manual. See http://openslides.org. The start script of OpenSlides ============================== Simply running - openslides.exe (on Windows) or - python start.py (on Linux/MacOS) + openslides.exe (on Windows) +or + openslides (on Linux/MacOS) will start OpenSlides using djangos development server. It will also try to open OpenSlides in your default webbrowser. @@ -69,16 +70,14 @@ The following command line options are available: --no-reload Does not reload the development server +--version + Show version and exit. Example 1: Openslides should only be accessible on this computer: - openslides.exe -a 127.0.0.1 - or - python start.py -a 127.0.0.1 + openslides -a 127.0.0.1 Example 2: Like above, but also specify the port as 8080 - openslides.exe -a 127.0.0.01 -p 8080 - or - python start.py -a 127.0.0.1 -p 8080 + openslides -a 127.0.0.01 -p 8080 Supported operating systems and browsers