Document uuid directive

* doc/snippet-development.org: Mention uuid in directive list.
* yasnippet.el (yas-define-snippets): Fix docstring grammar.

diff --git a/doc/snippet-development.org b/doc/snippet-development.org
index e48e39723a771177880876844047602e8f38dbd6..fb9b94ae5130bdaac422f20ea70e1fd5b99b0652 100644 (file)
--- a/doc/snippet-development.org
+++ b/doc/snippet-development.org
@@ -169,6 +169,12 @@ This binding will be recorded in the keymap =html-mode-map=. To expand a
 paragraph tag newlines, just press =C-u C-c C-c C-m=. Omitting the =C-u=
 will expand the paragraph tag without newlines.
 
+** =# uuid:= unique identifier
+
+This provides to a way to identify a snippet, independent of its name.
+Loading a second snippet file with the same uuid would replace the
+previous snippet.
+
 ** =# contributor:= snippet author
 
 This is optional and has no effect whatsoever on snippet functionality,

diff --git a/yasnippet.el b/yasnippet.el
index eeea6367c6842a3e850ec259a03cbfca9ef2dd0e..43564ffbac78e6858502929fec7ed2d1342ee78e 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1631,8 +1631,8 @@ The remaining elements are strings.
 FILE is probably of very little use if you're programatically
 defining snippets.
 
-UUID is the snippets \"unique-id\". Loading a second snippet file
-with the same uuid replaced the previous snippet.
+UUID is the snippet's \"unique-id\". Loading a second snippet
+file with the same uuid would replace the previous snippet.
 
 You can use `yas--parse-template' to return such lists based on
 the current buffers contents."