From 6b5953818b9159d99018efb0ad99828541964db8 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Fri, 14 Jan 2011 06:30:36 -0700
Subject: [PATCH] doc: fixes to "yasnippet" sub-section in Conflicts

* doc/org.texi (Conflicts): Changed "yasnippets" to "yasnippet" and
  added extra whitespace around functions to be consistent with the
  rest of the section.
---
 doc/org.texi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/org.texi b/doc/org.texi
index 4d696ae7a..a30d5b64e 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -13465,15 +13465,17 @@ fixed this problem:
             (define-key yas/keymap [tab] 'yas/next-field-group)))
 @end lisp
 
-The latest version of yasnippets doesn't play well with Org mode. If the
+The latest version of yasnippet doesn't play well with Org mode. If the
 above code does not fix the conflict, start by defining the following
 function:
+
 @lisp
 (defun yas/org-very-safe-expand ()
        (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
 @end lisp
 
 Then, tell Org mode what to do with the new function:
+
 @lisp
 (add-hook 'org-mode-hook
           (lambda ()
-- 
2.11.4.GIT