From 769c3fea73378417799cb1295923ca29a418c3fb Mon Sep 17 00:00:00 2001 From: fengchaoyang Date: Tue, 29 Nov 2016 19:26:45 +0800 Subject: [PATCH] Fix two errors in YAML example and a error in action doc Errors list: 1. "on-complete" is incorrectly written as "on_complete". 2. Use ":" will raise "ERROR (app) Definition could not be parsed: mapping values are not allowed here". 3. Action note description is out of frame. Change-Id: I7f4e8c7755f11a1f0a040f14481e5f7374a1d87f --- doc/source/terminology/actions.rst | 5 +---- doc/source/terminology/workflows.rst | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/source/terminology/actions.rst b/doc/source/terminology/actions.rst index 4c080cba..05135d06 100644 --- a/doc/source/terminology/actions.rst +++ b/doc/source/terminology/actions.rst @@ -39,7 +39,4 @@ Ad-hoc actions are always created as a wrapper around any other existing system actions and their main goal is to simplify using same actions many times with similar pattern. -.. note:: Nested ad-hoc actions currently are not supported (i.e. ad-hoc -action around another ad-hoc action). - -.. note:: More about actions - :ref:`actions-dsl`. +.. note:: Nested ad-hoc actions currently are not supported (i.e. ad-hoc action around another ad-hoc action). More about actions - :ref:`actions-dsl`. diff --git a/doc/source/terminology/workflows.rst b/doc/source/terminology/workflows.rst index d4f6ac77..feee4d76 100644 --- a/doc/source/terminology/workflows.rst +++ b/doc/source/terminology/workflows.rst @@ -83,10 +83,10 @@ YAML example         - send_success_email     send_error_email:       action: send_email to='admin@mysite.org' body='Failed to create a VM' -       on_complete: +       on-complete:         - fail     send_success_email: -       action: send_email to='admin@mysite.org' body='Vm is successfully created and its id: <% $.vm_id %>' +       action: send_email to='admin@mysite.org' body='Vm is successfully created and its id is <% $.vm_id %>' Reverse workflow ----------------