This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git
commit b92e2a46c278905616f6493078f39d32141484bf Merge: 2fc635b 20ffa3f Author: Rohit Yadav <[email protected]> AuthorDate: Mon Jan 18 17:12:20 2021 +0530 Merge remote-tracking branch 'origin/4.15' source/_global.rst | 2 +- source/_static/images/vapps-deployment-opts.png | Bin 0 -> 35001 bytes source/_static/images/vapps-eulas.png | Bin 0 -> 103639 bytes source/_static/images/vapps-networks.png | Bin 0 -> 68255 bytes source/_static/images/vapps-properties.png | Bin 0 -> 60989 bytes source/adminguide/accounts.rst | 27 +++++++-- source/adminguide/api.rst | 2 +- source/adminguide/locale/pot/api.pot | 2 +- source/adminguide/locale/pot/troubleshooting.pot | 2 +- source/adminguide/locale/zh_CN/LC_MESSAGES/api.mo | Bin 5123 -> 5123 bytes source/adminguide/locale/zh_CN/LC_MESSAGES/api.po | 4 +- .../locale/zh_CN/LC_MESSAGES/troubleshooting.mo | Bin 17260 -> 17260 bytes .../locale/zh_CN/LC_MESSAGES/troubleshooting.po | 6 +- source/adminguide/templates.rst | 31 +++++++++- source/adminguide/troubleshooting.rst | 2 +- source/adminguide/virtual_machines.rst | 15 ++++- source/adminguide/virtual_machines/user-data.rst | 6 +- .../virtual_machines/virtual_appliances.rst | 65 +++++++++++++++++++++ source/conceptsandterminology/locale/pot/dev.pot | 2 +- .../locale/pot/developer_guide.pot | 4 +- source/conceptsandterminology/network_setup.rst | 2 +- source/developersguide/dev.rst | 4 +- source/developersguide/developer_guide.rst | 4 +- source/installguide/locale/pot/network_setup.pot | 2 +- .../locale/zh_CN/LC_MESSAGES/network_setup.mo | Bin 58589 -> 58589 bytes .../locale/zh_CN/LC_MESSAGES/network_setup.po | 4 +- 26 files changed, 150 insertions(+), 36 deletions(-)
