Merge pull request #3567 from michael-k/doc-typo

Fix typo in documentation
pytest-dev · Jun 11, 2018 · efc9a0e · efc9a0e
2 parents 1170504 + 4a78711
commit efc9a0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog/3567.trivial.rst b/changelog/3567.trivial.rst
@@ -0,0 +1 @@
+Fix typo in documentation
diff --git a/doc/en/mark.rst b/doc/en/mark.rst
@@ -78,7 +78,7 @@ Updating code
 ~~~~~~~~~~~~~
 
 The old ``Node.get_marker(name)`` function is considered deprecated because it returns an internal ``MarkerInfo`` object
-which contains the merged name, ``*args`` and ``**kwargs**`` of all the markers which apply to that node.
+which contains the merged name, ``*args`` and ``**kwargs`` of all the markers which apply to that node.
 
 In general there are two scenarios on how markers should be handled: