diff options
| author | Paul Eggert | 2018-01-01 01:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-01-01 01:13:04 -0800 |
| commit | bb267f17f9e1e593d8dee379aceee22d7fa42680 (patch) | |
| tree | 466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /doc/misc/org.texi | |
| parent | a5835dfee139322de7aa071f1c87ef015acbecad (diff) | |
| parent | 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff) | |
| download | emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.zip | |
Merge from origin/emacs-26
63b04c11d5 Fix copyright years by hand
5c7dd8a783 Update copyright year to 2018
220a9ecba1 Merge from Gnulib
312c565566 Don't add empty keyboard macro to macro ring (Bug#24992)
39ca289a7a Allow customization of decoding of "man" command
f8240815ea * etc/NEWS: Add security consideration note on passphrase ...
0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ...
acd289c5a4 Fix problems with indexing in User manual
b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh...
e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846
81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ...
7175496d7a Fix doc string of 'enable-recursive-minibuffers'
5b38406491 Fix documentation of delsel and of killing text
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
Diffstat (limited to 'doc/misc/org.texi')
| -rw-r--r-- | doc/misc/org.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 1f6e10287d1..a252db48184 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -260,7 +260,7 @@ | |||
| 260 | @copying | 260 | @copying |
| 261 | This manual is for Org version @value{VERSION}. | 261 | This manual is for Org version @value{VERSION}. |
| 262 | 262 | ||
| 263 | Copyright @copyright{} 2004--2017 Free Software Foundation, Inc. | 263 | Copyright @copyright{} 2004--2018 Free Software Foundation, Inc. |
| 264 | 264 | ||
| 265 | @quotation | 265 | @quotation |
| 266 | Permission is granted to copy, distribute and/or modify this document | 266 | Permission is granted to copy, distribute and/or modify this document |
| @@ -13799,7 +13799,7 @@ Copyright information is printed on the back of the title page. | |||
| 13799 | 13799 | ||
| 13800 | This is a short example of a complete Texinfo file, version 1.0. | 13800 | This is a short example of a complete Texinfo file, version 1.0. |
| 13801 | 13801 | ||
| 13802 | Copyright \copy 2016 Free Software Foundation, Inc. | 13802 | Copyright \copy 2018 Free Software Foundation, Inc. |
| 13803 | @end example | 13803 | @end example |
| 13804 | 13804 | ||
| 13805 | @node Info directory file | 13805 | @node Info directory file |
| @@ -14076,7 +14076,7 @@ This manual is for GNU Sample (version @{@{@{version@}@}@}, | |||
| 14076 | This manual is for GNU Sample (version @{@{@{version@}@}@}, | 14076 | This manual is for GNU Sample (version @{@{@{version@}@}@}, |
| 14077 | @{@{@{updated@}@}@}), which is an example in the Texinfo documentation. | 14077 | @{@{@{updated@}@}@}), which is an example in the Texinfo documentation. |
| 14078 | 14078 | ||
| 14079 | Copyright \copy 2016 Free Software Foundation, Inc. | 14079 | Copyright \copy 2018 Free Software Foundation, Inc. |
| 14080 | 14080 | ||
| 14081 | #+BEGIN_QUOTE | 14081 | #+BEGIN_QUOTE |
| 14082 | Permission is granted to copy, distribute and/or modify this | 14082 | Permission is granted to copy, distribute and/or modify this |