diff --git a/doc/source/articles/app_migrating.rst b/doc/source/articles/app_migrating.rst index ee59037a4..0cb3d32a4 100644 --- a/doc/source/articles/app_migrating.rst +++ b/doc/source/articles/app_migrating.rst @@ -17,7 +17,7 @@ Migrating applications from Murano v0.5 to Stable/Juno ====================================================== -Applications created for Murano v0.5, unfortunately, are not suported in Murano +Applications created for Murano v0.5, unfortunately, are not supported in Murano stable/juno. This document provides the application code changes required for compatibility with the stable/juno Murano version. diff --git a/doc/source/articles/client.rst b/doc/source/articles/client.rst index 3036ada5d..5f5f1ac0b 100644 --- a/doc/source/articles/client.rst +++ b/doc/source/articles/client.rst @@ -112,10 +112,10 @@ Murano Repository. would inspect images already present in the image database. Unless image with the specific name and hash is present client would attempt to download it. -For more info about specifiying images and requirements for the package see +For more info about specifying images and requirements for the package see package creation docs: :ref:`app_pkg`. -If any of the packages, being installed is already registerd in Murano, client +If any of the packages, being installed is already registered in Murano, client would ask you what do do with it. You can specify the default action with ``--exists-action``, passing `s` for skip, `u` for update, and `a` for abort. @@ -162,7 +162,7 @@ Running:: murano package-download > file.zip -would download the zip arhive with specified package +would download the zip archive with specified package Creating a package ================== @@ -189,7 +189,7 @@ It is possible to create/update/delete environments with following commands:: murano environment-rename murano environment-show -You can get list of deployments for environmet with:: +You can get list of deployments for environment with:: murano deployment-list @@ -203,8 +203,8 @@ It is possible to create/update/delete categories with following commands:: murano category-list murano category-show -Managing Environmet Templates -============================= +Managing environment templates +============================== It is possible to manage environment templates with following commands:: diff --git a/doc/source/articles/dynamic_ui.rst b/doc/source/articles/dynamic_ui.rst index 239e121e1..6dcbaed85 100644 --- a/doc/source/articles/dynamic_ui.rst +++ b/doc/source/articles/dynamic_ui.rst @@ -16,7 +16,7 @@ .. _DynamicUISpec: =================================== -Dynamic UI Definition specification +Dynamic UI definition specification =================================== The main purpose of Dynamic UI is to generate application creation @@ -110,7 +110,7 @@ as *$.appConfiguration.name*. This context will be called as Forms ===== -This section describes markup elements for defining forms (which are currently rendered and validated with Django). Each form has name, field definitions (mandatory) and validator definitions (optionally). Note that each form is splitted into 2 parts - input area (left side, where all the controls are located) and description area (right side, where descriptions of the controls are located). +This section describes markup elements for defining forms (which are currently rendered and validated with Django). Each form has name, field definitions (mandatory) and validator definitions (optionally). Note that each form is split into 2 parts - input area (left side, where all the controls are located) and description area (right side, where descriptions of the controls are located). Each field should contain: @@ -222,7 +222,7 @@ fields. type: flavor label: Instance flavor description: >- - Select registered in Openstack flavor. Consider that service performance + Select registered in OpenStack flavor. Consider that service performance depends on this parameter. required: false - name: osImage diff --git a/doc/source/articles/heat_support.rst b/doc/source/articles/heat_support.rst index 0090ff2ff..aed3e94b6 100644 --- a/doc/source/articles/heat_support.rst +++ b/doc/source/articles/heat_support.rst @@ -14,7 +14,7 @@ under the License. ================================================== -Uploading HOT templates to the Application Catalog +Uploading HOT templates to the application catalog ================================================== Murano is an Application catalog which intends to support applications, defined in different formats. As a first step to universality, heat orchestration template support was added. diff --git a/doc/source/articles/policy_enf_dev.rst b/doc/source/articles/policy_enf_dev.rst index 9ebd1dc82..54dfa3715 100644 --- a/doc/source/articles/policy_enf_dev.rst +++ b/doc/source/articles/policy_enf_dev.rst @@ -160,7 +160,7 @@ Transformed to rules: ``murano:parent_types(object_id, parent_name)`` """"""""""""""""""""""""""""""""""""""""""""""" -Each object in murano has class type and these classes can inherit from one or more parents: +Each object in murano has a class type and these classes can inherit from one or more parents: e.g. ``LinuxMuranoInstance`` > ``LinuxInstance`` > ``Instance`` diff --git a/doc/source/articles/policy_enf_setup.rst b/doc/source/articles/policy_enf_setup.rst index a978eb8bf..83cf22d9f 100644 --- a/doc/source/articles/policy_enf_setup.rst +++ b/doc/source/articles/policy_enf_setup.rst @@ -49,7 +49,7 @@ following command. - **murano** policy - Policy is created by Congress' Murano datasource driver, which is part of + Policy is created by Congress' murano datasource driver, which is part of Congress. It has to be configured for the OpenStack tenant where Murano application will be deployed. Datasource driver retrieves deployed Murano environments and populates Congress' murano policy tables diff --git a/doc/source/articles/repository.rst b/doc/source/articles/repository.rst index f24a68e87..f3393f7a8 100644 --- a/doc/source/articles/repository.rst +++ b/doc/source/articles/repository.rst @@ -56,7 +56,7 @@ Bundle file is a json or a yaml file with the following structure: } Glance images can be auto-imported by client, when mentioned in ``images.lst`` -inside the package. Please see :ref:`app_pkg` for more info about pakcage +inside the package. Please see :ref:`app_pkg` for more info about package composition. When importing images from ``image.lst`` file client simply searches for a file with the same name as the ``Name`` attribute of the image in the diff --git a/doc/source/articles/test_docs.rst b/doc/source/articles/test_docs.rst index 7c49cd4da..000fa9ccf 100644 --- a/doc/source/articles/test_docs.rst +++ b/doc/source/articles/test_docs.rst @@ -14,7 +14,7 @@ under the License. ================================== -Murano Automated Tests Description +Murano automated tests description ================================== This page describes automated tests for a Murano project: @@ -23,7 +23,7 @@ This page describes automated tests for a Murano project: * how execute tests on a local machine * how to find the the root of problems with FAILed tests -Murano Continuous Integration Service +Murano continuous integration service ===================================== Murano project has separate CI server, which runs tests for all commits and verifies that new code does not break anything. @@ -39,10 +39,10 @@ There you can find each job for each repository: one for the **murano** and anot Other jobs allow to build and test Murano documentation and perform another usefull work to support Murano CI infrastructure. All jobs are run on fresh installation of operation system and all components are installed on each run. -Murano Automated Tests: UI Tests +Murano automated tests: UI tests ================================ -Murano project has a Web User Interface and all possible user scenarios should be tested. +The murano project has a web user interface and all possible user scenarios should be tested. All UI tests are located at the https://git.openstack.org/cgit/openstack/murano-dashboard/tree/muranodashboard/tests/functional Automated tests for Murano Web UI are written in Python using special Selenium library. This library is used to automate web browser interaction from Python. @@ -120,7 +120,7 @@ There are also a number of command line options that can be used to control the Murano Automated Tests: Tempest Tests ===================================== -All Murano services have tempest-based automated tests, which allow to verify API interfaces and deployment scenarious. +All Murano services have tempest-based automated tests, which allow to verify API interfaces and deployment scenarios. Tempest tests for Murano are located at the: https://git.openstack.org/cgit/openstack/murano/tree/murano/tests/functional