Skip to content

Commit

Permalink
fixed issues from new cloudslangers
Browse files Browse the repository at this point in the history
Signed-off-by: SamMarkowitz <[email protected]>
  • Loading branch information
SamMarkowitz committed Mar 14, 2016
1 parent eae5ed3 commit 2b48312
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion _static/css/cloudslang_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

.wy-nav-side .wy-side-nav-search{
background-color: #6DC692;
border-color: #6DC692
border-color: #6DC692;
}
5 changes: 4 additions & 1 deletion tutorial/01_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ Copy/Pasting Code
-----------------

Because proper indentation is so important in YAML, take care to indent pasted
code examples to their proper indentation levels.
code examples to their **proper indentation levels**. If you are unsure what the
indentation level is for a particular code snippet, you can take a look at where
it fits into the rest of the code in the **New Code - Complete** section at the
bottom of each lesson.

Prerequisites
-------------
Expand Down
5 changes: 3 additions & 2 deletions tutorial/09_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,15 @@ Fix Up Parent Flow
Finally, let's make changes to our original flow so that it makes use of
the subflow we just created.

First let's replace the two tasks we took out with one new one that
First let's replace the two tasks we took out with one new task that
calls the subflow instead of an operation. You may have noticed that
both flows and operations take inputs, return outputs and return
results. That allows us to use them almost interchangeably. We've run
both flows and operations using the CLI. Now we see that we can call
them both from tasks as well.

We'll call our new task ``create_email_address``. It will pass along the
Delete the ``generate_address`` and ``check_address`` tasks. We'll now replace
the with a new task we'll call ``create_email_address``. It will pass along the
flow inputs, publish the necessary outputs and wire up the appropriate
navigation.

Expand Down
2 changes: 1 addition & 1 deletion tutorial/10_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ removing the last item in the loop expression's list.
The first thing you'll notice is that the subflow is being run several
times. This is what our loop has done. Next, you'll notice that
depending on whether you've passed a middle name and how big the loop
list is different things will happen. This is due to the default
list is, different things will happen. This is due to the default
behavior of loops and our ``create_user_email`` subflow.

By default a loop exits when either the list it is looping on has been
Expand Down
7 changes: 4 additions & 3 deletions tutorial/11_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ a loop. This time we'll loop through a map of items and their prices.
- item
- price
We'll also need to create some input variables first. One variable, that
we'll call ``order_map``, will contain the map we're looping on. Notice how a
map is most easily passed as an input value using the ``default`` property.
We'll also need to create some input variables in the flow's ``inputs`` section
first. One variable, that we'll call ``order_map``, will contain the map we're
looping on. Notice how a map is most easily passed as an input value using the
``default`` property.

Also, each time through the loop we want to aggregate the data that is output.
We'll create two variables, ``missing`` and ``total_cost``, for this
Expand Down
2 changes: 1 addition & 1 deletion tutorial/13_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ First, we'll use a system property in the inputs of ``generate_user_email``
by calling the ``get_sp()`` function in the ``default`` property of the
the ``domain`` input. The ``get_sp()`` function will retrieve the value
associated with the property defined by the fully qualified name in its first
argument. If no such property if found, the function will return the second
argument. If no such property is found, the function will return the second
argument.

.. code-block:: yaml
Expand Down
5 changes: 3 additions & 2 deletions tutorial/14_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ installation instructions.

We'll also need to add a **requirements.txt** file to a **python-lib** folder
which is at the same level as the **bin** folder that the CLI executable
resides in.
resides in. If you downloaded a pre-built CLI the **requirements.txt** file is
already there and we will be appending to its contents.

The folder structure where the CLI executable is should look something
like this:
Expand Down Expand Up @@ -62,8 +63,8 @@ depends on it. Each package we need takes up one line in our

.. code:: bash
pyfiglet == 0.7.2
setuptools
pyfiglet == 0.7.2
Installing
----------
Expand Down
5 changes: 3 additions & 2 deletions tutorial/15_lesson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ For more information, see :ref:`aggregate` and :ref:`branches_context` in the
DSL reference.

For more information on the Python constructs used here, see
`lamda <https://docs.python.org/2.7/reference/expressions.html?highlight=lambda#lambda>`__,
`lambda <https://docs.python.org/2.7/reference/expressions.html?highlight=lambda#lambda>`__,
`map <https://docs.python.org/2.7/library/functions.html?highlight=map%20function#map>`__
and `sum <https://docs.python.org/2.7/library/functions.html?highlight=map%20function#sum>`__
in the Python documentation.
Expand Down Expand Up @@ -234,7 +234,8 @@ file is very similar to a system properties file. It is written in plain
YAML which will make it easy for us to format and it will also be more
readable than if we had taken a different approach.

Here is the contents of our **hires.yaml** input file.
Here is the contents of our **hires.yaml** input file that we created in the
**tutorials/inputs** folder.

.. code-block:: yaml
Expand Down

0 comments on commit 2b48312

Please sign in to comment.