diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-10-16 22:17:09 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-10-16 22:17:09 +0200 |
commit | 249b7b4742a9978ee310cad505042848120ed9eb (patch) | |
tree | 9ae54d3cf53176e0751b99047def7210af50ac48 | |
parent | a427098b57c747ecc76feb0593f32922a1e12f67 (diff) | |
parent | 843be85c1d354f882ddb9be5236f9e1c3daefd28 (diff) | |
download | org-mode-249b7b4742a9978ee310cad505042848120ed9eb.tar.gz |
Merge branch 'maint'
-rw-r--r-- | doc/org.texi | 2 | ||||
-rw-r--r-- | doc/orgguide.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi index 5200473..c31424e 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -1693,7 +1693,7 @@ In that case, all items are closed. Here is an example: But in the end, no individual scenes matter but the film as a whole. Important actors in this film are: - @b{Elijah Wood} :: He plays Frodo - - @b{Sean Austin} :: He plays Sam, Frodo's friend. I still remember + - @b{Sean Astin} :: He plays Sam, Frodo's friend. I still remember him very well from his role as Mikey Walsh in @i{The Goonies}. @end group @end example diff --git a/doc/orgguide.texi b/doc/orgguide.texi index 93b3c26..d018373 100644 --- a/doc/orgguide.texi +++ b/doc/orgguide.texi @@ -503,7 +503,7 @@ blank lines. An example: + I really like Miranda Otto. Important actors in this film are: - @b{Elijah Wood} :: He plays Frodo - - @b{Sean Austin} :: He plays Sam, Frodo's friend. + - @b{Sean Astin} :: He plays Sam, Frodo's friend. @end group @end smallexample |