diff --git a/CHANGES b/CHANGES
index ee746253288cffb751c61782392f020e50f37b01..7f3b0ad7c3d8f65d3d32f5e55b9ea4ce923af6e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -286,12 +286,11 @@ Core
    - 'media cache delete <item>' - remove an item from the cache
    - 'media cache create <uri>' - retrieve a URI and store it in the cache
 
- * The ability for hints to be automatically created as a result of device state
-   changes now exists in the PBX. This functionality is referred to as "autohints"
-   and is configurable in extensions.conf by placing "autohints=yes" in the
-   context. If enabled then a hint will be automatically created with the name of
-   the device.
-
+ * The ability for device state hints to be automatically created as a result of
+   device state changes now exists in the PBX. This functionality is referred to
+   as "autohints" and is configurable in extensions.conf by placing "autohints=yes"
+   in the context. If enabled a device state hint will be automatically created
+   with the name of the device.
 
 Functions
 ------------------
diff --git a/configs/samples/extensions.conf.sample b/configs/samples/extensions.conf.sample
index f8770c55daf4e26fa9b2e56c2aaa2b0a9b8440f4..28319b59219e885f28fe6c8259358f4493bc9b45 100644
--- a/configs/samples/extensions.conf.sample
+++ b/configs/samples/extensions.conf.sample
@@ -197,6 +197,11 @@ TRUNKMSD=1					; MSD digits to strip (usually 1 or 0)
 ; before "B".
 ;
 ;[context]
+;
+;autohints = yes
+; If enabled for a context, a device state hint will be automatically created in
+; the context with the name of the device and updated with device state changes.
+;
 ;exten => someexten,{priority|label{+|-}offset}[(alias)],application(arg1,arg2,...)
 ;
 ; Timing list for includes is