diff --git a/faq.html b/faq.html
index 470f0cea..6a38b436 100644
--- a/faq.html
+++ b/faq.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Frequently Asked Questions</title>
-<!-- 2015-09-24 Thu 21:15 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -232,11 +232,11 @@ <h2 id="sec-2">Why doesn't TAB expand a snippet?</h2>
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(add-hook 'org-mode-hook
-	  (let ((original-command (lookup-key org-mode-map [tab])))
-	    `(lambda ()
-	       (setq yas-fallback-behavior
-		     '(apply ,original-command))
-	       (local-set-key [tab] 'yas-expand))))
+          (<span class="org-keyword">let</span> ((original-command (lookup-key org-mode-map [tab])))
+            `(<span class="org-keyword">lambda</span> ()
+               (setq yas-fallback-behavior
+                     '(apply ,original-command))
+               (local-set-key [tab] 'yas-expand))))
 </pre>
 </div>
 
@@ -251,15 +251,15 @@ <h2 id="sec-2">Why doesn't TAB expand a snippet?</h2>
 
 <div class="org-src-container">
 
-<pre class="src src-emacs-lisp">(defun yas-advise-indent-function (function-symbol)
-  (eval `(defadvice ,function-symbol (around yas-try-expand-first activate)
-	   ,(format
-	     "Try to expand a snippet before point, then call `%s' as usual"
-	     function-symbol)
-	   (let ((yas-fallback-behavior nil))
-	     (unless (and (interactive-p)
-			  (yas-expand))
-	       ad-do-it)))))
+<pre class="src src-emacs-lisp">(<span class="org-keyword">defun</span> <span class="org-function-name">yas-advise-indent-function</span> (function-symbol)
+  (eval `(<span class="org-keyword">defadvice</span> ,function-symbol (around yas-try-expand-first activate)
+           ,(format
+             <span class="org-string">"Try to expand a snippet before point, then call `</span><span class="org-string"><span class="org-constant">%s</span></span><span class="org-string">' as usual"</span>
+             function-symbol)
+           (<span class="org-keyword">let</span> ((yas-fallback-behavior nil))
+             (<span class="org-keyword">unless</span> (and (interactive-p)
+                          (yas-expand))
+               ad-do-it)))))
 
 (yas-advise-indent-function 'ruby-indent-line)
 </pre>
@@ -295,9 +295,9 @@ <h2 id="sec-3">Why doesn't TAB navigation work with flyspell</h2>
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(add-hook 'flyspell-incorrect-hook
-	  #'(lambda (dummy1 dummy2 dymmy3)
-	      (and yas-active-field-overlay
-		   (overlay-buffer yas-active-field-overlay))))
+          #'(<span class="org-keyword">lambda</span> (dummy1 dummy2 dymmy3)
+              (and yas-active-field-overlay
+                   (overlay-buffer yas-active-field-overlay))))
 </pre>
 </div>
 
@@ -322,17 +322,17 @@ <h2 id="sec-4">How to I use alternative keys, i.e. not TAB?</h2>
 
 <div class="org-src-container">
 
