Merge branch 'maint'

This commit is contained in:
Bastien 2018-03-20 10:01:52 +01:00
commit a06b72bb9d
1 changed files with 1 additions and 1 deletions

View File

@ -10023,7 +10023,7 @@ To turn off fontification for marked up text, you can set
available markup syntax, you can customize @code{org-emphasis-alist}. To fine available markup syntax, you can customize @code{org-emphasis-alist}. To fine
tune what characters are allowed before and after the markup characters, you tune what characters are allowed before and after the markup characters, you
can tweak @code{org-emphasis-regexp-components}. Beware that changing one of can tweak @code{org-emphasis-regexp-components}. Beware that changing one of
the above variables will no take effect until you reload Org, for which you the above variables will not take effect until you reload Org, for which you
may need to restart Emacs. may need to restart Emacs.
@node Horizontal rules @node Horizontal rules