Merge commit '0cda39255827f283e7578cd469ae42daad9556a2' from js2-mode

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

diff --git a/packages/yasnippet/doc/snippet-organization.org b/packages/yasnippet/doc/snippet-organization.org
index 0f5de52198707a14243ca11591d71d6cfa2a315b..746cff00bb917eabce30d19a3acbaa1cfc2cbdc0 100644 (file)
--- a/packages/yasnippet/doc/snippet-organization.org
+++ b/packages/yasnippet/doc/snippet-organization.org
@@ -108,9 +108,11 @@
    Yet another way to create a nice snippet menu is to write into
    =.yas-make-groups= a menu definition. TODO
 
-* TODO The =.yas-setup.el= file
+* The =.yas-setup.el= file
 
-** TODO
+  If there is file named =.yas-setup.el= in a mode's snippet
+  subdirectory, it is loaded along with the snippets.  Utility
+  functions used by the snippets can be put here.
 
 * The =.yas-compiled-snippet.el= file
 
@@ -127,5 +129,3 @@
 
   A =.yas-skip= file in a mode's snippet subdirectory tells YASnippet
   not to load snippets from there.
-
-** TODO