Merge pull request #3 from mattthias/master_update_documentation

mattthias · mattthias · commit b3a86811c6de · 2015-06-22T17:26:01.000+02:00
Master update documentation
diff --git a/AUTHORS b/AUTHORS
@@ -4,3 +4,5 @@
 
 Łukasz Oleś <lukaszoles@gmail.com>
 Mattias de Hollander <m.dehollander@nioo.knaw.nl>
+Matthias Schmitz <matthias@sigxcpu.org>
+Michael Schmidt <michael@familie-schmidt.com>
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 ##############################################
 OCA - OpenNebula Cloud Api
 ##############################################
-:Version: 3.0.0-a1
+:Version: 4.10.0-a1
 :status: .. image:: https://travis-ci.org/python-oca/python-oca.svg
 
 About
@@ -11,7 +11,7 @@ Bindings for XMLRPC OpenNebula Cloud API
 
 Documentation
 -------------
-see http://lukaszo.github.com/python-oca/index.html and http://www.opennebula.org/documentation:rel3.2:api
+see http://python-oca.github.com/python-oca/index.html and http://docs.opennebula.org/4.10/integration/system_interfaces/api.html
 
 All `allocate` functions are implemented as static methods.
 
@@ -35,5 +35,6 @@ OCA is under Apache Software License
 Authors
 -------
 
-Łukasz Oleś
+See AUTHORS file
+
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.0.0'
+version = '4.10.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.0-alfa1'
+release = '4.10.0-a1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

-Original file line number
+Diff line change
 Łukasz Oleś <[email protected]>
 Mattias de Hollander <[email protected]>
 +Matthias Schmitz <[email protected]>
 +Michael Schmidt <[email protected]>