Merge branch '2953-keyword-expressions-error' of github.com:feuillemo…

…rte/pytest into 2953-keyword-expressions-error
pytest-dev · Jan 16, 2018 · dc79116 · dc79116
2 parents 8433e2b + 86e1b44
commit dc79116
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/changelog/2953.trivial b/changelog/2953.trivial
@@ -1 +1 @@
-Show a simple and easy error when keyword expressions trigger a syntax error (for example, "-k foo and import" will show an error that you can not use import in expressions)
+Show a simple and easy error when keyword expressions trigger a syntax error (for example, ``"-k foo and import"`` will show an error that you can not use the ``import`` keyword in expressions).