Merge remote-tracking branch 'origin/master'

Author: jtodea

.travis.yml

@@ -1,22 +1,21 @@
 #OSIAM Connector for Python
 
-This project contains the OSIAM Connector for Python and some auxiliary modules that depend on the connector.
+This repository contains the OSIAM Connector for Python and some auxiliary modules that depend on the connector. For more information and documentation visit the [repo's Wiki](https://github.com/osiam/connector4python/wiki).
 
 For more information on OSIAM have a look into the [OSIAM server repository's README.md](https://github.com/osiam/server/README.md) or visit OSIAM's homepage at [www.osiam.org](https://www.osiam.org).
 
 #Project structure
 
 This project gets build with maven, the module structure is
 
-* python -- is the main project, the request based OSIAM connector for Python itself.
-* example-client -- an example web application (Python 2.7, flask) using the API of the connector.
-* performance-tests -- our framework for running stresstests agains OSIAM, it also makes use of the connector.
+* python -- is the main project, the request based OSIAM connector for Python itself -> [Wiki](https://github.com/osiam/connector4python/wiki#osiam-connector-for-python)
+* example-client -- an example web application (Python 2.7, flask) using the API of the connector -> [Wiki](https://github.com/osiam/connector4python/wiki#sample-client-for-osiam)
+* performance-tests -- our framework for running stresstests agains OSIAM, it also makes use of the connector -> [Wiki](https://github.com/osiam/connector4python/wiki#performance-test-framework-and-tests-for-osiam)
 
 # Requirements
 
 * Python 2.7
 * An up and running OSIAM instance
-* ...
 
 # Issue tracker for the connector
 

README.md

@@ -4,16 +4,16 @@
     from distutils.core import setup, find_packages
 
 config = {
-    'description': 'OSIAM NG Connector -- enables easy access to OSIAM NG backend',
+    'description': 'OSIAM Connector for Python -- enables easy access to OSIAM services',
     'author': 'Philipp Eder',
-    'url': 'http://github.com/osiam-dev/osiam',
+    'url': 'http://github.com/osiam/connector4python',
     'author_email': 'p.eder@tarent.de',
     'version': '0.1',
     'install_requires': ['nose', 'requests', 'flask', 'mock'],
 #    'packages': ['osiam'],
     'packages':find_packages(exclude=['performance']),
     'scripts': [],
-    'name': 'OSIAM NG Example Client'
+    'name': 'OSIAM Sample Client'
 }
 
 setup(**config)