diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-06-02 10:29:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-06-02 10:29:37 -0700 |
| commit | 02c7d45d490dd28a1c4effa928f9a8b9373149b0 (patch) | |
| tree | 670652f24cf21779b201e11a55ebce64158fb39c /doc/misc/org.texi | |
| parent | 0aaf14a441041fa8b5810ae0eec624011b53bb4c (diff) | |
| parent | 90bea37d466f47a65f3790b4bc46b11af9a4a27a (diff) | |
| download | emacs-02c7d45d490dd28a1c4effa928f9a8b9373149b0.tar.gz | |
Merge from origin/emacs-26
90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit
af82d1f * etc/PROBLEMS: Document stickyness problem with FVWM (Bug#31...
4a3aed2 Update Emacs Lisp Intro to match current behavior
21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
3257085 Fix previous commit
6d23525 Fix typos in several manuals (Bug#31610)
9188291 Add detailed documentation about lock files
e5471b2 Add commentary for subtle aspect of frame.el
Conflicts:
doc/lispintro/emacs-lisp-intro.texi
Diffstat (limited to 'doc/misc/org.texi')
| -rw-r--r-- | doc/misc/org.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 807b80dbdb5..3bce0dd7369 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -5134,7 +5134,7 @@ that Org can parse this line correctly: In this example, @samp{GTD} is the @emph{group tag} and it is related to two other tags: @samp{Control}, @samp{Persp}. Defining @samp{Control} and -@samp{Persp} as group tags creates an hierarchy of tags: +@samp{Persp} as group tags creates a hierarchy of tags: @example #+TAGS: [ Control : Context Task ] @@ -11178,7 +11178,7 @@ Org exports text in this block only when using ASCII back-end. @cindex horizontal rules, in ASCII export ASCII back-end recognizes only one attribute, @code{:width}, which specifies -the width of an horizontal rule in number of characters. The keyword and +the width of a horizontal rule in number of characters. The keyword and syntax for specifying widths is: @example |