Update packages/yasnippet by subtree-merging from its external upstream

[gnu-emacs-elpa] / packages / yasnippet / doc / doc / snippet-organization.org

diff --git a/packages/yasnippet/doc/doc/snippet-organization.org b/packages/yasnippet/doc/doc/snippet-organization.org
index ee55a8efb6a6be1d5bc43004ed189ace6281bf20..0f5de52198707a14243ca11591d71d6cfa2a315b 100644 (file)
--- a/packages/yasnippet/doc/doc/snippet-organization.org
+++ b/packages/yasnippet/doc/doc/snippet-organization.org
@@ -48,7 +48,7 @@
                                   '("~/Downloads/interesting-snippets")))
    #+end_src
 
-   Collections appearing earlier in the list shadow snippets with same names
+   Collections appearing earlier in the list override snippets with same names
    appearing in collections later in the list. [[sym:yas-new-snippet][=yas-new-snippet=]] always stores
    snippets in the first collection.
 
@@ -112,10 +112,20 @@
 
 ** TODO
 
-* TODO The =.yas-compiled-snippet.el= file
+* The =.yas-compiled-snippet.el= file
 
-** TODO
+   You may compile a top-level snippet directory with the
+   =yas-compile-directory= function, which will create a
+   =.yas-compiled-snippets.el= file under each mode subdirectory,
+   which contains definitions for all snippets in the subdirectory.
+   Compilation helps improve loading time.
+
+   Alternatively, you may compile all directories in the list
+   =yas-snippet-dirs= with the =yas-recompile-all= function.
+
+* The =.yas-skip= file
 
-* TODO The =.yas-skip= file
+  A =.yas-skip= file in a mode's snippet subdirectory tells YASnippet
+  not to load snippets from there.
 
 ** TODO