commit ce1d662c4a8647cf9c01dd5a2e661e937964741d
Author: Loïc Estève <address@hidden>
Date:   Wed Feb 1 09:44:05 2017 +0100

    Replace org-set-local by setq-local in the documentation
    
    * contrib/orgmanual.org (Conflicts): Update yasnippet instructions.
    
    * doc/org.texi (Packages that conflict with Org mode): Update
      yasnippet instructions
    
    TINYCHANGE

diff --git a/contrib/orgmanual.org b/contrib/orgmanual.org
index d2275af..21011cd 100644
--- a/contrib/orgmanual.org
+++ b/contrib/orgmanual.org
@@ -16760,7 +16760,7 @@ region even if the cursor moves across a special context.
   #+begin_src emacs-lisp
   (add-hook 'org-mode-hook
             (lambda ()
-              (org-set-local 'yas/trigger-key [tab])
+              (setq-local yas/trigger-key [tab])
               (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
   #+end_src
 
diff --git a/doc/org.texi b/doc/org.texi
index f68ef6e..4c3e140 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -17661,7 +17661,7 @@ fixed this problem:
 @lisp
 (add-hook 'org-mode-hook
           (lambda ()
-            (org-set-local 'yas/trigger-key [tab])
+            (setq-local yas/trigger-key [tab])
             (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
 @end lisp