Merge pull request #819 from normanjaeckel/BeforeRelease

Fix README and INSTALL
This commit is contained in:
Norman Jäckel 2013-07-08 11:02:33 -07:00
commit ab5f23d038
2 changed files with 15 additions and 15 deletions

View File

@ -1,5 +1,5 @@
==============================================
Installation Instructions for OpenSlides 1.4
Installation instructions for OpenSlides 1.4
==============================================
Content
@ -14,8 +14,8 @@ If you need help ask on OpenSlides users mailing list.
See http://openslides.org for more information.
I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
=============================================================================
I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
===============================================================================
1. Check requirements:
@ -80,8 +80,8 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
$ openslides
II. Installation on GNU/Linux and MacOSX using the package from openslides.org
================================================================================
II. Installation on GNU/Linux and MacOSX using the package from openslides.org
===============================================================================
1. Get OpenSlides:
@ -90,7 +90,7 @@ II. Installation on GNU/Linux and MacOSX using the package from openslides.org
2. Follow the same steps as in I. but use in step 3.
$ pip install openslides-XXX.tar.gz
$ pip install openslides-1.4.tar.gz
instead of $ pip install openslides.
@ -160,8 +160,8 @@ III. Installation on GNU/Linux and MacOSX using the sources (for development)
$ python start.py
IV. Installation on Windows using the Python Package Index (PyPI)
=========================================================================
IV. Installation on Windows using the Python Package Index (PyPI)
==================================================================
NOTE: There is a portable version of OpenSlides for Windows which does not
required any install steps! If there is a reason that you can not use the

View File

@ -19,8 +19,8 @@ Getting started
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://openslides.org.
If you need help please contact the OpenSlides team on public mailing list
or read the OpenSlides manual. See http://openslides.org.
The start script of OpenSlides
@ -34,13 +34,13 @@ Simply running
or
openslides (on Linux/MacOS)
will start OpenSlides using djangos development server. It will also
will start OpenSlides using the integrated Tornado webserver. 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).
This means that the server will be available to everyone on your
local network (at least for commonly used network configurations).
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. This means that
the server will be available to everyone on your local network (at least
for commonly used network configurations).
See `Command line options` below if you need to change this.