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
4 changes: 2 additions & 2 deletions source/adminguide/accounts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ password for a user:
Using API Key and Secret Key based Authentication
-------------------------------------------------
Users can generate API key and Secret key to directly access CloudStack APIs.
This authenctication method is used for programatically calling CloudStack APIs and thus helps in automation.
The API key uniquely identifies the Account, while the Secret key is used to generate a secure singnature.
This authentication method is used for programmatically calling CloudStack APIs and thus helps in automation.
The API key uniquely identifies the Account, while the Secret key is used to generate a secure signature.
When making an API call, the API key and signature are included along with the command and other parameters,
and sent to the CloudStack API endpoint. For detailed information, refer to the CloudStack's Programmer Guide.

Expand Down
4 changes: 2 additions & 2 deletions source/adminguide/events/webhooks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This allows users to consume event notifications without any external services
such as an event streaming platforms.

Webhooks can be managed using both API and UI. CloudStack provides following
APIs for webhhoks:
APIs for webhooks:

.. cssclass:: table-striped table-bordered table-hover

Expand All @@ -37,7 +37,7 @@ APIs for webhhoks:
executeWebhookDelivery Executes a Webhook delivery
====================== ===========================

In the UI, webhooks can be managed under *Tools > Webhhooks* menu.
In the UI, webhooks can be managed under *Tools > Webhooks* menu.

|webhooks.png|

Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/hosts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ There are four stages in the KVM rolling maintenance process:

#. Pre-Flight stage: Pre-flight script (``PreFlight`` or ``PreFlight.sh`` or ``PreFlight.py``) runs on hosts before commencing the rolling maintenance. If pre-flight check scripts return an error from any host, then rolling maintenance will be cancelled with no actions taken, and an error returned. If there are no pre-flight scripts defined, then no checks will be done from the hosts.

#. Pre-Maintenace stage: Pre-maintenance script ((``PreMaintenance`` or ``PreMaintenance.sh`` or ``PreMaintenance.py``)) runs before a specific host is put into maintenance. If no pre-maintenance script is defined, then no pre-maintenance actions will be taken, and the management server will move straight to putting the host in maintenance followed by requesting that the agent runs the maintenance script.
#. Pre-Maintenance stage: Pre-maintenance script ((``PreMaintenance`` or ``PreMaintenance.sh`` or ``PreMaintenance.py``)) runs before a specific host is put into maintenance. If no pre-maintenance script is defined, then no pre-maintenance actions will be taken, and the management server will move straight to putting the host in maintenance followed by requesting that the agent runs the maintenance script.

