diff --git a/INSTALL.txt b/INSTALL.txt index d27c338ed..b1a15f014 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -Installation Instructions for OpenSlides 1.2 +Installation Instructions for OpenSlides 1.3 ============================================ Content @@ -48,7 +48,7 @@ I. Installation on Windows (32/64bit) easy_install django django-mptt reportlab pil If you use a 64bit version of Python, you have to install reportlab - and pil not by using easy_install but manually. + and PIL manually - without using easy_install. 2. Get OpenSlides: @@ -56,13 +56,12 @@ I. Installation on Windows (32/64bit) OR - b) Clone development version from mercurial repository - http://hg.openslides.org. This requires Mercurial source control - management (hg), see http://mercurial.selenic.com. - + b) Clone development version from OpenSlides' github repository + https://github.com/OpenSlides/OpenSlides. + This requires Git, see http://git-scm.com/. Open command line (cmd) and run: - hg clone http://hg.openslides.org OpenSlides + git clone git://github.com/OpenSlides/OpenSlides.git 3. Start OpenSlides server and open URL in your default browser: diff --git a/README.txt b/README.txt index 3d7096b1d..2f82dd045 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ English README file for OpenSlides ================================== -This is OpenSlides, version 1.2 (2012-07-25). +This is OpenSlides, version 1.3-beta1 (2012-10-30). What is OpenSlides? @@ -47,17 +47,27 @@ Command line options -------------------- The following command line options are available: +-h, --help + Shows all options + -a, --address=ADDRESS Changes the address on which the server will listen for connections --p, --port +-p PORT, --port=PORT Changes the port on which the server will listen for connections --syncdb - Create/ update the database + Creates/updates database before starting the server --reset-admin - This will reset the password of the user + Resets the password to 'admin' for user 'admin' + +-s SETTINGS, --settings=SETTINGS + Sets the path to the settings file. + +--no-reload + Does not reload the development server + Example 1: Openslides should only be accessible on this computer: openslides.exe -a 127.0.0.1 @@ -82,4 +92,3 @@ Browsers: IE 7+ Chrome Safari - diff --git a/openslides/__init__.py b/openslides/__init__.py index 17d119cf0..0fd7c9fdd 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -5,7 +5,7 @@ :license: GNU GPL, see LICENSE for more details. """ -VERSION = (1, 3, 0, 'alpha', 1) +VERSION = (1, 3, 0, 'beta', 1) def get_version(version=None):