diff --git a/README.rst b/README.rst
index cf6d04a4e..aa64c0f8e 100644
--- a/README.rst
+++ b/README.rst
@@ -54,11 +54,7 @@ Installation on GNU/Linux or Mac OS X
3. Install OpenSlides
- To use the Python Package Index (PyPI) simply run::
-
- $ pip install openslides
-
- You can also use the package from the `OpenSlides Website
+ You can use the package from the `OpenSlides Website
`_. Download latest OpenSlides release
as compressed tar archive and run::
@@ -80,8 +76,8 @@ portable version you should observe the following install steps.*
Make sure that you have installed Python Programming Language 3 (>= 3.3)
and Setuptools on your system.
- a. Download and run the `Python 32-bit MSI installer
- `_. Note
+ a. Download and run the latest `Python 3.4 32-bit MSI installer
+ `_. Note
that the 32-bit MSI installer is required even on a 64-bit Windows
system. If you use the 64-bit MSI installer, step 3 of this
instruction will fail unless you installed the package reportlab
@@ -117,11 +113,7 @@ portable version you should observe the following install steps.*
3. Install OpenSlides
- To use the Python Package Index (PyPI) simply run on command line (cmd)::
-
- > easy_install openslides
-
- You can also use the package from the `OpenSlides Website
+ You can use the package from the `OpenSlides Website
`_. Download latest OpenSlides release
as compressed tar archive and run::
@@ -198,16 +190,10 @@ Installation and start of the development version
Follow step 2 in the correspondent instruction in section III.
-4. Install all required Python packages
-
- For Unix and Mac OS X run::
+4. Install all required Python packages::
$ pip install -r requirements.txt
- For Windows run::
-
- > easy_install # Insert all packages from requirements.txt and requirements_production.txt here
-
5. Install all npm and bower packages
For Unix and Mac OS X run::
@@ -231,17 +217,13 @@ Installation and start of the development version
> node_modules\.bin\gulp
-7. Create a development settings file
+7. Start OpenSlides
Use the command-line interface::
- python manage.py create-dev-settings
+ python manage.py start
-8. Start OpenSlides
-
- Use the command-line interface::
-
- python manage.py start --settings settings.py
+ This will create a new development directoy with settings.py and database.
To get help on the command-line options run::
@@ -275,16 +257,8 @@ OpenSlides uses the following projects or parts of them:
* `Django CKEditor `_, License: BSD
-* `django-jsonfield `_,
- License: MIT
-
* `Django haystack `_, License: BSD
-* `insertpre CKEditor plugin `_,
- License: GPL/LGPL/MPL
-
-* `natsort `_, License: MIT
-
* `pdf.js `_, License: Apache License v2.0
* `ReportLab `_,
@@ -295,9 +269,6 @@ OpenSlides uses the following projects or parts of them:
* `setuptools `_,
License: Python Software Foundation License
-* `sockjs-client `_,
- License: MIT
-
* `sockjs-tornado `_,
License: MIT
@@ -317,44 +288,7 @@ OpenSlides uses the following projects or parts of them:
* `Whoosh `_, License: BSD
-* `jQuery `_, License: MIT
-
-* jQuery Plugins:
-
- - `jQuery DataTables Plugin `_, License:
- BSD/GPLv2
-
- - `DataTables Natural Sort Plugin `_,
- License: MIT
-
- - `jQuery Cookie Plugin `_,
- License: MIT
-
- - `jQuery Form Plugin `_, License: MIT/GPLv2
-
- - `jQuery Once Plugin `_, License: MIT/GPL
-
- - `jQuery Templating Plugin
- `_, License: MIT/GPLv2
-
- - `jQuery bsmSelect `_, License:
- MIT/GPLv2
-
-* `jQuery UI `_ with custom ui components: core,
- widget, mouse, resizable, sortable, datepicker, slider and css theme 'smoothness',
- License: MIT
-
-* jQuery UI AddOns:
-
- - `jQuery UI Nested Sortable
- `_, License: MIT
-
- - `jQuery UI Slider Access
- `_, License:
- MIT/GPLv2
-
- - `jQuery UI Timepicker
- `_, License: MIT/GPLv2
+* Several JavaScript packages (see bower.json)
VII. License and authors