Skip to content

Bring branch up-to-date with master #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-os merged 4 commits into from
Jun 23, 2015
Merged

Bring branch up-to-date with master #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13abde4
Fix mistake github.com != github.io
mattthias Jun 22, 2015
de59571
Update link to ONe api
mattthias Jun 22, 2015
1c8e524
Update authors and years in docs
mattthias Jun 22, 2015
7f912be
Merge pull request #4 from mattthias/master_update_documentation
mattthias Jun 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Bindings for XMLRPC OpenNebula Cloud API

Documentation
-------------
see http://python-oca.github.com/python-oca/index.html and http://docs.opennebula.org/4.10/integration/system_interfaces/api.html
see http://python-oca.github.io/python-oca/index.html and http://docs.opennebula.org/4.10/integration/system_interfaces/api.html

All `allocate` functions are implemented as static methods.

Expand Down
2 changes: 1 addition & 1 deletion docs/api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
API Documentation
=================

See http://www.opennebula.org/documentation:rel3.2:api
See http://docs.opennebula.org/4.10/integration/system_interfaces/api.html

.. toctree::
:maxdepth: 2
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

# General information about the project.
project = u'oca'
copyright = u'2010-2011, Łukasz Oleś'
copyright = u'2010-2015, Python OCA authors'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down