Adapt documentation

Author: Birgit Schachler

README.rst

@@ -1,6 +1,8 @@
-The windpowerlib is designed to calculate feedin time series of wind power plants. The windpowerlib is an out-take from the feedinlib (windpower and pv) to build up a community concentrating on wind power models.
+windpowerlib
+==============
 
-The windpowerlib is ready to use but may have some teething troubles. The used model is still very simple but we found some new contributors and the windpowerlib will improve soon. If you are interested in wind models and want to improve the existing model, publish an alternative model or extend it to wind farms do not hesitate to contact us.
+The windpowerlib is designed to calculate feedin time series of wind power plants. The windpowerlib is an out-take from the 
+`feedinlib <https://github.com/oemof/feedinlib>`_ (windpower and pv) to build up a community concentrating on wind power models.
 
 .. contents:: `Table of contents`
     :depth: 1
@@ -10,67 +12,44 @@ The windpowerlib is ready to use but may have some teething troubles. The used m
 Introduction
 ============
 
-Having weather data sets you can use the windpowerlib to calculate the electrical output of common wind power plants. Basic parameters for many manufacturers are provided with the library so that you can start directly using one of these parameter sets. Of course you are free to add your own parameter set.
+Having weather data sets you can use the windpowerlib to calculate the electrical output of common wind turbines. 
+Basic parameters for many manufacturers are provided with the library so that you can start directly using one of these parameter sets. Of course you are free to add your own parameter set.
+For a quick start download the example weather data and basic example file and execute it:
 
-The cp-values for the wind turbines are provided by the Reiner Lemoine Institut and can be found here:
+https://github.com/wind-python/windpowerlib/tree/master/example
 
- * http://vernetzen.uni-flensburg.de/~git/cp_values.csv
+Documentation
+==============
 
+Full documentation can be found at `readthedocs <http://windpowerlib.readthedocs.org/en/latest/>`_. Use the project site of readthedocs to choose the version of the documentation. 
 
-Actual Release
-~~~~~~~~~~~~~~
-
-Download/Install: https://pypi.python.org/pypi/windpowerlib/
-
-Documentation: http://pythonhosted.org/windpowerlib/
-
-Developing Version
-~~~~~~~~~~~~~~~~~~
+Contributing
+==============
 
 Clone/Fork: https://github.com/wind-python/windpowerlib
 
-Documentation: http://windpowerlib.readthedocs.org/en/latest/
-
-As the windpowerlib started with contributors from the oemof developer group we use the same developer rules: http://oemof.readthedocs.io/en/stable/developer_notes.html
+If you are interested in wind models and want to help improve the existing model do not hesitate to contact us.
+As the windpowerlib started with contributors from the `oemof developer group <https://github.com/orgs/oemof/teams/oemof-developer-group>`_ we use the same 
+`developer rules <http://oemof.readthedocs.io/en/stable/developing_oemof.html>`_.
 
 
 Installation
 ============
 
-Using the windpowerlib
-~~~~~~~~~~~~~~~~~~~~~~~
-
-So far, the windpowerlib is mainly tested on python 3.4 but seems to work down
-to 2.7.
-
 Install the windpowerlib using pip3.
 
 ::
 
     pip3 install windpowerlib
 
-Developing the Windpowerlib
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you have push rights clone this repository to your local system.
-
-::
-
-    git clone [email protected]:oemof/windpower.git
-    
-If you do not have push rights, fork the project at github, clone your personal fork to your system and send a pull request.
-
-If the project is cloned you can install it using pip3 with the -e flag. Using this installation, every change is applied directly.
-
-::
+So far, the windpowerlib is mainly tested on python 3.4 but seems to work down to 2.7.
+Please see the `Installation page <http://oemof.readthedocs.io/en/stable/installation_and_setup.html>`_ of the documentation for complete instructions.
 
-    pip3 install -e <path/to/the/windpowerlib/root/dir>
-    
 
 Optional Packages
 ~~~~~~~~~~~~~~~~~
 
-To see the plots of the example file one should install the matplotlib package.
+To see the plots of the example file you should install the matplotlib package.
 
 Matplotlib can be installed using pip3 but some Linux users reported that it is easier and more stable to use the pre-built packages of your Linux distribution.
 

doc/modules.rst

@@ -47,9 +47,9 @@ power curve or power coefficient curve needed by the :py:class:`~wind_turbine.Wi
 .. autosummary::
    :toctree: temp/
 
-   wind_turbine.WindTurbine.fetch_wpp_data
-   wind_turbine.get_wind_pp_types
-   wind_turbine.read_wpp_data
+   wind_turbine.WindTurbine.fetch_turbine_data
+   wind_turbine.get_turbine_types
+   wind_turbine.read_turbine_data
 
 
 Power output
@@ -90,5 +90,4 @@ Methods of the Modelchain object.
 
    modelchain.Modelchain.rho_hub
    modelchain.Modelchain.v_wind_hub
-   modelchain.Modelchain.turbine_power_output
-   modelchain.Modelchain.read_weather_data
+   modelchain.Modelchain.turbine_power_output