-<pre class="src src-emacs-lisp">(define-key yas-minor-mode-map (kbd "&lt;tab&gt;") nil)
-(define-key yas-minor-mode-map (kbd "TAB") nil)
-(define-key yas-minor-mode-map (kbd "&lt;the new key&gt;") 'yas-expand)
+<pre class="src src-emacs-lisp">(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;tab&gt;"</span>) nil)
+(define-key yas-minor-mode-map (kbd <span class="org-string">"TAB"</span>) nil)
+(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;the new key&gt;"</span>) 'yas-expand)
 
-;;keys for navigation
+<span class="org-comment-delimiter">;;</span><span class="org-comment">keys for navigation</span>
 (define-key yas-keymap [(tab)]       nil)
-(define-key yas-keymap (kbd "TAB")   nil)
+(define-key yas-keymap (kbd <span class="org-string">"TAB"</span>)   nil)
 (define-key yas-keymap [(shift tab)] nil)
 (define-key yas-keymap [backtab]     nil)
-(define-key yas-keymap (kbd "&lt;new-next-field-key&gt;") 'yas-next-field-or-maybe-expand)
-(define-key yas-keymap (kbd "&lt;new-prev-field-key&gt;") 'yas-prev)
+(define-key yas-keymap (kbd <span class="org-string">"&lt;new-next-field-key&gt;"</span>) 'yas-next-field-or-maybe-expand)
+(define-key yas-keymap (kbd <span class="org-string">"&lt;new-prev-field-key&gt;"</span>) 'yas-prev)
 </pre>
 </div>
 </div>
@@ -349,9 +349,9 @@ <h2 id="sec-5">How do I turn off the minor mode where in some buffers?</h2>
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(set-default 'yas-dont-activate
-	     #'(lambda ()
-		 (and yas-root-directory
-		      (null (yas-get-snippet-tables)))))
+             #'(<span class="org-keyword">lambda</span> ()
+                 (and yas-root-directory
+                      (null (yas-get-snippet-tables)))))
 </pre>
 </div>
 
@@ -389,17 +389,17 @@ <h2 id="sec-6">How do I define an abbrev key containing characters not supported
 
 <div class="org-src-container">
 
-<pre class="src src-snippet"># key: &lt;
-# name: &lt;...&gt;&lt;/...&gt;
-# --
-&lt;${1:div}&gt;$0&lt;/$1&gt;
+<pre class="src src-snippet"><span class="org-comment"># key: &lt;</span>
+<span class="org-comment"># name: &lt;...&gt;&lt;/...&gt;</span>
+<span class="org-comment"># --</span>
+&lt;<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span>div<span class="org-keyword">}</span>&gt;<span class="org-keyword">$</span><span class="org-string">0</span>&lt;/<span class="org-keyword">$</span><span class="org-string">1</span>&gt;
 </pre>
 </div>
 </div>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/index.html b/index.html
index 65e488f2..aef5de31 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Yet another snippet extension</title>
-<!-- 2015-09-24 Thu 21:15 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -222,7 +222,7 @@ <h1 class="title">Yet another snippet extension</h1>
 </ol>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/snippet-development.html b/snippet-development.html
index 0fa40956..8a3979e2 100644
--- a/snippet-development.html
+++ b/snippet-development.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Writing snippets</title>
-<!-- 2015-09-24 Thu 21:15 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -179,14 +179,14 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-2-9"><code># contributor:</code> snippet author</a></li>
 </ul>
 </li>
-<li><a href="#sec-3"></a>
+<li><a href="#sec-3">Template Syntax</a>
 <ul>
 <li><a href="#sec-3-1">Plain Text</a></li>
 <li><a href="#sec-3-2">Embedded Emacs-lisp code</a></li>
 <li><a href="#sec-3-3">Tab stop fields</a></li>
 <li><a href="#sec-3-4">Placeholder fields</a></li>
-<li><a href="#sec-3-5"></a></li>
-<li><a href="#sec-3-6">Mirrors with </a></li>
+<li><a href="#sec-3-5">Mirrors </a></li>
+<li><a href="#sec-3-6">Mirrors with transformations </a></li>
 <li><a href="#sec-3-7">Fields with transformations</a></li>
 <li><a href="#sec-3-8">Choosing fields value from a list and other tricks</a></li>
 <li><a href="#sec-3-9">Nested placeholder fields</a></li>
@@ -311,10 +311,10 @@ <h2 id="sec-2">File content</h2>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet"># contributor: pluskid &lt;pluskid@gmail.com&gt;
-# name: __...__
-# --
-__${init}__
+<pre class="src src-snippet"><span class="org-comment"># contributor: pluskid <a href="mailto:pluskid%40gmail.com">&lt;pluskid@gmail.com&gt;</a></span>
+<span class="org-comment"># name: __...__</span>
+<span class="org-comment"># --</span>
+__${init<span class="org-keyword">}</span>__
 </pre>
 </div>
 
@@ -416,19 +416,19 @@ <h3 id="sec-2-5"><code># expand-env:</code> expand environment</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet"># name: ASCII home
-# expand-env: ((yas-indent-line 'fixed) (yas-wrap-around-region 'nil))
-# --
-		welcome to my
-	    X      humble
-	   / \      home,
-	  /   \      $0
-	 /     \
-	/-------\
-	|       |
-	|  +-+  |
-	|  | |  |
-	+--+-+--+
+<pre class="src src-snippet"><span class="org-comment"># name: ASCII home</span>
+<span class="org-comment"># expand-env: ((yas-indent-line 'fixed) (yas-wrap-around-region 'nil))</span>
+<span class="org-comment"># --</span>
+                welcome to my
+            X      humble
+           / \      home,
+          /   \      <span class="org-keyword">$</span><span class="org-string">0</span>
+         /     \
+        /-------\
+        |       |
+        |  +-+  |
+        |  | |  |
+        +--+-+--+
 </pre>
 </div>
 </div>
@@ -451,10 +451,10 @@ <h3 id="sec-2-6"><code># binding:</code> direct keybinding</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet"># name: &lt;p&gt;...&lt;/p&gt;
-# binding: C-c C-c C-m
-# --
-&lt;p&gt;`(when yas-prefix "\n")`$0`(when yas-prefix "\n")`&lt;/p&gt;
+<pre class="src src-snippet"><span class="org-comment"># name: &lt;p&gt;...&lt;/p&gt;</span>
+<span class="org-comment"># binding: C-c C-c C-m</span>
+<span class="org-comment"># --</span>
+&lt;p&gt;`(<span class="org-keyword">when</span> yas-prefix "\n")`<span class="org-keyword">$</span><span class="org-string">0</span>`(<span class="org-keyword">when</span> yas-prefix "\n")`&lt;/p&gt;
 </pre>
 </div>
 
@@ -477,7 +477,7 @@ <h3 id="sec-2-7"><code># type:</code> <code>snippet</code> or <code>command</cod
 
 <p>
 If it's <code>snippet</code> (the default when there is no <code>type</code> directive), the
-snippet body will be parsed according to the <i>Template Syntax</i>,
+snippet body will be parsed according to the <a href="#sec-3">Template Syntax</a>,
 described below.
 </p>
 </div>
@@ -506,7 +506,7 @@ <h3 id="sec-2-9"><code># contributor:</code> snippet author</h3>
 </div>
 
 <div id="outline-container-sec-3" class="outline-2">
-<h2 id="sec-3"><a id="Template-syntax" name="Template-syntax"></a></h2>
+<h2 id="sec-3">Template Syntax</h2>
 <div class="outline-text-2" id="text-3">
 <p>
 The syntax of the snippet template is simple but powerful, very similar
@@ -543,12 +543,12 @@ <h3 id="sec-3-2">Embedded Emacs-lisp code</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">#ifndef ${1:_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_H_}
-#define $1
+<pre class="src src-snippet"><span class="org-comment">#ifndef ${</span><span class="org-warning">1</span><span class="org-comment">:_`(upcase (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))`_H_}</span>
+<span class="org-comment">#define $</span><span class="org-string">1</span>
 
-$0
+<span class="org-keyword">$</span><span class="org-string">0</span>
 
-#endif /* $1 */
+<span class="org-comment">#endif /* $</span><span class="org-string">1</span><span class="org-comment"> */</span>
 </pre>
 </div>
 
@@ -560,9 +560,9 @@ <h3 id="sec-3-2">Embedded Emacs-lisp code</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">for ($1;$2;$3) {
-  `yas-selected-text`$0
-}
+<pre class="src src-snippet">for (<span class="org-keyword">$</span><span class="org-string">1</span>;<span class="org-keyword">$</span><span class="org-string">2</span>;<span class="org-keyword">$</span><span class="org-string">3</span>) {
+  `yas-selected-text`<span class="org-keyword">$</span><span class="org-string">0</span>
+<span class="org-keyword">}</span>
 </pre>
 </div>
 
@@ -586,8 +586,8 @@ <h3 id="sec-3-3">Tab stop fields</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">&lt;div$1&gt;
-    $0
+<pre class="src src-snippet">&lt;div<span class="org-keyword">$</span><span class="org-string">1</span>&gt;
+    <span class="org-keyword">$</span><span class="org-string">0</span>
 &lt;/div&gt;
 </pre>
 </div>
@@ -603,21 +603,21 @@ <h3 id="sec-3-4">Placeholder fields</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">${N:default value}
+<pre class="src src-snippet">${N:default value<span class="org-keyword">}</span>
 </pre>
 </div>
 
 <p>
 They acts as the default value for a tab stop. But when you firstly
 type at a tab stop, the default value will be replaced by your typing.
-The number can be omitted if you don't want to create <i>mirrors</i> or
-<a href="#transformations">3.6</a> for this field.
+The number can be omitted if you don't want to create <a href="#mirrors-fields">mirrors</a> or
+<a href="#mirror-transformations">transformations</a> for this field.
 </p>
 </div>
 </div>
 
 <div id="outline-container-sec-3-5" class="outline-3">
-<h3 id="sec-3-5"><a id="Mirrors" name="Mirrors"></a></h3>
+<h3 id="sec-3-5">Mirrors <a id="mirrors-fields" name="mirrors-fields"></a></h3>
 <div class="outline-text-3" id="text-3-5">
 <p>
 We refer the tab stops with placeholders as a <i>field</i>. A field can have
@@ -627,9 +627,9 @@ <h3 id="sec-3-5"><a id="Mirrors" name="Mirrors"></a></h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">\begin{${1:enumerate}}
-    $0
-\end{$1}
+<pre class="src src-snippet">\begin{<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span>enumerate<span class="org-keyword">}}</span>
+    <span class="org-keyword">$</span><span class="org-string">0</span>
+\end{<span class="org-keyword">$</span><span class="org-string">1</span><span class="org-keyword">}</span>
 </pre>
 </div>
 
@@ -648,7 +648,7 @@ <h3 id="sec-3-5"><a id="Mirrors" name="Mirrors"></a></h3>
 </div>
 
 <div id="outline-container-sec-3-6" class="outline-3">
-<h3 id="sec-3-6">Mirrors with <a id="transformations" name="transformations"></a></h3>
+<h3 id="sec-3-6">Mirrors with transformations <a id="mirror-transformations" name="mirror-transformations"></a></h3>
 <div class="outline-text-3" id="text-3-6">
 <p>
 If the value of an <code>${n:</code>-construct starts with and contains <code>$(</code>,
@@ -662,17 +662,17 @@ <h3 id="sec-3-6">Mirrors with <a id="transformations" name="transformations"></a
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">- (${1:id})${2:foo}
+<pre class="src src-snippet">- (<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span>id<span class="org-keyword">}</span>)<span class="org-keyword">${</span><span class="org-warning">2</span><span class="org-keyword">:</span>foo<span class="org-keyword">}</span>
 {
-    return $2;
-}
+    return <span class="org-keyword">$</span><span class="org-string">2</span>;
+<span class="org-keyword">}</span>
 
-- (void)set${2:$(capitalize yas-text)}:($1)aValue
+- (void)set<span class="org-keyword">${</span><span class="org-warning">2</span><span class="org-keyword">:</span><span class="org-preprocessor">$(</span>capitalize yas-text)<span class="org-keyword">}</span>:(<span class="org-keyword">$</span><span class="org-string">1</span>)aValue
 {
-    [$2 autorelease];
-    $2 = [aValue retain];
-}
-$0
+    [<span class="org-keyword">$</span><span class="org-string">2</span> autorelease];
+    <span class="org-keyword">$</span><span class="org-string">2</span> = [aValue retain];
+<span class="org-keyword">}</span>
+<span class="org-keyword">$</span><span class="org-string">0</span>
 </pre>
 </div>
 
