openstack
/
murano
Code Issues Proposed changes

Replace curly quotes with straight quotes 

Curly quotes usually input from Chinese input method.
When read from english context, it makes some confusion.

Change-Id: Ia93558845ffdb8ecfa818f1369bf67744894f47f
This commit is contained in:
gaofei 2018-01-24 14:04:01 +08:00
parent 539313cd1d
commit 33a4ab8f84
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/admin/appdev-guide/examples.rst
View File

@ -14,7 +14,7 @@ Examples
- Description - Description
* - | `Zabbix Agent`_ * - | `Zabbix Agent`_
- Zabbix Agent is a simple application. It doesn’t deploy a VM by itself, - Zabbix Agent is a simple application. It doesn't deploy a VM by itself,
but is installed on a specific VM that may contain any other but is installed on a specific VM that may contain any other
applications. This VM is tracked by Zabbix and by its configuration. applications. This VM is tracked by Zabbix and by its configuration.
@ -24,7 +24,7 @@ Examples
It is worth noting that application scripts are written in Python, not It is worth noting that application scripts are written in Python, not
in Bash as usual. This application does not work without Zabbix server in Bash as usual. This application does not work without Zabbix server
application since it’s a required property, determined in the application since it's a required property, determined in the
application definition. application definition.
* - | `Zabbix Server`_ * - | `Zabbix Server`_
@ -55,7 +55,7 @@ Examples
needed to be opened) is contained in the getContainer method. All other needed to be opened) is contained in the getContainer method. All other
actions for the application configuration are located at the actions for the application configuration are located at the
DockerStandaloneHost definition and its dependencies. Note that this DockerStandaloneHost definition and its dependencies. Note that this
application doesn’t have a filename:Resources folder at all since the application doesn't have a filename:Resources folder at all since the
installation is made by Docker itself. installation is made by Docker itself.

4
doc/source/admin/appdev-guide/faq.rst
View File

@ -42,7 +42,7 @@ Heat Template?**
value is ``In``, so sometimes it is omitted. The ``Out`` property value is ``In``, so sometimes it is omitted. The ``Out`` property
indicates that it is not set from outside, but is calculated in indicates that it is not set from outside, but is calculated in
the class methods and is available for the ``read`` operation from the class methods and is available for the ``read`` operation from
other classes. If you don’t want to initialize in the class other classes. If you don't want to initialize in the class
constructor, and the property has no default value, you specify constructor, and the property has no default value, you specify
``Out`` in the ``Usage``. ``Out`` in the ``Usage``.
@ -52,7 +52,7 @@ Heat Template?**
string in the regular YAML notation. The list with one element is string in the regular YAML notation. The list with one element is
also acceptable. also acceptable.
**There are FullName and Name properties in the manifest file. What’s **There are FullName and Name properties in the manifest file. What's
the difference between them?** the difference between them?**
``Name`` is displayed in the web UI catalog, and ``FullName`` is a ``Name`` is displayed in the web UI catalog, and ``FullName`` is a

4
doc/source/admin/appdev-guide/hot_packages.rst
View File

@ -97,10 +97,10 @@ Hot packages with nested Heat templates
In Murano HOT packages it is possible to allow Heat nested templates to be In Murano HOT packages it is possible to allow Heat nested templates to be
saved and deployed as part of a Murano Heat applications. Such templates saved and deployed as part of a Murano Heat applications. Such templates
should be placed in package under ‘/Resources/HotFiles’. Adding additional should be placed in package under '/Resources/HotFiles'. Adding additional
templates to a package is optional. When a Heat generated package is being templates to a package is optional. When a Heat generated package is being
deployed, if there are any Heat nested templates located in the package under deployed, if there are any Heat nested templates located in the package under
‘/Resources/HotFiles’, they are sent to Heat together with the main template '/Resources/HotFiles', they are sent to Heat together with the main template
and params during stack creation. and params during stack creation.
These nested templates can be referenced by putting the template name into the These nested templates can be referenced by putting the template name into the

4
doc/source/admin/appdev-guide/use_cases.rst
View File

@ -12,7 +12,7 @@ The decision of how to combine applications is made by the author of
an application. an application.
To illustrate the way such interconnection can be configured, To illustrate the way such interconnection can be configured,
let’s analyze the mechanisms applied in WordPress application, which let's analyze the mechanisms applied in WordPress application, which
uses MySql. uses MySql.
MySql is a very popular database and can be used in quite a number of various MySql is a very popular database and can be used in quite a number of various
@ -160,7 +160,7 @@ External load-balancer
---------------------- ----------------------
Suppose, you have powerful load-balancer on a real server. And you want to run Suppose, you have powerful load-balancer on a real server. And you want to run
the application on an OpenStack VM. Murano can set up new applications to be managed the application on an OpenStack VM. Murano can set up new applications to be managed
by that external load-balancer (LB). Let’s go into more details. by that external load-balancer (LB). Let's go into more details.
To implement this case the following apps are used: To implement this case the following apps are used:

2
doc/source/admin/deploy_murano/prerequisites.rst
View File

@ -138,7 +138,7 @@ To reproduce the performance test, proceed with the following steps:
sudo ./start-vm.sh 5 sudo ./start-vm.sh 5
To view VM’s desktops, connect with VNC viewer to your To view VM's desktops, connect with VNC viewer to your
host to VNC screens :1 thru :5 (ports 5901-5905). host to VNC screens :1 thru :5 (ports 5901-5905).
#. Turn off the instances. You may simply kill all KVM processes by running: #. Turn off the instances. You may simply kill all KVM processes by running:

