Skip to content

Commit 1995a13

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: [Workflow] Removed note about flushing in `entered` event Fix invalid reference to importing JavaScript
2 parents c61768b + e61ccc6 commit 1995a13

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

frontend/encore/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ is the main config file for both Webpack and Webpack Encore:
9999
module.exports = Encore.getWebpackConfig();
100100
101101
Next, create a new ``assets/js/app.js`` file with some basic JavaScript *and*
102-
import some JavaScript:
102+
import some CSS:
103103

104104
.. code-block:: javascript
105105

workflow.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,7 @@ order:
275275
* ``workflow.[workflow name].enter.[place name]``
276276

277277
``workflow.entered``
278-
The subject has entered in the places and the marking is updated (making it a good
279-
place to flush data in Doctrine).
278+
The subject has entered in the places and the marking is updated.
280279

281280
The three events being dispatched are:
282281

0 commit comments

Comments
 (0)