diff --git a/INSTALL b/INSTALL.txt similarity index 100% rename from INSTALL rename to INSTALL.txt diff --git a/MANIFEST.in b/MANIFEST.in index 36f436eed..6bf92a5f7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include AUTHORS include LICENSE -include INSTALL +include INSTALL.txt include CHANGELOG include initial_data.json include manage.py diff --git a/README.txt b/README.txt index 86811c775..722747528 100644 --- a/README.txt +++ b/README.txt @@ -1,31 +1,32 @@ English README file for OpenSlides ================================== - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Attention: This is a BETA version of OpenSlides. This means, some - functionalities might be missing or NOT WORKING CORRECTLY. - - Beta versions are intended for testing to learn about the upcoming - version and to suggest changes. They should not be used in a - production environment. - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -This is OpenSlides, version 1.2-RC1 (2012-07-16). +This is OpenSlides, version 1.2 (2012-07-25). What is OpenSlides? =================== OpenSlides is a free, web-based presentation system for displaying and -controlling of agendas, applications and elections of an event. +controlling of agenda, applications and elections of an assembly. See http://www.openslides.org for more information. Getting started =============== -Simply running openslides.exe will start OpenSlides using djangos -development server. It will also try to open OpenSlides in your -default webbrowser. +Install and start OpenSlides as described in the INSTALL.txt. + +If you need help please contact the OpenSlides team on public mailing +list or read the OpenSlides manual. See http://www.openslides.org. + + +The start script of OpenSlides +============================== +Simply running + openslides.exe (on Windows) or + python start.py (on Linux/MacOS) +will start OpenSlides using djangos development server. It will also +try to open OpenSlides in your default webbrowser. The server will listen on the IP address of your current hostname on port 80 (if port 80 is not available port 8000 will be used). @@ -42,7 +43,7 @@ is as follows: Command line options -==================== +-------------------- The following command line options are available: -a, --address=ADDRESS @@ -59,20 +60,25 @@ The following command line options are available: 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 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 Supported operating systems and browsers ======================================== -Operating Systems: - Windows XP or newer (32 and 64bit) [use openslides.exe] - MacOS X [use start.py, see INSTALL] - GNU/Linux [use start.py, see INSTALL] +Operating Systems (OpenSlides runs anywhere where Pyhton is running): + Windows XP or newer (32 and 64bit) + MacOS X + GNU/Linux Browsers: Firefox 3.6+ IE 7+ Chrome Safari + diff --git a/openslides/__init__.py b/openslides/__init__.py index 2420bcb16..6e440cbbb 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -5,7 +5,7 @@ :license: GNU GPL, see LICENSE for more details. """ -VERSION = (1, 2, 0, 'rc', 1) +VERSION = (1, 2, 0, 'final', 1) def get_version(version=None): """Derives a PEP386-compliant version number from VERSION."""