@@ -694,9 +694,9 @@ <h3 id="sec-3-6">Mirrors with <a id="transformations" name="transformations"></a
 
 <div class="org-src-container">
 
-<pre class="src src-rst">=====
-Title
-=====
+<pre class="src src-rst"><span class="org-rst-adornment">=====</span>
+<span class="org-rst-level-1">Title</span>
+<span class="org-rst-adornment">=====</span>
 </pre>
 </div>
 
@@ -706,9 +706,9 @@ <h3 id="sec-3-6">Mirrors with <a id="transformations" name="transformations"></a
 
 <div class="org-src-container">
 
-<pre class="src src-rst">===
-Title
-===
+<pre class="src src-rst"><span class="org-rst-adornment">===</span>
+<span class="org-rst-level-1">Title</span>
+<span class="org-rst-adornment">===</span>
 </pre>
 </div>
 
@@ -718,11 +718,11 @@ <h3 id="sec-3-6">Mirrors with <a id="transformations" name="transformations"></a
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">${1:$(make-string (string-width yas-text) ?\=)}
-${1:Title}
-${1:$(make-string (string-width yas-text) ?\=)}
+<pre class="src src-snippet"><span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span><span class="org-preprocessor">$(</span>make-string (string-width yas-text) ?\=)<span class="org-keyword">}</span>
+<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span>Title<span class="org-keyword">}</span>
+<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span><span class="org-preprocessor">$(</span>make-string (string-width yas-text) ?\=)<span class="org-keyword">}</span>
 
-$0
+<span class="org-keyword">$</span><span class="org-string">0</span>
 </pre>
 </div>
 </div>
