diff --git a/CHANGES.rst b/CHANGES.rst
index 1ebe593..d7be597 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -27,6 +27,11 @@ Backwards incompatible changes:
       pre_call_hook(ns)
       argh.run_endpoint_function(func, ns, ...)
 
+  - Kwonly arguments without default values used to be marked as required
+    options (``--foo FOO``), now they are treated as positionals (``foo``) when
+    the default (legacy) name mapping policy is used.  Please consider the new
+    policy for better treatment of kwonly.
+
 Deprecated:
 
 - The `@expects_obj` decorator.  Rationale: it used to support the old,
@@ -51,6 +56,14 @@ Enhancements:
 
   Please note that the names may change in the upcoming versions.
 
+- Selectable name mapping policies have been introduced for function argument
+  to CLI argument translation (#191 → #199):
+
+  - `BY_NAME_IF_HAS_DEFAULT` (close to pre-v.0.30 behaviour);
+  - `BY_NAME_IF_KWONLY` (recommended).
+
+  Please check API docs on `NameMappingPolicy` for details.
+
 Version 0.29.4
 --------------
 
diff --git a/src/argh/assembling.py b/src/argh/assembling.py
index c4ded66..5f32a8c 100644
--- a/src/argh/assembling.py
+++ b/src/argh/assembling.py
@@ -49,7 +49,7 @@ class NameMappingPolicy(Enum):
 
     * `BY_NAME_IF_HAS_DEFAULT` is very close to the the legacy approach
       (pre-v.0.30).  If a function argument has a default value, it becomes an
-      "option" (called by name, like `--foo`); otherwise it's treated as a
+      "option" (called by name, like ``--foo``); otherwise it's treated as a
       positional argument.
 
       Example::
@@ -62,15 +62,16 @@ def func(alpha, beta=1, *, gamma, delta=2): ...
 
       The difference between this policy and the behaviour of Argh before
       v.0.30 is in the treatment of kwonly arguments without default values:
-      they use to become `--foo FOO` (required) but for the sake of simplicity
-      they are treated as positionals.  If you are already using kwonly args,
-      please consider the better suited policy `BY_NAME_IF_KWONLY` instead.
+      they used to become ``--foo FOO`` (required) but for the sake of
+      simplicity they are treated as positionals.  If you are already using
+      kwonly args, please consider the better suited policy `BY_NAME_IF_KWONLY`
+      instead.
 
     * `BY_NAME_IF_KWONLY` is the newer approach.  It enables finer control over
       positional vs named and required vs optional.  "Normal" arguments become
       positionals, "kwonly" become "options", regardless of the presence of
       default values.  A positional with a default value becomes optional but
-      still positional (`nargs=OPTIONAL`).  A kwonly argument without a default
+      still positional (``nargs=OPTIONAL``).  A kwonly argument without a default
       value becomes a required "option".
 
       Example::