minor: cosmetic fixes to manual

diff --git a/doc/faq.org b/doc/faq.org
index c02577658413124dd224bd3b1f1fa8441bc8a5c9..cc889e118c9b543b57678919360469b2343db7e6 100644 (file)
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -94,7 +94,7 @@ active:
 
 This is apparently related to overlay priorities. For some reason, the
 =keymap= property of flyspell's overlays always takes priority over the
-same property in yasnippet's overlays, even if one sets the latter's
+same property in YASnippet's overlays, even if one sets the latter's
 =priority= property to something big. If you know emacs-lisp and can
 solve this problem, drop a line in the
 [[http://groups.google.com/group/smart-snippet][discussion group]].
@@ -148,7 +148,7 @@ filename as a trigger key in this case.
 
 You should rather use the =# key:= directive to specify the key of the
 defined snippet explicitly and name your snippet with an arbitrary valid
-filename, =lt.yasnippet= for example, using =<= for the =# key:=
+filename, =lt.YASnippet= for example, using =<= for the =# key:=
 directive:
 
 #+BEGIN_SRC snippet

diff --git a/doc/snippet-expansion.org b/doc/snippet-expansion.org
index f317bcf2272137ec6fd39699439b741d579d3b38..0618d4a2e57ed7ea06a9865ea40f3b024ef700bc 100644 (file)
--- a/doc/snippet-expansion.org
+++ b/doc/snippet-expansion.org
@@ -94,15 +94,18 @@ See [[./snippet-menu.org][the YASnippet Menu]].
 
 ** Expanding with =hippie-expand=
 
-To integrate with =hippie-expand=, just put [[sym:yas-hippie-try-expand][=yas-hippie-try-expand=]] in
-=hippie-expand-try-functions-list=. This probably makes more sense when
-placed at the top of the list, but it can be put anywhere you prefer.
+To integrate with =hippie-expand=, just put
+[[sym:yas-hippie-try-expand][=yas-hippie-try-expand=]] in
+=hippie-expand-try-functions-list=. This probably makes more sense
+when placed at the top of the list, but it can be put anywhere you
+prefer.
 
 ** Expanding from emacs-lisp code
 
-Sometimes you might want to expand a snippet directly from you own elisp
-code. You should call [[sym:yas-expand-snippet][=yas-expand-snippet=]] instead of [[sym:yas-expand][=yas-expand=]] in
-this case.
+Sometimes you might want to expand a snippet directly from you own
+elisp code. You should call
+[[sym:yas-expand-snippet][=yas-expand-snippet=]] instead of
+[[sym:yas-expand][=yas-expand=]] in this case.
 
 As with expanding from the menubar, the condition system and multiple
 candidates doesn't affect expansion. In fact, expanding from the
@@ -145,9 +148,9 @@ In particular, the following things matter:
 
 -  Buffer-local list of extra modes
 
-   Use [[#yas-activate-extra-mode][=yas-activate-extra-mode=]] to consider snippet tables whose name
-   does not correspond to a major mode. Typically, you call this from
-   a minor mode hook, for example:
+   Use [[#yas-activate-extra-mode][=yas-activate-extra-mode=]] to
+   consider snippet tables whose name does not correspond to a major
+   mode. Typically, you call this from a minor mode hook, for example:
 
 #+BEGIN_SRC emacs-lisp
   ;; When entering rinari-minor-mode, consider also the snippets in the
@@ -157,7 +160,9 @@ In particular, the following things matter:
                 (yas-activate-extra-mode 'rails-mode)))
 #+END_SRC
 
--  Buffer-local [[sym:yas-buffer-local-condition][=yas-buffer-local-condition=]] variable
+-  Buffer-local
+   [[sym:yas-buffer-local-condition][=yas-buffer-local-condition=]]
+   variable
 
    This variable provides finer grained control over what snippets can
    be expanded in the current buffer. The default value won't let you
@@ -255,4 +260,3 @@ shortcut to select the 6th candidate.
 *** Roll your own
 
 See the documentation on variable [[sym:yas-prompt-functions][=yas-prompt-functions=]]
-

diff --git a/doc/snippet-organization.org b/doc/snippet-organization.org
index 0ec12a1012f4c4d7a1968341c5aaef9d31bdc4e3..ee55a8efb6a6be1d5bc43004ed189ace6281bf20 100644 (file)
--- a/doc/snippet-organization.org
+++ b/doc/snippet-organization.org
@@ -43,7 +43,7 @@
    (setq yas-snippet-dirs '("~/emacs.d/mysnippets"
                               "~/Downloads/interesting-snippets"))
 
-   ;; OR, keeping yasnippet's defaults try out ~/Downloads/interesting-snippets
+   ;; OR, keeping YASnippet defaults try out ~/Downloads/interesting-snippets
    (setq yas-snippet-dirs (append yas-snippet-dirs
                                   '("~/Downloads/interesting-snippets")))
    #+end_src