Merge branch 'maint'

contrib/lisp/org-wikinodes.el

@@ -115,7 +115,7 @@ variable `org-wikinodes-scope'.
 
 If a target headline is not found, it may be created according to the
 setting of `org-wikinodes-create-targets'."
-  (if current-prefix-arg (org-wikinodes-clear-direcory-targets-cache))
+  (if current-prefix-arg (org-wikinodes-clear-directory-targets-cache))
   (let ((create org-wikinodes-create-targets)
 	visiting buffer m pos file rpl)
     (setq pos
@@ -184,10 +184,10 @@ setting of `org-wikinodes-create-targets'."
 	     (org-in-regexp (format org-complex-heading-regexp-format
 				    org-wikinodes-camel-regexp))
 	     (org-in-regexp org-wikinodes-camel-regexp))
-    (org-wikinodes-clear-direcory-targets-cache)
+    (org-wikinodes-clear-directory-targets-cache)
     t))
 
-(defun org-wikinodes-clear-direcory-targets-cache ()
+(defun org-wikinodes-clear-directory-targets-cache ()
   "Clear the cache where to find wiki targets."
   (interactive)
   (setq org-wikinodes-directory-targets-cache nil)

doc/org.texi

@@ -15389,6 +15389,18 @@ Yes, these are unfortunately more difficult to remember.  If you want
 to have other replacement keys, look at the variable
 @code{org-disputed-keys}.
 
+@item @file{filladapt.el} by Kyle Jones
+@cindex @file{filladapt.el}
+
+Org mode tries to do the right thing when filling paragraphs, list items and
+other elements.  Many users reported they had problems using both
+@file{filladapt.el} and Org mode, so a safe thing to do is to disable it like
+this:
+
+@lisp
+(add-hook 'org-mode-hook 'turn-off-filladapt-mode)
+@end lisp
+
 @item @file{yasnippet.el}
 @cindex @file{yasnippet.el}
 The way Org mode binds the TAB key (binding to @code{[tab]} instead of