@@ -790,8 +790,8 @@ <h3 id="sec-3-8">Choosing fields value from a list and other tricks</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">&lt;div align="${2:$$(yas-choose-value '("right" "center" "left"))}"&gt;
-  $0
+<pre class="src src-snippet">&lt;div align="<span class="org-keyword">${</span><span class="org-warning">2</span><span class="org-keyword">:</span>$<span class="org-preprocessor">$(</span>yas-choose-value '("right" "center" "left"))<span class="org-keyword">}</span>"&gt;
+  <span class="org-keyword">$</span><span class="org-string">0</span>
 &lt;/div&gt;
 </pre>
 </div>
@@ -808,10 +808,10 @@ <h3 id="sec-3-8">Choosing fields value from a list and other tricks</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">\section{${1:"Titel der Tour"}}%
-\index{$1}%
-\label{{2:"waiting for reftex-label call..."$(unless yas-modified-p (reftex-label nil 'dont-
-insert))}}%
+<pre class="src src-snippet">\section{<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span>"Titel der Tour"<span class="org-keyword">}}</span>%
+\index{<span class="org-keyword">$</span><span class="org-string">1</span><span class="org-keyword">}</span>%
+\label{{2:"waiting for reftex-label call..."<span class="org-preprocessor">$(</span><span class="org-keyword">unless</span> yas-modified-p (reftex-label nil 'dont-
+insert))<span class="org-keyword">}}</span>%
 </pre>
 </div>
 
@@ -831,7 +831,7 @@ <h3 id="sec-3-9">Nested placeholder fields</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-snippet">&lt;div${1: id="${2:some_id}"}&gt;$0&lt;/div&gt;
+<pre class="src src-snippet">&lt;div<span class="org-keyword">${</span><span class="org-warning">1</span><span class="org-keyword">:</span> id="<span class="org-keyword">${</span><span class="org-warning">2</span><span class="org-keyword">:</span>some_id<span class="org-keyword">}</span>"<span class="org-keyword">}</span>&gt;<span class="org-keyword">$</span><span class="org-string">0</span>&lt;/div&gt;
 </pre>
 </div>
 
@@ -853,7 +853,7 @@ <h3 id="sec-3-9">Nested placeholder fields</h3>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/snippet-expansion.html b/snippet-expansion.html
index 01268a84..d42a22c9 100644
--- a/snippet-expansion.html
+++ b/snippet-expansion.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Expanding snippets</title>
-<!-- 2015-09-24 Thu 21:14 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -167,7 +167,11 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-1-1-1">Fallback behaviour</a></li>
 </ul>
 </li>
-<li><a href="#sec-1-2">Insert at point</a></li>
+<li><a href="#sec-1-2">Insert at point</a>
+<ul>
+<li><a href="#sec-1-2-1">Inserting region or register contents into snippet</a></li>
+</ul>
+</li>
 <li><a href="#sec-1-3">Snippet keybinding</a></li>
 <li><a href="#sec-1-4">Expanding from the menu</a></li>
 <li><a href="#sec-1-5">Expanding with <code>hippie-expand</code></a></li>
@@ -253,9 +257,9 @@ <h3 id="sec-1-1">Trigger key</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-emacs-lisp">(define-key yas-minor-mode-map (kbd "&lt;tab&gt;") nil)
-(define-key yas-minor-mode-map (kbd "TAB") nil)
-(define-key yas-minor-mode-map (kbd "&lt;the new key&gt;") 'yas-expand)
+<pre class="src src-emacs-lisp">(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;tab&gt;"</span>) nil)
+(define-key yas-minor-mode-map (kbd <span class="org-string">"TAB"</span>) nil)
+(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;the new key&gt;"</span>) 'yas-expand)
 </pre>
 </div>
 
@@ -325,6 +329,26 @@ <h3 id="sec-1-2">Insert at point</h3>
 <a href="snippet-reference.html#yas-prompt-functions"><code>yas-prompt-functions</code></a>.
 </p>
 </div>
+
+<div id="outline-container-sec-1-2-1" class="outline-4">
+<h4 id="sec-1-2-1">Inserting region or register contents into snippet</h4>
+<div class="outline-text-4" id="text-1-2-1">
+<p>
+It's often useful to inject already written text in the middle of a
+snippet.  The variable <a href="snippet-reference.html#yas-wrap-around-region"><code>yas-wrap-around-region</code></a> when to t substitute
+the region contents into the <code>$0</code> placeholder of a snippet expanded by
+<i><code>yas-insert-snippet</code></i>.  Setting it to a character value (e.g. <code>?0</code>)
+will insert the contents of corresponding register.
+</p>
+
+<p>
+Older (versions 0.9.1 and below) of Yasnippet, supported a setting of
+<code>cua</code> that is equivalent to <code>?0</code> but only worked with <code>cua-mode</code>
+turned on.  This setting is still supported for backwards
+compatibility, but is now entirely equivalent to <code>?0</code>.
+</p>
+</div>
+</div>
 </div>
 
 <div id="outline-container-sec-1-3" class="outline-3">
@@ -447,11 +471,11 @@ <h3 id="sec-2-1">Eligible snippets</h3>
 
 <div class="org-src-container">
 
-<pre class="src src-emacs-lisp">;; When entering rinari-minor-mode, consider also the snippets in the
-;; snippet table "rails-mode"
+<pre class="src src-emacs-lisp"><span class="org-comment-delimiter">;; </span><span class="org-comment">When entering rinari-minor-mode, consider also the snippets in the</span>
+<span class="org-comment-delimiter">;; </span><span class="org-comment">snippet table "rails-mode"</span>
 (add-hook 'rinari-minor-mode-hook
-	  #'(lambda ()
-	      (yas-activate-extra-mode 'rails-mode)))
+          #'(<span class="org-keyword">lambda</span> ()
+              (yas-activate-extra-mode 'rails-mode)))
 </pre>
 </div>
 
@@ -499,11 +523,11 @@ <h3 id="sec-2-2">The condition system</h3>
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(add-hook 'python-mode-hook
-	  (lambda ()
-	    (setq yas-buffer-local-condition
-		  '(if (python-in-string/comment)
-		       '(require-snippet-condition . force-in-comment)
-		     t))))
+          (<span class="org-keyword">lambda</span> ()
+            (setq yas-buffer-local-condition
+                  '(<span class="org-keyword">if</span> (python-in-string/comment)
+                       '(require-snippet-condition . force-in-comment)
+                     t))))
 </pre>
 </div>
 
@@ -632,7 +656,7 @@ <h4 id="sec-2-3-4">Roll your own</h4>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/snippet-menu.html b/snippet-menu.html
index 3b2106b2..5565f974 100644
--- a/snippet-menu.html
+++ b/snippet-menu.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>YASnippet menu</title>
-<!-- 2015-09-24 Thu 21:14 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -284,7 +284,7 @@ <h2 id="sec-5">Misc</h2>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/snippet-organization.html b/snippet-organization.html
index b7a458bf..ecc523a5 100644
--- a/snippet-organization.html
+++ b/snippet-organization.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Organizing snippets</title>
-<!-- 2015-09-24 Thu 21:14 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -164,17 +164,9 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-2">Setting up <code>yas-snippet-dirs</code></a></li>
 <li><a href="#sec-3">The <code>.yas-parents</code> file</a></li>
 <li><a href="#sec-4"><span class="todo TODO">TODO</span> The <code>.yas-make-groups</code> file</a></li>
-<li><a href="#sec-5"><span class="todo TODO">TODO</span> The <code>.yas-setup.el</code> file</a>
-<ul>
-<li><a href="#sec-5-1"><span class="todo TODO">TODO</span> </a></li>
-</ul>
-</li>
+<li><a href="#sec-5">The <code>.yas-setup.el</code> file</a></li>
 <li><a href="#sec-6">The <code>.yas-compiled-snippet.el</code> file</a></li>
-<li><a href="#sec-7">The <code>.yas-skip</code> file</a>
-<ul>
-<li><a href="#sec-7-1"><span class="todo TODO">TODO</span> </a></li>
-</ul>
-</li>
+<li><a href="#sec-7">The <code>.yas-skip</code> file</a></li>
 </ul>
 </div>
 </div>
@@ -234,14 +226,14 @@ <h2 id="sec-2">Setting up <code>yas-snippet-dirs</code></h2>
 
 <div class="org-src-container">
 
-<pre class="src src-emacs-lisp">;; Develop in ~/emacs.d/mysnippets, but also
-;; try out snippets in ~/Downloads/interesting-snippets
-(setq yas-snippet-dirs '("~/emacs.d/mysnippets"
-			   "~/Downloads/interesting-snippets"))
+<pre class="src src-emacs-lisp"><span class="org-comment-delimiter">;; </span><span class="org-comment">Develop in ~/emacs.d/mysnippets, but also</span>
+<span class="org-comment-delimiter">;; </span><span class="org-comment">try out snippets in ~/Downloads/interesting-snippets</span>
+(setq yas-snippet-dirs '(<span class="org-string">"~/emacs.d/mysnippets"</span>
+                           <span class="org-string">"~/Downloads/interesting-snippets"</span>))
 
-;; OR, keeping YASnippet defaults try out ~/Downloads/interesting-snippets
+<span class="org-comment-delimiter">;; </span><span class="org-comment">OR, keeping YASnippet defaults try out ~/Downloads/interesting-snippets</span>
 (setq yas-snippet-dirs (append yas-snippet-dirs
-			       '("~/Downloads/interesting-snippets")))
+                               '(<span class="org-string">"~/Downloads/interesting-snippets"</span>)))
 </pre>
 </div>
 
@@ -328,10 +320,13 @@ <h2 id="sec-4"><span class="todo TODO">TODO</span> The <code>.yas-make-groups</c
 </div>
 
 <div id="outline-container-sec-5" class="outline-2">
-<h2 id="sec-5"><span class="todo TODO">TODO</span> The <code>.yas-setup.el</code> file</h2>
+<h2 id="sec-5">The <code>.yas-setup.el</code> file</h2>
 <div class="outline-text-2" id="text-5">
-</div><div id="outline-container-sec-5-1" class="outline-3">
-<h3 id="sec-5-1"><span class="todo TODO">TODO</span> </h3>
+<p>
+If there is file named <code>.yas-setup.el</code> in a mode's snippet
+subdirectory, it is loaded along with the snippets.  Utility
+functions used by the snippets can be put here.
+</p>
 </div>
 </div>
 
@@ -361,14 +356,10 @@ <h2 id="sec-7">The <code>.yas-skip</code> file</h2>
 not to load snippets from there.
 </p>
 </div>
-
-<div id="outline-container-sec-7-1" class="outline-3">
-<h3 id="sec-7-1"><span class="todo TODO">TODO</span> </h3>
-</div>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/snippet-reference.html b/snippet-reference.html
index 1526aa5d..acebf86b 100644
--- a/snippet-reference.html
+++ b/snippet-reference.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Reference</title>
-<!-- 2015-09-24 Thu 21:14 -->
+<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -222,12 +222,14 @@ <h2>Table of Contents</h2>
 <li><a href="#yas-lookup-snippet"><code>yas-lookup-snippet</code> (<code>name</code> <i>&amp;optional</i> <code>mode</code> <code>noerror</code>)</a></li>
 <li><a href="#yas-throw"><code>yas-throw</code> (<code>text</code>)</a></li>
 <li><a href="#yas-inside-string"><code>yas-inside-string</code> ()</a></li>
+<li><a href="#yas-next-field-will-exit-p"><code>yas-next-field-will-exit-p</code> (<i>&amp;optional</i> <code>arg</code>)</a></li>
 <li><a href="#yas-x-prompt"><code>yas-x-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</a></li>
 <li><a href="#yas-shortest-key-until-whitespace"><code>yas-shortest-key-until-whitespace</code> (<code>_start-point</code>)</a></li>
 <li><a href="#yas-longest-key-from-whitespace"><code>yas-longest-key-from-whitespace</code> (<code>start-point</code>)</a></li>
 <li><a href="#yas-text"><code>yas-text</code> ()</a></li>
 <li><a href="#yas-ido-prompt"><code>yas-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</a></li>
 <li><a href="#yas-try-key-from-whitespace"><code>yas-try-key-from-whitespace</code> (<code>_start-point</code>)</a></li>
+<li><a href="#yas-maybe-ido-prompt"><code>yas-maybe-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</a></li>
 <li><a href="#yas-dropdown-prompt"><code>yas-dropdown-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</a></li>
 <li><a href="#yas-define-snippets"><code>yas-define-snippets</code> (<code>mode</code> <code>snippets</code>)</a></li>
 <li><a href="#yas-global-mode-enable-in-buffers"><code>yas-global-mode-enable-in-buffers</code> ()</a></li>
@@ -253,7 +255,6 @@ <h2>Table of Contents</h2>
 <li><a href="#yas-snippet-beg"><code>yas-snippet-beg</code></a></li>
 <li><a href="#yas-after-exit-snippet-hook"><code>yas-after-exit-snippet-hook</code></a></li>
 <li><a href="#yas-global-mode-hook"><code>yas-global-mode-hook</code></a></li>
-<li><a href="#yas-dont-activate"><code>yas-dont-activate</code></a></li>
 <li><a href="#yas-minor-mode-map"><code>yas-minor-mode-map</code></a></li>
 <li><a href="#yas-moving-away-p"><code>yas-moving-away-p</code></a></li>
 <li><a href="#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a></li>
@@ -262,6 +263,7 @@ <h2>Table of Contents</h2>
 <li><a href="#yas-keymap"><code>yas-keymap</code></a></li>
 <li><a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a></li>
 <li><a href="#yas-snippet-end"><code>yas-snippet-end</code></a></li>
+<li><a href="#yas-dont-activate-functions"><code>yas-dont-activate-functions</code></a></li>
 <li><a href="#yas-minor-mode-hook"><code>yas-minor-mode-hook</code></a></li>
 <li><a href="#yas-verbosity"><code>yas-verbosity</code></a></li>
 <li><a href="#yas-minor-mode-major-mode"><code>yas-minor-mode-major-mode</code></a></li>
@@ -506,7 +508,7 @@ <h3 id="yas-minor-mode-on"><a id="sec-1-18" name="sec-1-18"></a><code>yas-minor-
 </p>
 
 <p>
-Honour <a href="#yas-dont-activate"><code>yas-dont-activate</code></a>, which see.
+Honour <a href="#yas-dont-activate-functions"><code>yas-dont-activate-functions</code></a>, which see.
 </p>
 </div>
 </div>
@@ -753,12 +755,14 @@ <h3 id="yas-fallback-behavior"><a id="sec-2-6" name="sec-2-6"></a><code>yas-fall
 <h3 id="yas-wrap-around-region"><a id="sec-2-7" name="sec-2-7"></a><code>yas-wrap-around-region</code></h3>
 <div class="outline-text-3" id="text-yas-wrap-around-region">
 <p>
-If non-nil, snippet expansion wraps around selected region.
+What to insert for snippet's $0 field.
 </p>
 
 <p>
-The wrapping occurs just before the snippet's exit marker.  This
-can be overridden on a per-snippet basis.
+If set to a character, insert contents of corresponding register.
+If non-nil insert region contents.  This can be overridden on a
+per-snippet basis.  A value of <code>cua</code> is considered equivalent to
+`?0' for backwards compatibility.
 </p>
 </div>
 </div>
@@ -1047,8 +1051,17 @@ <h3 id="yas-inside-string"><a id="sec-3-8" name="sec-3-8"></a><code>yas-inside-s
 </div>
 </div>
 
+<div id="outline-container-yas-next-field-will-exit-p" class="outline-3">
+<h3 id="yas-next-field-will-exit-p"><a id="sec-3-9" name="sec-3-9"></a><code>yas-next-field-will-exit-p</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
+<div class="outline-text-3" id="text-yas-next-field-will-exit-p">
+<p>
+Return non-nil if (yas-next-field <code>arg</code>) would exit the current snippet.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-x-prompt" class="outline-3">
-<h3 id="yas-x-prompt"><a id="sec-3-9" name="sec-3-9"></a><code>yas-x-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-x-prompt"><a id="sec-3-10" name="sec-3-10"></a><code>yas-x-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-x-prompt">
 <p>
 Display choices in a x-window prompt.
@@ -1057,7 +1070,7 @@ <h3 id="yas-x-prompt"><a id="sec-3-9" name="sec-3-9"></a><code>yas-x-prompt</cod
 </div>
 
 <div id="outline-container-yas-shortest-key-until-whitespace" class="outline-3">
-<h3 id="yas-shortest-key-until-whitespace"><a id="sec-3-10" name="sec-3-10"></a><code>yas-shortest-key-until-whitespace</code> (<code>_start-point</code>)</h3>
+<h3 id="yas-shortest-key-until-whitespace"><a id="sec-3-11" name="sec-3-11"></a><code>yas-shortest-key-until-whitespace</code> (<code>_start-point</code>)</h3>
 <div class="outline-text-3" id="text-yas-shortest-key-until-whitespace">
 <p>
 Like <a href="#yas-longest-key-from-whitespace"><code>yas-longest-key-from-whitespace</code></a> but take the shortest key.
@@ -1066,7 +1079,7 @@ <h3 id="yas-shortest-key-until-whitespace"><a id="sec-3-10" name="sec-3-10"></a>
 </div>
 
 <div id="outline-container-yas-longest-key-from-whitespace" class="outline-3">
-<h3 id="yas-longest-key-from-whitespace"><a id="sec-3-11" name="sec-3-11"></a><code>yas-longest-key-from-whitespace</code> (<code>start-point</code>)</h3>
+<h3 id="yas-longest-key-from-whitespace"><a id="sec-3-12" name="sec-3-12"></a><code>yas-longest-key-from-whitespace</code> (<code>start-point</code>)</h3>
 <div class="outline-text-3" id="text-yas-longest-key-from-whitespace">
 <p>
 As <a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a> element, look for longest key between point and whitespace.
@@ -1080,7 +1093,7 @@ <h3 id="yas-longest-key-from-whitespace"><a id="sec-3-11" name="sec-3-11"></a><c
 </div>
 
 <div id="outline-container-yas-text" class="outline-3">
-<h3 id="yas-text"><a id="sec-3-12" name="sec-3-12"></a><code>yas-text</code> ()</h3>
+<h3 id="yas-text"><a id="sec-3-13" name="sec-3-13"></a><code>yas-text</code> ()</h3>
 <div class="outline-text-3" id="text-yas-text">
 <p>
 Return <a href="#yas-text"><code>yas-text</code></a> if that exists and is non-empty, else nil.
@@ -1089,7 +1102,7 @@ <h3 id="yas-text"><a id="sec-3-12" name="sec-3-12"></a><code>yas-text</code> ()<
 </div>
 
 <div id="outline-container-yas-ido-prompt" class="outline-3">
-<h3 id="yas-ido-prompt"><a id="sec-3-13" name="sec-3-13"></a><code>yas-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-ido-prompt"><a id="sec-3-14" name="sec-3-14"></a><code>yas-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-ido-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-ido-prompt</code>
@@ -1098,7 +1111,7 @@ <h3 id="yas-ido-prompt"><a id="sec-3-13" name="sec-3-13"></a><code>yas-ido-promp
 </div>
 
 <div id="outline-container-yas-try-key-from-whitespace" class="outline-3">
-<h3 id="yas-try-key-from-whitespace"><a id="sec-3-14" name="sec-3-14"></a><code>yas-try-key-from-whitespace</code> (<code>_start-point</code>)</h3>
+<h3 id="yas-try-key-from-whitespace"><a id="sec-3-15" name="sec-3-15"></a><code>yas-try-key-from-whitespace</code> (<code>_start-point</code>)</h3>
 <div class="outline-text-3" id="text-yas-try-key-from-whitespace">
 <p>
 As <a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a> element, look for whitespace delimited key.
@@ -1111,8 +1124,17 @@ <h3 id="yas-try-key-from-whitespace"><a id="sec-3-14" name="sec-3-14"></a><code>
 </div>
 </div>
 
+<div id="outline-container-yas-maybe-ido-prompt" class="outline-3">
+<h3 id="yas-maybe-ido-prompt"><a id="sec-3-16" name="sec-3-16"></a><code>yas-maybe-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<div class="outline-text-3" id="text-yas-maybe-ido-prompt">
+<p>
+<b><i>warning</i></b>: no doc for symbol <code>yas-maybe-ido-prompt</code>
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-dropdown-prompt" class="outline-3">
-<h3 id="yas-dropdown-prompt"><a id="sec-3-15" name="sec-3-15"></a><code>yas-dropdown-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-dropdown-prompt"><a id="sec-3-17" name="sec-3-17"></a><code>yas-dropdown-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-dropdown-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-dropdown-prompt</code>
@@ -1121,7 +1143,7 @@ <h3 id="yas-dropdown-prompt"><a id="sec-3-15" name="sec-3-15"></a><code>yas-drop
 </div>
 
 <div id="outline-container-yas-define-snippets" class="outline-3">
-<h3 id="yas-define-snippets"><a id="sec-3-16" name="sec-3-16"></a><code>yas-define-snippets</code> (<code>mode</code> <code>snippets</code>)</h3>
+<h3 id="yas-define-snippets"><a id="sec-3-18" name="sec-3-18"></a><code>yas-define-snippets</code> (<code>mode</code> <code>snippets</code>)</h3>
 <div class="outline-text-3" id="text-yas-define-snippets">
 <p>
 Define <code>snippets</code> for <code>mode</code>.
@@ -1173,7 +1195,7 @@ <h3 id="yas-define-snippets"><a id="sec-3-16" name="sec-3-16"></a><code>yas-defi
 </div>
 
 <div id="outline-container-yas-global-mode-enable-in-buffers" class="outline-3">
-<h3 id="yas-global-mode-enable-in-buffers"><a id="sec-3-17" name="sec-3-17"></a><code>yas-global-mode-enable-in-buffers</code> ()</h3>
+<h3 id="yas-global-mode-enable-in-buffers"><a id="sec-3-19" name="sec-3-19"></a><code>yas-global-mode-enable-in-buffers</code> ()</h3>
 <div class="outline-text-3" id="text-yas-global-mode-enable-in-buffers">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-global-mode-enable-in-buffers</code>
@@ -1182,7 +1204,7 @@ <h3 id="yas-global-mode-enable-in-buffers"><a id="sec-3-17" name="sec-3-17"></a>
 </div>
 
 <div id="outline-container-yas-no-prompt" class="outline-3">
-<h3 id="yas-no-prompt"><a id="sec-3-18" name="sec-3-18"></a><code>yas-no-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>_display-fn</code>)</h3>
+<h3 id="yas-no-prompt"><a id="sec-3-20" name="sec-3-20"></a><code>yas-no-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>_display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-no-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-no-prompt</code>
@@ -1191,7 +1213,7 @@ <h3 id="yas-no-prompt"><a id="sec-3-18" name="sec-3-18"></a><code>yas-no-prompt<
 </div>
 
 <div id="outline-container-yas-active-keys" class="outline-3">
-<h3 id="yas-active-keys"><a id="sec-3-19" name="sec-3-19"></a><code>yas-active-keys</code> ()</h3>
+<h3 id="yas-active-keys"><a id="sec-3-21" name="sec-3-21"></a><code>yas-active-keys</code> ()</h3>
 <div class="outline-text-3" id="text-yas-active-keys">
 <p>
 Return all active trigger keys for current buffer and point.
@@ -1200,7 +1222,7 @@ <h3 id="yas-active-keys"><a id="sec-3-19" name="sec-3-19"></a><code>yas-active-k
 </div>
 
 <div id="outline-container-yas-define-condition-cache" class="outline-3">
-<h3 id="yas-define-condition-cache"><a id="sec-3-20" name="sec-3-20"></a><code>yas-define-condition-cache</code> (<code>func</code> <code>doc</code> <i>&amp;rest</i> <code>body</code>)</h3>
+<h3 id="yas-define-condition-cache"><a id="sec-3-22" name="sec-3-22"></a><code>yas-define-condition-cache</code> (<code>func</code> <code>doc</code> <i>&amp;rest</i> <code>body</code>)</h3>
 <div class="outline-text-3" id="text-yas-define-condition-cache">
 <p>
 Define a function <code>func</code> with doc <code>doc</code> and body <code>body</code>.
@@ -1215,7 +1237,7 @@ <h3 id="yas-define-condition-cache"><a id="sec-3-20" name="sec-3-20"></a><code>y
 </div>
 
 <div id="outline-container-yas-global-mode-check-buffers" class="outline-3">
-<h3 id="yas-global-mode-check-buffers"><a id="sec-3-21" name="sec-3-21"></a><code>yas-global-mode-check-buffers</code> ()</h3>
+<h3 id="yas-global-mode-check-buffers"><a id="sec-3-23" name="sec-3-23"></a><code>yas-global-mode-check-buffers</code> ()</h3>
 <div class="outline-text-3" id="text-yas-global-mode-check-buffers">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-global-mode-check-buffers</code>
@@ -1224,7 +1246,7 @@ <h3 id="yas-global-mode-check-buffers"><a id="sec-3-21" name="sec-3-21"></a><cod
 </div>
 
 <div id="outline-container-yas-define-menu" class="outline-3">
-<h3 id="yas-define-menu"><a id="sec-3-22" name="sec-3-22"></a><code>yas-define-menu</code> (<code>mode</code> <code>menu</code> <i>&amp;optional</i> <code>omit-items</code>)</h3>
+<h3 id="yas-define-menu"><a id="sec-3-24" name="sec-3-24"></a><code>yas-define-menu</code> (<code>mode</code> <code>menu</code> <i>&amp;optional</i> <code>omit-items</code>)</h3>
 <div class="outline-text-3" id="text-yas-define-menu">
 <p>
 Define a snippet menu for <code>mode</code> according to <code>menu</code>, omitting <code>omit-items</code>.
@@ -1257,7 +1279,7 @@ <h3 id="yas-define-menu"><a id="sec-3-22" name="sec-3-22"></a><code>yas-define-m
 </div>
 
 <div id="outline-container-yas-field-value" class="outline-3">
-<h3 id="yas-field-value"><a id="sec-3-23" name="sec-3-23"></a><code>yas-field-value</code> (<code>number</code>)</h3>
+<h3 id="yas-field-value"><a id="sec-3-25" name="sec-3-25"></a><code>yas-field-value</code> (<code>number</code>)</h3>
 <div class="outline-text-3" id="text-yas-field-value">
 <p>
 Get the string for field with <code>number</code>.
@@ -1270,7 +1292,7 @@ <h3 id="yas-field-value"><a id="sec-3-23" name="sec-3-23"></a><code>yas-field-va
 </div>
 
 <div id="outline-container-yas-verify-value" class="outline-3">
-<h3 id="yas-verify-value"><a id="sec-3-24" name="sec-3-24"></a><code>yas-verify-value</code> (<code>possibilities</code>)</h3>
+<h3 id="yas-verify-value"><a id="sec-3-26" name="sec-3-26"></a><code>yas-verify-value</code> (<code>possibilities</code>)</h3>
 <div class="outline-text-3" id="text-yas-verify-value">
 <p>
 Verify that the current field value is in <code>possibilities</code>.
@@ -1283,7 +1305,7 @@ <h3 id="yas-verify-value"><a id="sec-3-24" name="sec-3-24"></a><code>yas-verify-
 </div>
 
 <div id="outline-container-yas-key-to-value" class="outline-3">
-<h3 id="yas-key-to-value"><a id="sec-3-25" name="sec-3-25"></a><code>yas-key-to-value</code> (<code>alist</code>)</h3>
+<h3 id="yas-key-to-value"><a id="sec-3-27" name="sec-3-27"></a><code>yas-key-to-value</code> (<code>alist</code>)</h3>
 <div class="outline-text-3" id="text-yas-key-to-value">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-key-to-value</code>
@@ -1292,7 +1314,7 @@ <h3 id="yas-key-to-value"><a id="sec-3-25" name="sec-3-25"></a><code>yas-key-to-
 </div>
 
 <div id="outline-container-yas-choose-value" class="outline-3">
-<h3 id="yas-choose-value"><a id="sec-3-26" name="sec-3-26"></a><code>yas-choose-value</code> (<i>&amp;rest</i> <code>possibilities</code>)</h3>
+<h3 id="yas-choose-value"><a id="sec-3-28" name="sec-3-28"></a><code>yas-choose-value</code> (<i>&amp;rest</i> <code>possibilities</code>)</h3>
 <div class="outline-text-3" id="text-yas-choose-value">
 <p>
 Prompt for a string in <code>possibilities</code> and return it.
@@ -1305,7 +1327,7 @@ <h3 id="yas-choose-value"><a id="sec-3-26" name="sec-3-26"></a><code>yas-choose-
 </div>
 
 <div id="outline-container-yas-substr" class="outline-3">
-<h3 id="yas-substr"><a id="sec-3-27" name="sec-3-27"></a><code>yas-substr</code> (<code>str</code> <code>pattern</code> <i>&amp;optional</i> <code>subexp</code>)</h3>
+<h3 id="yas-substr"><a id="sec-3-29" name="sec-3-29"></a><code>yas-substr</code> (<code>str</code> <code>pattern</code> <i>&amp;optional</i> <code>subexp</code>)</h3>
 <div class="outline-text-3" id="text-yas-substr">
 <p>
 Search <code>pattern</code> in <code>str</code> and return <code>subexp</code>th match.
@@ -1319,7 +1341,7 @@ <h3 id="yas-substr"><a id="sec-3-27" name="sec-3-27"></a><code>yas-substr</code>
 </div>
 
 <div id="outline-container-yas-unimplemented" class="outline-3">
-<h3 id="yas-unimplemented"><a id="sec-3-28" name="sec-3-28"></a><code>yas-unimplemented</code> (<i>&amp;optional</i> <code>missing-feature</code>)</h3>
+<h3 id="yas-unimplemented"><a id="sec-3-30" name="sec-3-30"></a><code>yas-unimplemented</code> (<i>&amp;optional</i> <code>missing-feature</code>)</h3>
 <div class="outline-text-3" id="text-yas-unimplemented">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-unimplemented</code>
@@ -1328,7 +1350,7 @@ <h3 id="yas-unimplemented"><a id="sec-3-28" name="sec-3-28"></a><code>yas-unimpl
 </div>
 
 <div id="outline-container-yas-expand-snippet" class="outline-3">
-<h3 id="yas-expand-snippet"><a id="sec-3-29" name="sec-3-29"></a><code>yas-expand-snippet</code> (<code>content</code> <i>&amp;optional</i> <code>start</code> <code>end</code> <code>expand-env</code>)</h3>
+<h3 id="yas-expand-snippet"><a id="sec-3-31" name="sec-3-31"></a><code>yas-expand-snippet</code> (<code>content</code> <i>&amp;optional</i> <code>start</code> <code>end</code> <code>expand-env</code>)</h3>
 <div class="outline-text-3" id="text-yas-expand-snippet">
 <p>
 Expand snippet <code>content</code> at current point.
@@ -1343,7 +1365,7 @@ <h3 id="yas-expand-snippet"><a id="sec-3-29" name="sec-3-29"></a><code>yas-expan
 </div>
 
 <div id="outline-container-yas-minor-mode-set-explicitly" class="outline-3">
-<h3 id="yas-minor-mode-set-explicitly"><a id="sec-3-30" name="sec-3-30"></a><code>yas-minor-mode-set-explicitly</code> ()</h3>
+<h3 id="yas-minor-mode-set-explicitly"><a id="sec-3-32" name="sec-3-32"></a><code>yas-minor-mode-set-explicitly</code> ()</h3>
 <div class="outline-text-3" id="text-yas-minor-mode-set-explicitly">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-minor-mode-set-explicitly</code>
@@ -1418,41 +1440,8 @@ <h3 id="yas-global-mode-hook"><a id="sec-4-5" name="sec-4-5"></a><code>yas-globa
 </div>
 </div>
 
-<div id="outline-container-yas-dont-activate" class="outline-3">
-<h3 id="yas-dont-activate"><a id="sec-4-6" name="sec-4-6"></a><code>yas-dont-activate</code></h3>
-<div class="outline-text-3" id="text-yas-dont-activate">
-<p>
-If non-nil don't let <a href="#yas-global-mode"><code>yas-global-mode</code></a> affect some buffers.
-</p>
-
-<p>
-If a function of zero arguments, then its result is used.
-</p>
-
-<p>
-If a list of functions, then all functions must return nil to
-activate yas for this buffer.
-</p>
-
-<p>
-In Emacsen &lt;= 23, this variable is buffer-local.  Because
-<a href="#yas-minor-mode-on"><code>yas-minor-mode-on</code></a> is called by <a href="#yas-global-mode"><code>yas-global-mode</code></a> after
-executing the buffer's major mode hook, setting this variable
-there is an effective way to define exceptions to the "global"
-activation behaviour.
-</p>
-
-<p>
-In Emacsen &gt; 23, only the global value is used.  To define
-per-mode exceptions to the "global" activation behaviour, call
-<a href="#yas-minor-mode"><code>yas-minor-mode</code></a> with a negative argument directily in the major
-mode's hook.
-</p>
-</div>
-</div>
-
 <div id="outline-container-yas-minor-mode-map" class="outline-3">
-<h3 id="yas-minor-mode-map"><a id="sec-4-7" name="sec-4-7"></a><code>yas-minor-mode-map</code></h3>
+<h3 id="yas-minor-mode-map"><a id="sec-4-6" name="sec-4-6"></a><code>yas-minor-mode-map</code></h3>
 <div class="outline-text-3" id="text-yas-minor-mode-map">
 <p>
 The keymap used when <a href="#yas-minor-mode"><code>yas-minor-mode</code></a> is active.
@@ -1461,7 +1450,7 @@ <h3 id="yas-minor-mode-map"><a id="sec-4-7" name="sec-4-7"></a><code>yas-minor-m
 </div>
 
 <div id="outline-container-yas-moving-away-p" class="outline-3">
-<h3 id="yas-moving-away-p"><a id="sec-4-8" name="sec-4-8"></a><code>yas-moving-away-p</code></h3>
+<h3 id="yas-moving-away-p"><a id="sec-4-7" name="sec-4-7"></a><code>yas-moving-away-p</code></h3>
 <div class="outline-text-3" id="text-yas-moving-away-p">
 <p>
 Non-nil if user is about to exit field.
@@ -1470,7 +1459,7 @@ <h3 id="yas-moving-away-p"><a id="sec-4-8" name="sec-4-8"></a><code>yas-moving-a
 </div>
 
 <div id="outline-container-yas-buffer-local-condition" class="outline-3">
-<h3 id="yas-buffer-local-condition"><a id="sec-4-9" name="sec-4-9"></a><code>yas-buffer-local-condition</code></h3>
+<h3 id="yas-buffer-local-condition"><a id="sec-4-8" name="sec-4-8"></a><code>yas-buffer-local-condition</code></h3>
 <div class="outline-text-3" id="text-yas-buffer-local-condition">
 <p>
 Snippet expanding condition.
@@ -1541,7 +1530,7 @@ <h3 id="yas-buffer-local-condition"><a id="sec-4-9" name="sec-4-9"></a><code>yas
 
 <p>
 (add-hook 'python-mode-hook
-          '(lambda ()
+          (lambda ()
              (setq yas-buffer-local-condition
                    '(if (python-in-string/comment)
                         '(require-snippet-condition . force-in-comment)
@@ -1558,7 +1547,7 @@ <h3 id="yas-buffer-local-condition"><a id="sec-4-9" name="sec-4-9"></a><code>yas
 </div>
 
 <div id="outline-container-yas-modified-p" class="outline-3">
-<h3 id="yas-modified-p"><a id="sec-4-10" name="sec-4-10"></a><code>yas-modified-p</code></h3>
+<h3 id="yas-modified-p"><a id="sec-4-9" name="sec-4-9"></a><code>yas-modified-p</code></h3>
 <div class="outline-text-3" id="text-yas-modified-p">
 <p>
 Non-nil if field has been modified by user or transformation.
@@ -1567,7 +1556,7 @@ <h3 id="yas-modified-p"><a id="sec-4-10" name="sec-4-10"></a><code>yas-modified-
 </div>
 
 <div id="outline-container-yas-before-expand-snippet-hook" class="outline-3">
-<h3 id="yas-before-expand-snippet-hook"><a id="sec-4-11" name="sec-4-11"></a><code>yas-before-expand-snippet-hook</code></h3>
+<h3 id="yas-before-expand-snippet-hook"><a id="sec-4-10" name="sec-4-10"></a><code>yas-before-expand-snippet-hook</code></h3>
 <div class="outline-text-3" id="text-yas-before-expand-snippet-hook">
 <p>
 Hooks to run just before expanding a snippet.
@@ -1576,7 +1565,7 @@ <h3 id="yas-before-expand-snippet-hook"><a id="sec-4-11" name="sec-4-11"></a><co
 </div>
 
 <div id="outline-container-yas-keymap" class="outline-3">
-<h3 id="yas-keymap"><a id="sec-4-12" name="sec-4-12"></a><code>yas-keymap</code></h3>
+<h3 id="yas-keymap"><a id="sec-4-11" name="sec-4-11"></a><code>yas-keymap</code></h3>
 <div class="outline-text-3" id="text-yas-keymap">
 <p>
 The active keymap while a snippet expansion is in progress.
@@ -1585,7 +1574,7 @@ <h3 id="yas-keymap"><a id="sec-4-12" name="sec-4-12"></a><code>yas-keymap</code>
 </div>
 
 <div id="outline-container-yas-key-syntaxes" class="outline-3">
-<h3 id="yas-key-syntaxes"><a id="sec-4-13" name="sec-4-13"></a><code>yas-key-syntaxes</code></h3>
+<h3 id="yas-key-syntaxes"><a id="sec-4-12" name="sec-4-12"></a><code>yas-key-syntaxes</code></h3>
 <div class="outline-text-3" id="text-yas-key-syntaxes">
 <p>
 Syntaxes and functions to help look for trigger keys before point.
@@ -1645,7 +1634,7 @@ <h3 id="yas-key-syntaxes"><a id="sec-4-13" name="sec-4-13"></a><code>yas-key-syn
 </div>
 
 <div id="outline-container-yas-snippet-end" class="outline-3">
-<h3 id="yas-snippet-end"><a id="sec-4-14" name="sec-4-14"></a><code>yas-snippet-end</code></h3>
+<h3 id="yas-snippet-end"><a id="sec-4-13" name="sec-4-13"></a><code>yas-snippet-end</code></h3>
 <div class="outline-text-3" id="text-yas-snippet-end">
 <p>
 End position of the last snippet committed.
@@ -1653,6 +1642,32 @@ <h3 id="yas-snippet-end"><a id="sec-4-14" name="sec-4-14"></a><code>yas-snippet-
 </div>
 </div>
 
+<div id="outline-container-yas-dont-activate-functions" class="outline-3">
+<h3 id="yas-dont-activate-functions"><a id="sec-4-14" name="sec-4-14"></a><code>yas-dont-activate-functions</code></h3>
+<div class="outline-text-3" id="text-yas-dont-activate-functions">
+<p>
+Special hook to control which buffers <a href="#yas-global-mode"><code>yas-global-mode</code></a> affects.
+Functions are called with no argument, and should return non-nil to prevent
+<a href="#yas-global-mode"><code>yas-global-mode</code></a> from enabling yasnippet in this buffer.
+</p>
+
+<p>
+In Emacsen &lt; 24, this variable is buffer-local.  Because
+<a href="#yas-minor-mode-on"><code>yas-minor-mode-on</code></a> is called by <a href="#yas-global-mode"><code>yas-global-mode</code></a> after
+executing the buffer's major mode hook, setting this variable
+there is an effective way to define exceptions to the "global"
+activation behaviour.
+</p>
+
+<p>
+In Emacsen &gt;= 24, only the global value is used.  To define
+per-mode exceptions to the "global" activation behaviour, call
+<a href="#yas-minor-mode"><code>yas-minor-mode</code></a> with a negative argument directily in the major
+mode's hook.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-minor-mode-hook" class="outline-3">
 <h3 id="yas-minor-mode-hook"><a id="sec-4-15" name="sec-4-15"></a><code>yas-minor-mode-hook</code></h3>
 <div class="outline-text-3" id="text-yas-minor-mode-hook">
@@ -1693,7 +1708,7 @@ <h3 id="yas-installed-snippets-dir"><a id="sec-4-18" name="sec-4-18"></a><code>y
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.91.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from 7703a55ac416a131dec45fa6a1e0ec1e31adf760
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
 </p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
diff --git a/stylesheets/manual.css b/stylesheets/manual.css
index f2677c5a..9580347a 100644
--- a/stylesheets/manual.css
+++ b/stylesheets/manual.css
@@ -24,3 +24,36 @@ code {
     margin-left: 5%;
     margin-right: 10%;
 }
+
+/* Styles for htmlize.el fontification.  */
+
+.org-comment        { color: #005000; }    /* font-lock-comment-face */
+.org-keyword        { font-weight: bold; } /* font-lock-keyword-face */
+.org-string         { color: #8b0000; }    /* font-lock-string-face */
+.org-warning        { color: #ff8c00;
+                      font-weight: bold; } /* warning */
+.org-warning-1      { color: #ff0000;
+                      font-weight: bold; } /* font-lock-warning-face */
+.org-preprocessor   { color: #483d8b; }    /* font-lock-preprocessor-face */
+.org-constant       { color: #008b8b; }    /* font-lock-constant-face */
+.org-function-name  { color: #0000ff; }    /* font-lock-function-name-face */
+.org-type           { color: #228b22; }    /* font-lock-type-face */
+.org-variable-name  { color: #a0522d; }    /* font-lock-variable-name-face */
+
+.org-rst-adornment  { color: #a020f0; }            /* rst-adornment */
+.org-rst-block      { color: #a020f0; }            /* rst-block */
+.org-rst-comment    { color: #b22222; }            /* rst-comment */
+.org-rst-definition { color: #0000ff; }            /* rst-definition */
+.org-rst-directive  { color: #483d8b; }            /* rst-directive */
+.org-rst-emphasis1  { font-style: italic; }        /* rst-emphasis1 */
+.org-rst-emphasis2  { font-weight: bold; }         /* rst-emphasis2 */
+.org-rst-external   { color: #228b22; }            /* rst-external */
+.org-rst-level-1    { background-color: #d9d9d9; } /* rst-level-1 */
+.org-rst-level-2    { background-color: #c7c7c7; } /* rst-level-2 */
+.org-rst-level-3    { background-color: #b5b5b5; } /* rst-level-3 */
+.org-rst-level-4    { background-color: #a3a3a3; } /* rst-level-4 */
+.org-rst-level-5    { background-color: #919191; } /* rst-level-5 */
+.org-rst-level-6    { background-color: #7f7f7f; } /* rst-level-6 */
+.org-rst-literal    { color: #8b2252; }            /* rst-literal */
+.org-rst-reference  { color: #a0522d; }            /* rst-reference */
+.org-rst-transition { color: #a020f0; }            /* rst-transition */
