You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/07/05 09:21:15 UTC
[cloudstack-documentation] 01/01: Merge remote-tracking branch
'origin/4.15' into main
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git
commit e44625b320abba12736f7bb0f1ca9cec5421fabb
Merge: 771dd0e 26e4a11
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Jul 5 14:50:56 2021 +0530
Merge remote-tracking branch 'origin/4.15' into main
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
source/_global.rst | 26 +-
source/adminguide/accounts.rst | 45 ++-
source/adminguide/autoscale_without_netscaler.rst | 4 -
source/adminguide/hosts.rst | 83 +++---
source/adminguide/locale/pot/hosts.pot | 32 ++-
source/adminguide/locale/pot/management.pot | 6 +-
source/adminguide/locale/pot/networking.pot | 6 +-
.../pot/networking/acquiring_an_ip_address.pot | 4 +-
.../external_firewalls_and_load_balancers.pot | 4 +-
.../networking/ip_forwarding_and_firewalling.pot | 6 +-
.../multiple_subnets_in_shared_network.pot | 4 +-
.../locale/pot/networking/portable_ips.pot | 4 +-
.../pot/networking/releasing_an_ip_address.pot | 4 +-
.../locale/pot/networking/remote_access_vpn.pot | 4 +-
.../locale/pot/networking/static_nat.pot | 4 +-
.../networking/virtual_private_cloud_config.pot | 4 +-
source/adminguide/locale/pot/networking2.pot | 10 +-
.../locale/pot/networking_and_traffic.pot | 10 +-
source/adminguide/locale/pot/projects.pot | 13 +-
.../adminguide/locale/zh_CN/LC_MESSAGES/hosts.po | 27 +-
.../locale/zh_CN/LC_MESSAGES/management.po | 14 +-
.../locale/zh_CN/LC_MESSAGES/networking.po | 10 +-
.../networking/acquiring_an_ip_address.po | 4 +-
.../external_firewalls_and_load_balancers.po | 4 +-
.../networking/ip_forwarding_and_firewalling.po | 6 +-
.../multiple_subnets_in_shared_network.po | 5 +-
.../zh_CN/LC_MESSAGES/networking/portable_ips.po | 4 +-
.../networking/releasing_an_ip_address.po | 4 +-
.../LC_MESSAGES/networking/remote_access_vpn.po | 4 +-
.../zh_CN/LC_MESSAGES/networking/static_nat.po | 4 +-
.../networking/virtual_private_cloud_config.po | 4 +-
.../locale/zh_CN/LC_MESSAGES/networking2.po | 11 +-
.../zh_CN/LC_MESSAGES/networking_and_traffic.po | 11 +-
.../locale/zh_CN/LC_MESSAGES/projects.po | 11 +-
source/adminguide/management.rst | 130 ++++-----
source/adminguide/networking.rst | 6 +-
.../networking/acquiring_an_ip_address.rst | 4 +-
.../adminguide/networking/advanced_zone_config.rst | 10 +-
.../external_firewalls_and_load_balancers.rst | 31 +-
.../networking/ip_forwarding_and_firewalling.rst | 12 +-
.../ip_reservation_in_guest_networks.rst | 10 +-
.../isolation_in_advanced_zone_with_vlan.rst | 11 +-
.../networking/multiple_guest_networks.rst | 6 +-
.../networking/multiple_ips_on_single_nic.rst | 2 +-
.../multiple_subnets_in_shared_network.rst | 3 +-
source/adminguide/networking/portable_ips.rst | 10 +-
.../networking/releasing_an_ip_address.rst | 2 +-
source/adminguide/networking/remote_access_vpn.rst | 2 +-
source/adminguide/networking/site_to_site_vpn.rst | 15 +
source/adminguide/networking/static_nat.rst | 2 +-
.../networking/virtual_private_cloud_config.rst | 4 +-
source/adminguide/projects.rst | 8 -
source/adminguide/service_offerings.rst | 22 +-
source/adminguide/systemvm.rst | 270 +++++++++---------
.../locale/pot/administration_guide.pot | 26 +-
source/conceptsandterminology/network_setup.rst | 24 +-
source/developersguide/developer_guide.rst | 6 +-
source/upgrading/index.rst | 1 +
source/upgrading/upgrade/upgrade-4.15.rst | 314 +++++++++++++++++++++
59 files changed, 813 insertions(+), 514 deletions(-)
diff --cc source/_global.rst
index 1b49bc7,74bb5bc..9a4d2a5
--- a/source/_global.rst
+++ b/source/_global.rst
@@@ -5,7 -5,7 +5,7 @@@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-- http://www.apache.org/licenses/LICENSE-2.0
++ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@@ -17,33 -17,33 +17,33 @@@
.. This file contain Variables shared across other .rst files in this project
--.. _CloudStack Installation Guide: http://docs.cloudstack.apache.org/projects/cloudstack-installation
--.. _CloudStack Administrator's Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration
++.. _CloudStack Installation Guide: https://docs.cloudstack.apache.org/projects/cloudstack-installation
++.. _CloudStack Administrator's Guide: https://docs.cloudstack.apache.org/projects/cloudstack-administration
.. _CloudStack Apidocs: https://cloudstack.apache.org/api.html
--.. |documentation_home| replace:: http://docs.cloudstack.apache.org/
++.. |documentation_home| replace:: https://docs.cloudstack.apache.org/
.. Latest version systemvm template name
-.. |sysvm64-version| replace:: 4.15.1
-.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.15.1
-.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.15.1
-.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.15.1
-.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.15.1
-.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.15.1
+.. |sysvm64-version| replace:: 4.16.0
+.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.16.0
+.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.16.0
+.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.16.0
+.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.16.0
+.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.16.0
.. Latest version systemvm template URL
- .. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2
- .. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2
- .. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-vmware.ova
- .. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-hyperv.vhd.zip
- .. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-ovm.raw.bz2
-.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.1-xen.vhd.bz2
-.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.1-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.1-vmware.ova
-.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.1-hyperv.vhd.zip
-.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.1-ovm.raw.bz2
++.. |sysvm64-url-xen| replace:: https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-xen.vhd.bz2
++.. |sysvm64-url-kvm| replace:: https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-kvm.qcow2.bz2
++.. |sysvm64-url-vmware| replace:: https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-vmware.ova
++.. |sysvm64-url-hyperv| replace:: https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-hyperv.vhd.zip
++.. |sysvm64-url-ovm| replace:: https://download.cloudstack.org/systemvm/4.16/systemvmtemplate-4.16.0-ovm.raw.bz2
.. Version specific: 4.5 systemvm template URL
--.. |acs45-sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
--.. |acs45-sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2
--.. |acs45-sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-vmware.ova
--.. |acs45-sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-hyperv.vhd.zip
++.. |acs45-sysvm64-url-xen| replace:: https://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
++.. |acs45-sysvm64-url-kvm| replace:: https://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2
++.. |acs45-sysvm64-url-vmware| replace:: https://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-vmware.ova
++.. |acs45-sysvm64-url-hyperv| replace:: https://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-hyperv.vhd.zip
.. Images