8
doc/source/admin/prepare_lab.rst
View File

@ -143,8 +143,8 @@ Steps to reproduce test:
kvm -m 1024 -drive file=ws-2012-std-$i.qcow2,if=virtio -net user -net nic,model=virtio -nographic -usbdevice tablet -vnc :$i & done kvm -m 1024 -drive file=ws-2012-std-$i.qcow2,if=virtio -net user -net nic,model=virtio -nographic -usbdevice tablet -vnc :$i & done
#. Start ONE instance with command below (as root) and measure time #. Start ONE instance with command below (as root) and measure time
between VM’s launch and the moment when Server Manager window between VM's launch and the moment when Server Manager window
appears. To view VM’s desktop, connect with VNC viewer to your host appears. To view VM's desktop, connect with VNC viewer to your host
to VNC screen :1 (port 5901): to VNC screen :1 (port 5901):
.. code-block:: console .. code-block:: console
@ -158,8 +158,8 @@ Steps to reproduce test:
sudo killall kvm sudo killall kvm
#. Start FIVE instances with command below (as root) and measure time #. Start FIVE instances with command below (as root) and measure time
interval between ALL VM’s launch and the moment when LAST Server Manager interval between ALL VM's launch and the moment when LAST Server Manager
window appears. To view VM’s desktops, connect with VNC viewer to your window appears. To view VM's desktops, connect with VNC viewer to your
host to VNC screens :1 thru :5 (ports 5901-5905): host to VNC screens :1 thru :5 (ports 5901-5905):
.. code-block:: console .. code-block:: console

4
doc/source/configuration/configure_cloud_foundry_service_broker.rst
View File

@ -10,10 +10,10 @@ Service broker overview
Service broker is a new murano component which implements `Cloud Foundry Service broker is a new murano component which implements `Cloud Foundry
<https://www.cloudfoundry.org/>`_ Service Broker API. <https://www.cloudfoundry.org/>`_ Service Broker API.
This lets users build ‘hybrid’ infrastructures that are services like databases, message This lets users build 'hybrid' infrastructures that are services like databases, message
queues, key/value stores, and so on. This services can be uploaded and deployed with queues, key/value stores, and so on. This services can be uploaded and deployed with
murano and made available to Cloud Foundry apps on demand. The result is lowered cost, murano and made available to Cloud Foundry apps on demand. The result is lowered cost,
shorter timetables, and quicker access to required tools — developers can ‘self serve’ shorter timetables, and quicker access to required tools — developers can 'self serve'
by building any required service, then make it instantly available in Cloud Foundry. by building any required service, then make it instantly available in Cloud Foundry.
Configure service broker Configure service broker

4
doc/source/contributor/stable_branches.rst
View File

@ -41,9 +41,9 @@ There are two notable exceptions to the support phases rule:
the same: low regression risks during upgrades, high adoption impact. However the same: low regression risks during upgrades, high adoption impact. However
since core library is much more sensitive app, backports to it should be taken since core library is much more sensitive app, backports to it should be taken
more seriously and should be discussed on IRC and Mailing List and receive more seriously and should be discussed on IRC and Mailing List and receive
PTL’s approval. PTL's approval.
These two exceptions do not mean, that we’re free to backport These two exceptions do not mean, that we're free to backport
any code from master to stable branches. Instead they show, that murano team any code from master to stable branches. Instead they show, that murano team
recognises the importance of these two areas of murano project and treats recognises the importance of these two areas of murano project and treats
exceptions to those slightly more liberally than to other parts of murano exceptions to those slightly more liberally than to other parts of murano

2
doc/source/reference/appendix/articles/specification/murano-api.rst
View File

@ -316,7 +316,7 @@ simultaneously, but only one session going to be deployed. First session that
starts deploying is going to be deployed; other ones become invalid and could starts deploying is going to be deployed; other ones become invalid and could
not be deployed at all. not be deployed at all.
User could not open new session for environment that in User could not open new session for environment that in
*deploying* state (that’s why we call it "almost lock free" model). *deploying* state (that's why we call it "almost lock free" model).
+----------------------+------------+-------------------------------------------+ +----------------------+------------+-------------------------------------------+
| Attribute | Type | Description | | Attribute | Type | Description |

2
doc/source/reference/key_features.rst
View File

@ -6,7 +6,7 @@ Key features
Murano has a number of features designed to Murano has a number of features designed to
interact with the application catalog, for instance interact with the application catalog, for instance
managing what’s in the catalog, and determining managing what's in the catalog, and determining
how apps in the catalog are deployed. how apps in the catalog are deployed.
Application catalog Application catalog

2
doc/source/user/userguide/use_cli.rst
View File

@ -241,7 +241,7 @@ This command supports an optional ``--package-version`` parameter that instructs
murano client to download a specified package version. murano client to download a specified package version.
The :command:`package-import` command inspects package requirements The :command:`package-import` command inspects package requirements
specified in the package’s manifest under the *Require* section, and specified in the package's manifest under the *Require* section, and
attempts to import them from murano repository. The :command:`package-import` attempts to import them from murano repository. The :command:`package-import`
command also inspects any image prerequisites mentioned in the command also inspects any image prerequisites mentioned in the
:file:`images.lst` file in the package. If there are any image :file:`images.lst` file in the package. If there are any image