Skip to content

Commit 6c77530

Browse files
committed
Merge branch '4.2'
* 4.2: Removed unneeded versionadded directives Fixed a typo
2 parents 530f710 + c1c755e commit 6c77530

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

workflow.rst

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,6 @@ As configured, the following property is used by the marking store::
197197
Setting the ``audit_trail.enabled`` option to ``true`` makes the application
198198
generate detailed log messages for the workflow activity.
199199

200-
.. versionadded:: 3.3
201-
202-
The ``audit_trail`` option was introduced in Symfony 3.3.
203-
204200
With this workflow named ``blog_publishing``, you can get help to decide
205201
what actions are allowed on a blog post::
206202

@@ -406,10 +402,6 @@ This means that each event has access to the following information:
406402
:method:`Symfony\\Component\\Workflow\\Event\\Event::getWorkflowName`
407403
Returns a string with the name of the workflow that triggered the event.
408404

409-
.. versionadded:: 3.3
410-
411-
The ``getWorkflowName()`` method was introduced in Symfony 3.3.
412-
413405
For Guard Events, there is an extended class :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent`.
414406
This class has two more methods:
415407

@@ -475,11 +467,6 @@ of domain logic in your templates:
475467
``workflow_has_marked_place()``
476468
Returns ``true`` if the marking of the given object has the given state.
477469

478-
.. versionadded:: 3.3
479-
480-
The ``workflow_marked_places()`` and ``workflow_has_marked_place()``
481-
functions were introduced in Symfony 3.3.
482-
483470
The following example shows these functions in action:
484471

485472
.. code-block:: html+twig

workflow/introduction.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Workflows and State Machines
22
============================
33

4-
Worflows
5-
--------
4+
Workflows
5+
---------
66

77
A workflow is a model of a process in your application. It may be the process of
88
how a blog post goes from draft to review and publish. Another example is when a
@@ -51,9 +51,9 @@ your model. The most important differences between them are:
5151
machines can't;
5252
* Workflows usually don't have cyclic paths in the definition graph, but it's
5353
common for state machines;
54-
* In order to apply a transition, worflows require that the object is in all the
55-
previous places of the transition, whereas state machines only require that
56-
the object is at least in one of those places.
54+
* In order to apply a transition, workflows require that the object is in all
55+
the previous places of the transition, whereas state machines only require
56+
that the object is at least in one of those places.
5757

5858
Example
5959
~~~~~~~

0 commit comments

Comments
 (0)