diff --git a/doc/define_snippet.html b/doc/define_snippet.html
index c722eef..d0f1eb5 100644
--- a/doc/define_snippet.html
+++ b/doc/define_snippet.html
@@ -696,6 +696,7 @@ window system, i.e. when you are working in a terminal.
Currently there're three solution come with YASnippet.
+
The function yas/x-popup-menu-for-template can be used to show a
@@ -717,10 +718,11 @@ bet you never want to use this. :p
+
Originally, only the above two function is available in
YASnippet. They are difficult to use -- especially in a
-terminal. Until later Jaeyoun Chung show me his
-dropdown-menu.el, I say wow! It's wonderful!
+terminal. Until later Jaeyoun Chung show me his
dropdown-menu.el,
+I say wow! It's wonderful!
- It works in both window system and terminal.
- It is customizable, you can use C-n, C-p to navigate, q
@@ -747,6 +749,7 @@ trigger key yas/trigger-keyyas/expand to try to expand a snippet.
+
When yas/minor-mode is enabled, the trigger key will take
effect. The default key is (kbd "TAB"), however, you can freely
set it to some other key. By default, YASnippet add a hook to
@@ -788,6 +791,7 @@ menu. You can select a snippet from the menu to expand it. Since you
select manually from the menu, you can expand any snippet. For
example, you can expand a snippet defined for python-mode in a
c-mode buffer by selecting it from the menu:
+
- Condition system is ignored since you select to expand it
explicitly.
diff --git a/doc/define_snippet.rst b/doc/define_snippet.rst
index 1eee201..0b734dd 100644
--- a/doc/define_snippet.rst
+++ b/doc/define_snippet.rst
@@ -411,6 +411,9 @@ customized. There're two variable related:
Currently there're three solution come with YASnippet.
+.. image:: images/popup-menu.png
+ :align: right
+
Popup Menu
~~~~~~~~~~
@@ -434,10 +437,13 @@ bet you never want to use this. :p
Use a dropdown-menu.el
~~~~~~~~~~~~~~~~~~~~~~
+.. image:: images/dropdown-menu.png
+ :align: right
+
Originally, only the above two function is available in
YASnippet. They are difficult to use -- especially in a
-terminal. Until later Jaeyoun Chung show me his
-``dropdown-menu.el``, I say wow! It's wonderful!
+terminal. Until later Jaeyoun Chung show me his ``dropdown-menu.el``,
+I say wow! It's wonderful!
* It works in both window system and terminal.
* It is customizable, you can use ``C-n``, ``C-p`` to navigate, ``q``
@@ -471,6 +477,9 @@ to call ``yas/expand`` to try to expand a snippet.
The Minor Mode
~~~~~~~~~~~~~~
+.. image:: images/minor-mode-indicator.png
+ :align: left
+
When ``yas/minor-mode`` is enabled, the trigger key will take
effect. The default key is ``(kbd "TAB")``, however, you can freely
set it to some other key. By default, YASnippet add a hook to
@@ -520,6 +529,9 @@ select manually from the menu, you can expand any snippet. For
example, you can expand a snippet defined for ``python-mode`` in a
``c-mode`` buffer by selecting it from the menu:
+.. image:: images/menubar.png
+ :align: right
+
* Condition system is ignored since you select to expand it
explicitly.
* There will be no muliple candidates since they are listed in the
diff --git a/doc/images/dropdown-menu.png b/doc/images/dropdown-menu.png
new file mode 100644
index 0000000..94bbfe3
Binary files /dev/null and b/doc/images/dropdown-menu.png differ
diff --git a/doc/images/menubar.png b/doc/images/menubar.png
new file mode 100644
index 0000000..363c766
Binary files /dev/null and b/doc/images/menubar.png differ
diff --git a/doc/images/minor-mode-indicator.png b/doc/images/minor-mode-indicator.png
new file mode 100644
index 0000000..3743455
Binary files /dev/null and b/doc/images/minor-mode-indicator.png differ
diff --git a/doc/images/popup-menu.png b/doc/images/popup-menu.png
new file mode 100644
index 0000000..0fc2bb5
Binary files /dev/null and b/doc/images/popup-menu.png differ