diff --git a/_pytest/mark/structures.py b/_pytest/mark/structures.py
index 3879c9f8f..451614d92 100644
--- a/_pytest/mark/structures.py
+++ b/_pytest/mark/structures.py
@@ -114,11 +114,21 @@ class ParameterSet(namedtuple('ParameterSet', 'values, marks, id')):
 
 @attr.s(frozen=True)
 class Mark(object):
-    name = attr.ib()
-    args = attr.ib()
-    kwargs = attr.ib()
+    #: name of the mark
+    name = attr.ib(type=str)
+    #: positional arguments of the mark decorator
+    args = attr.ib(type="List[object]")
+    #: keyword arguments of the mark decorator
+    kwargs = attr.ib(type="Dict[str, object]")
 
     def combined_with(self, other):
+        """
+        :param other: the mark to combine with
+        :type other: Mark
+        :rtype: Mark
+
+        combines by appending aargs and merging the mappings
+        """
         assert self.name == other.name
         return Mark(
             self.name, self.args + other.args,
diff --git a/doc/en/mark.rst b/doc/en/mark.rst
index 24d9b1cdc..1ce716f8e 100644
--- a/doc/en/mark.rst
+++ b/doc/en/mark.rst
@@ -27,5 +27,35 @@ which also serve as documentation.
 
 
 
+
+
 .. currentmodule:: _pytest.mark.structures
-.. autoclass:: Mark
\ No newline at end of file
+.. autoclass:: Mark
+	:members:
+
+
+
+
+
+.. `marker-iteration`
+
+Marker iteration
+=================
+
+.. versionadded:: 3.6
+
+A new api to access markers was introduced in order to elevate the inherent design mistakes
+which accumulated over the evolution of markers from simply updating the ``__dict__`` attribute of functions to something more powerful.
+
+At the end of this evolution Markers would unintenedly pass along in class hierachies and the api for retriving them was inconsistent,
+as markers from parameterization would store differently than markers from objects and markers added via ``node.add_marker``
+
+This in turnd made it technically next to impossible to use the data of markers correctly without having a deep understanding of the broken internals.
+
+The new api is provides :func:`_pytest.nodes.Node.iter_markers` on :py:class:`_pytest.nodes.node`  method to iterate over markers in a consistent manner.
+
+.. warning::
+
+	in a future major relase of pytest we will introduce class based markers,
+	at which points markers will no longer be limited to instances of :py:class:`Mark`
+