Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 source/_global.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

.. _CloudStack Installation Guide: http://docs.cloudstack.apache.org/projects/cloudstack-installation
.. _CloudStack Administrator's Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration
.. _CloudStack Apidocs: http://cloudstack.apache.org/docs/api/
.. _CloudStack Apidocs: https://cloudstack.apache.org/api.html

.. |documentation_home| replace:: http://docs.cloudstack.apache.org/

Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ some indication of their state.
The API has a REST-like query basis and returns results in XML or JSON.

See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_
and `the API Reference <http://cloudstack.apache.org/docs/api/>`_.
and `the API Reference <https://cloudstack.apache.org/api.html>`_.


Provisioning and Authentication API
Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/locale/pot/api.pot
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ msgstr ""

#: ../../api.rst:31
# 1f57015e966c480795b141ba3f87b86a
msgid "See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ and `the API Reference <http://cloudstack.apache.org/docs/api/>`_."
msgid "See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ and `the API Reference <https://cloudstack.apache.org/api.html>`_."
msgstr ""

#: ../../api.rst:36
Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/locale/pot/troubleshooting.pot
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ msgstr ""

#: ../../troubleshooting.rst:132
# 25bdb5c7a6a7454ea25d62c3f0a02c57
msgid "For more information about the API syntax, see the API Reference at `http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_."
msgid "For more information about the API syntax, see the API Reference at `https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`_."
msgstr ""

#: ../../troubleshooting.rst:137
Expand Down
Binary file modified source/adminguide/locale/zh_CN/LC_MESSAGES/api.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions source/adminguide/locale/zh_CN/LC_MESSAGES/api.po
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ msgstr "API基于类似REST的查询, 可以返回XML或JSON格式."
msgid ""
"See `the Developer’s Guide "
"<https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ "
"and `the API Reference <http://cloudstack.apache.org/docs/api/>`_."
msgstr "参阅 `开发指南 <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ 和 `参考API <http://cloudstack.apache.org/docs/api/>`_."
"and `the API Reference <https://cloudstack.apache.org/api.html>`_."
msgstr "参阅 `开发指南 <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ 和 `参考API <https://cloudstack.apache.org/api.html>`_."

# de3d35bb699f45f495251ceb69a2c238
#: ../../api.rst:36
Expand Down
Binary file modified source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.mo
Binary file not shown.
6 changes: 3 additions & 3 deletions source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.po
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ msgstr "使用restartNetwork API(参数cleanup=false)重建丢失的虚拟
#: ../../troubleshooting.rst:132
msgid ""
"For more information about the API syntax, see the API Reference at "
"`http://cloudstack.apache.org/docs/api/ "
"<http://cloudstack.apache.org/docs/api/>`_."
msgstr "关于更多的API语法信息,参见API参考`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_。"
"`https://cloudstack.apache.org/api.html "
"<https://cloudstack.apache.org/api.html>`_."
msgstr "关于更多的API语法信息,参见API参考`https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`_。"

# d1a32a2023024c72907911b8c7757cae
#: ../../troubleshooting.rst:137
Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ cleanup=false parameter. For more information about redundant router
setup, see Creating a New Network Offering.

For more information about the API syntax, see the API Reference at
`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_.
`https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`_.


Maintenance mode not working on vCenter
Expand Down
6 changes: 3 additions & 3 deletions source/adminguide/virtual_machines/user-data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ User-Data and Meta-Data
CloudStack provides APIs to attach up to 32KB of user-data to a deployed VM.

There are two CloudStack APIs that can be used to store user-data:
`deployVirtualMachine <http://cloudstack.apache.org/docs/api/apidocs-4.14/user/deployVirtualMachine.html>`_
`deployVirtualMachine <https://cloudstack.apache.org/docs/api/apidocs-4.14/user/deployVirtualMachine.html>`_
and
`updateVirtualMachine <http://cloudstack.apache.org/docs/api/apidocs-4.14/user/updateVirtualMachine.html>`_
`updateVirtualMachine <https://cloudstack.apache.org/docs/api/apidocs-4.14/user/updateVirtualMachine.html>`_
They both support the parameter ``userdata=``. The value for this parameter
must be a `base64 <https://www.base64encode.org/>`_-encoded multi-part MIME
message. See further below for an example of what this should look like.
Expand Down Expand Up @@ -89,7 +89,7 @@ Fetching user-data via the API
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

User-data is not included with the normal VM state for historic reasons.
To read out the base64-encoded user-data via the API, use the `getVirtualMachineUserData <http://cloudstack.apache.org/docs/api/apidocs-4.14/user/getVirtualMachineUserData.html>`_
To read out the base64-encoded user-data via the API, use the `getVirtualMachineUserData <https://cloudstack.apache.org/docs/api/apidocs-4.14/user/getVirtualMachineUserData.html>`_
API call:

.. code:: bash
Expand Down
2 changes: 1 addition & 1 deletion source/conceptsandterminology/locale/pot/dev.pot
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ msgstr ""

#: ../../dev.rst:64
# bcdf9d282f994c9e9cfc62a64151533a
msgid "`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`__"
msgid "`https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`__"
msgstr ""

#: ../../dev.rst:68
Expand Down
4 changes: 2 additions & 2 deletions source/conceptsandterminology/locale/pot/developer_guide.pot
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,12 @@ msgstr ""

#: ../../developer_guide.rst:460
# 7c104d4cd0fe475e863b91f53449a5c5
msgid "The CloudStack API is a query based API using http that return results in XML or JSON. It is used to implement the default web UI. This API is not a standard like `OGF OCCI <http://www.ogf.org/gf/group_info/view.php?group=occi-wg>`__ or `DMTF CIMI <http://dmtf.org/standards/cloud>`__ but is easy to learn. Mapping exists between the AWS API and the CloudStack API as will be seen in the next section. Recently a Google Compute Engine interface was also developed that maps the GCE REST API to the CloudStack API described here. The API `docs <http://cloudstack.apache.org/docs/api/>`__ are a good start to learn the extent of the API. Multiple clients exist on `github <https://github.com/search?q=cloudstack+client&ref=cmdform>`__ to use this API, you should be able to find one in your favorite language. The reference documentation for the API and changes that might occur from version to version is availble `on-line <http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.1.1/html/Developers_Guide/index.html>`__. This short section is aimed at providing a quick summary to give you a base understanding of how to use this API. As a quick start, a good way to explore the API is to navigate the dashboard with a firebug console (or similar developer console) to study the queries."
msgid "The CloudStack API is a query based API using http that return results in XML or JSON. It is used to implement the default web UI. This API is not a standard like `OGF OCCI <http://www.ogf.org/gf/group_info/view.php?group=occi-wg>`__ or `DMTF CIMI <http://dmtf.org/standards/cloud>`__ but is easy to learn. Mapping exists between the AWS API and the CloudStack API as will be seen in the next section. Recently a Google Compute Engine interface was also developed that maps the GCE REST API to the CloudStack API described here. The API `docs <https://cloudstack.apache.org/api.html>`__ are a good start to learn the extent of the API. Multiple clients exist on `github <https://github.com/search?q=cloudstack+client&ref=cmdform>`__ to use this API, you should be able to find one in your favorite language. The reference documentation for the API and changes that might occur from version to version is availble `on-line <http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.1.1/html/Developers_Guide/index.html>`__. This short section is aimed at providing a quick summary to give you a base understanding of how to use this API. As a quick start, a good way to explore the API is to navigate the dashboard with a firebug console (or similar developer console) to study the queries."
msgstr ""

#: ../../developer_guide.rst:481
# 0bcb8dd851254f9b9b0240917b405d84
msgid "In a succint statement, the CloudStack query API can be used via http GET requests made against your cloud endpoint (e.g http://localhost:8080/client/api). The API name is passed using the ``command`` key and the various parameters for this API call are passed as key value pairs. The request is signed using the access key and secret key of the user making the call. Some calls are synchronous while some are asynchronous, this is documented in the API `docs <http://cloudstack.apache.org/docs/api/>`__. Asynchronous calls return a ``jobid``, the status and result of a job can be queried with the ``queryAsyncJobResult`` call. Let's get started and give an example of calling the ``listUsers`` API in Python."
msgid "In a succint statement, the CloudStack query API can be used via http GET requests made against your cloud endpoint (e.g http://localhost:8080/client/api). The API name is passed using the ``command`` key and the various parameters for this API call are passed as key value pairs. The request is signed using the access key and secret key of the user making the call. Some calls are synchronous while some are asynchronous, this is documented in the API `docs <https://cloudstack.apache.org/api.html>`__. Asynchronous calls return a ``jobid``, the status and result of a job can be queried with the ``queryAsyncJobResult`` call. Let's get started and give an example of calling the ``listUsers`` API in Python."
msgstr ""