#. Maintenance stage: Maintenance script ((``Maintenance`` or ``Maintenance.sh`` or ``Maintenance.py``)) runs after a host has been put into maintenance. If no maintenance script is defined, or if the pre-flight or pre-maintenance scripts determine that no maintenance is required, then the host will not be put into maintenance, and the completion of the pre-maintenance scripts will signal the end of all maintenance tasks and the KVM agent will hand the host back to the management server. Once the maintenance scripts have signalled that it has completed, the host agent will signal to the management server that the maintenance tasks have completed, and therefore the host is ready to exit maintenance mode and any 'information' which was collected (such as processing times) will be returned to the management server.

Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/nas_plugin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Field Value
Name A suitable name to represent the Backup Repository
Address URL, in case of NFS <server IP>:/path
Type NFS ( only NFS type in 4.20)
label.mountopts Any mount point options to be passed while mouting this storage on the hypervisor.
label.mountopts Any mount point options to be passed while mounting this storage on the hypervisor.
Zone The zone in CloudStack with which this Backup Repository must be associated.
=================== ========================

Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/networking/dynamic_static_routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ For more information, see `“CloudStack Kubernetes Service” <../plugins/cloud


.. |manage-ipv4-subnets-for-zone.png| image:: /_static/images/manage-ipv4-subnets-for-zone.png
:alt: Manage IPv4 subnets for zoone
:alt: Manage IPv4 subnets for zone

.. |manage-ipv4-subnets-for-networks.png| image:: /_static/images/manage-ipv4-subnets-for-networks.png
:alt: Manage IPv4 subnets for guest networks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Limitations
- Upgrading network offering which causes a change in CIDR (such as
upgrading an offering with no external devices to one with external
devices) IP Reservation becomes void if any. Reconfigure IP
Reservation in the new re-implemeted network.
Reservation in the new re-implemented network.


Best Practices
Expand Down
4 changes: 2 additions & 2 deletions source/adminguide/service_offerings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -654,11 +654,11 @@ To create a system service offering:
Network Throttling
------------------

Network throttling is the process of controlling the network bandwith. CloudStack controls this
Network throttling is the process of controlling the network bandwidth. CloudStack controls this
behaviour of the guest networks in the cloud by using the network rate
parameter. This parameter is defined as the default data transfer rate
in Mbps (Megabits Per Second) allowed in a guest network. It defines the
upper limits for network bandwith.
upper limits for network bandwidth.

You can throttle the network bandwidth either to control the usage above
a certain limit for some accounts, or to control network congestion in a
Expand Down
4 changes: 2 additions & 2 deletions source/adminguide/templates.rst
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,9 @@ Attaching an ISO to a Instance
.. |template-permissions-update-2.png| image:: /_static/images/template-permissions-update-2.png
:alt: Sharing template with 2 specific projects
.. |template-permissions-update-3.png| image:: /_static/images/template-permissions-update-3.png
:alt: Revoking permissins from Account "user8"
:alt: Revoking permissions from Account "user8"
.. |template-permissions-update-4.png| image:: /_static/images/template-permissions-update-4.png
:alt: Revoking permsissons from both projects previously added
:alt: Revoking permissions from both projects previously added
.. |template-permissions-update-5.png| image:: /_static/images/template-permissions-update-5.png
:alt: Resetting (removing all) permissions
.. |iso.png| image:: /_static/images/iso-icon.png
Expand Down
4 changes: 2 additions & 2 deletions source/adminguide/templates/_import_ami.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ To import an AMI:
none /sys sysfs defaults 0 0
#. Enable login via the console. The default console device in a
XenServer system is xvc0. Ensure that etc/inittab and etc/securetty
XenServer system is xvc0. Ensure that etc/inittab and etc/security
have the following lines respectively:

.. code:: bash
# grep xvc0 etc/inittab
co:2345:respawn:/sbin/agetty xvc0 9600 vt100-nav
# grep xvc0 etc/securetty
# grep xvc0 etc/security
xvc0
#. Ensure the ramdisk supports PV disk and PV network. Customize this
Expand Down
2 changes: 1 addition & 1 deletion source/adminguide/ui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ Example for adding custom plugins:
Not all ant icons are supported at the moment. You will find a list of supported icons
within the github repository in ui/src/core/lazy_lib/icons_use.js. To use an icon you
need to transform the listed name. For example "PieChartOutlined" needs to be transformed
to "pie-chart-outlined", "ReadOutlined" needs to be tranformed to "read-outlined".
to "pie-chart-outlined", "ReadOutlined" needs to be transformed to "read-outlined".

For displaying a custom HTML in the plugin, HTML file can be stored in the CloudStack management server's web application directory on the server, i.e., */usr/share/cloudstack-management/webapp* and `path` can be set to the name of the file. For displaying a service or a web page, URL can be set as the `path` of the plugin.

Expand Down
4 changes: 2 additions & 2 deletions source/adminguide/vm_volume_allocators.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ Use global configuration parameter:
**vm.allocation.algorithm** to specify the algorithm that the Allocator must use. By default it is configured to use "random" algorithm.


Volme Allocator
Volume Allocator
--------------

Volume allocator returns suitable storage pools available in the cluster where volumes of the given instance can be created.
To decide the storage pools, it considers factors such as disk offering, storage capactiy, availability scope etc.
To decide the storage pools, it considers factors such as disk offering, storage capacity, availability scope etc.

Volume allocator supports following algorithms to select a host in the cluster:

Expand Down
2 changes: 1 addition & 1 deletion source/developersguide/get_help.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following guides are available:
- CloudStack Concepts and Terminology
- Quick Installation Guide
- Installation Guide
- Upgradong CloudStack
- Upgrading CloudStack
- Usage Guide
- Developers Guide
- Plugins Guide
Expand Down
4 changes: 2 additions & 2 deletions source/installguide/hypervisor/vsphere.rst
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ Configure Virtual Switch
^^^^^^^^^^^^^^^^^^^^^^^^

During the initial installation of an ESXi host a default virtual switch
vSwitch0 is created. You may need to create additional vSwiches depending
vSwitch0 is created. You may need to create additional vSwitches depending
on your required architecture. CloudStack requires all ESXi hosts in the cloud
to use consistently named virtual switches. If
you change the default virtual switch name, you will need to configure
Expand Down Expand Up @@ -878,7 +878,7 @@ The three fields to fill in are:

**nexusdvs**: Represents Cisco Nexus 1000v distributed virtual switch.

If nothing specified (left empty), zone-level default virtual switchwould
If nothing specified (left empty), zone-level default virtual switch would
be defaulted, based on the value of global parameter you specify.

Following are the global configuration parameters:
Expand Down