#: ../../developer_guide.rst:493
Expand Down
2 changes: 1 addition & 1 deletion source/conceptsandterminology/network_setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ To set up the integration between CloudStack and Traffic Sentinel:
Traffic Sentinel as protocol + host + port (optional); for example,
http://10.147.28.100:8080. For the addTrafficMonitor command syntax,
see the API Reference at `API Documentation
<http://cloudstack.apache.org/docs/api/index.html>`_.
<https://cloudstack.apache.org/api.html>`_.

For information about how to call the CloudStack API, see the
Developer’s Guide at the CloudStack API Developer's Guide :ref:`the-api`
Expand Down
4 changes: 2 additions & 2 deletions source/developersguide/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ API Reference Documentation

You can find all the API reference documentation at the below site:

`http://cloudstack.apache.org/docs/api/
<http://cloudstack.apache.org/docs/api/>`__
`https://cloudstack.apache.org/api.html
<https://cloudstack.apache.org/api.html>`__


Making API Requests
Expand Down
4 changes: 2 additions & 2 deletions source/developersguide/developer_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Mapping exists between the AWS API and the CloudStack API as will be
seen in the next section. Recently a Google Compute Engine interface was
also developed that maps the GCE REST API to the CloudStack API
described here. The API
`docs <http://cloudstack.apache.org/docs/api/>`__ are a good start to
`docs <https://cloudstack.apache.org/api.html>`__ are a good start to
learn the extent of the API. Multiple clients exist on
`github <https://github.com/search?q=cloudstack+client&ref=cmdform>`__
to use this API, you should be able to find one in your favorite
Expand All @@ -365,7 +365,7 @@ http://localhost:8080/client/api). The API name is passed using the
as key value pairs. The request is signed using the access key and
secret key of the user making the call. Some calls are synchronous while
some are asynchronous, this is documented in the API
`docs <http://cloudstack.apache.org/docs/api/>`__. Asynchronous calls
`docs <https://cloudstack.apache.org/api.html>`__. Asynchronous calls
return a ``jobid``, the status and result of a job can be queried with
the ``queryAsyncJobResult`` call. Let's get started and give an example
of calling the ``listUsers`` API in Python.
Expand Down
2 changes: 1 addition & 1 deletion source/installguide/locale/pot/network_setup.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1591,7 +1591,7 @@ msgstr ""

#: ../../network_setup.rst:1001
# 99d0d664da654239ad897c4d6eb6b08e
msgid "On CloudStack, add the Traffic Sentinel host by calling the CloudStack API command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as protocol + host + port (optional); for example, http://10.147.28.100:8080. For the addTrafficMonitor command syntax, see the API Reference at `API Documentation <http://cloudstack.apache.org/docs/api/index.html>`_."
msgid "On CloudStack, add the Traffic Sentinel host by calling the CloudStack API command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as protocol + host + port (optional); for example, http://10.147.28.100:8080. For the addTrafficMonitor command syntax, see the API Reference at `API Documentation <https://cloudstack.apache.org/api.htmlindex.html>`_."
msgstr ""

#: ../../network_setup.rst:1008
Expand Down
Binary file modified source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.po
Original file line number Diff line number Diff line change
Expand Up @@ -1915,8 +1915,8 @@ msgid ""
"command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as "
"protocol + host + port (optional); for example, http://10.147.28.100:8080. "
"For the addTrafficMonitor command syntax, see the API Reference at `API "
"Documentation <http://cloudstack.apache.org/docs/api/index.html>`_."
msgstr "在CloudStack中,使用API中的addTrafficMonitor命令添加流量哨兵主机。传入的流量哨兵URL类似于protocol + host + port (可选);例如, http://10.147.28.100:8080。 关于addTrafficMonitor命令用法,请参阅API文档 `API Documentation <http://cloudstack.apache.org/docs/api/index.html>`_."
"Documentation <https://cloudstack.apache.org/api.html>`_."
msgstr "在CloudStack中,使用API中的addTrafficMonitor命令添加流量哨兵主机。传入的流量哨兵URL类似于protocol + host + port (可选);例如, http://10.147.28.100:8080。 关于addTrafficMonitor命令用法,请参阅API文档 `API Documentation <https://cloudstack.apache.org/api.html>`_."

# 382c1696b18d4f25a2e2b5b7cb142225
#: ../../network_setup.rst:1008
Expand Down