diff options
| author | Joakim Verona | 2012-01-09 11:26:23 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-01-09 11:26:23 +0100 |
| commit | e4f761f1e3df7fbc7793c73c5d808b8da0b3a700 (patch) | |
| tree | 4bdf869626ac37c6a5a1fd5764a9c8481136d805 /etc | |
| parent | 2f74c36bf173b5ad01f99e0d1b31b9b8fa5c8f2f (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-e4f761f1e3df7fbc7793c73c5d808b8da0b3a700.tar.gz emacs-e4f761f1e3df7fbc7793c73c5d808b8da0b3a700.zip | |
upstream
Diffstat (limited to 'etc')
142 files changed, 1241 insertions, 214 deletions
diff --git a/etc/AUTHORS b/etc/AUTHORS index b7929dbf453..0c86e2b199a 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS | |||
| @@ -3429,7 +3429,7 @@ Steve Nygard: changed unexnext.c | |||
| 3429 | 3429 | ||
| 3430 | Steve Purcell: changed nnimap.el | 3430 | Steve Purcell: changed nnimap.el |
| 3431 | 3431 | ||
| 3432 | Steve Strassman: wrote spook.el | 3432 | Steve Strassmann: wrote spook.el |
| 3433 | 3433 | ||
| 3434 | Steve Youngs: changed mh-utils.el mh-xemacs-compat.el mh-customize.el | 3434 | Steve Youngs: changed mh-utils.el mh-xemacs-compat.el mh-customize.el |
| 3435 | mh-e.el mh-comp.el mh-mime.el dns.el gnus-art.el browse-url.el | 3435 | mh-e.el mh-comp.el mh-mime.el dns.el gnus-art.el browse-url.el |
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index 990335a3f77..06b9a9e45a5 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2006-2011 Free Software Foundation, Inc. | 1 | Copyright (C) 2006-2012 Free Software Foundation, Inc. |
| 2 | See end for license conditions. | 2 | See end for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/etc/ChangeLog b/etc/ChangeLog index 758025c6c3e..2fa4aee8363 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,45 @@ | |||
| 1 | 2012-01-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * refcards/calccard.tex, refcards/cs-dired-ref.tex: | ||
| 4 | * refcards/cs-refcard.tex, refcards/cs-survival.tex: | ||
| 5 | * refcards/de-refcard.tex, refcards/dired-ref.tex: | ||
| 6 | * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex: | ||
| 7 | * refcards/fr-survival.tex, refcards/pl-refcard.tex: | ||
| 8 | * refcards/pt-br-refcard.tex, refcards/refcard.tex: | ||
| 9 | * refcards/ru-refcard.tex, refcards/sk-dired-ref.tex: | ||
| 10 | * refcards/sk-refcard.tex, refcards/sk-survival.tex: | ||
| 11 | * refcards/survival.tex: Bump version number to 24. | ||
| 12 | |||
| 13 | * refcards/calccard.tex, refcards/cs-dired-ref.tex: | ||
| 14 | * refcards/cs-refcard.tex, refcards/cs-survival.tex: | ||
| 15 | * refcards/de-refcard.tex, refcards/dired-ref.tex: | ||
| 16 | * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex: | ||
| 17 | * refcards/fr-survival.tex, refcards/orgcard.tex: | ||
| 18 | * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex: | ||
| 19 | * refcards/refcard.tex, refcards/ru-refcard.tex: | ||
| 20 | * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex: | ||
| 21 | * refcards/sk-survival.tex, refcards/survival.tex: | ||
| 22 | * refcards/vipcard.tex, refcards/viperCard.tex: | ||
| 23 | Update short copyright year to 2012. | ||
| 24 | |||
| 25 | 2012-01-04 Chong Yidong <cyd@stupidchicken.com> | ||
| 26 | |||
| 27 | * org/README: Rename from COPYRIGHT-AND-LICENSE. | ||
| 28 | |||
| 29 | 2012-01-03 Jambunathan K <kjambunathan@gmail.com> | ||
| 30 | |||
| 31 | * org/OrgOdtContentTemplate.xml, org/OrgOdtStyles.xml: New files. | ||
| 32 | |||
| 33 | 2012-01-03 Bastien Guerry <bzg@altern.org> | ||
| 34 | |||
| 35 | * org/COPYRIGHT-AND-LICENSE: New file. | ||
| 36 | |||
| 37 | * org/: New directory. | ||
| 38 | |||
| 39 | 2012-01-03 Julian Gehring <julian.gehring@googlemail.com> | ||
| 40 | |||
| 41 | * refcards/orgcard.tex: Correct one markup in the "Timestamps" section. | ||
| 42 | |||
| 1 | 2011-12-10 Lars Magne Ingebrigtsen <larsi@gnus.org> | 43 | 2011-12-10 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 44 | ||
| 3 | * NEWS: Mention auth-source twice in connection with smtpmail to | 45 | * NEWS: Mention auth-source twice in connection with smtpmail to |
| @@ -5528,7 +5570,7 @@ | |||
| 5528 | ;; coding: utf-8 | 5570 | ;; coding: utf-8 |
| 5529 | ;; End: | 5571 | ;; End: |
| 5530 | 5572 | ||
| 5531 | Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. | 5573 | Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. |
| 5532 | 5574 | ||
| 5533 | This file is part of GNU Emacs. | 5575 | This file is part of GNU Emacs. |
| 5534 | 5576 | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | Debugging GNU Emacs | 1 | Debugging GNU Emacs |
| 2 | 2 | ||
| 3 | Copyright (C) 1985, 2000-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1985, 2000-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
diff --git a/etc/DISTRIB b/etc/DISTRIB index cc121105073..7a724c97a95 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | -*- text -*- | 1 | -*- text -*- |
| 2 | GNU Emacs availability information | 2 | GNU Emacs availability information |
| 3 | 3 | ||
| 4 | Copyright (C) 1986-1993, 1995, 1998, 2000-2011 Free Software Foundation, Inc. | 4 | Copyright (C) 1986-1993, 1995, 1998, 2000-2012 Free Software Foundation, Inc. |
| 5 | See the end of the file for license conditions. | 5 | See the end of the file for license conditions. |
| 6 | 6 | ||
| 7 | 7 | ||
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 14d2a22e9f9..68b4e7e8168 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ERC NEWS -*- outline -*- | 1 | ERC NEWS -*- outline -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2006-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2006-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | * Changes in ERC 5.3 | 6 | * Changes in ERC 5.3 |
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 333465b7a41..2b4857b747a 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF | |||
| @@ -94,7 +94,7 @@ those. | |||
| 94 | 94 | ||
| 95 | ===================== end of discussion of tag names ===================== | 95 | ===================== end of discussion of tag names ===================== |
| 96 | 96 | ||
| 97 | Copyright (C) 2002-2011 Free Software Foundation, Inc. | 97 | Copyright (C) 2002-2012 Free Software Foundation, Inc. |
| 98 | 98 | ||
| 99 | COPYING PERMISSIONS: | 99 | COPYING PERMISSIONS: |
| 100 | 100 | ||
diff --git a/etc/ETAGS.README b/etc/ETAGS.README index fd9636c9734..39045719b1c 100644 --- a/etc/ETAGS.README +++ b/etc/ETAGS.README | |||
| @@ -28,7 +28,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
| 28 | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2011 | 31 | Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2012 |
| 32 | Free Software Foundation, Inc. | 32 | Free Software Foundation, Inc. |
| 33 | 33 | ||
| 34 | This file is not considered part of GNU Emacs. | 34 | This file is not considered part of GNU Emacs. |
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 1985, 1993, 2001-2011 Free Software Foundation, Inc. | 1 | Copyright (C) 1985, 1993, 2001-2012 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | Permission is granted to anyone to make or distribute verbatim copies | 3 | Permission is granted to anyone to make or distribute verbatim copies |
| 4 | of this document, in any medium, provided that the copyright notice and | 4 | of this document, in any medium, provided that the copyright notice and |
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS index 3192a58ce90..086e44f2bba 100644 --- a/etc/GNUS-NEWS +++ b/etc/GNUS-NEWS | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNUS NEWS -- history of user-visible changes. | 1 | GNUS NEWS -- history of user-visible changes. |
| 2 | 2 | ||
| 3 | Copyright (C) 1999-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1999-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Please send Gnus bug reports to bugs@gnus.org. | 6 | Please send Gnus bug reports to bugs@gnus.org. |
| @@ -72,7 +72,7 @@ Korean ($(CGQ1[(B) $(C>H3gGO<<?d(B / $(C>H3gGO=J4O1n(B | |||
| 72 | 72 | ||
| 73 | 73 | ||
| 74 | 74 | ||
| 75 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 75 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 76 | 76 | ||
| 77 | This file is part of GNU Emacs. | 77 | This file is part of GNU Emacs. |
| 78 | 78 | ||
diff --git a/etc/MACHINES b/etc/MACHINES index 1e68376b94a..695bc092e9e 100644 --- a/etc/MACHINES +++ b/etc/MACHINES | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Emacs machines list | 1 | Emacs machines list |
| 2 | 2 | ||
| 3 | Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011 | 3 | Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2012 |
| 4 | Free Software Foundation, Inc. | 4 | Free Software Foundation, Inc. |
| 5 | See the end of the file for license conditions. | 5 | See the end of the file for license conditions. |
| 6 | 6 | ||
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS index 98f10511835..33e4ff03657 100644 --- a/etc/MAILINGLISTS +++ b/etc/MAILINGLISTS | |||
| @@ -318,7 +318,7 @@ mode: outline | |||
| 318 | fill-column: 72 | 318 | fill-column: 72 |
| 319 | End: | 319 | End: |
| 320 | 320 | ||
| 321 | Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. | 321 | Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. |
| 322 | 322 | ||
| 323 | Permission is hereby granted, free of charge, to any person obtaining | 323 | Permission is hereby granted, free of charge, to any person obtaining |
| 324 | a copy of this file, to deal in the file without restriction, including | 324 | a copy of this file, to deal in the file without restriction, including |
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 8b96d08c17a..aca5781fe35 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | * COPYRIGHT | 1 | * COPYRIGHT |
| 2 | 2 | ||
| 3 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | * Changes in MH-E 8.3.1 | 6 | * Changes in MH-E 8.3.1 |
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index d876b6df504..84a34d24585 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | More Neat Stuff for your Emacs | 1 | More Neat Stuff for your Emacs |
| 2 | 2 | ||
| 3 | Copyright (C) 1993, 1999, 2001-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1993, 1999, 2001-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | This file describes GNU Emacs programs and resources that are | 6 | This file describes GNU Emacs programs and resources that are |
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. | 1 | GNU Emacs NEWS -- history of user-visible changes. |
| 2 | 2 | ||
| 3 | Copyright (C) 2010-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Please send Emacs bug reports to bug-gnu-emacs@gnu.org. | 6 | Please send Emacs bug reports to bug-gnu-emacs@gnu.org. |
| @@ -116,7 +116,8 @@ and pops down the *Completions* buffer accordingly. | |||
| 116 | 116 | ||
| 117 | ** Mail changes | 117 | ** Mail changes |
| 118 | 118 | ||
| 119 | The default of `send-mail-function' is now `sendmail-query-once', | 119 | +++ |
| 120 | *** The default of `send-mail-function' is now `sendmail-query-once', | ||
| 120 | which asks the user (once) whether to use the smtpmail package to send | 121 | which asks the user (once) whether to use the smtpmail package to send |
| 121 | email, or to use the old defaults that rely on external mail | 122 | email, or to use the old defaults that rely on external mail |
| 122 | facilities (`sendmail-send-it' on GNU/Linux and other Unix-like | 123 | facilities (`sendmail-send-it' on GNU/Linux and other Unix-like |
| @@ -156,14 +157,12 @@ If you had that set, then you need to put | |||
| 156 | 157 | ||
| 157 | in your ~/.authinfo file instead. | 158 | in your ~/.authinfo file instead. |
| 158 | 159 | ||
| 159 | *** sendmail changes | 160 | *** Mail mode changes (this is the old Mail mode, not Message mode) |
| 160 | +++ | 161 | +++ |
| 161 | You can now add MIME attachments to outgoing messages with the new | 162 | **** New command `mail-add-attachment' for adding MIME attachments |
| 162 | command `mail-add-attachment'. | ||
| 163 | |||
| 164 | --- | 163 | --- |
| 165 | The command `mail-attach-file' was renamed to `mail-insert-file'; the | 164 | **** The command `mail-attach-file' was renamed to `mail-insert-file'. |
| 166 | old name is now an obsolete alias to the new name. | 165 | The old name is now an obsolete alias to the new name. |
| 167 | 166 | ||
| 168 | ** Emacs server and client changes | 167 | ** Emacs server and client changes |
| 169 | +++ | 168 | +++ |
| @@ -342,14 +341,14 @@ automatically when Emacs starts up. To disable this, set | |||
| 342 | loaded, customize `package-load-list'. | 341 | loaded, customize `package-load-list'. |
| 343 | 342 | ||
| 344 | ** Custom Themes | 343 | ** Custom Themes |
| 345 | 344 | +++ | |
| 346 | *** `M-x customize-themes' lists Custom themes which can be enabled. | 345 | *** `M-x customize-themes' lists Custom themes which can be enabled. |
| 347 | 346 | +++ | |
| 348 | *** New option `custom-theme-load-path' is the load path for themes. | 347 | *** New option `custom-theme-load-path' is the load path for themes. |
| 349 | Emacs no longer looks for custom themes in `load-path'. The default | 348 | Emacs no longer looks for custom themes in `load-path'. The default |
| 350 | is to search in `custom-theme-directory', followed by a built-in theme | 349 | is to search in `custom-theme-directory', followed by a built-in theme |
| 351 | directory named "themes/" in `data-directory'. | 350 | directory named "themes/" in `data-directory'. |
| 352 | 351 | +++ | |
| 353 | *** New option `custom-safe-themes' records known-safe theme files. | 352 | *** New option `custom-safe-themes' records known-safe theme files. |
| 354 | If a theme is not in this list, Emacs queries before loading it, and | 353 | If a theme is not in this list, Emacs queries before loading it, and |
| 355 | offers to save the theme to `custom-safe-themes' automatically. By | 354 | offers to save the theme to `custom-safe-themes' automatically. By |
| @@ -364,7 +363,7 @@ the remote file-name cache is used for read access. | |||
| 364 | Add an element (subdirs . nil) to the alist portion of any variables | 363 | Add an element (subdirs . nil) to the alist portion of any variables |
| 365 | settings to indicate that the section should not apply to | 364 | settings to indicate that the section should not apply to |
| 366 | subdirectories. | 365 | subdirectories. |
| 367 | 366 | +++ | |
| 368 | *** Directory local variables can apply to some file-less buffers. | 367 | *** Directory local variables can apply to some file-less buffers. |
| 369 | Affected modes include dired, vc-dir, and log-edit. For example, | 368 | Affected modes include dired, vc-dir, and log-edit. For example, |
| 370 | adding "(diff-mode . ((mode . whitespace)))" to .dir-locals.el will | 369 | adding "(diff-mode . ((mode . whitespace)))" to .dir-locals.el will |
| @@ -567,6 +566,7 @@ region (or with the left margin if there is no previous line). | |||
| 567 | +++ | 566 | +++ |
| 568 | ** Archive Mode has basic support for browsing and updating 7z archives. | 567 | ** Archive Mode has basic support for browsing and updating 7z archives. |
| 569 | 568 | ||
| 569 | +++ | ||
| 570 | ** browse-url has a new variable `browse-url-mailto-function' | 570 | ** browse-url has a new variable `browse-url-mailto-function' |
| 571 | specifies how mailto: URLs are handled. The default is `browse-url-mail'. | 571 | specifies how mailto: URLs are handled. The default is `browse-url-mail'. |
| 572 | 572 | ||
| @@ -640,15 +640,18 @@ in the *compilation* buffer was used. | |||
| 640 | 640 | ||
| 641 | ** Customize | 641 | ** Customize |
| 642 | 642 | ||
| 643 | +++ | ||
| 643 | *** Customize buffers now contain a search field. | 644 | *** Customize buffers now contain a search field. |
| 644 | The search is performed using `customize-apropos'. | 645 | The search is performed using `customize-apropos'. |
| 645 | To turn off the search field, set custom-search-field to nil. | 646 | To turn off the search field, set custom-search-field to nil. |
| 646 | 647 | ||
| 648 | +++ | ||
| 647 | *** Custom options now start out hidden if at their default values. | 649 | *** Custom options now start out hidden if at their default values. |
| 648 | Use the arrow to the left of the option name to toggle visibility. | 650 | Use the arrow to the left of the option name to toggle visibility. |
| 649 | 651 | ||
| 650 | *** custom-buffer-sort-alphabetically now defaults to t. | 652 | *** custom-buffer-sort-alphabetically now defaults to t. |
| 651 | 653 | ||
| 654 | +++ | ||
| 652 | *** The color widget now has a "Choose" button, which allows you to | 655 | *** The color widget now has a "Choose" button, which allows you to |
| 653 | choose a color via list-colors-display. | 656 | choose a color via list-colors-display. |
| 654 | 657 | ||
| @@ -693,7 +696,7 @@ utf-8, and do the normal `undecided' decoding for the rest. | |||
| 693 | exists, that is used instead. | 696 | exists, that is used instead. |
| 694 | 697 | ||
| 695 | ** gdb-mi | 698 | ** gdb-mi |
| 696 | 699 | +++ | |
| 697 | *** GDB User Interface migrated to GDB Machine Interface and now | 700 | *** GDB User Interface migrated to GDB Machine Interface and now |
| 698 | supports multithread non-stop debugging and debugging of several | 701 | supports multithread non-stop debugging and debugging of several |
| 699 | threads simultaneously. | 702 | threads simultaneously. |
| @@ -719,6 +722,13 @@ handy if you have many manuals in many Info buffers, and don't | |||
| 719 | remember the name of the buffer visiting the manual you want to | 722 | remember the name of the buffer visiting the manual you want to |
| 720 | consult. | 723 | consult. |
| 721 | 724 | ||
| 725 | +++ | ||
| 726 | *** `e' is now bound to `end-of-buffer' rather than to `Info-edit'. | ||
| 727 | This is for compatibility with the stand-alone Info reader program, | ||
| 728 | and also because `Info-edit' is a rarely used command that is disabled | ||
| 729 | by default. | ||
| 730 | |||
| 731 | +++ | ||
| 722 | ** The Landmark game is now invoked with `landmark', not `lm'. | 732 | ** The Landmark game is now invoked with `landmark', not `lm'. |
| 723 | 733 | ||
| 724 | ** MH-E has been upgraded to MH-E version 8.3.1. | 734 | ** MH-E has been upgraded to MH-E version 8.3.1. |
| @@ -743,17 +753,13 @@ This change was made in Emacs 23.1 but was not advertised at the time. | |||
| 743 | Try using `rmail-show-message-hook' instead. | 753 | Try using `rmail-show-message-hook' instead. |
| 744 | 754 | ||
| 745 | ** Shell mode | 755 | ** Shell mode |
| 746 | 756 | +++ | |
| 747 | *** Shell mode uses pcomplete rules, with the standard completion UI. | 757 | *** Shell mode uses pcomplete rules, with the standard completion UI. |
| 748 | 758 | +++ | |
| 749 | *** The `shell' command prompts for the shell path name if the default | 759 | *** The `shell' command prompts for the shell path name if the default |
| 750 | directory is a remote file name and neither the environment variable | 760 | directory is a remote file name and neither the environment variable |
| 751 | $ESHELL nor the variable `explicit-shell-file-name' is set. | 761 | $ESHELL nor the variable `explicit-shell-file-name' is set. |
| 752 | 762 | ||
| 753 | *** New variable `shell-dir-cookie-re'. | ||
| 754 | If set to an appropriate regexp, Shell mode can track your cwd by | ||
| 755 | reading it from your prompt. | ||
| 756 | |||
| 757 | --- | 763 | --- |
| 758 | ** SQL Mode enhancements. | 764 | ** SQL Mode enhancements. |
| 759 | 765 | ||
| @@ -903,6 +909,7 @@ They are superseded by shift-select-mode enabled by default in 23.1. | |||
| 903 | --- | 909 | --- |
| 904 | *** `copyright-fix-years' can optionally convert consecutive years to ranges. | 910 | *** `copyright-fix-years' can optionally convert consecutive years to ranges. |
| 905 | 911 | ||
| 912 | +++ | ||
| 906 | *** New command `nato-region' converts text to NATO phonetic alphabet. | 913 | *** New command `nato-region' converts text to NATO phonetic alphabet. |
| 907 | 914 | ||
| 908 | 915 | ||
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 8b861cca875..7f568ffc1ce 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 | 1 | GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1986, 2006-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1985-1986, 2006-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
diff --git a/etc/NEWS.18 b/etc/NEWS.18 index 820103e3110..92454af1013 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 | 1 | GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 |
| 2 | 2 | ||
| 3 | Copyright (C) 1988, 2006-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1988, 2006-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
diff --git a/etc/NEWS.19 b/etc/NEWS.19 index df6c4893f87..54e49484c10 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. 1992. | 1 | GNU Emacs NEWS -- history of user-visible changes. 1992. |
| 2 | 2 | ||
| 3 | Copyright (C) 1993-1995, 2001, 2006-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1993-1995, 2001, 2006-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
| @@ -5032,7 +5032,7 @@ if it is `memq' in the list. | |||
| 5032 | 5032 | ||
| 5033 | ** If you call `get-buffer-window' passing t as its second argument, it | 5033 | ** If you call `get-buffer-window' passing t as its second argument, it |
| 5034 | will only search for windows on visible frames. Previously, passing t | 5034 | will only search for windows on visible frames. Previously, passing t |
| 5035 | as the secord argument caused `get-buffer-window' to search all | 5035 | as the second argument caused `get-buffer-window' to search all |
| 5036 | frames, visible or not. | 5036 | frames, visible or not. |
| 5037 | 5037 | ||
| 5038 | ** If you call `other-buffer' with a nil or omitted second argument, it | 5038 | ** If you call `other-buffer' with a nil or omitted second argument, it |
diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 332eec60535..7a76bdd38a9 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 | 1 | GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 |
| 2 | 2 | ||
| 3 | Copyright (C) 1999-2001, 2006-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 1999-2001, 2006-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
diff --git a/etc/NEWS.21 b/etc/NEWS.21 index c018567c40d..6d50b687fae 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 | 1 | GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 |
| 2 | 2 | ||
| 3 | Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
| @@ -4639,7 +4639,7 @@ simpler form STRING as property value. | |||
| 4639 | *** Variable width and height spaces | 4639 | *** Variable width and height spaces |
| 4640 | 4640 | ||
| 4641 | To display a space of fractional width or height, use a display | 4641 | To display a space of fractional width or height, use a display |
| 4642 | specification of the form `(LOCATION STRECH)'. If LOCATION is | 4642 | specification of the form `(LOCATION STRETCH)'. If LOCATION is |
| 4643 | `(margin left-margin)', the space is displayed in the left marginal | 4643 | `(margin left-margin)', the space is displayed in the left marginal |
| 4644 | area, if it is `(margin right-margin)', it is displayed in the right | 4644 | area, if it is `(margin right-margin)', it is displayed in the right |
| 4645 | marginal area, and if LOCATION is `(margin nil)' the space is | 4645 | marginal area, and if LOCATION is `(margin nil)' the space is |
diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 70c7b0e018b..6dd12a7a34f 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. | 1 | GNU Emacs NEWS -- history of user-visible changes. |
| 2 | 2 | ||
| 3 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Please send Emacs bug reports to bug-gnu-emacs@gnu.org. | 6 | Please send Emacs bug reports to bug-gnu-emacs@gnu.org. |
| @@ -3035,7 +3035,7 @@ appropriate `sql-interactive-mode' wrapper for the current setting of | |||
| 3035 | ** Fortran mode changes | 3035 | ** Fortran mode changes |
| 3036 | 3036 | ||
| 3037 | *** F90 mode and Fortran mode have support for `hs-minor-mode' (hideshow). | 3037 | *** F90 mode and Fortran mode have support for `hs-minor-mode' (hideshow). |
| 3038 | It cannot deal with every code format, but ought to handle a sizeable | 3038 | It cannot deal with every code format, but ought to handle a sizable |
| 3039 | majority. | 3039 | majority. |
| 3040 | 3040 | ||
| 3041 | *** F90 mode and Fortran mode have new navigation commands | 3041 | *** F90 mode and Fortran mode have new navigation commands |
diff --git a/etc/NEWS.23 b/etc/NEWS.23 index b9570ee9e29..f9dbfa8adef 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | GNU Emacs NEWS -- history of user-visible changes. | 1 | GNU Emacs NEWS -- history of user-visible changes. |
| 2 | 2 | ||
| 3 | Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Please send Emacs bug reports to bug-gnu-emacs@gnu.org. | 6 | Please send Emacs bug reports to bug-gnu-emacs@gnu.org. |
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP index 4aa1dca93f2..6ea431fe982 100644 --- a/etc/NEXTSTEP +++ b/etc/NEXTSTEP | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 1 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | This file contains information about GNU Emacs on "Nextstep" platforms. | 4 | This file contains information about GNU Emacs on "Nextstep" platforms. |
diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 57a3387ee40..78cb24b427d 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | Known Problems with GNU Emacs | 1 | Known Problems with GNU Emacs |
| 2 | 2 | ||
| 3 | Copyright (C) 1987-1989, 1993-1999, 2001-2011 | 3 | Copyright (C) 1987-1989, 1993-1999, 2001-2012 |
| 4 | Free Software Foundation, Inc. | 4 | Free Software Foundation, Inc. |
| 5 | See the end of the file for license conditions. | 5 | See the end of the file for license conditions. |
| 6 | 6 | ||
diff --git a/etc/README b/etc/README index d1cad4a3a0f..613306b397c 100644 --- a/etc/README +++ b/etc/README | |||
| @@ -9,5 +9,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | |||
| 9 | 9 | ||
| 10 | File: emacs.icon | 10 | File: emacs.icon |
| 11 | Author: Sun Microsystems, Inc | 11 | Author: Sun Microsystems, Inc |
| 12 | Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. | 12 | Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. |
| 13 | License: GNU General Public License version 3 or later (see COPYING) | 13 | License: GNU General Public License version 3 or later (see COPYING) |
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. | 1 | Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. |
| 2 | See the end of the file for copying permissions. | 2 | See the end of the file for copying permissions. |
| 3 | 3 | ||
| 4 | This file describes what you must or might want to do to termcap entries | 4 | This file describes what you must or might want to do to termcap entries |
| @@ -1,6 +1,6 @@ | |||
| 1 | Emacs TODO List -*-outline-*- | 1 | Emacs TODO List -*-outline-*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 3 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | 6 | ||
| @@ -79,7 +79,7 @@ understand. I find it quite hard to figure out what compilation | |||
| 79 | command it will use. | 79 | command it will use. |
| 80 | 80 | ||
| 81 | I suggest totally rewriting that part of Flymake, using the simplest | 81 | I suggest totally rewriting that part of Flymake, using the simplest |
| 82 | mechanism that sufficies for the specific needs. That will be easy | 82 | mechanism that suffices for the specific needs. That will be easy |
| 83 | for users to customize. | 83 | for users to customize. |
| 84 | 84 | ||
| 85 | ** Compute the list of active keymaps *after* reading the first event. | 85 | ** Compute the list of active keymaps *after* reading the first event. |
diff --git a/etc/charsets/README b/etc/charsets/README index cd009220c3b..10791b31971 100644 --- a/etc/charsets/README +++ b/etc/charsets/README | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | # README file for charset mapping files in this directory. | 1 | # README file for charset mapping files in this directory. |
| 2 | |||
| 3 | # Copyright (C) 2003-2012 Free Software Foundation, Inc. | ||
| 2 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 4 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 3 | # National Institute of Advanced Industrial Science and Technology (AIST) | 5 | # National Institute of Advanced Industrial Science and Technology (AIST) |
| 4 | # Registration Number H13PRO009 | 6 | # Registration Number H13PRO009 |
| 5 | # Copyright (C) 2003-2011 Free Software Foundation, Inc. | ||
| 6 | 7 | ||
| 7 | # This file is part of GNU Emacs. | 8 | # This file is part of GNU Emacs. |
| 8 | 9 | ||
diff --git a/etc/compilation.txt b/etc/compilation.txt index eeb09b1712c..269f8d23e6b 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt | |||
| @@ -570,7 +570,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49 | |||
| 570 | Compilation finished at Thu Jul 21 15:02:15 | 570 | Compilation finished at Thu Jul 21 15:02:15 |
| 571 | 571 | ||
| 572 | 572 | ||
| 573 | Copyright (C) 2004-2011 Free Software Foundation, Inc. | 573 | Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 574 | 574 | ||
| 575 | COPYING PERMISSIONS: | 575 | COPYING PERMISSIONS: |
| 576 | 576 | ||
diff --git a/etc/edt-user.el b/etc/edt-user.el index 84e6f8ca1b8..3a7a707eeda 100644 --- a/etc/edt-user.el +++ b/etc/edt-user.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation | 1 | ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1986, 1992-1993, 2000-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1986, 1992-1993, 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Kevin Gallagher <kgallagh@@spd.dsccc.com> | 5 | ;; Author: Kevin Gallagher <kgallagh@@spd.dsccc.com> |
| 6 | ;; Maintainer: Kevin Gallagher <kgallagh@@spd.dsccc.com> | 6 | ;; Maintainer: Kevin Gallagher <kgallagh@@spd.dsccc.com> |
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index d4eecc9f8ef..2bd2fa23794 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps | 1 | # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps |
| 2 | 2 | ||
| 3 | # Copyright (C) 2005-2011 Free Software Foundation, Inc. | 3 | # Copyright (C) 2005-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Maintainer: Noah Friedman <friedman@splode.com> | 5 | # Maintainer: Noah Friedman <friedman@splode.com> |
| 6 | # Created: 2005-04-28 | 6 | # Created: 2005-04-28 |
diff --git a/etc/emacs2.py b/etc/emacs2.py index 805024cca3d..ed99a3a1409 100644 --- a/etc/emacs2.py +++ b/etc/emacs2.py | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | """Definitions used by commands sent to inferior Python in python.el.""" | 1 | """Definitions used by commands sent to inferior Python in python.el.""" |
| 2 | 2 | ||
| 3 | # Copyright (C) 2004-2011 Free Software Foundation, Inc. | 3 | # Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 4 | # Author: Dave Love <fx@gnu.org> | 4 | # Author: Dave Love <fx@gnu.org> |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
diff --git a/etc/emacs3.py b/etc/emacs3.py index 470547b1877..f0e4659bb6b 100644 --- a/etc/emacs3.py +++ b/etc/emacs3.py | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # Copyright (C) 2004-2011 Free Software Foundation, Inc. | 1 | # Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 2 | # Author: Dave Love <fx@gnu.org> | 2 | # Author: Dave Love <fx@gnu.org> |
| 3 | 3 | ||
| 4 | # This file is part of GNU Emacs. | 4 | # This file is part of GNU Emacs. |
diff --git a/etc/enriched.doc b/etc/enriched.doc index 5b2e1a88f24..78459de8090 100644 --- a/etc/enriched.doc +++ b/etc/enriched.doc | |||
| @@ -256,7 +256,7 @@ bug reports are welcome.</indent> | |||
| 256 | 256 | ||
| 257 | 257 | ||
| 258 | 258 | ||
| 259 | Copyright (C) 1995, 1997, 2001-2011 Free Software Foundation, Inc. | 259 | Copyright (C) 1995, 1997, 2001-2012 Free Software Foundation, Inc. |
| 260 | 260 | ||
| 261 | COPYING PERMISSIONS: | 261 | COPYING PERMISSIONS: |
| 262 | 262 | ||
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 9132ece533e..60594f0eb0a 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt | |||
| @@ -24,7 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne | |||
| 24 | Ingebrigtsen. If you have a WWW browser, you can investigate to your | 24 | Ingebrigtsen. If you have a WWW browser, you can investigate to your |
| 25 | heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>. | 25 | heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>. |
| 26 | 26 | ||
| 27 | ;; Copyright (C) 1995, 2001-2011 Free Software Foundation, Inc. | 27 | ;; Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. |
| 28 | 28 | ||
| 29 | ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no> | 29 | ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no> |
| 30 | ;; Keywords: news | 30 | ;; Keywords: news |
diff --git a/etc/grep.txt b/etc/grep.txt index 01ffa9f3ef8..e9fea92e304 100644 --- a/etc/grep.txt +++ b/etc/grep.txt | |||
| @@ -84,7 +84,7 @@ grep -nH -e "xyzxyz" ../info/* | |||
| 84 | 84 | ||
| 85 | 85 | ||
| 86 | 86 | ||
| 87 | Copyright (C) 2005-2011 Free Software Foundation, Inc. | 87 | Copyright (C) 2005-2012 Free Software Foundation, Inc. |
| 88 | 88 | ||
| 89 | COPYING PERMISSIONS: | 89 | COPYING PERMISSIONS: |
| 90 | 90 | ||
diff --git a/etc/images/README b/etc/images/README index ae2d0556ad2..a9a8d10be7e 100644 --- a/etc/images/README +++ b/etc/images/README | |||
| @@ -23,19 +23,19 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | |||
| 23 | 23 | ||
| 24 | File: mh-logo.xpm | 24 | File: mh-logo.xpm |
| 25 | Author: Satyaki Das | 25 | Author: Satyaki Das |
| 26 | Copyright (C) 2003-2011 Free Software Foundation, Inc. | 26 | Copyright (C) 2003-2012 Free Software Foundation, Inc. |
| 27 | 27 | ||
| 28 | Files: splash.pbm, splash.xpm, gnus.pbm | 28 | Files: splash.pbm, splash.xpm, gnus.pbm |
| 29 | Author: Luis Fernandes <elf@ee.ryerson.ca> | 29 | Author: Luis Fernandes <elf@ee.ryerson.ca> |
| 30 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 30 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 31 | 31 | ||
| 32 | Files: splash.png, splash.svg | 32 | Files: splash.png, splash.svg |
| 33 | Author: Francesc Rocher <rocher@member.fsf.org> | 33 | Author: Francesc Rocher <rocher@member.fsf.org> |
| 34 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 34 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 35 | 35 | ||
| 36 | Files: checked.xpm, unchecked.xpm | 36 | Files: checked.xpm, unchecked.xpm |
| 37 | Author: Chong Yidong <cyd@stupidchicken.com> | 37 | Author: Chong Yidong <cyd@stupidchicken.com> |
| 38 | Copyright (C) 2010-2011 Free Software Foundation, Inc. | 38 | Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | * The following icons are from GTK+ 2.x. They are not part of Emacs, but | 41 | * The following icons are from GTK+ 2.x. They are not part of Emacs, but |
diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm index 959e77d7050..9dc29171250 100644 --- a/etc/images/checked.xpm +++ b/etc/images/checked.xpm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* XPM */ | 1 | /* XPM */ |
| 2 | /* Copyright (C) 2010-2011 Free Software Foundation, Inc. | 2 | /* Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 3 | * | 3 | * |
| 4 | * Author: Chong Yidong <cyd@stupidchicken.com> | 4 | * Author: Chong Yidong <cyd@stupidchicken.com> |
| 5 | * | 5 | * |
diff --git a/etc/images/custom/README b/etc/images/custom/README index ad37dc1a7ac..831fb8c6316 100644 --- a/etc/images/custom/README +++ b/etc/images/custom/README | |||
| @@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | |||
| 6 | 6 | ||
| 7 | Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm | 7 | Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm |
| 8 | Author: Juri Linkov | 8 | Author: Juri Linkov |
| 9 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 9 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 10 | License: GNU General Public License version 3 or later (see COPYING) | 10 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README index 38d49f3bb64..cf6291208a9 100644 --- a/etc/images/ezimage/README +++ b/etc/images/ezimage/README | |||
| @@ -7,5 +7,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm | |||
| 7 | tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm | 7 | tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm |
| 8 | tag.xpm unlock.xpm | 8 | tag.xpm unlock.xpm |
| 9 | Author: Eric M. Ludlam | 9 | Author: Eric M. Ludlam |
| 10 | Copyright (C) 1999-2011 Free Software Foundation, Inc. | 10 | Copyright (C) 1999-2012 Free Software Foundation, Inc. |
| 11 | License: GNU General Public License version 3 or later (see COPYING) | 11 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/gnus/README b/etc/images/gnus/README index b19ad3fedcb..824ca05ee2b 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README | |||
| @@ -7,7 +7,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | |||
| 7 | 7 | ||
| 8 | Files: important.xpm, unimportant.xpm | 8 | Files: important.xpm, unimportant.xpm |
| 9 | Author: Simon Josefsson <simon@josefsson.org> | 9 | Author: Simon Josefsson <simon@josefsson.org> |
| 10 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 10 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 11 | 11 | ||
| 12 | Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm | 12 | Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm |
| 13 | describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm | 13 | describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm |
| @@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm | |||
| 21 | unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm | 21 | unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm |
| 22 | uu-post.pbm uu-post.xpm | 22 | uu-post.pbm uu-post.xpm |
| 23 | Author: Luis Fernandes <elf@ee.ryerson.ca> | 23 | Author: Luis Fernandes <elf@ee.ryerson.ca> |
| 24 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 24 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 25 | 25 | ||
| 26 | Files: gnus.png, gnus.svg | 26 | Files: gnus.png, gnus.svg |
| 27 | Author: Francesc Rocher <rocher@member.fsf.org> | 27 | Author: Francesc Rocher <rocher@member.fsf.org> |
| 28 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 28 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | * The following icons are from GNOME 2.x. They are not part of Emacs, | 31 | * The following icons are from GNOME 2.x. They are not part of Emacs, |
diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index aad6560a004..9c8e57a3f75 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 2 | <!-- Gnu Emacs Logo | 2 | <!-- Gnu Emacs Logo |
| 3 | 3 | ||
| 4 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 4 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | Author: Francesc Rocher <f.rocher@member.fsf.org> | 6 | Author: Francesc Rocher <f.rocher@member.fsf.org> |
| 7 | 7 | ||
diff --git a/etc/images/gud/README b/etc/images/gud/README index 11c22bab49f..a37494bd5fa 100644 --- a/etc/images/gud/README +++ b/etc/images/gud/README | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | 1 | COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES |
| 2 | 2 | ||
| 3 | The following icons were created by Nick Roberts <nickrob@snap.net.nz>. | 3 | The following icons were created by Nick Roberts <nickrob@snap.net.nz>. |
| 4 | Copyright (C) 2002-2011 Free Software Foundation, Inc. | 4 | Copyright (C) 2002-2012 Free Software Foundation, Inc. |
| 5 | License: GNU General Public License version 3 or later (see COPYING) | 5 | License: GNU General Public License version 3 or later (see COPYING) |
| 6 | 6 | ||
| 7 | break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm | 7 | break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm |
| @@ -31,7 +31,7 @@ their copyright assignment included the icons. | |||
| 31 | The following icons are converted from the Insight Windows style icon | 31 | The following icons are converted from the Insight Windows style icon |
| 32 | set in src/gdb/gdbtk/library/images2. | 32 | set in src/gdb/gdbtk/library/images2. |
| 33 | 33 | ||
| 34 | Copyright (C) 2002-2011 Free Software Foundation, Inc. | 34 | Copyright (C) 2002-2012 Free Software Foundation, Inc. |
| 35 | License: GNU General Public License version 3 or later (see COPYING) | 35 | License: GNU General Public License version 3 or later (see COPYING) |
| 36 | 36 | ||
| 37 | cont.pbm and cont.xpm were converted from continue.gif | 37 | cont.pbm and cont.xpm were converted from continue.gif |
| @@ -47,7 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING) | |||
| 47 | The following icons are created from the Insight Windows style icon | 47 | The following icons are created from the Insight Windows style icon |
| 48 | set in src/gdb/gdbtk/library/images2. | 48 | set in src/gdb/gdbtk/library/images2. |
| 49 | 49 | ||
| 50 | Copyright (C) 2002-2011 Free Software Foundation, Inc. | 50 | Copyright (C) 2002-2012 Free Software Foundation, Inc. |
| 51 | License: GNU General Public License version 3 or later (see COPYING) | 51 | License: GNU General Public License version 3 or later (see COPYING) |
| 52 | 52 | ||
| 53 | rcont.xpm rfinish.xpm | 53 | rcont.xpm rfinish.xpm |
diff --git a/etc/images/icons/README b/etc/images/icons/README index b11b88781e8..664c52906ac 100644 --- a/etc/images/icons/README +++ b/etc/images/icons/README | |||
| @@ -5,7 +5,7 @@ Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png | |||
| 5 | hicolor/128x128/apps/emacs.png hicolor/scalable/apps/emacs.svg | 5 | hicolor/128x128/apps/emacs.png hicolor/scalable/apps/emacs.svg |
| 6 | 6 | ||
| 7 | Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> | 7 | Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> |
| 8 | Copyright (C) 2007-2011 Free Software Foundation, Inc. | 8 | Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 9 | License: GNU General Public License version 3 or later (see COPYING) | 9 | License: GNU General Public License version 3 or later (see COPYING) |
| 10 | 10 | ||
| 11 | 11 | ||
| @@ -13,7 +13,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png | |||
| 13 | hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png | 13 | hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png |
| 14 | 14 | ||
| 15 | Author: Andrew Zhilin <andrew_zhilin@yahoo.com> | 15 | Author: Andrew Zhilin <andrew_zhilin@yahoo.com> |
| 16 | Copyright (C) 2005-2011 Free Software Foundation, Inc. | 16 | Copyright (C) 2005-2012 Free Software Foundation, Inc. |
| 17 | License: GNU General Public License version 3 or later (see COPYING) | 17 | License: GNU General Public License version 3 or later (see COPYING) |
| 18 | 18 | ||
| 19 | Files: allout-widgets-dark-bg/closed.png | 19 | Files: allout-widgets-dark-bg/closed.png |
| @@ -62,5 +62,5 @@ Files: allout-widgets-dark-bg/closed.png | |||
| 62 | allout-widgets-light-bg/through-descender.xpm | 62 | allout-widgets-light-bg/through-descender.xpm |
| 63 | 63 | ||
| 64 | Author: Ken Manheimer <ken.manheimer@gmail.com> | 64 | Author: Ken Manheimer <ken.manheimer@gmail.com> |
| 65 | Copyright (C) 2011 Free Software Foundation, Inc. | 65 | Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 66 | License: GNU General Public License version 3 or later (see COPYING) | 66 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/icons/hicolor/scalable/apps/emacs.svg b/etc/images/icons/hicolor/scalable/apps/emacs.svg index 5abdc931c1c..a40eca6ea93 100644 --- a/etc/images/icons/hicolor/scalable/apps/emacs.svg +++ b/etc/images/icons/hicolor/scalable/apps/emacs.svg | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | id="svg4768" | 10 | id="svg4768" |
| 11 | xml:space="preserve"> | 11 | xml:space="preserve"> |
| 12 | <!-- Gnu Emacs Icon | 12 | <!-- Gnu Emacs Icon |
| 13 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 13 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 14 | 14 | ||
| 15 | This file is part of GNU Emacs. | 15 | This file is part of GNU Emacs. |
| 16 | 16 | ||
diff --git a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg index 2abe908b92c..04b03bc6317 100644 --- a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg +++ b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 2 | <!-- Gnu Emacs Document Icon | 2 | <!-- Gnu Emacs Document Icon |
| 3 | 3 | ||
| 4 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 4 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm index 8b1d1f53788..a805d93f7a3 100644 --- a/etc/images/mh-logo.xpm +++ b/etc/images/mh-logo.xpm | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* XPM */ | 1 | /* XPM */ |
| 2 | /* MH-E Logo | 2 | /* MH-E Logo |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2003-2011 Free Software Foundation, Inc. | 4 | * Copyright (C) 2003-2012 Free Software Foundation, Inc. |
| 5 | * | 5 | * |
| 6 | * Author: Satyaki Das | 6 | * Author: Satyaki Das |
| 7 | * | 7 | * |
diff --git a/etc/images/mpc/README b/etc/images/mpc/README index 99317ea90c0..0df00e859b8 100644 --- a/etc/images/mpc/README +++ b/etc/images/mpc/README | |||
| @@ -2,5 +2,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | |||
| 2 | 2 | ||
| 3 | Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm | 3 | Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm |
| 4 | Author: Stefan Monnier <monnier@iro.umontreal.ca> | 4 | Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 5 | Copyright (C) 2009-2011 Free Software Foundation, Inc. | 5 | Copyright (C) 2009-2012 Free Software Foundation, Inc. |
| 6 | License: GNU General Public License version 3 or later (see COPYING) | 6 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/newsticker/README b/etc/images/newsticker/README index dc91d9eafd4..a8457845537 100644 --- a/etc/images/newsticker/README +++ b/etc/images/newsticker/README | |||
| @@ -4,5 +4,5 @@ Files: browse-url.xpm get-all.xpm mark-immortal.xpm mark-read.xpm | |||
| 4 | narrow.xpm next-feed.xpm next-item.xpm prev-feed.xpm | 4 | narrow.xpm next-feed.xpm next-item.xpm prev-feed.xpm |
| 5 | prev-item.xpm update.xpm | 5 | prev-item.xpm update.xpm |
| 6 | Author: Ulf Jasper | 6 | Author: Ulf Jasper |
| 7 | Copyright (C) 2011 Free Software Foundation, Inc. | 7 | Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 8 | License: GNU General Public License version 3 or later (see COPYING) | 8 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/smilies/README b/etc/images/smilies/README index d009849e36c..db2991b4465 100644 --- a/etc/images/smilies/README +++ b/etc/images/smilies/README | |||
| @@ -3,5 +3,5 @@ Files: blink.pbm blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm | |||
| 3 | sad.xpm smile.pbm smile.xpm wry.pbm wry.xpm | 3 | sad.xpm smile.pbm smile.xpm wry.pbm wry.xpm |
| 4 | Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex | 4 | Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex |
| 5 | Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm. | 5 | Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm. |
| 6 | Copyright (C) 1999-2011 Free Software Foundation, Inc. | 6 | Copyright (C) 1999-2012 Free Software Foundation, Inc. |
| 7 | License: GNU General Public License version 3 or later (see COPYING) | 7 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/smilies/grayscale/README b/etc/images/smilies/grayscale/README index dc356104a78..0f936b35bb0 100644 --- a/etc/images/smilies/grayscale/README +++ b/etc/images/smilies/grayscale/README | |||
| @@ -2,5 +2,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm | |||
| 2 | frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm | 2 | frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm |
| 3 | smile.xpm wry.xpm | 3 | smile.xpm wry.xpm |
| 4 | Author: Adam Sj鴊ren | 4 | Author: Adam Sj鴊ren |
| 5 | Copyright (C) 2007-2011 Free Software Foundation, Inc. | 5 | Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 6 | License: GNU General Public License version 3 or later (see COPYING) | 6 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/smilies/medium/README b/etc/images/smilies/medium/README index dc356104a78..0f936b35bb0 100644 --- a/etc/images/smilies/medium/README +++ b/etc/images/smilies/medium/README | |||
| @@ -2,5 +2,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm | |||
| 2 | frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm | 2 | frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm |
| 3 | smile.xpm wry.xpm | 3 | smile.xpm wry.xpm |
| 4 | Author: Adam Sj鴊ren | 4 | Author: Adam Sj鴊ren |
| 5 | Copyright (C) 2007-2011 Free Software Foundation, Inc. | 5 | Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 6 | License: GNU General Public License version 3 or later (see COPYING) | 6 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/splash.svg b/etc/images/splash.svg index 68ba4d7f7d7..1f1279b9735 100644 --- a/etc/images/splash.svg +++ b/etc/images/splash.svg | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 2 | <!-- Gnu Emacs Logo | 2 | <!-- Gnu Emacs Logo |
| 3 | 3 | ||
| 4 | Copyright (C) 2008-2011 Free Software Foundation, Inc. | 4 | Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | Author: Francesc Rocher <f.rocher@members.fsf.org> | 6 | Author: Francesc Rocher <f.rocher@members.fsf.org> |
| 7 | Based on the original work by Luis Fernandes <elf@ee.ryerson.ca> | 7 | Based on the original work by Luis Fernandes <elf@ee.ryerson.ca> |
diff --git a/etc/images/splash.xpm b/etc/images/splash.xpm index 30a587babaa..65fcda22840 100644 --- a/etc/images/splash.xpm +++ b/etc/images/splash.xpm | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* XPM */ | 1 | /* XPM */ |
| 2 | /* Gnu Emacs Logo | 2 | /* Gnu Emacs Logo |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001-2011 Free Software Foundation, Inc. | 4 | * Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 5 | * | 5 | * |
| 6 | * Author: Luis Fernandes <elf@ee.ryerson.ca> | 6 | * Author: Luis Fernandes <elf@ee.ryerson.ca> |
| 7 | * | 7 | * |
diff --git a/etc/images/tree-widget/default/README b/etc/images/tree-widget/default/README index ccc6cdbf21e..78502a370e0 100644 --- a/etc/images/tree-widget/default/README +++ b/etc/images/tree-widget/default/README | |||
| @@ -5,5 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm | |||
| 5 | no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png | 5 | no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png |
| 6 | open.xpm | 6 | open.xpm |
| 7 | Author: David Ponce <david.ponce@wanadoo.fr> | 7 | Author: David Ponce <david.ponce@wanadoo.fr> |
| 8 | Copyright (C) 2004-2011 Free Software Foundation, Inc. | 8 | Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 9 | License: GNU General Public License version 3 or later (see COPYING) | 9 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/tree-widget/folder/README b/etc/images/tree-widget/folder/README index 58716db456d..ae4ad47d4fc 100644 --- a/etc/images/tree-widget/folder/README +++ b/etc/images/tree-widget/folder/README | |||
| @@ -5,5 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png | |||
| 5 | leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png | 5 | leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png |
| 6 | no-handle.xpm open.png open.xpm | 6 | no-handle.xpm open.png open.xpm |
| 7 | Author: David Ponce <david.ponce@wanadoo.fr> | 7 | Author: David Ponce <david.ponce@wanadoo.fr> |
| 8 | Copyright (C) 2004-2011 Free Software Foundation, Inc. | 8 | Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 9 | License: GNU General Public License version 3 or later (see COPYING) | 9 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm index 06e5178bce0..8201969b080 100644 --- a/etc/images/unchecked.xpm +++ b/etc/images/unchecked.xpm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* XPM */ | 1 | /* XPM */ |
| 2 | /* Copyright (C) 2010-2011 Free Software Foundation, Inc. | 2 | /* Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 3 | * | 3 | * |
| 4 | * Author: Chong Yidong <cyd@stupidchicken.com> | 4 | * Author: Chong Yidong <cyd@stupidchicken.com> |
| 5 | * | 5 | * |
diff --git a/etc/org/OrgOdtContentTemplate.xml b/etc/org/OrgOdtContentTemplate.xml new file mode 100644 index 00000000000..f50588b2adb --- /dev/null +++ b/etc/org/OrgOdtContentTemplate.xml | |||
| @@ -0,0 +1,209 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <!-- See etc/org/README for copyright information --> | ||
| 3 | <office:document-content | ||
| 4 | xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" | ||
| 5 | xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" | ||
| 6 | xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" | ||
| 7 | xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" | ||
| 8 | xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" | ||
| 9 | xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" | ||
| 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
| 11 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
| 12 | xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" | ||
| 13 | xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" | ||
| 14 | xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" | ||
| 15 | xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" | ||
| 16 | xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" | ||
| 17 | xmlns:math="http://www.w3.org/1998/Math/MathML" | ||
| 18 | xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" | ||
| 19 | xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" | ||
| 20 | xmlns:ooo="http://openoffice.org/2004/office" | ||
| 21 | xmlns:ooow="http://openoffice.org/2004/writer" | ||
| 22 | xmlns:oooc="http://openoffice.org/2004/calc" | ||
| 23 | xmlns:dom="http://www.w3.org/2001/xml-events" | ||
| 24 | xmlns:xforms="http://www.w3.org/2002/xforms" | ||
| 25 | xmlns:xsd="http://www.w3.org/2001/XMLSchema" | ||
| 26 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 27 | xmlns:rpt="http://openoffice.org/2005/report" | ||
| 28 | xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" | ||
| 29 | xmlns:xodt="http://www.w3.org/1999/xodt" | ||
| 30 | xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2"> | ||
| 31 | <!-- scripts --> | ||
| 32 | <office:scripts/> | ||
| 33 | |||
| 34 | <!-- font face declarations --> | ||
| 35 | <office:font-face-decls> | ||
| 36 | <style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/> | ||
| 37 | <style:font-face style:name="courier" svg:font-family="courier, monospace"/> | ||
| 38 | <style:font-face style:name="Arial Unicode MS" svg:font-family="'Arial Unicode MS'" style:font-pitch="variable"/> | ||
| 39 | <style:font-face style:name="HG Mincho Light J" svg:font-family="'HG Mincho Light J'" style:font-pitch="variable"/> | ||
| 40 | <style:font-face style:name="Thorndale" svg:font-family="Thorndale" style:font-family-generic="roman" style:font-pitch="variable"/> | ||
| 41 | <style:font-face style:name="Times New Roman" svg:font-family="'Times New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/> | ||
| 42 | <style:font-face style:name="Albany" svg:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable"/> | ||
| 43 | <style:font-face style:name="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/> | ||
| 44 | <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/> | ||
| 45 | </office:font-face-decls> | ||
| 46 | |||
| 47 | <!-- automatic styles --> | ||
| 48 | <office:automatic-styles> | ||
| 49 | <style:style style:name="OrgTable" style:family="table"> | ||
| 50 | <style:table-properties style:rel-width="90%" fo:margin-top="0cm" fo:margin-bottom="0.20cm" table:align="center"/> | ||
| 51 | </style:style> | ||
| 52 | |||
| 53 | <style:style style:name="OrgTableColumn" style:family="table-column"> | ||
| 54 | <style:table-column-properties style:rel-column-width="1*"/> | ||
| 55 | </style:style> | ||
| 56 | |||
| 57 | <style:style style:name="OrgTblCell" style:family="table-cell"> | ||
| 58 | <style:table-cell-properties style:vertical-align="top" fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="none" fo:border-left="none" fo:border-right="none"/> | ||
| 59 | </style:style> | ||
| 60 | <style:style style:name="OrgTblCellL" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 61 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="none"/> | ||
| 62 | </style:style> | ||
| 63 | <style:style style:name="OrgTblCellR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 64 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="none" fo:border-left="none" fo:border-right="0.002cm solid #000000"/> | ||
| 65 | </style:style> | ||
| 66 | <style:style style:name="OrgTblCellLR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 67 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000"/> | ||
| 68 | </style:style> | ||
| 69 | <style:style style:name="OrgTblCellT" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 70 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="none" fo:border-left="none" fo:border-right="none"/> | ||
| 71 | </style:style> | ||
| 72 | <style:style style:name="OrgTblCellTL" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 73 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="none"/> | ||
| 74 | </style:style> | ||
| 75 | <style:style style:name="OrgTblCellTR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 76 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="none" fo:border-left="none" fo:border-right="0.002cm solid #000000"/> | ||
| 77 | </style:style> | ||
| 78 | <style:style style:name="OrgTblCellTLR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 79 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000"/> | ||
| 80 | </style:style> | ||
| 81 | <style:style style:name="OrgTblCellB" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 82 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="0.002cm solid #000000" fo:border-left="none" fo:border-right="none"/> | ||
| 83 | </style:style> | ||
| 84 | <style:style style:name="OrgTblCellBL" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 85 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="0.002cm solid #000000" fo:border-left="0.002cm solid #000000" fo:border-right="none"/> | ||
| 86 | </style:style> | ||
| 87 | <style:style style:name="OrgTblCellBR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 88 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="0.002cm solid #000000" fo:border-left="none" fo:border-right="0.002cm solid #000000"/> | ||
| 89 | </style:style> | ||
| 90 | <style:style style:name="OrgTblCellBLR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 91 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="0.002cm solid #000000" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000"/> | ||
| 92 | </style:style> | ||
| 93 | <style:style style:name="OrgTblCellTB" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 94 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000" fo:border-left="none" fo:border-right="none"/> | ||
| 95 | </style:style> | ||
| 96 | <style:style style:name="OrgTblCellTBL" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 97 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000" fo:border-left="0.002cm solid #000000" fo:border-right="none"/> | ||
| 98 | </style:style> | ||
| 99 | <style:style style:name="OrgTblCellTBR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 100 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000" fo:border-left="none" fo:border-right="0.002cm solid #000000"/> | ||
| 101 | </style:style> | ||
| 102 | <style:style style:name="OrgTblCellTBLR" style:family="table-cell" style:parent-style-name="OrgTblCell"> | ||
| 103 | <style:table-cell-properties fo:padding="0.159cm" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000"/> | ||
| 104 | </style:style> | ||
| 105 | |||
| 106 | <!-- BEGIN: Table styles for numbered equations --> | ||
| 107 | <style:style style:name="OrgEquation" style:family="table"> | ||
| 108 | <style:table-properties style:rel-width="100%" fo:margin-top="0cm" fo:margin-bottom="0.20cm" table:align="center"/> | ||
| 109 | </style:style> | ||
| 110 | <style:style style:name="OrgEquationTableColumn" style:family="table-column"> | ||
| 111 | <style:table-column-properties style:rel-column-width="1*"/> | ||
| 112 | </style:style> | ||
| 113 | <style:style style:name="OrgFirstEquationFirstColumnTableCell" style:family="table-cell"> | ||
| 114 | <style:table-cell-properties style:vertical-align="middle" fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="none" fo:border-left="none" fo:border-right="none"/> | ||
| 115 | </style:style> | ||
| 116 | <style:style style:name="OrgEquationLastColumnTableCell" style:family="table-cell"> | ||
| 117 | <style:table-cell-properties style:vertical-align="middle" fo:padding="0.159cm" fo:border-top="none" fo:border-bottom="none" fo:border-left="none" fo:border-right="none"/> | ||
| 118 | </style:style> | ||
| 119 | <style:style style:name="OrgEquationFirstColumnTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 120 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 121 | </style:style> | ||
| 122 | <style:style style:name="OrgEquationLastColumnTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 123 | <style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/> | ||
| 124 | </style:style> | ||
| 125 | <!-- END: Table styles for numbered equations --> | ||
| 126 | |||
| 127 | <!-- BEGIN: Custom Table Template --> | ||
| 128 | <style:style style:name="Custom" style:family="table"> | ||
| 129 | <style:table-properties style:rel-width="80%" table:align="center"/> | ||
| 130 | </style:style> | ||
| 131 | |||
| 132 | <style:style style:name="CustomColumn" style:family="table-column"> | ||
| 133 | <style:table-column-properties style:rel-column-width="1*"/> | ||
| 134 | </style:style> | ||
| 135 | |||
| 136 | <!-- Table Paragraph Styles --> | ||
| 137 | <style:style style:name="CustomTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 138 | <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> | ||
| 139 | <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:font-name="Times New Roman" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-overline-style="none" style:text-overline-color="font-color"/> | ||
| 140 | </style:style> | ||
| 141 | |||
| 142 | <style:style style:name="CustomLastRowTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 143 | <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> | ||
| 144 | <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:font-name="Times New Roman" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-overline-style="none" style:text-overline-color="font-color"/> | ||
| 145 | </style:style> | ||
| 146 | |||
| 147 | <style:style style:name="CustomLastColumnTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 148 | <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> | ||
| 149 | <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:font-name="Times New Roman" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-overline-style="none" style:text-overline-color="font-color"/> | ||
| 150 | </style:style> | ||
| 151 | |||
| 152 | <style:style style:name="CustomFirstRowTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 153 | <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> | ||
| 154 | <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:font-name="Times New Roman" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-overline-style="none" style:text-overline-color="font-color"/> | ||
| 155 | </style:style> | ||
| 156 | |||
| 157 | <style:style style:name="CustomFirstColumnTableParagraph" style:family="paragraph" style:parent-style-name="Table_20_Contents"> | ||
| 158 | <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> | ||
| 159 | <style:text-properties fo:color="#ffffff" style:text-outline="false" style:text-line-through-style="none" style:font-name="Times New Roman" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-overline-style="none" style:text-overline-color="font-color"/> | ||
| 160 | </style:style> | ||
| 161 | |||
| 162 | <!-- Table Cell Styles --> | ||
| 163 | <style:style style:name="CustomTableCell" style:family="table-cell"> | ||
| 164 | <style:table-cell-properties style:vertical-align="top" fo:background-color="#ffffff" fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000"> | ||
| 165 | <style:background-image/> | ||
| 166 | </style:table-cell-properties> | ||
| 167 | </style:style> | ||
| 168 | |||
| 169 | <style:style style:name="CustomFirstRowTableCell" style:family="table-cell"> | ||
| 170 | <style:table-cell-properties style:vertical-align="top" fo:background-color="#000080" fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000"> | ||
| 171 | <style:background-image/> | ||
| 172 | </style:table-cell-properties> | ||
| 173 | </style:style> | ||
| 174 | |||
| 175 | <style:style style:name="CustomLastRowTableCell" style:family="table-cell"> | ||
| 176 | <style:table-cell-properties style:vertical-align="top" fo:background-color="#cccccc" fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000"> | ||
| 177 | <style:background-image/> | ||
| 178 | </style:table-cell-properties> | ||
| 179 | </style:style> | ||
| 180 | |||
| 181 | <style:style style:name="CustomFirstColumnTableCell" style:family="table-cell"> | ||
| 182 | <style:table-cell-properties style:vertical-align="top" fo:background-color="#4d4d4d" fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000"> | ||
| 183 | <style:background-image/> | ||
| 184 | </style:table-cell-properties> | ||
| 185 | </style:style> | ||
| 186 | |||
| 187 | <style:style style:name="CustomLastColumnTableCell" style:family="table-cell"> | ||
| 188 | <style:table-cell-properties style:vertical-align="top" fo:background-color="#cccccc" fo:padding="0.097cm" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="0.002cm solid #000000" fo:border-bottom="0.002cm solid #000000"> | ||
| 189 | <style:background-image/> | ||
| 190 | </style:table-cell-properties> | ||
| 191 | </style:style> | ||
| 192 | |||
| 193 | <!-- END: Custom Table Template --> | ||
| 194 | |||
| 195 | </office:automatic-styles> | ||
| 196 | |||
| 197 | <office:body> | ||
| 198 | <office:text> | ||
| 199 | <text:sequence-decls> | ||
| 200 | <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/> | ||
| 201 | <text:sequence-decl text:display-outline-level="0" text:name="Table"/> | ||
| 202 | <text:sequence-decl text:display-outline-level="0" text:name="Text"/> | ||
| 203 | <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> | ||
| 204 | <text:sequence-decl text:display-outline-level="0" text:name="Equation"/> | ||
| 205 | <text:sequence-decl text:display-outline-level="0" text:name="Figure"/> | ||
| 206 | </text:sequence-decls> | ||
| 207 | </office:text> | ||
| 208 | </office:body> | ||
| 209 | </office:document-content> | ||
diff --git a/etc/org/OrgOdtStyles.xml b/etc/org/OrgOdtStyles.xml new file mode 100644 index 00000000000..4fb282064b0 --- /dev/null +++ b/etc/org/OrgOdtStyles.xml | |||
| @@ -0,0 +1,732 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <!-- See etc/org/README for copyright information --> | ||
| 3 | <office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" office:version="1.2"> | ||
| 4 | <office:font-face-decls> | ||
| 5 | <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/> | ||
| 6 | <style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/> | ||
| 7 | <style:font-face style:name="Courier New" svg:font-family="'Courier New'" style:font-family-generic="modern" style:font-pitch="fixed"/> | ||
| 8 | <style:font-face style:name="NSimSun" svg:font-family="NSimSun" style:font-family-generic="modern" style:font-pitch="fixed"/> | ||
| 9 | <style:font-face style:name="Times New Roman" svg:font-family="'Times New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/> | ||
| 10 | <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/> | ||
| 11 | <style:font-face style:name="SimSun" svg:font-family="SimSun" style:font-family-generic="system" style:font-pitch="variable"/> | ||
| 12 | <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/> | ||
| 13 | </office:font-face-decls> | ||
| 14 | <office:styles> | ||
| 15 | <style:default-style style:family="graphic"> | ||
| 16 | <style:graphic-properties draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/> | ||
| 17 | <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> | ||
| 18 | <style:tab-stops/> | ||
| 19 | </style:paragraph-properties> | ||
| 20 | <style:text-properties style:use-window-font-color="true" fo:font-size="12pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/> | ||
| 21 | </style:default-style> | ||
| 22 | <style:default-style style:family="paragraph"> | ||
| 23 | <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/> | ||
| 24 | <style:text-properties style:use-window-font-color="true" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="en" fo:country="GB" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Tahoma" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/> | ||
| 25 | </style:default-style> | ||
| 26 | <style:default-style style:family="table"> | ||
| 27 | <style:table-properties table:border-model="collapsing"/> | ||
| 28 | </style:default-style> | ||
| 29 | <style:default-style style:family="table-row"> | ||
| 30 | <style:table-row-properties fo:keep-together="auto"/> | ||
| 31 | </style:default-style> | ||
| 32 | |||
| 33 | <!-- Outline numbering --> | ||
| 34 | <text:outline-style style:name="OrgOutline"> | ||
| 35 | <text:outline-level-style text:level="1" style:num-suffix=". " style:num-format="1"> | ||
| 36 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 37 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-0.762cm" fo:margin-left="0.762cm"/> | ||
| 38 | </style:list-level-properties> | ||
| 39 | </text:outline-level-style> | ||
| 40 | <text:outline-level-style text:level="2" style:num-suffix=". " style:num-format="1" text:display-levels="2"> | ||
| 41 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 42 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-1.016cm" fo:margin-left="1.016cm"/> | ||
| 43 | </style:list-level-properties> | ||
| 44 | </text:outline-level-style> | ||
| 45 | <text:outline-level-style text:level="3" style:num-suffix=". " style:num-format="1" text:display-levels="3"> | ||
| 46 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 47 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-1.27cm" fo:margin-left="1.27cm"/> | ||
| 48 | </style:list-level-properties> | ||
| 49 | </text:outline-level-style> | ||
| 50 | <text:outline-level-style text:level="4" style:num-suffix=". " style:num-format="1" text:display-levels="4"> | ||
| 51 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 52 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-1.524cm" fo:margin-left="1.524cm"/> | ||
| 53 | </style:list-level-properties> | ||
| 54 | </text:outline-level-style> | ||
| 55 | <text:outline-level-style text:level="5" style:num-suffix=". " style:num-format="1" text:display-levels="5"> | ||
| 56 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 57 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-1.778cm" fo:margin-left="1.778cm"/> | ||
| 58 | </style:list-level-properties> | ||
| 59 | </text:outline-level-style> | ||
| 60 | <text:outline-level-style text:level="6" style:num-suffix=". " style:num-format="1" text:display-levels="6"> | ||
| 61 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 62 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-2.032cm" fo:margin-left="2.032cm"/> | ||
| 63 | </style:list-level-properties> | ||
| 64 | </text:outline-level-style> | ||
| 65 | <text:outline-level-style text:level="7" style:num-suffix=". " style:num-format="1" text:display-levels="7"> | ||
| 66 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 67 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-2.286cm" fo:margin-left="2.286cm"/> | ||
| 68 | </style:list-level-properties> | ||
| 69 | </text:outline-level-style> | ||
| 70 | <text:outline-level-style text:level="8" style:num-suffix=". " style:num-format="1" text:display-levels="8"> | ||
| 71 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 72 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-2.54cm" fo:margin-left="2.54cm"/> | ||
| 73 | </style:list-level-properties> | ||
| 74 | </text:outline-level-style> | ||
| 75 | <text:outline-level-style text:level="9" style:num-suffix=". " style:num-format="1" text:display-levels="9"> | ||
| 76 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 77 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-2.794cm" fo:margin-left="2.794cm"/> | ||
| 78 | </style:list-level-properties> | ||
| 79 | </text:outline-level-style> | ||
| 80 | <text:outline-level-style text:level="10" style:num-suffix=". " style:num-format="1" text:display-levels="10"> | ||
| 81 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 82 | <style:list-level-label-alignment text:label-followed-by="nothing" fo:text-indent="-3.048cm" fo:margin-left="3.048cm"/> | ||
| 83 | </style:list-level-properties> | ||
| 84 | </text:outline-level-style> | ||
| 85 | </text:outline-style> | ||
| 86 | |||
| 87 | <style:style style:name="Standard" style:family="paragraph" style:class="text"/> | ||
| 88 | <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text"> | ||
| 89 | <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/> | ||
| 90 | <style:text-properties style:font-name="Arial" fo:font-size="14pt" style:font-name-asian="SimSun" style:font-size-asian="14pt" style:font-name-complex="Tahoma" style:font-size-complex="14pt"/> | ||
| 91 | </style:style> | ||
| 92 | <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"> | ||
| 93 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/> | ||
| 94 | </style:style> | ||
| 95 | <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"> | ||
| 96 | <style:text-properties style:font-name-complex="Tahoma1"/> | ||
| 97 | </style:style> | ||
| 98 | <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"> | ||
| 99 | <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0"/> | ||
| 100 | <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Tahoma1" style:font-size-complex="12pt" style:font-style-complex="italic"/> | ||
| 101 | </style:style> | ||
| 102 | <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index"> | ||
| 103 | <style:paragraph-properties text:number-lines="false" text:line-number="0"/> | ||
| 104 | <style:text-properties style:font-name-complex="Tahoma1"/> | ||
| 105 | </style:style> | ||
| 106 | <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="1" style:class="text"> | ||
| 107 | <style:text-properties fo:font-size="115%" fo:font-weight="bold" style:font-size-asian="115%" style:font-weight-asian="bold" style:font-size-complex="115%" style:font-weight-complex="bold"/> | ||
| 108 | </style:style> | ||
| 109 | <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="2" style:class="text"> | ||
| 110 | <style:text-properties fo:font-size="14pt" fo:font-style="italic" fo:font-weight="bold" style:font-size-asian="14pt" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-style-complex="italic" style:font-weight-complex="bold"/> | ||
| 111 | </style:style> | ||
| 112 | <style:style style:name="Heading_20_3" style:display-name="Heading 3" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="3" style:class="text"> | ||
| 113 | <style:text-properties fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> | ||
| 114 | </style:style> | ||
| 115 | <style:style style:name="Heading_20_4" style:display-name="Heading 4" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="4" style:class="text"> | ||
| 116 | <style:text-properties fo:font-size="85%" fo:font-style="italic" fo:font-weight="bold" style:font-size-asian="85%" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-size-complex="85%" style:font-style-complex="italic" style:font-weight-complex="bold"/> | ||
| 117 | </style:style> | ||
| 118 | <style:style style:name="Heading_20_5" style:display-name="Heading 5" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="5" style:class="text"> | ||
| 119 | <style:text-properties fo:font-size="85%" fo:font-weight="bold" style:font-size-asian="85%" style:font-weight-asian="bold" style:font-size-complex="85%" style:font-weight-complex="bold"/> | ||
| 120 | </style:style> | ||
| 121 | <style:style style:name="Heading_20_6" style:display-name="Heading 6" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="6" style:class="text"> | ||
| 122 | <style:text-properties fo:font-size="75%" fo:font-weight="bold" style:font-size-asian="75%" style:font-weight-asian="bold" style:font-size-complex="75%" style:font-weight-complex="bold"/> | ||
| 123 | </style:style> | ||
| 124 | <style:style style:name="Heading_20_7" style:display-name="Heading 7" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="7" style:class="text"> | ||
| 125 | <style:text-properties fo:font-size="75%" fo:font-weight="bold" style:font-size-asian="75%" style:font-weight-asian="bold" style:font-size-complex="75%" style:font-weight-complex="bold"/> | ||
| 126 | </style:style> | ||
| 127 | <style:style style:name="Heading_20_8" style:display-name="Heading 8" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="8" style:class="text"> | ||
| 128 | <style:text-properties fo:font-size="75%" fo:font-weight="bold" style:font-size-asian="75%" style:font-weight-asian="bold" style:font-size-complex="75%" style:font-weight-complex="bold"/> | ||
| 129 | </style:style> | ||
| 130 | <style:style style:name="Heading_20_9" style:display-name="Heading 9" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="9" style:class="text"> | ||
| 131 | <style:text-properties fo:font-size="75%" fo:font-weight="bold" style:font-size-asian="75%" style:font-weight-asian="bold" style:font-size-complex="75%" style:font-weight-complex="bold"/> | ||
| 132 | </style:style> | ||
| 133 | <style:style style:name="Heading_20_10" style:display-name="Heading 10" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="10" style:class="text"> | ||
| 134 | <style:text-properties fo:font-size="75%" fo:font-weight="bold" style:font-size-asian="75%" style:font-weight-asian="bold" style:font-size-complex="75%" style:font-weight-complex="bold"/> | ||
| 135 | </style:style> | ||
| 136 | <style:style style:name="Heading_20_1.title" style:display-name="Heading 1.title" style:family="paragraph" style:parent-style-name="Heading_20_1"> | ||
| 137 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 138 | </style:style> | ||
| 139 | <style:style style:name="Title" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Subtitle" style:class="chapter"> | ||
| 140 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 141 | <style:text-properties fo:font-size="18pt" fo:font-weight="bold" style:font-size-asian="18pt" style:font-weight-asian="bold" style:font-size-complex="18pt" style:font-weight-complex="bold"/> | ||
| 142 | </style:style> | ||
| 143 | <style:style style:name="OrgTitle" style:family="paragraph" style:parent-style-name="Title"> | ||
| 144 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm"/> | ||
| 145 | <style:text-properties fo:font-size="24pt"/> | ||
| 146 | </style:style> | ||
| 147 | <style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:class="chapter"> | ||
| 148 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 149 | <style:text-properties fo:font-size="14pt" fo:font-style="italic" style:font-size-asian="14pt" style:font-style-asian="italic" style:font-size-complex="14pt" style:font-style-complex="italic"/> | ||
| 150 | </style:style> | ||
| 151 | <style:style style:name="OrgSubtitle" style:family="paragraph" style:parent-style-name="Subtitle"> | ||
| 152 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm"/> | ||
| 153 | <style:text-properties fo:font-size="20pt"/> | ||
| 154 | </style:style> | ||
| 155 | <style:style style:name="Text_20_body_20_indent" style:display-name="Text body indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text"> | ||
| 156 | <style:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/> | ||
| 157 | </style:style> | ||
| 158 | <style:style style:name="List_20_Indent" style:display-name="List Indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text"> | ||
| 159 | <style:paragraph-properties fo:margin-left="5.001cm" fo:margin-right="0cm" fo:text-indent="-4.5cm" style:auto-text-indent="false"> | ||
| 160 | <style:tab-stops> | ||
| 161 | <style:tab-stop style:position="0cm"/> | ||
| 162 | </style:tab-stops> | ||
| 163 | </style:paragraph-properties> | ||
| 164 | </style:style> | ||
| 165 | <style:style style:name="First_20_line_20_indent" style:display-name="First line indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text"> | ||
| 166 | <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0.499cm" style:auto-text-indent="false"/> | ||
| 167 | </style:style> | ||
| 168 | <style:style style:name="Hanging_20_indent" style:display-name="Hanging indent" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="text"> | ||
| 169 | <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="0cm" fo:text-indent="-0.499cm" style:auto-text-indent="false"> | ||
| 170 | <style:tab-stops> | ||
| 171 | <style:tab-stop style:position="0cm"/> | ||
| 172 | </style:tab-stops> | ||
| 173 | </style:paragraph-properties> | ||
| 174 | </style:style> | ||
| 175 | <style:style style:name="Salutation" style:family="paragraph" style:parent-style-name="Standard" style:class="text"> | ||
| 176 | <style:paragraph-properties text:number-lines="false" text:line-number="0"/> | ||
| 177 | </style:style> | ||
| 178 | <style:style style:name="Contents_20_Heading" style:display-name="Contents Heading" style:family="paragraph" style:parent-style-name="Heading" style:class="index"> | ||
| 179 | <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" text:number-lines="false" text:line-number="0"/> | ||
| 180 | <style:text-properties fo:font-size="16pt" fo:font-weight="bold" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/> | ||
| 181 | </style:style> | ||
| 182 | <style:style style:name="Contents_20_1" style:display-name="Contents 1" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 183 | <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 184 | <style:tab-stops> | ||
| 185 | <style:tab-stop style:position="17cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 186 | </style:tab-stops> | ||
| 187 | </style:paragraph-properties> | ||
| 188 | </style:style> | ||
| 189 | <style:style style:name="Contents_20_2" style:display-name="Contents 2" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 190 | <style:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 191 | <style:tab-stops> | ||
| 192 | <style:tab-stop style:position="16.501cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 193 | </style:tab-stops> | ||
| 194 | </style:paragraph-properties> | ||
| 195 | </style:style> | ||
| 196 | <style:style style:name="Contents_20_3" style:display-name="Contents 3" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 197 | <style:paragraph-properties fo:margin-left="0.998cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 198 | <style:tab-stops> | ||
| 199 | <style:tab-stop style:position="16.002cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 200 | </style:tab-stops> | ||
| 201 | </style:paragraph-properties> | ||
| 202 | </style:style> | ||
| 203 | <style:style style:name="Contents_20_4" style:display-name="Contents 4" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 204 | <style:paragraph-properties fo:margin-left="1.498cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 205 | <style:tab-stops> | ||
| 206 | <style:tab-stop style:position="15.503cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 207 | </style:tab-stops> | ||
| 208 | </style:paragraph-properties> | ||
| 209 | </style:style> | ||
| 210 | <style:style style:name="Contents_20_5" style:display-name="Contents 5" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 211 | <style:paragraph-properties fo:margin-left="1.997cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 212 | <style:tab-stops> | ||
| 213 | <style:tab-stop style:position="15.004cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 214 | </style:tab-stops> | ||
| 215 | </style:paragraph-properties> | ||
| 216 | </style:style> | ||
| 217 | <style:style style:name="Contents_20_6" style:display-name="Contents 6" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 218 | <style:paragraph-properties fo:margin-left="2.496cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 219 | <style:tab-stops> | ||
| 220 | <style:tab-stop style:position="14.504cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 221 | </style:tab-stops> | ||
| 222 | </style:paragraph-properties> | ||
| 223 | </style:style> | ||
| 224 | <style:style style:name="Contents_20_7" style:display-name="Contents 7" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 225 | <style:paragraph-properties fo:margin-left="2.995cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 226 | <style:tab-stops> | ||
| 227 | <style:tab-stop style:position="14.005cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 228 | </style:tab-stops> | ||
| 229 | </style:paragraph-properties> | ||
| 230 | </style:style> | ||
| 231 | <style:style style:name="Contents_20_8" style:display-name="Contents 8" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 232 | <style:paragraph-properties fo:margin-left="3.494cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 233 | <style:tab-stops> | ||
| 234 | <style:tab-stop style:position="13.506cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 235 | </style:tab-stops> | ||
| 236 | </style:paragraph-properties> | ||
| 237 | </style:style> | ||
| 238 | <style:style style:name="Contents_20_9" style:display-name="Contents 9" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 239 | <style:paragraph-properties fo:margin-left="3.993cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 240 | <style:tab-stops> | ||
| 241 | <style:tab-stop style:position="13.007cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 242 | </style:tab-stops> | ||
| 243 | </style:paragraph-properties> | ||
| 244 | </style:style> | ||
| 245 | <style:style style:name="Contents_20_10" style:display-name="Contents 10" style:family="paragraph" style:parent-style-name="Index" style:class="index"> | ||
| 246 | <style:paragraph-properties fo:margin-left="4.493cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"> | ||
| 247 | <style:tab-stops> | ||
| 248 | <style:tab-stop style:position="12.508cm" style:type="right" style:leader-style="dotted" style:leader-text="."/> | ||
| 249 | </style:tab-stops> | ||
| 250 | </style:paragraph-properties> | ||
| 251 | </style:style> | ||
| 252 | <style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard" style:class="html"> | ||
| 253 | <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm" fo:margin-top="0cm" fo:margin-bottom="0.499cm" fo:text-indent="0cm" style:auto-text-indent="false"/> | ||
| 254 | </style:style> | ||
| 255 | <style:style style:name="Preformatted_20_Text" style:display-name="Preformatted Text" style:family="paragraph" style:parent-style-name="Standard" style:class="html"> | ||
| 256 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm"/> | ||
| 257 | <style:text-properties style:font-name="Courier New" fo:font-size="10pt" style:font-name-asian="NSimSun" style:font-size-asian="10pt" style:font-name-complex="Courier New" style:font-size-complex="10pt"/> | ||
| 258 | </style:style> | ||
| 259 | <style:style style:name="OrgVerse" style:family="paragraph" style:parent-style-name="Preformatted_20_Text"> | ||
| 260 | <style:paragraph-properties fo:background-color="#c0c0c0" fo:padding="0.049cm" fo:border="0.018cm solid #000000" style:shadow="none"> | ||
| 261 | <style:background-image/> | ||
| 262 | </style:paragraph-properties> | ||
| 263 | </style:style> | ||
| 264 | |||
| 265 | <style:style style:name="OrgFixedWidthBlock" style:family="paragraph" style:parent-style-name="Preformatted_20_Text"> | ||
| 266 | <style:paragraph-properties fo:background-color="#c0c0c0" fo:padding="0.049cm" fo:border="0.018cm solid #000000" style:shadow="none"> | ||
| 267 | <style:background-image/> | ||
| 268 | </style:paragraph-properties> | ||
| 269 | </style:style> | ||
| 270 | |||
| 271 | <style:style style:name="OrgFixedWidthBlockLastLine" style:family="paragraph" style:parent-style-name="OrgFixedWidthBlock"> | ||
| 272 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.21cm"/> | ||
| 273 | </style:style> | ||
| 274 | |||
| 275 | <style:style style:name="OrgSrcBlockLastLine" style:family="paragraph" style:parent-style-name="OrgSrcBlock"> | ||
| 276 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.21cm"/> | ||
| 277 | </style:style> | ||
| 278 | |||
| 279 | <style:style style:name="OrgCenter" style:family="paragraph" style:parent-style-name="Text_20_body"> | ||
| 280 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 281 | </style:style> | ||
| 282 | <style:style style:name="OrgTableContents" style:family="paragraph" style:parent-style-name="Text_20_body"/> | ||
| 283 | <style:style style:name="OrgTableHeading" style:family="paragraph" style:parent-style-name="OrgTableContents" style:class="extra"> | ||
| 284 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/> | ||
| 285 | <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> | ||
| 286 | </style:style> | ||
| 287 | |||
| 288 | <style:style style:name="OrgTableHeadingLeft" style:family="paragraph" style:parent-style-name="OrgTableHeading"> | ||
| 289 | <style:paragraph-properties fo:text-align="left" style:justify-single-word="false"/> | ||
| 290 | </style:style> | ||
| 291 | <style:style style:name="OrgTableHeadingRight" style:family="paragraph" style:parent-style-name="OrgTableHeading"> | ||
| 292 | <style:paragraph-properties fo:text-align="right" style:justify-single-word="false"/> | ||
| 293 | </style:style> | ||
| 294 | <style:style style:name="OrgTableHeadingCenter" style:family="paragraph" style:parent-style-name="OrgTableHeading"> | ||
| 295 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 296 | </style:style> | ||
| 297 | |||
| 298 | <style:style style:name="OrgTableContentsLeft" style:family="paragraph" style:parent-style-name="OrgTableContents"> | ||
| 299 | <style:paragraph-properties fo:text-align="left" style:justify-single-word="false"/> | ||
| 300 | </style:style> | ||
| 301 | <style:style style:name="OrgTableContentsRight" style:family="paragraph" style:parent-style-name="OrgTableContents"> | ||
| 302 | <style:paragraph-properties fo:text-align="right" style:justify-single-word="false"/> | ||
| 303 | </style:style> | ||
| 304 | <style:style style:name="OrgTableContentsCenter" style:family="paragraph" style:parent-style-name="OrgTableContents"> | ||
| 305 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 306 | </style:style> | ||
| 307 | <style:style style:name="Text_20_body_20_bold" style:display-name="Text body bold" style:family="paragraph" style:parent-style-name="Text_20_body" style:next-style-name="Text_20_body"> | ||
| 308 | <style:text-properties fo:font-weight="bold"/> | ||
| 309 | </style:style> | ||
| 310 | <style:style style:name="Footnote" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"> | ||
| 311 | <style:paragraph-properties fo:margin-left="0.499cm" fo:margin-right="0cm" fo:text-indent="-0.499cm" style:auto-text-indent="false" text:number-lines="false" text:line-number="0"/> | ||
| 312 | <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> | ||
| 313 | </style:style> | ||
| 314 | <style:style style:name="Figure" style:family="paragraph" style:parent-style-name="Caption"/> | ||
| 315 | <style:style style:name="Illustration_20_Index_20_Heading" style:display-name="Illustration Index Heading" style:family="paragraph" style:parent-style-name="Heading" style:class="index"> | ||
| 316 | <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false" text:number-lines="false" text:line-number="0"/> | ||
| 317 | <style:text-properties fo:font-size="16pt" fo:font-weight="bold" style:font-size-asian="16pt" style:font-weight-asian="bold" style:font-size-complex="16pt" style:font-weight-complex="bold"/> | ||
| 318 | </style:style> | ||
| 319 | <style:style style:name="Table" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"> | ||
| 320 | <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/> | ||
| 321 | </style:style> | ||
| 322 | <style:style style:name="Horizontal_20_Line" style:display-name="Horizontal Line" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="html"> | ||
| 323 | <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.499cm" style:border-line-width-bottom="0.002cm 0.035cm 0.002cm" fo:padding="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.039cm double #808080" text:number-lines="false" text:line-number="0" style:join-border="false"/> | ||
| 324 | <style:text-properties fo:font-size="6pt" style:font-size-asian="6pt" style:font-size-complex="6pt"/> | ||
| 325 | </style:style> | ||
| 326 | <style:style style:name="Emphasis" style:family="text"> | ||
| 327 | <style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/> | ||
| 328 | </style:style> | ||
| 329 | <style:style style:name="Underline" style:family="text"> | ||
| 330 | <style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:background-color="transparent"/> | ||
| 331 | </style:style> | ||
| 332 | <style:style style:name="Strikethrough" style:family="text"> | ||
| 333 | <style:text-properties style:text-line-through-style="solid"/> | ||
| 334 | </style:style> | ||
| 335 | <style:style style:name="Source_20_Text" style:display-name="Source Text" style:family="text"> | ||
| 336 | <style:text-properties style:font-name="Courier New" fo:background-color="transparent" style:font-name-asian="NSimSun" style:font-name-complex="Courier New"/> | ||
| 337 | </style:style> | ||
| 338 | <style:style style:name="Citation" style:family="text"> | ||
| 339 | <style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/> | ||
| 340 | </style:style> | ||
| 341 | <style:style style:name="Example" style:family="text"> | ||
| 342 | <style:text-properties style:font-name="Courier New" fo:background-color="transparent" style:font-name-asian="NSimSun" style:font-name-complex="Courier New"/> | ||
| 343 | </style:style> | ||
| 344 | <style:style style:name="OrgCode" style:family="text" style:parent-style-name="Source_20_Text"/> | ||
| 345 | |||
| 346 | <!-- BEGIN: Org Agenda Styles --> | ||
| 347 | <style:style style:name="OrgTodo" style:family="text"> | ||
| 348 | <style:text-properties fo:color="#ff0000"/> | ||
| 349 | </style:style> | ||
| 350 | <style:style style:name="OrgDone" style:family="text"> | ||
| 351 | <style:text-properties fo:color="#008000"/> | ||
| 352 | </style:style> | ||
| 353 | <style:style style:name="OrgTag" style:family="text"> | ||
| 354 | <style:text-properties fo:background-color="#add8e6"/> | ||
| 355 | </style:style> | ||
| 356 | <style:style style:name="OrgTimestamp" style:family="text"> | ||
| 357 | <style:text-properties fo:color="#bebebe"/> | ||
| 358 | </style:style> | ||
| 359 | <style:style style:name="OrgTimestampKeyword" style:family="text"> | ||
| 360 | <style:text-properties fo:color="#5f9ea0"/> | ||
| 361 | </style:style> | ||
| 362 | <style:style style:name="OrgTimestampWrapper" style:family="text"/> | ||
| 363 | <style:style style:name="OrgTarget" style:family="text"/> | ||
| 364 | <!-- END: Org Agenda Styles --> | ||
| 365 | |||
| 366 | <style:style style:name="Bold" style:family="text"> | ||
| 367 | <style:text-properties fo:font-weight="bold"/> | ||
| 368 | </style:style> | ||
| 369 | <style:style style:name="Numbering_20_Symbols" style:display-name="Numbering Symbols" style:family="text"/> | ||
| 370 | <style:style style:name="Footnote_20_Symbol" style:display-name="Footnote Symbol" style:family="text"/> | ||
| 371 | <style:style style:name="Footnote_20_anchor" style:display-name="Footnote anchor" style:family="text"> | ||
| 372 | <style:text-properties style:text-position="super 58%"/> | ||
| 373 | </style:style> | ||
| 374 | <style:style style:name="OrgSuperscript" style:family="text"> | ||
| 375 | <style:text-properties style:text-position="super 58%"/> | ||
| 376 | </style:style> | ||
| 377 | <style:style style:name="OrgSubscript" style:family="text"> | ||
| 378 | <style:text-properties style:text-position="sub 58%"/> | ||
| 379 | </style:style> | ||
| 380 | <style:style style:name="Internet_20_link" style:display-name="Internet link" style:family="text"> | ||
| 381 | <style:text-properties fo:color="#000080" fo:language="zxx" fo:country="none" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" style:language-asian="zxx" style:country-asian="none" style:language-complex="zxx" style:country-complex="none"/> | ||
| 382 | </style:style> | ||
| 383 | <style:style style:name="Graphics" style:family="graphic"> | ||
| 384 | <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/> | ||
| 385 | </style:style> | ||
| 386 | <style:style style:name="Frame" style:family="graphic"> | ||
| 387 | <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm" svg:y="0cm" fo:margin-left="0.201cm" fo:margin-right="0.201cm" fo:margin-top="0.201cm" fo:margin-bottom="0.201cm" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:padding="0.15cm" fo:border="0.002cm solid #000000"/> | ||
| 388 | </style:style> | ||
| 389 | |||
| 390 | <!-- Simple Images --> | ||
| 391 | <style:style style:name="OrgDisplayImage" style:family="graphic" style:parent-style-name="Graphics"> | ||
| 392 | <style:graphic-properties text:anchor-type="paragraph" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph"/> | ||
| 393 | </style:style> | ||
| 394 | |||
| 395 | <style:style style:name="OrgPageImage" style:family="graphic" style:parent-style-name="Graphics"> | ||
| 396 | <style:graphic-properties text:anchor-type="page" fo:margin-top="0.21cm" fo:margin-bottom="0.21cm" style:vertical-pos="middle" style:vertical-rel="page" style:horizontal-pos="center" style:horizontal-rel="page" fo:background-color="transparent" style:background-transparency="100%" style:shadow="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"> | ||
| 397 | <style:background-image/> | ||
| 398 | </style:graphic-properties> | ||
| 399 | </style:style> | ||
| 400 | |||
| 401 | <!-- Captioned Images --> | ||
| 402 | <style:style style:name="OrgCaptionedImage" style:family="graphic" style:parent-style-name="Graphics"> | ||
| 403 | <style:graphic-properties style:rel-width="100%" text:anchor-type="paragraph" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="foreground" style:wrap="none" style:vertical-pos="from-top" style:vertical-rel="paragraph-content" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" fo:padding="0cm" fo:border="none" style:shadow="none"/> | ||
| 404 | </style:style> | ||
| 405 | |||
| 406 | <style:style style:name="OrgImageCaptionFrame" style:family="graphic" style:parent-style-name="Frame"> | ||
| 407 | <style:graphic-properties text:anchor-type="paragraph" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="center" style:horizontal-rel="paragraph" fo:padding="0cm" fo:border="none"/> | ||
| 408 | </style:style> | ||
| 409 | |||
| 410 | <style:style style:name="OrgPageImageCaptionFrame" style:family="graphic" style:parent-style-name="Frame"> | ||
| 411 | <style:graphic-properties text:anchor-type="paragraph" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.21cm" fo:margin-bottom="0.21cm" style:wrap="none" style:vertical-pos="middle" style:vertical-rel="page" style:horizontal-pos="center" style:horizontal-rel="page" fo:background-color="transparent" style:background-transparency="100%" fo:padding="0cm" fo:border="none" style:shadow="none"> | ||
| 412 | <style:background-image/> | ||
| 413 | </style:graphic-properties> | ||
| 414 | </style:style> | ||
| 415 | |||
| 416 | <!-- Inlined Images --> | ||
| 417 | <style:style style:name="OrgInlineImage" style:family="graphic" style:parent-style-name="Graphics"> | ||
| 418 | <style:graphic-properties text:anchor-type="as-char" style:vertical-pos="top" style:vertical-rel="baseline" style:horizontal-pos="center" style:horizontal-rel="paragraph"/> | ||
| 419 | </style:style> | ||
| 420 | |||
| 421 | <!-- Inline Formula --> | ||
| 422 | <style:style style:name="OrgFormula" style:family="graphic"> | ||
| 423 | <style:graphic-properties text:anchor-type="as-char" svg:y="0cm" fo:margin-left="0.201cm" fo:margin-right="0.201cm" style:vertical-pos="middle" style:vertical-rel="text" style:shadow="none"/> | ||
| 424 | </style:style> | ||
| 425 | |||
| 426 | <style:style style:name="OrgInlineFormula" style:family="graphic" style:parent-style-name="Formula"> | ||
| 427 | <style:graphic-properties text:anchor-type="as-char" fo:margin-left="0.201cm" fo:margin-right="0.201cm" style:vertical-pos="middle" style:vertical-rel="text"/> | ||
| 428 | </style:style> | ||
| 429 | |||
| 430 | <style:style style:name="OrgInlineFormula" style:family="graphic" style:parent-style-name="Formula"> | ||
| 431 | <style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" draw:ole-draw-aspect="1"/> | ||
| 432 | </style:style> | ||
| 433 | |||
| 434 | <style:style style:name="OrgDisplayFormula" style:family="graphic" style:parent-style-name="OrgFormula"> | ||
| 435 | <style:graphic-properties style:vertical-pos="middle" style:vertical-rel="text" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" draw:ole-draw-aspect="1"/> | ||
| 436 | </style:style> | ||
| 437 | |||
| 438 | <style:style style:name="OrgFormulaCaptionFrame" style:family="graphic" style:parent-style-name="Frame"> | ||
| 439 | <style:graphic-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:vertical-pos="middle" style:vertical-rel="text" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" fo:padding="0cm" fo:border="none"/> | ||
| 440 | </style:style> | ||
| 441 | |||
| 442 | <style:style style:name="OrgCaptionedFormula" style:family="graphic" style:parent-style-name="OrgFormula"> | ||
| 443 | <style:graphic-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="foreground" style:wrap="none" style:vertical-pos="from-top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:padding="0cm" fo:border="none" style:shadow="none" draw:ole-draw-aspect="1"/> | ||
| 444 | </style:style> | ||
| 445 | |||
| 446 | <!-- Inline Tasks --> | ||
| 447 | <style:style style:name="OrgInlineTaskHeading" style:family="paragraph" style:parent-style-name="Caption" style:next-style-name="Text_20_body"> | ||
| 448 | <style:text-properties style:font-name="Arial1" fo:font-style="normal" fo:font-weight="bold"/> | ||
| 449 | </style:style> | ||
| 450 | <style:style style:name="OrgInlineTaskFrame" style:family="graphic" style:parent-style-name="Frame"> | ||
| 451 | <style:graphic-properties svg:x="0cm" svg:y="0cm" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph-content" style:horizontal-pos="center" style:horizontal-rel="paragraph-content" fo:background-color="#ffffcc" style:background-transparency="0%" fo:padding="0.15cm" fo:border="0.26pt solid #000000" style:shadow="none"> | ||
| 452 | <style:background-image/> | ||
| 453 | </style:graphic-properties> | ||
| 454 | </style:style> | ||
| 455 | |||
| 456 | <text:list-style style:name="Numbering_20_1" style:display-name="Numbering 1"> | ||
| 457 | <text:list-level-style-number text:level="1" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 458 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 459 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.499cm" fo:text-indent="-0.499cm" fo:margin-left="0.499cm"/> | ||
| 460 | </style:list-level-properties> | ||
| 461 | </text:list-level-style-number> | ||
| 462 | <text:list-level-style-number text:level="2" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 463 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 464 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1cm" fo:text-indent="-0.499cm" fo:margin-left="1cm"/> | ||
| 465 | </style:list-level-properties> | ||
| 466 | </text:list-level-style-number> | ||
| 467 | <text:list-level-style-number text:level="3" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 468 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 469 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.499cm" fo:text-indent="-0.499cm" fo:margin-left="1.499cm"/> | ||
| 470 | </style:list-level-properties> | ||
| 471 | </text:list-level-style-number> | ||
| 472 | <text:list-level-style-number text:level="4" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 473 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 474 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2cm" fo:text-indent="-0.499cm" fo:margin-left="2cm"/> | ||
| 475 | </style:list-level-properties> | ||
| 476 | </text:list-level-style-number> | ||
| 477 | <text:list-level-style-number text:level="5" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 478 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 479 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.499cm" fo:text-indent="-0.499cm" fo:margin-left="2.499cm"/> | ||
| 480 | </style:list-level-properties> | ||
| 481 | </text:list-level-style-number> | ||
| 482 | <text:list-level-style-number text:level="6" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 483 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 484 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3cm" fo:text-indent="-0.499cm" fo:margin-left="3cm"/> | ||
| 485 | </style:list-level-properties> | ||
| 486 | </text:list-level-style-number> | ||
| 487 | <text:list-level-style-number text:level="7" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 488 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 489 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.5cm" fo:text-indent="-0.499cm" fo:margin-left="3.5cm"/> | ||
| 490 | </style:list-level-properties> | ||
| 491 | </text:list-level-style-number> | ||
| 492 | <text:list-level-style-number text:level="8" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 493 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 494 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="4.001cm" fo:text-indent="-0.499cm" fo:margin-left="4.001cm"/> | ||
| 495 | </style:list-level-properties> | ||
| 496 | </text:list-level-style-number> | ||
| 497 | <text:list-level-style-number text:level="9" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 498 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 499 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="4.5cm" fo:text-indent="-0.499cm" fo:margin-left="4.5cm"/> | ||
| 500 | </style:list-level-properties> | ||
| 501 | </text:list-level-style-number> | ||
| 502 | <text:list-level-style-number text:level="10" text:style-name="Numbering_20_Symbols" style:num-suffix="." style:num-format="1"> | ||
| 503 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 504 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="5.001cm" fo:text-indent="-0.499cm" fo:margin-left="5.001cm"/> | ||
| 505 | </style:list-level-properties> | ||
| 506 | </text:list-level-style-number> | ||
| 507 | </text:list-style> | ||
| 508 | <text:list-style style:name="List_20_1" style:display-name="List 1"> | ||
| 509 | <text:list-level-style-bullet text:level="1" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 510 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 511 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.4cm" fo:text-indent="-0.4cm" fo:margin-left="0.4cm"/> | ||
| 512 | </style:list-level-properties> | ||
| 513 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 514 | </text:list-level-style-bullet> | ||
| 515 | <text:list-level-style-bullet text:level="2" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 516 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 517 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.801cm" fo:text-indent="-0.4cm" fo:margin-left="0.801cm"/> | ||
| 518 | </style:list-level-properties> | ||
| 519 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 520 | </text:list-level-style-bullet> | ||
| 521 | <text:list-level-style-bullet text:level="3" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 522 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 523 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.199cm" fo:text-indent="-0.4cm" fo:margin-left="1.199cm"/> | ||
| 524 | </style:list-level-properties> | ||
| 525 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 526 | </text:list-level-style-bullet> | ||
| 527 | <text:list-level-style-bullet text:level="4" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 528 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 529 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.6cm" fo:text-indent="-0.4cm" fo:margin-left="1.6cm"/> | ||
| 530 | </style:list-level-properties> | ||
| 531 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 532 | </text:list-level-style-bullet> | ||
| 533 | <text:list-level-style-bullet text:level="5" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 534 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 535 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2cm" fo:text-indent="-0.4cm" fo:margin-left="2cm"/> | ||
| 536 | </style:list-level-properties> | ||
| 537 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 538 | </text:list-level-style-bullet> | ||
| 539 | <text:list-level-style-bullet text:level="6" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 540 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 541 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.401cm" fo:text-indent="-0.4cm" fo:margin-left="2.401cm"/> | ||
| 542 | </style:list-level-properties> | ||
| 543 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 544 | </text:list-level-style-bullet> | ||
| 545 | <text:list-level-style-bullet text:level="7" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 546 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 547 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.799cm" fo:text-indent="-0.4cm" fo:margin-left="2.799cm"/> | ||
| 548 | </style:list-level-properties> | ||
| 549 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 550 | </text:list-level-style-bullet> | ||
| 551 | <text:list-level-style-bullet text:level="8" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 552 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 553 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.2cm" fo:text-indent="-0.4cm" fo:margin-left="3.2cm"/> | ||
| 554 | </style:list-level-properties> | ||
| 555 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 556 | </text:list-level-style-bullet> | ||
| 557 | <text:list-level-style-bullet text:level="9" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 558 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 559 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.6cm" fo:text-indent="-0.4cm" fo:margin-left="3.6cm"/> | ||
| 560 | </style:list-level-properties> | ||
| 561 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 562 | </text:list-level-style-bullet> | ||
| 563 | <text:list-level-style-bullet text:level="10" text:style-name="Numbering_20_Symbols" text:bullet-char="鈥"> | ||
| 564 | <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> | ||
| 565 | <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="4.001cm" fo:text-indent="-0.4cm" fo:margin-left="4.001cm"/> | ||
| 566 | </style:list-level-properties> | ||
| 567 | <style:text-properties style:font-name="OpenSymbol"/> | ||
| 568 | </text:list-level-style-bullet> | ||
| 569 | </text:list-style> | ||
| 570 | |||
| 571 | <!-- Numbered List --> | ||
| 572 | <text:list-style style:name="OrgNumberedList"> | ||
| 573 | <text:list-level-style-number text:level="1" style:num-suffix="." style:num-format="1"> | ||
| 574 | <style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm"/> | ||
| 575 | </text:list-level-style-number> | ||
| 576 | <text:list-level-style-number text:level="2" style:num-suffix="." style:num-format="1"> | ||
| 577 | <style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm"/> | ||
| 578 | </text:list-level-style-number> | ||
| 579 | <text:list-level-style-number text:level="3" style:num-suffix="." style:num-format="1"> | ||
| 580 | <style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm"/> | ||
| 581 | </text:list-level-style-number> | ||
| 582 | <text:list-level-style-number text:level="4" style:num-suffix="." style:num-format="1"> | ||
| 583 | <style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm"/> | ||
| 584 | </text:list-level-style-number> | ||
| 585 | <text:list-level-style-number text:level="5" style:num-suffix="." style:num-format="1"> | ||
| 586 | <style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm"/> | ||
| 587 | </text:list-level-style-number> | ||
| 588 | <text:list-level-style-number text:level="6" style:num-suffix="." style:num-format="1"> | ||
| 589 | <style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm"/> | ||
| 590 | </text:list-level-style-number> | ||
| 591 | <text:list-level-style-number text:level="7" style:num-suffix="." style:num-format="1"> | ||
| 592 | <style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm"/> | ||
| 593 | </text:list-level-style-number> | ||
| 594 | <text:list-level-style-number text:level="8" style:num-suffix="." style:num-format="1"> | ||
| 595 | <style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm"/> | ||
| 596 | </text:list-level-style-number> | ||
| 597 | <text:list-level-style-number text:level="9" style:num-suffix="." style:num-format="1"> | ||
| 598 | <style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm"/> | ||
| 599 | </text:list-level-style-number> | ||
| 600 | <text:list-level-style-number text:level="10" style:num-suffix="." style:num-format="1"> | ||
| 601 | <style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm"/> | ||
| 602 | </text:list-level-style-number> | ||
| 603 | </text:list-style> | ||
| 604 | |||
| 605 | <!-- Bulleted List --> | ||
| 606 | <text:list-style style:name="OrgBulletedList"> | ||
| 607 | <text:list-level-style-bullet text:level="1" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 608 | <style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm"/> | ||
| 609 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 610 | </text:list-level-style-bullet> | ||
| 611 | <text:list-level-style-bullet text:level="2" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 612 | <style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm"/> | ||
| 613 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 614 | </text:list-level-style-bullet> | ||
| 615 | <text:list-level-style-bullet text:level="3" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 616 | <style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm"/> | ||
| 617 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 618 | </text:list-level-style-bullet> | ||
| 619 | <text:list-level-style-bullet text:level="4" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 620 | <style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm"/> | ||
| 621 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 622 | </text:list-level-style-bullet> | ||
| 623 | <text:list-level-style-bullet text:level="5" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 624 | <style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm"/> | ||
| 625 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 626 | </text:list-level-style-bullet> | ||
| 627 | <text:list-level-style-bullet text:level="6" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 628 | <style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm"/> | ||
| 629 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 630 | </text:list-level-style-bullet> | ||
| 631 | <text:list-level-style-bullet text:level="7" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 632 | <style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm"/> | ||
| 633 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 634 | </text:list-level-style-bullet> | ||
| 635 | <text:list-level-style-bullet text:level="8" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 636 | <style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm"/> | ||
| 637 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 638 | </text:list-level-style-bullet> | ||
| 639 | <text:list-level-style-bullet text:level="9" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 640 | <style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm"/> | ||
| 641 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 642 | </text:list-level-style-bullet> | ||
| 643 | <text:list-level-style-bullet text:level="10" text:style-name="Bullet_20_Symbols" style:num-suffix="." text:bullet-char="鈥"> | ||
| 644 | <style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm"/> | ||
| 645 | <style:text-properties fo:font-family="StarSymbol" style:font-charset="x-symbol"/> | ||
| 646 | </text:list-level-style-bullet> | ||
| 647 | </text:list-style> | ||
| 648 | |||
| 649 | <!-- Description List --> | ||
| 650 | <text:list-style style:name="OrgDescriptionList"> | ||
| 651 | <text:list-level-style-number text:level="1" style:num-format=""> | ||
| 652 | <style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm"/> | ||
| 653 | </text:list-level-style-number> | ||
| 654 | <text:list-level-style-number text:level="2" style:num-format=""> | ||
| 655 | <style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm"/> | ||
| 656 | </text:list-level-style-number> | ||
| 657 | <text:list-level-style-number text:level="3" style:num-format=""> | ||
| 658 | <style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm"/> | ||
| 659 | </text:list-level-style-number> | ||
| 660 | <text:list-level-style-number text:level="4" style:num-format=""> | ||
| 661 | <style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm"/> | ||
| 662 | </text:list-level-style-number> | ||
| 663 | <text:list-level-style-number text:level="5" style:num-format=""> | ||
| 664 | <style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm"/> | ||
| 665 | </text:list-level-style-number> | ||
| 666 | <text:list-level-style-number text:level="6" style:num-format=""> | ||
| 667 | <style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm"/> | ||
| 668 | </text:list-level-style-number> | ||
| 669 | <text:list-level-style-number text:level="7" style:num-format=""> | ||
| 670 | <style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm"/> | ||
| 671 | </text:list-level-style-number> | ||
| 672 | <text:list-level-style-number text:level="8" style:num-format=""> | ||
| 673 | <style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm"/> | ||
| 674 | </text:list-level-style-number> | ||
| 675 | <text:list-level-style-number text:level="9" style:num-format=""> | ||
| 676 | <style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm"/> | ||
| 677 | </text:list-level-style-number> | ||
| 678 | <text:list-level-style-number text:level="10" style:num-format=""> | ||
| 679 | <style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm"/> | ||
| 680 | </text:list-level-style-number> | ||
| 681 | </text:list-style> | ||
| 682 | |||
| 683 | <text:list-style style:name="OrgSrcBlockNumberedLine"> | ||
| 684 | <text:list-level-style-number text:level="1" style:num-format="1"> | ||
| 685 | <style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 686 | </text:list-level-style-number> | ||
| 687 | <text:list-level-style-number text:level="2" style:num-format="1"> | ||
| 688 | <style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 689 | </text:list-level-style-number> | ||
| 690 | <text:list-level-style-number text:level="3" style:num-format="1"> | ||
| 691 | <style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 692 | </text:list-level-style-number> | ||
| 693 | <text:list-level-style-number text:level="4" style:num-format="1"> | ||
| 694 | <style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 695 | </text:list-level-style-number> | ||
| 696 | <text:list-level-style-number text:level="5" style:num-format="1"> | ||
| 697 | <style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 698 | </text:list-level-style-number> | ||
| 699 | <text:list-level-style-number text:level="6" style:num-format="1"> | ||
| 700 | <style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 701 | </text:list-level-style-number> | ||
| 702 | <text:list-level-style-number text:level="7" style:num-format="1"> | ||
| 703 | <style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 704 | </text:list-level-style-number> | ||
| 705 | <text:list-level-style-number text:level="8" style:num-format="1"> | ||
| 706 | <style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 707 | </text:list-level-style-number> | ||
| 708 | <text:list-level-style-number text:level="9" style:num-format="1"> | ||
| 709 | <style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 710 | </text:list-level-style-number> | ||
| 711 | <text:list-level-style-number text:level="10" style:num-format="1"> | ||
| 712 | <style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm" text:min-label-distance="0.101cm" fo:text-align="end"/> | ||
| 713 | </text:list-level-style-number> | ||
| 714 | </text:list-style> | ||
| 715 | |||
| 716 | <text:notes-configuration text:note-class="footnote" text:citation-style-name="Footnote_20_Symbol" text:citation-body-style-name="Footnote_20_anchor" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/> | ||
| 717 | <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/> | ||
| 718 | <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/> | ||
| 719 | </office:styles> | ||
| 720 | <office:automatic-styles> | ||
| 721 | <style:page-layout style:name="Mpm1"> | ||
| 722 | <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm"> | ||
| 723 | <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:adjustment="left" style:rel-width="25%" style:color="#000000"/> | ||
| 724 | </style:page-layout-properties> | ||
| 725 | <style:header-style/> | ||
| 726 | <style:footer-style/> | ||
| 727 | </style:page-layout> | ||
| 728 | </office:automatic-styles> | ||
| 729 | <office:master-styles> | ||
| 730 | <style:master-page style:name="Standard" style:page-layout-name="Mpm1"/> | ||
| 731 | </office:master-styles> | ||
| 732 | </office:document-styles> | ||
diff --git a/etc/org/README b/etc/org/README new file mode 100644 index 00000000000..206f3a26b52 --- /dev/null +++ b/etc/org/README | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the | ||
| 2 | following copyright information: | ||
| 3 | |||
| 4 | Copyright (C) 2010-2012 Free Software Foundation, Inc. | ||
| 5 | |||
| 6 | These files are part of GNU Emacs. | ||
| 7 | |||
| 8 | GNU Emacs is free software: you can redistribute it and/or modify | ||
| 9 | it under the terms of the GNU General Public License as published by | ||
| 10 | the Free Software Foundation, either version 3 of the License, or | ||
| 11 | (at your option) any later version. | ||
| 12 | |||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | ||
| 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | GNU General Public License for more details. | ||
| 17 | |||
| 18 | You should have received a copy of the GNU General Public License | ||
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | |||
| 21 | |||
| 22 | Author: Jambunathan K <kjambunathan at gmail dot com> | ||
| 23 | Keywords: outlines, hypermedia, calendar, wp | ||
| 24 | Homepage: http://orgmode.org | ||
| 25 | |||
| 26 | Commentary: | ||
| 27 | |||
| 28 | These files are part of Org-mode's OpenDocument export module. | ||
| 29 | |||
| 30 | OrgOdtContentTemplate.xml provides a template within which the content | ||
| 31 | of an exported document is enclosed. This file contributes to | ||
| 32 | "content.xml" file within an exported document and acts as a | ||
| 33 | repository of automatic styles. | ||
| 34 | |||
| 35 | OrgOdtStyles.xml contributes to "styles.xml" file within an exported | ||
| 36 | document and acts as a repository of custom styles. | ||
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps index ed48807b068..59bdd2c5eba 100644 --- a/etc/ps-prin0.ps +++ b/etc/ps-prin0.ps | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | % === BEGIN ps-print prologue 0 | 1 | % === BEGIN ps-print prologue 0 |
| 2 | % version: 6.0 | 2 | % version: 6.0 |
| 3 | 3 | ||
| 4 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 4 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % This file is part of GNU Emacs. | 6 | % This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps index dbb0db846bf..85130e7cadb 100644 --- a/etc/ps-prin1.ps +++ b/etc/ps-prin1.ps | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | % === BEGIN ps-print prologue 1 | 1 | % === BEGIN ps-print prologue 1 |
| 2 | % version: 6.1 | 2 | % version: 6.1 |
| 3 | 3 | ||
| 4 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 4 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % This file is part of GNU Emacs. | 6 | % This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile index 115b0ca084a..64e2d8638f8 100644 --- a/etc/refcards/Makefile +++ b/etc/refcards/Makefile | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### Makefile for Emacs refcards | 1 | ### Makefile for Emacs refcards |
| 2 | 2 | ||
| 3 | ## Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc. | 3 | ## Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | # | 6 | # |
diff --git a/etc/refcards/README b/etc/refcards/README index fa5ae9258eb..a1fa2f063b5 100644 --- a/etc/refcards/README +++ b/etc/refcards/README | |||
| @@ -12,5 +12,5 @@ it is reproduced here for convenience. | |||
| 12 | 12 | ||
| 13 | File: gnus-logo.eps, gnus-logo.pdf | 13 | File: gnus-logo.eps, gnus-logo.pdf |
| 14 | Author: Luis Fernandes <elf@ee.ryerson.ca> | 14 | Author: Luis Fernandes <elf@ee.ryerson.ca> |
| 15 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 15 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 16 | License: GNU General Public License version 3 or later (see COPYING) | 16 | License: GNU General Public License version 3 or later (see COPYING) |
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index f60be117ad5..fd3d45b8da4 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | % Typical command to format: tex calccard.tex | 20 | % Typical command to format: tex calccard.tex |
| 21 | % Typical command to print (3 cols): dvips -t landscape calccard.dvi | 21 | % Typical command to print (3 cols): dvips -t landscape calccard.dvi |
| 22 | 22 | ||
| 23 | % Copyright (C) 1987, 1992, 2001-2011 Free Software Foundation, Inc. | 23 | % Copyright (C) 1987, 1992, 2001-2012 Free Software Foundation, Inc. |
| 24 | 24 | ||
| 25 | % This file is part of GNU Emacs. | 25 | % This file is part of GNU Emacs. |
| 26 | 26 | ||
| @@ -63,8 +63,8 @@ | |||
| 63 | % UUCP: mit-erl!gildea | 63 | % UUCP: mit-erl!gildea |
| 64 | % Internet: gildea@stop.mail-abuse.org | 64 | % Internet: gildea@stop.mail-abuse.org |
| 65 | 65 | ||
| 66 | \def\emacsversionnumber{23} | 66 | \def\emacsversionnumber{24} |
| 67 | \def\year{2011} % latest copyright year | 67 | \def\year{2012} % latest copyright year |
| 68 | 68 | ||
| 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill | 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill |
| 70 | \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. | 70 | \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. |
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index 63239b55c10..ee7acaf416d 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for Dired | 1 | % Reference Card for Dired |
| 2 | 2 | ||
| 3 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> | 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> |
| 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 | 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 |
| @@ -41,8 +41,8 @@ | |||
| 41 | \input pdflayout.sty | 41 | \input pdflayout.sty |
| 42 | \pdflayout=(0) | 42 | \pdflayout=(0) |
| 43 | 43 | ||
| 44 | \def\versionemacs{23} % version of Emacs this is for | 44 | \def\versionemacs{24} % version of Emacs this is for |
| 45 | \def\year{2011} % latest copyright year | 45 | \def\year{2012} % latest copyright year |
| 46 | 46 | ||
| 47 | % Nothing else needs to be changed. | 47 | % Nothing else needs to be changed. |
| 48 | 48 | ||
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 8b9456b4a63..d17e5c6ddeb 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for GNU Emacs | 1 | % Reference Card for GNU Emacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2011 | 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2012 |
| 4 | % Free Software Foundation, Inc. | 4 | % Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| @@ -59,8 +59,8 @@ | |||
| 59 | \input pdflayout.sty | 59 | \input pdflayout.sty |
| 60 | \pdflayout=(0) | 60 | \pdflayout=(0) |
| 61 | 61 | ||
| 62 | \def\versionemacs{23} % version of Emacs this is for | 62 | \def\versionemacs{24} % version of Emacs this is for |
| 63 | \def\year{2011} % latest copyright year | 63 | \def\year{2012} % latest copyright year |
| 64 | 64 | ||
| 65 | % Nothing else needs to be changed. | 65 | % Nothing else needs to be changed. |
| 66 | 66 | ||
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index d20d6a08364..5aa111c0297 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Title: GNU Emacs Survival Card | 1 | % Title: GNU Emacs Survival Card |
| 2 | 2 | ||
| 3 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> | 5 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> |
| 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 | 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 |
| @@ -54,8 +54,8 @@ | |||
| 54 | % Czech hyphenation rules applied | 54 | % Czech hyphenation rules applied |
| 55 | \chyph | 55 | \chyph |
| 56 | 56 | ||
| 57 | \def\versionemacs{23} % version of Emacs this is for | 57 | \def\versionemacs{24} % version of Emacs this is for |
| 58 | \def\year{2011} % latest copyright year | 58 | \def\year{2012} % latest copyright year |
| 59 | 59 | ||
| 60 | \def\copyrightnotice{\penalty-1\vfill | 60 | \def\copyrightnotice{\penalty-1\vfill |
| 61 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 61 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter |
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 58527be9d76..ca3141b8390 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for GNU Emacs | 1 | % Reference Card for GNU Emacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 1993, 1996, 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 1987, 1993, 1996, 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 5 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| 6 | % German translation: Sven Joachim <svenjoac@gmx.de> | 6 | % German translation: Sven Joachim <svenjoac@gmx.de> |
| @@ -60,8 +60,8 @@ | |||
| 60 | \input german.sty | 60 | \input german.sty |
| 61 | \mdqoff % deactivates the "-char | 61 | \mdqoff % deactivates the "-char |
| 62 | 62 | ||
| 63 | \def\versionemacs{23} % version of Emacs this is for | 63 | \def\versionemacs{24} % version of Emacs this is for |
| 64 | \def\year{2011} % latest copyright year | 64 | \def\year{2012} % latest copyright year |
| 65 | 65 | ||
| 66 | % Nothing else needs to be changed below this line. | 66 | % Nothing else needs to be changed below this line. |
| 67 | 67 | ||
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index f1fd6808cde..9ccf57682ff 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for Dired | 1 | % Reference Card for Dired |
| 2 | 2 | ||
| 3 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> | 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> |
| 6 | 6 | ||
| @@ -43,8 +43,8 @@ | |||
| 43 | \input pdflayout.sty | 43 | \input pdflayout.sty |
| 44 | \pdflayout=(1) | 44 | \pdflayout=(1) |
| 45 | 45 | ||
| 46 | \def\versionemacs{23} % version of Emacs this is for | 46 | \def\versionemacs{24} % version of Emacs this is for |
| 47 | \def\year{2011} % latest copyright year | 47 | \def\year{2012} % latest copyright year |
| 48 | 48 | ||
| 49 | % Nothing else needs to be changed. | 49 | % Nothing else needs to be changed. |
| 50 | 50 | ||
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index 01afe76ff30..2819bbaa25b 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for Dired | 1 | % Reference Card for Dired |
| 2 | 2 | ||
| 3 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> | 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> |
| 6 | % French translation: Eric Jacoboni | 6 | % French translation: Eric Jacoboni |
| @@ -35,8 +35,8 @@ | |||
| 35 | \input pdflayout.sty | 35 | \input pdflayout.sty |
| 36 | \pdflayout=(0) | 36 | \pdflayout=(0) |
| 37 | 37 | ||
| 38 | \def\versionemacs{23} % version of Emacs this is for | 38 | \def\versionemacs{24} % version of Emacs this is for |
| 39 | \def\year{2011} % latest copyright year | 39 | \def\year{2012} % latest copyright year |
| 40 | 40 | ||
| 41 | % Nothing else needs to be changed. | 41 | % Nothing else needs to be changed. |
| 42 | 42 | ||
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index 61caccbea8e..ed82f00a85d 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for GNU Emacs | 1 | % Reference Card for GNU Emacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2011 | 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2012 |
| 4 | % Free Software Foundation, Inc. | 4 | % Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| @@ -56,8 +56,8 @@ | |||
| 56 | \input pdflayout.sty | 56 | \input pdflayout.sty |
| 57 | \pdflayout=(0l) | 57 | \pdflayout=(0l) |
| 58 | 58 | ||
| 59 | \def\versionemacs{23} % version of Emacs this is for | 59 | \def\versionemacs{24} % version of Emacs this is for |
| 60 | \def\year{2011} % latest copyright year | 60 | \def\year{2012} % latest copyright year |
| 61 | 61 | ||
| 62 | % Nothing else needs to be changed below this line. | 62 | % Nothing else needs to be changed below this line. |
| 63 | 63 | ||
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index b9c84ac680a..1cd9cc4cf05 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | %&tex | 1 | %&tex |
| 2 | % Title: GNU Emacs Survival Card | 2 | % Title: GNU Emacs Survival Card |
| 3 | 3 | ||
| 4 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 4 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> | 6 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> |
| 7 | % French translation: \'Eric Jacoboni <jaco@teaser.fr>, November 2001 | 7 | % French translation: \'Eric Jacoboni <jaco@teaser.fr>, November 2001 |
| @@ -49,8 +49,8 @@ | |||
| 49 | \input pdflayout.sty | 49 | \input pdflayout.sty |
| 50 | \pdflayout=(0) | 50 | \pdflayout=(0) |
| 51 | 51 | ||
| 52 | \def\versionemacs{23} % version of Emacs this is for | 52 | \def\versionemacs{24} % version of Emacs this is for |
| 53 | \def\year{2011} % latest copyright year | 53 | \def\year{2012} % latest copyright year |
| 54 | 54 | ||
| 55 | \def\copyrightnotice{\penalty-1\vfill | 55 | \def\copyrightnotice{\penalty-1\vfill |
| 56 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 56 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter |
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps index 36659ebfb4b..f959767c577 100644 --- a/etc/refcards/gnus-logo.eps +++ b/etc/refcards/gnus-logo.eps | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | %!PS-Adobe-2.0 EPSF-2.0 | 1 | %!PS-Adobe-2.0 EPSF-2.0 |
| 2 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 2 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 3 | % | 3 | % |
| 4 | % Author: Luis Fernandes <elf@ee.ryerson.ca> | 4 | % Author: Luis Fernandes <elf@ee.ryerson.ca> |
| 5 | % | 5 | % |
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex index 9f13974584d..a2ce63aa20a 100644 --- a/etc/refcards/gnus-refcard.tex +++ b/etc/refcards/gnus-refcard.tex | |||
| @@ -120,7 +120,7 @@ | |||
| 120 | %% Gnus logo by Luis Fernandes. | 120 | %% Gnus logo by Luis Fernandes. |
| 121 | \newcommand{\Copyright}{% | 121 | \newcommand{\Copyright}{% |
| 122 | \begin{center} | 122 | \begin{center} |
| 123 | Copyright \copyright\ 1995, 2000, 2002-2011 Free Software Foundation, Inc.\\* | 123 | Copyright \copyright\ 1995, 2000, 2002-2012 Free Software Foundation, Inc.\\* |
| 124 | \end{center} | 124 | \end{center} |
| 125 | 125 | ||
| 126 | Permission is granted to make and distribute copies of this reference | 126 | Permission is granted to make and distribute copies of this reference |
diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf index 71f216156f3..92df030d4d2 100644 --- a/etc/refcards/orgcard.pdf +++ b/etc/refcards/orgcard.pdf | |||
| Binary files differ | |||
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 1579a31b8d5..64200742ae9 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | % Reference Card for Org Mode | 1 | % Reference Card for Org Mode |
| 2 | \def\orgversionnumber{7.7} | 2 | \def\orgversionnumber{7.8.02} |
| 3 | \def\versionyear{2011} % latest update | 3 | \def\versionyear{2011} % latest update |
| 4 | \def\year{2011} % latest copyright year | 4 | \def\year{2012} % latest copyright year |
| 5 | 5 | ||
| 6 | %**start of header | 6 | %**start of header |
| 7 | \newcount\columnsperpage | 7 | \newcount\columnsperpage |
| @@ -17,7 +17,7 @@ | |||
| 17 | \pdflayout=(0l) | 17 | \pdflayout=(0l) |
| 18 | 18 | ||
| 19 | % Nothing else needs to be changed below this line. | 19 | % Nothing else needs to be changed below this line. |
| 20 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2011 | 20 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2012 |
| 21 | % Free Software Foundation, Inc. | 21 | % Free Software Foundation, Inc. |
| 22 | 22 | ||
| 23 | % This file is part of GNU Emacs. | 23 | % This file is part of GNU Emacs. |
| @@ -445,6 +445,7 @@ formula, \kbd{:=} a field formula. | |||
| 445 | \key{execute code block at point}{C-c C-c} | 445 | \key{execute code block at point}{C-c C-c} |
| 446 | \key{open results of code block at point}{C-c C-o} | 446 | \key{open results of code block at point}{C-c C-o} |
| 447 | \key{check code block at point for errors}{C-c C-v c} | 447 | \key{check code block at point for errors}{C-c C-v c} |
| 448 | \key{insert a header argument with completion}{C-c C-v j} | ||
| 448 | \key{view expanded body of code block at point}{C-c C-v v} | 449 | \key{view expanded body of code block at point}{C-c C-v v} |
| 449 | \key{view information about code block at point}{C-c C-v I} | 450 | \key{view information about code block at point}{C-c C-v I} |
| 450 | \key{go to named code block}{C-c C-v g} | 451 | \key{go to named code block}{C-c C-v g} |
| @@ -460,7 +461,7 @@ formula, \kbd{:=} a field formula. | |||
| 460 | \key{tangle code blocks in supplied file}{C-c C-v f} | 461 | \key{tangle code blocks in supplied file}{C-c C-v f} |
| 461 | \key{ingest all code blocks in supplied file into the Library of Babel}{C-c C-v i} | 462 | \key{ingest all code blocks in supplied file into the Library of Babel}{C-c C-v i} |
| 462 | \key{switch to the session of the current code block}{C-c C-v z} | 463 | \key{switch to the session of the current code block}{C-c C-v z} |
| 463 | \key{load expanded body of the current code block into a session}{C-c C-v l} | 464 | \key{load the current code block into a session}{C-c C-v l} |
| 464 | \key{view sha1 hash of the current code block}{C-c C-v a} | 465 | \key{view sha1 hash of the current code block}{C-c C-v a} |
| 465 | 466 | ||
| 466 | \section{Completion} | 467 | \section{Completion} |
| @@ -525,7 +526,7 @@ after ``{\tt :}'', and dictionary words elsewhere. | |||
| 525 | \section{Timestamps} | 526 | \section{Timestamps} |
| 526 | 527 | ||
| 527 | \key{prompt for date and insert timestamp}{C-c .} | 528 | \key{prompt for date and insert timestamp}{C-c .} |
| 528 | \key{like \kbd{C-c} . but insert date and time format}{C-u C-c .} | 529 | \key{like \kbd{C-c .} but insert date and time format}{C-u C-c .} |
| 529 | \key{like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME | 530 | \key{like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME |
| 530 | \key{insert DEADLINE timestamp}{C-c C-d} | 531 | \key{insert DEADLINE timestamp}{C-c C-d} |
| 531 | \key{insert SCHEDULED timestamp}{C-c C-s} | 532 | \key{insert SCHEDULED timestamp}{C-c C-s} |
| @@ -673,7 +674,7 @@ never exported. | |||
| 673 | 674 | ||
| 674 | \section{Notes} | 675 | \section{Notes} |
| 675 | [1] This is only a suggestion for a binding of this command. Choose | 676 | [1] This is only a suggestion for a binding of this command. Choose |
| 676 | your own key as shown under INSTALLATION. | 677 | your own key as shown under ACTIVATION. |
| 677 | 678 | ||
| 678 | [2] Keybinding affected by {\tt org-support-shift-select} and also | 679 | [2] Keybinding affected by {\tt org-support-shift-select} and also |
| 679 | {\tt org-replace-disputed-keys}. | 680 | {\tt org-replace-disputed-keys}. |
| @@ -686,4 +687,3 @@ your own key as shown under INSTALLATION. | |||
| 686 | % compile-command: "tex refcard" | 687 | % compile-command: "tex refcard" |
| 687 | % End: | 688 | % End: |
| 688 | 689 | ||
| 689 | |||
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty index c7eb1913a09..1b421a1cee8 100644 --- a/etc/refcards/pdflayout.sty +++ b/etc/refcards/pdflayout.sty | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | % Copyright (C) 2007-2011 Free Software Foundation, Inc. | 1 | % Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | % This file is part of GNU Emacs. | 3 | % This file is part of GNU Emacs. |
| 4 | 4 | ||
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index 23624116709..9cc6fc6a6cd 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | %&mex | 1 | %&mex |
| 2 | % Reference Card for GNU Emacs | 2 | % Reference Card for GNU Emacs |
| 3 | 3 | ||
| 4 | % Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. | 4 | % Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| 7 | % Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl> | 7 | % Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl> |
| @@ -69,8 +69,8 @@ | |||
| 69 | \input pdflayout.sty | 69 | \input pdflayout.sty |
| 70 | \pdflayout=(0) | 70 | \pdflayout=(0) |
| 71 | 71 | ||
| 72 | \def\versionemacs{23} % version of Emacs this is for | 72 | \def\versionemacs{24} % version of Emacs this is for |
| 73 | \def\year{2011} % latest copyright year | 73 | \def\year{2012} % latest copyright year |
| 74 | 74 | ||
| 75 | % Nothing else needs to be changed. | 75 | % Nothing else needs to be changed. |
| 76 | 76 | ||
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index 4091f59d1f6..c16d5096f30 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for GNU Emacs | 1 | % Reference Card for GNU Emacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2011 | 3 | % Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2012 |
| 4 | % Free Software Foundation, Inc. | 4 | % Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| @@ -62,8 +62,8 @@ | |||
| 62 | \input pdflayout.sty | 62 | \input pdflayout.sty |
| 63 | \pdflayout=(0l) | 63 | \pdflayout=(0l) |
| 64 | 64 | ||
| 65 | \def\versionemacs{23} % version of Emacs this is for | 65 | \def\versionemacs{24} % version of Emacs this is for |
| 66 | \def\year{2011} % latest copyright year | 66 | \def\year{2012} % latest copyright year |
| 67 | 67 | ||
| 68 | % Nothing else needs to be changed below this line. | 68 | % Nothing else needs to be changed below this line. |
| 69 | 69 | ||
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 7d4f9dbfa89..70788e8c67b 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for GNU Emacs | 1 | % Reference Card for GNU Emacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2011 | 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2012 |
| 4 | % Free Software Foundation, Inc. | 4 | % Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| @@ -63,8 +63,8 @@ | |||
| 63 | 63 | ||
| 64 | % Nothing else needs to be changed below this line. | 64 | % Nothing else needs to be changed below this line. |
| 65 | 65 | ||
| 66 | \def\versionemacs{23} % version of Emacs this is for | 66 | \def\versionemacs{24} % version of Emacs this is for |
| 67 | \def\year{2011} % copyright year | 67 | \def\year{2012} % copyright year |
| 68 | 68 | ||
| 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill | 69 | \def\shortcopyrightnotice{\vskip 1ex plus 2 fill |
| 70 | \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. | 70 | \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. |
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index f2b47acc809..1e9cd0e5b79 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | % Copyright (C) 1997, 2002-2011 Free Software Foundation, Inc. | 1 | % Copyright (C) 1997, 2002-2012 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 3 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| 4 | % Russian translation: Alex Ott <alexott@gmail.com> | 4 | % Russian translation: Alex Ott <alexott@gmail.com> |
| @@ -21,8 +21,8 @@ | |||
| 21 | \newlength{\ColThreeWidth} | 21 | \newlength{\ColThreeWidth} |
| 22 | \setlength{\ColThreeWidth}{25mm} | 22 | \setlength{\ColThreeWidth}{25mm} |
| 23 | 23 | ||
| 24 | \newcommand{\versionemacs}[0]{23} % version of Emacs this is for | 24 | \newcommand{\versionemacs}[0]{24} % version of Emacs this is for |
| 25 | \newcommand{\cyear}[0]{2011} % copyright year | 25 | \newcommand{\cyear}[0]{2012} % copyright year |
| 26 | 26 | ||
| 27 | \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill | 27 | \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill |
| 28 | \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. | 28 | \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. |
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 12d66ce9554..4b12b0b42eb 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for Dired | 1 | % Reference Card for Dired |
| 2 | 2 | ||
| 3 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> | 5 | % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu> |
| 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 | 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 |
| @@ -42,8 +42,8 @@ | |||
| 42 | \input pdflayout.sty | 42 | \input pdflayout.sty |
| 43 | \pdflayout=(0) | 43 | \pdflayout=(0) |
| 44 | 44 | ||
| 45 | \def\versionemacs{23} % version of Emacs this is for | 45 | \def\versionemacs{24} % version of Emacs this is for |
| 46 | \def\year{2011} % latest copyright year | 46 | \def\year{2012} % latest copyright year |
| 47 | 47 | ||
| 48 | % Nothing else needs to be changed. | 48 | % Nothing else needs to be changed. |
| 49 | 49 | ||
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 789bbaea92f..5105e8ca986 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Reference Card for GNU Emacs | 1 | % Reference Card for GNU Emacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2011 | 3 | % Copyright (C) 1987, 1993, 1996-1997, 2001-2012 |
| 4 | % Free Software Foundation, Inc. | 4 | % Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> | 6 | % Author: Stephen Gildea <gildea@stop.mail-abuse.org> |
| @@ -60,8 +60,8 @@ | |||
| 60 | \input pdflayout.sty | 60 | \input pdflayout.sty |
| 61 | \pdflayout=(0) | 61 | \pdflayout=(0) |
| 62 | 62 | ||
| 63 | \def\versionemacs{23} % version of Emacs this is for | 63 | \def\versionemacs{24} % version of Emacs this is for |
| 64 | \def\year{2010} % latest copyright year | 64 | \def\year{2012} % latest copyright year |
| 65 | 65 | ||
| 66 | % Nothing else needs to be changed. | 66 | % Nothing else needs to be changed. |
| 67 | 67 | ||
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index f496ac1af0f..7597c63f5c7 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Title: GNU Emacs Survival Card | 1 | % Title: GNU Emacs Survival Card |
| 2 | 2 | ||
| 3 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> | 5 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> |
| 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 | 6 | % Czech translation: Pavel Jan韐 <Pavel@Janik.cz>, March 2001 |
| @@ -55,8 +55,8 @@ | |||
| 55 | % Slovak hyphenation rules applied | 55 | % Slovak hyphenation rules applied |
| 56 | \shyph | 56 | \shyph |
| 57 | 57 | ||
| 58 | \def\versionemacs{23} % version of Emacs this is for | 58 | \def\versionemacs{24} % version of Emacs this is for |
| 59 | \def\year{2011} % latest copyright year | 59 | \def\year{2012} % latest copyright year |
| 60 | 60 | ||
| 61 | \def\copyrightnotice{\penalty-1\vfill | 61 | \def\copyrightnotice{\penalty-1\vfill |
| 62 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 62 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter |
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 845bc38bc47..92d178a130a 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | %&tex | 1 | %&tex |
| 2 | % Title: GNU Emacs Survival Card | 2 | % Title: GNU Emacs Survival Card |
| 3 | 3 | ||
| 4 | % Copyright (C) 2000-2011 Free Software Foundation, Inc. | 4 | % Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> | 6 | % Author: Wlodek Bzyl <matwb@univ.gda.pl> |
| 7 | 7 | ||
| @@ -44,8 +44,8 @@ | |||
| 44 | \input pdflayout.sty | 44 | \input pdflayout.sty |
| 45 | \pdflayout=(1) | 45 | \pdflayout=(1) |
| 46 | 46 | ||
| 47 | \def\versionemacs{23} % version of Emacs this is for | 47 | \def\versionemacs{24} % version of Emacs this is for |
| 48 | \def\year{2011} % latest copyright year | 48 | \def\year{2012} % latest copyright year |
| 49 | 49 | ||
| 50 | \def\copyrightnotice{\penalty-1\vfill | 50 | \def\copyrightnotice{\penalty-1\vfill |
| 51 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter | 51 | \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter |
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index 47decbb9f74..13b43dbab73 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % Quick Reference Card for VIP | 1 | % Quick Reference Card for VIP |
| 2 | 2 | ||
| 3 | % Copyright (C) 1987, 2001-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 1987, 2001-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet> | 5 | % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet> |
| 6 | 6 | ||
| @@ -50,7 +50,7 @@ | |||
| 50 | \pdflayout=(1) | 50 | \pdflayout=(1) |
| 51 | 51 | ||
| 52 | \def\versionemacs{18} % version of Emacs this is for | 52 | \def\versionemacs{18} % version of Emacs this is for |
| 53 | \def\year{2011} % latest copyright year | 53 | \def\year{2012} % latest copyright year |
| 54 | \def\versionvip{3.5} | 54 | \def\versionvip{3.5} |
| 55 | 55 | ||
| 56 | % Nothing else needs to be changed. | 56 | % Nothing else needs to be changed. |
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index 594137744fe..a8694dd3bed 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | % ViperCard -- The Reference Card for Viper under GNU Emacs and XEmacs | 1 | % ViperCard -- The Reference Card for Viper under GNU Emacs and XEmacs |
| 2 | 2 | ||
| 3 | % Copyright (C) 1995-1997, 2001-2011 Free Software Foundation, Inc. | 3 | % Copyright (C) 1995-1997, 2001-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | % Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper) | 5 | % Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper) |
| 6 | % Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3) | 6 | % Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3) |
| @@ -53,7 +53,7 @@ | |||
| 53 | \pdflayout=(1) | 53 | \pdflayout=(1) |
| 54 | 54 | ||
| 55 | \def\versionemacs{21} % version of Emacs this is for | 55 | \def\versionemacs{21} % version of Emacs this is for |
| 56 | \def\year{2011} % latest copyright year | 56 | \def\year{2012} % latest copyright year |
| 57 | \def\versionxemacs{20} % version of XEmacs this is for | 57 | \def\versionxemacs{20} % version of XEmacs this is for |
| 58 | \def\versionviper{3.0} % version of Viper this is for | 58 | \def\versionviper{3.0} % version of Viper this is for |
| 59 | 59 | ||
diff --git a/etc/schema/locate.rnc b/etc/schema/locate.rnc index bab527107e9..431597b1796 100644 --- a/etc/schema/locate.rnc +++ b/etc/schema/locate.rnc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # Copyright (C) 2003-2004, 2007-2011 Free Software Foundation, Inc. | 1 | # Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | # This file is part of GNU Emacs. | 3 | # This file is part of GNU Emacs. |
| 4 | 4 | ||
diff --git a/etc/schema/relaxng.rnc b/etc/schema/relaxng.rnc index 15b836c7500..b00ac078133 100644 --- a/etc/schema/relaxng.rnc +++ b/etc/schema/relaxng.rnc | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # RELAX NG XML syntax expressed in RELAX NG Compact syntax. | 1 | # RELAX NG XML syntax expressed in RELAX NG Compact syntax. |
| 2 | 2 | ||
| 3 | # Copyright (C) 2003-2004, 2007-2011 Free Software Foundation, Inc. | 3 | # Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml index 36c5fd873d8..e6d6564c76d 100644 --- a/etc/schema/schemas.xml +++ b/etc/schema/schemas.xml | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!-- Copyright (C) 2003-2004, 2007-2011 Free Software Foundation, Inc. | 1 | <!-- Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc. |
| 2 | 2 | ||
| 3 | This file is part of GNU Emacs. | 3 | This file is part of GNU Emacs. |
| 4 | 4 | ||
diff --git a/etc/ses-example.ses b/etc/ses-example.ses index 842d0ad9477..f0ff4aca121 100644 --- a/etc/ses-example.ses +++ b/etc/ses-example.ses | |||
| @@ -205,7 +205,7 @@ Sales summary - Acme fundraising | |||
| 205 | ;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other")) | 205 | ;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other")) |
| 206 | ;;; End: | 206 | ;;; End: |
| 207 | 207 | ||
| 208 | ;;; Copyright (C) 2002-2011 Free Software Foundation, Inc. | 208 | ;;; Copyright (C) 2002-2012 Free Software Foundation, Inc. |
| 209 | 209 | ||
| 210 | ;;; COPYING PERMISSIONS: | 210 | ;;; COPYING PERMISSIONS: |
| 211 | ;;; | 211 | ;;; |
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt index 0b042efce69..16cfc535761 100644 --- a/etc/srecode/cpp.srt +++ b/etc/srecode/cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cpp.srt --- SRecode templates for c++-mode | 1 | ;;; cpp.srt --- SRecode templates for c++-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt index 91a76321193..2cedcfceeff 100644 --- a/etc/srecode/default.srt +++ b/etc/srecode/default.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; default.srt --- SRecode templates for srecode-template-mode | 1 | ;;; default.srt --- SRecode templates for srecode-template-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index a9ea16d1811..67d13691cef 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-c.srt --- SRecode templates for "document" applications | 1 | ;; doc-c.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index ac8d8bc1ac2..f3876c830af 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-default.srt --- SRecode templates for "document" applications | 1 | ;; doc-default.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index aeae1c2c389..729d025008a 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-java.srt --- SRecode templates for "document" applications | 1 | ;; doc-java.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index 48c5aae5a68..97725f4ff56 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. | 1 | ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 03a797bb709..cc5af736f15 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; el.srt --- SRecode templates for Emacs Lisp mode | 1 | ;;; el.srt --- SRecode templates for Emacs Lisp mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt index ebca17098d5..22dca4ed1b3 100644 --- a/etc/srecode/getset-cpp.srt +++ b/etc/srecode/getset-cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. | 1 | ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index 3059afad601..706b6b39d57 100644 --- a/etc/srecode/java.srt +++ b/etc/srecode/java.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; java.srt | 1 | ;; java.srt |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt index d07d211a984..4001132e35e 100644 --- a/etc/srecode/make.srt +++ b/etc/srecode/make.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; make.srt | 1 | ;; make.srt |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt index adbe554216b..226d51c7ba9 100644 --- a/etc/srecode/template.srt +++ b/etc/srecode/template.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; template.srt --- Templates for Semantic Recoders | 1 | ;;; template.srt --- Templates for Semantic Recoders |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index d3dad33a5a2..fe12eb8b8c5 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; test.srt --- SRecode templates for testing | 1 | ;; test.srt --- SRecode templates for testing |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt index abf086c7281..8c4ee858e62 100644 --- a/etc/srecode/texi.srt +++ b/etc/srecode/texi.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; texi.srt --- SRecode templates for Texinfo | 1 | ;; texi.srt --- SRecode templates for Texinfo |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index b66a17a4be5..75ce5f6b7ab 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. | 1 | ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el index 9e991847d5c..26796b85849 100644 --- a/etc/themes/adwaita-theme.el +++ b/etc/themes/adwaita-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; adwaita-theme.el --- Tango-based custom theme for faces | 1 | ;;; adwaita-theme.el --- Tango-based custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: William Stevenson <yhvh2000@gmail.com> | 5 | ;; Author: William Stevenson <yhvh2000@gmail.com> |
| 6 | 6 | ||
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el index 1a4ca82f438..0021d580073 100644 --- a/etc/themes/deeper-blue-theme.el +++ b/etc/themes/deeper-blue-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; deeper-blue-theme.el --- Custom theme for faces | 1 | ;;; deeper-blue-theme.el --- Custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Scott Frazer <frazer.scott@gmail.com> | 5 | ;; Author: Scott Frazer <frazer.scott@gmail.com> |
| 6 | 6 | ||
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el index 80215e564f5..903776a779d 100644 --- a/etc/themes/dichromacy-theme.el +++ b/etc/themes/dichromacy-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; dichromacy-theme.el --- color theme suitable for color-blind users | 1 | ;;; dichromacy-theme.el --- color theme suitable for color-blind users |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Chong Yidong <cyd@stupidchicken> | 5 | ;; Author: Chong Yidong <cyd@stupidchicken> |
| 6 | 6 | ||
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el index cf6ae543575..ece61f1e1c1 100644 --- a/etc/themes/light-blue-theme.el +++ b/etc/themes/light-blue-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; light-blue-theme.el --- Custom theme for faces | 1 | ;;; light-blue-theme.el --- Custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Drew Adams <drew.adams@oracle.com> | 5 | ;; Author: Drew Adams <drew.adams@oracle.com> |
| 6 | 6 | ||
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index b06678636c7..d09c550b0b6 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; manoj-dark.el --- A dark theme from Manoj | 1 | ;;; manoj-dark.el --- A dark theme from Manoj |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Manoj Srivastava <srivasta@ieee.org> | 5 | ;; Author: Manoj Srivastava <srivasta@ieee.org> |
| 6 | ;; Keywords: lisp, faces | 6 | ;; Keywords: lisp, faces |
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | ;;; Commentary: | 21 | ;;; Commentary: |
| 22 | 22 | ||
| 23 | ;; I spend a lot of time workin in front of a screen (many hours in a | 23 | ;; I spend a lot of time working in front of a screen (many hours in a |
| 24 | ;; dimly lit room) and eye fatigue is an issue. This is a dark color | 24 | ;; dimly lit room) and eye fatigue is an issue. This is a dark color |
| 25 | ;; theme for emacs, which is easier on the eyes than light themes. | 25 | ;; theme for emacs, which is easier on the eyes than light themes. |
| 26 | 26 | ||
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el index 6e38a43a4f0..9a47e61d7cd 100644 --- a/etc/themes/misterioso-theme.el +++ b/etc/themes/misterioso-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; misterioso-theme.el --- Custom face theme for Emacs | 1 | ;;; misterioso-theme.el --- Custom face theme for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Sebastian Hermida | 5 | ;; Author: Sebastian Hermida |
| 6 | 6 | ||
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el index ae45966b347..27a8f1868b4 100644 --- a/etc/themes/tango-dark-theme.el +++ b/etc/themes/tango-dark-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; tango-dark-theme.el --- Tango-based custom theme for faces | 1 | ;;; tango-dark-theme.el --- Tango-based custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: Chong Yidong <cyd@stupidchicken> | 5 | ;; Authors: Chong Yidong <cyd@stupidchicken> |
| 6 | ;; Jan Moringen <jan.moringen@uni-bielefeld.de> | 6 | ;; Jan Moringen <jan.moringen@uni-bielefeld.de> |
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el index b46bd677f21..e07ccc35360 100644 --- a/etc/themes/tango-theme.el +++ b/etc/themes/tango-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; tango-theme.el --- Tango-based custom theme for faces | 1 | ;;; tango-theme.el --- Tango-based custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: Chong Yidong <cyd@stupidchicken> | 5 | ;; Authors: Chong Yidong <cyd@stupidchicken> |
| 6 | ;; Jan Moringen <jan.moringen@uni-bielefeld.de> | 6 | ;; Jan Moringen <jan.moringen@uni-bielefeld.de> |
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el index 82732765885..85db38a9e5a 100644 --- a/etc/themes/tsdh-dark-theme.el +++ b/etc/themes/tsdh-dark-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; tsdh-dark-theme.el --- Tassilo's dark custom theme | 1 | ;;; tsdh-dark-theme.el --- Tassilo's dark custom theme |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el index f62cea4eb47..e905f37887d 100644 --- a/etc/themes/tsdh-light-theme.el +++ b/etc/themes/tsdh-light-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; tsdh-light-theme.el --- Tassilo's light custom theme | 1 | ;;; tsdh-light-theme.el --- Tassilo's light custom theme |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el index 50db2661a99..113fbae7b6a 100644 --- a/etc/themes/wheatgrass-theme.el +++ b/etc/themes/wheatgrass-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; wheatgrass-theme.el --- custom theme for faces | 1 | ;;; wheatgrass-theme.el --- custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el index e5c808df68d..a12edac8728 100644 --- a/etc/themes/whiteboard-theme.el +++ b/etc/themes/whiteboard-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; whiteboard-theme.el --- Custom theme for faces | 1 | ;;; whiteboard-theme.el --- Custom theme for faces |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Scott Frazer <frazer.scott@gmail.com> | 5 | ;; Author: Scott Frazer <frazer.scott@gmail.com> |
| 6 | 6 | ||
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el index 894a2444ab5..500c877046a 100644 --- a/etc/themes/wombat-theme.el +++ b/etc/themes/wombat-theme.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; wombat-theme.el --- Custom face theme for Emacs -*-coding: utf-8 -*- | 1 | ;;; wombat-theme.el --- Custom face theme for Emacs -*-coding: utf-8 -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Kristoffer Gr枚nlund <krig@koru.se> | 5 | ;; Author: Kristoffer Gr枚nlund <krig@koru.se> |
| 6 | 6 | ||
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index ae4cfb93edc..7713aba0140 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL | |||
| @@ -1121,7 +1121,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 1121 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1121 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1122 | and comes with permission to distribute copies on certain conditions: | 1122 | and comes with permission to distribute copies on certain conditions: |
| 1123 | 1123 | ||
| 1124 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1124 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1125 | 1125 | ||
| 1126 | This file is part of GNU Emacs. | 1126 | This file is part of GNU Emacs. |
| 1127 | 1127 | ||
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg index cbbc27bd9c4..22f96f169b9 100644 --- a/etc/tutorials/TUTORIAL.bg +++ b/etc/tutorials/TUTORIAL.bg | |||
| @@ -1160,7 +1160,7 @@ Dired 忤 镱玮铍忄 溧 汶邃囹 耧桉 铗 羿殡钼 滂疱牝铕 ( 赅蝾 | |||
| 1160 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1160 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1161 | comes with permission to distribute copies on certain conditions: | 1161 | comes with permission to distribute copies on certain conditions: |
| 1162 | 1162 | ||
| 1163 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1163 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1164 | 1164 | ||
| 1165 | Permission is granted to anyone to make or distribute verbatim copies | 1165 | Permission is granted to anyone to make or distribute verbatim copies |
| 1166 | of this document as received, in any medium, provided that the | 1166 | of this document as received, in any medium, provided that the |
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index 6a605f6e791..46201455997 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn | |||
| @@ -980,7 +980,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 980 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 980 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 981 | comes with permission to distribute copies on certain conditions: | 981 | comes with permission to distribute copies on certain conditions: |
| 982 | 982 | ||
| 983 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 983 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 984 | 984 | ||
| 985 | Permission is granted to anyone to make or distribute verbatim copies | 985 | Permission is granted to anyone to make or distribute verbatim copies |
| 986 | of this document as received, in any medium, provided that the | 986 | of this document as received, in any medium, provided that the |
| @@ -1005,7 +1005,7 @@ GNU Emacs to your friends. Help stamp out software obstructionism | |||
| 1005 | 1005 | ||
| 1006 | 本篇文档与 GNU Emacs 一样拥有版权,并允许在下列条件的约束下发行其拷贝: | 1006 | 本篇文档与 GNU Emacs 一样拥有版权,并允许在下列条件的约束下发行其拷贝: |
| 1007 | 1007 | ||
| 1008 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1008 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1009 | 1009 | ||
| 1010 | 本文档允许在不变更文档内容的情况下由任何人发布在任何媒体上,同时必须 | 1010 | 本文档允许在不变更文档内容的情况下由任何人发布在任何媒体上,同时必须 |
| 1011 | 完整保留版权和许可声明,且需给予受众与发行者完全相同的、如本声明所允 | 1011 | 完整保留版权和许可声明,且需给予受众与发行者完全相同的、如本声明所允 |
diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs index 98dcf473aef..db663fd0774 100644 --- a/etc/tutorials/TUTORIAL.cs +++ b/etc/tutorials/TUTORIAL.cs | |||
| @@ -1015,7 +1015,7 @@ tutori醠em napsan齧 Stuartem Cracraftem pro p鵹odn Emacs. | |||
| 1015 | Tato verze tutori醠u je, podobn jako GNU Emacs, chr醤靚a copyrightem a | 1015 | Tato verze tutori醠u je, podobn jako GNU Emacs, chr醤靚a copyrightem a |
| 1016 | je 鬼鴈na se svolen韒 distribuovat kopie za jist齝h podm韓ek: | 1016 | je 鬼鴈na se svolen韒 distribuovat kopie za jist齝h podm韓ek: |
| 1017 | 1017 | ||
| 1018 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1018 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1019 | 1019 | ||
| 1020 | Ka綿閙u je zaru鑕no pr醰o vytv狲et a distribuovat p鴈sn kopie tohoto | 1020 | Ka綿閙u je zaru鑕no pr醰o vytv狲et a distribuovat p鴈sn kopie tohoto |
| 1021 | dokumentu tak, jak jej obdr緀l, na jak閙koliv m閐iu, s t韒, 緀 bude | 1021 | dokumentu tak, jak jej obdr緀l, na jak閙koliv m閐iu, s t韒, 緀 bude |
diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de index ad0b765b55b..2908203b391 100644 --- a/etc/tutorials/TUTORIAL.de +++ b/etc/tutorials/TUTORIAL.de | |||
| @@ -1477,7 +1477,7 @@ Beachten Sie bitte, dass im Zweifelsfalle das englische Original | |||
| 1477 | dieser Urheberrechtsnotiz g黮tig ist (zu finden in der Datei | 1477 | dieser Urheberrechtsnotiz g黮tig ist (zu finden in der Datei |
| 1478 | TUTORIAL). | 1478 | TUTORIAL). |
| 1479 | 1479 | ||
| 1480 | Copyright (C) 1985, 1996-1997, 2001-2011 Free Software Foundation, Inc. | 1480 | Copyright (C) 1985, 1996-1997, 2001-2012 Free Software Foundation, Inc. |
| 1481 | 1481 | ||
| 1482 | Diese Datei ist ein Bestandteil von GNU Emacs. | 1482 | Diese Datei ist ein Bestandteil von GNU Emacs. |
| 1483 | 1483 | ||
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo index f95f3317abf..51c08db04a4 100644 --- a/etc/tutorials/TUTORIAL.eo +++ b/etc/tutorials/TUTORIAL.eo | |||
| @@ -1081,7 +1081,7 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso. | |||
| 1081 | kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj | 1081 | kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj |
| 1082 | kondi鎜j estas observataj: | 1082 | kondi鎜j estas observataj: |
| 1083 | 1083 | ||
| 1084 | Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2011 | 1084 | Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2012 |
| 1085 | Free Software Foundation, Inc. | 1085 | Free Software Foundation, Inc. |
| 1086 | 1086 | ||
| 1087 | 苅 tiu dosiero estas parto de "GNU Emacs". | 1087 | 苅 tiu dosiero estas parto de "GNU Emacs". |
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es index e4b2cf0d528..2597f00e95f 100644 --- a/etc/tutorials/TUTORIAL.es +++ b/etc/tutorials/TUTORIAL.es | |||
| @@ -1179,7 +1179,7 @@ Por favor, en caso de duda, s髄o es v醠ido el original en ingl閟 de la | |||
| 1179 | siguiente nota de derechos de reproducci髇 (que puede encontrar en el | 1179 | siguiente nota de derechos de reproducci髇 (que puede encontrar en el |
| 1180 | archivo TUTORIAL). | 1180 | archivo TUTORIAL). |
| 1181 | 1181 | ||
| 1182 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1182 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1183 | 1183 | ||
| 1184 | Se permite a cualquiera hacer o distribuir copias literales de este | 1184 | Se permite a cualquiera hacer o distribuir copias literales de este |
| 1185 | documento como se recibe, en cualquier medio, siempre que la nota | 1185 | documento como se recibe, en cualquier medio, siempre que la nota |
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr index 5ba4ebae9c3..95670ff1efe 100644 --- a/etc/tutorials/TUTORIAL.fr +++ b/etc/tutorials/TUTORIAL.fr | |||
| @@ -1162,7 +1162,7 @@ Cette version du didacticiel, comme GNU Emacs, est plac閑 sous | |||
| 1162 | copyright, et vous pouvez en distribuer des copies sous certaines | 1162 | copyright, et vous pouvez en distribuer des copies sous certaines |
| 1163 | conditions : | 1163 | conditions : |
| 1164 | 1164 | ||
| 1165 | Copyright (C) 1985, 1996, 2001-2011 Free Software Foundation, Inc. | 1165 | Copyright (C) 1985, 1996, 2001-2012 Free Software Foundation, Inc. |
| 1166 | 1166 | ||
| 1167 | Chacun peut cr閑r ou distribuer des copies de ce document tel qu'il | 1167 | Chacun peut cr閑r ou distribuer des copies de ce document tel qu'il |
| 1168 | l'a re鐄, sur n'importe quel support, pourvu que la note de | 1168 | l'a re鐄, sur n'importe quel support, pourvu que la note de |
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index 92d94a0da87..98690501f5f 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he | |||
| @@ -1008,7 +1008,7 @@ find-file. | |||
| 1008 | 讙讬专住讛 讝讜 砖诇 讛砖讬注讜专 讛讬谞讛 讞诇拽 诪讞讘讬诇转 GNU Emacs. 讛讬讗 诪讜讙谞转 讘讝讻讜讬讜转 讬讜爪专讬诐 | 1008 | 讙讬专住讛 讝讜 砖诇 讛砖讬注讜专 讛讬谞讛 讞诇拽 诪讞讘讬诇转 GNU Emacs. 讛讬讗 诪讜讙谞转 讘讝讻讜讬讜转 讬讜爪专讬诐 |
| 1009 | 讜谞讬转谞转 诇讛注转拽讛 讜讛驻爪转 注讜转拽讬诐 讘转谞讗讬诐 诪住讜讬讬诪讬诐 讻讚诇拽诪谉: | 1009 | 讜谞讬转谞转 诇讛注转拽讛 讜讛驻爪转 注讜转拽讬诐 讘转谞讗讬诐 诪住讜讬讬诪讬诐 讻讚诇拽诪谉: |
| 1010 | 1010 | ||
| 1011 | Copyright (C) 2010-2011 Free Software Foundation, Inc. | 1011 | Copyright (C) 2010-2012 Free Software Foundation, Inc. |
| 1012 | 1012 | ||
| 1013 | 鈥廏NU Emacs 讛讬谞讜 转讻谞讛 讞驻砖讬转; 讝讻讜转讻诐 诇讛驻讬爪讜 讜\讗讜 诇砖谞讜转讜 讘讻驻讜祝 诇转谞讗讬 | 1013 | 鈥廏NU Emacs 讛讬谞讜 转讻谞讛 讞驻砖讬转; 讝讻讜转讻诐 诇讛驻讬爪讜 讜\讗讜 诇砖谞讜转讜 讘讻驻讜祝 诇转谞讗讬 |
| 1014 | 讛专砖讬讜谉 GNU General Public License, 讻驻讬 砖讛讜讗 讬讜爪讗 诇讗讜专 注"讬 Free | 1014 | 讛专砖讬讜谉 GNU General Public License, 讻驻讬 砖讛讜讗 讬讜爪讗 诇讗讜专 注"讬 Free |
diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it index 1c9f8bc6654..1f222caceef 100644 --- a/etc/tutorials/TUTORIAL.it +++ b/etc/tutorials/TUTORIAL.it | |||
| @@ -1085,7 +1085,7 @@ distribuito con il permesso di farne copie a determinate condizioni: | |||
| 1085 | indicativo, restando comunque inteso il fatto che quella originale a | 1085 | indicativo, restando comunque inteso il fatto che quella originale a |
| 1086 | fare fede. | 1086 | fare fede. |
| 1087 | 1087 | ||
| 1088 | Copyright (C) 2003-2011 Free Software Foundation, Inc. | 1088 | Copyright (C) 2003-2012 Free Software Foundation, Inc. |
| 1089 | 1089 | ||
| 1090 | permesso a chiunque copiare e distribuire attraverso ogni mezzo copie | 1090 | permesso a chiunque copiare e distribuire attraverso ogni mezzo copie |
| 1091 | fedeli di questo documento cos come viene ricevuto, a condizione che | 1091 | fedeli di questo documento cos come viene ricevuto, a condizione che |
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index d50727ceb82..13a6d01be0e 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja | |||
| @@ -1062,7 +1062,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 1062 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1062 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1063 | comes with permission to distribute copies on certain conditions: | 1063 | comes with permission to distribute copies on certain conditions: |
| 1064 | 1064 | ||
| 1065 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1065 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1066 | 1066 | ||
| 1067 | Permission is granted to anyone to make or distribute verbatim copies | 1067 | Permission is granted to anyone to make or distribute verbatim copies |
| 1068 | of this document as received, in any medium, provided that the | 1068 | of this document as received, in any medium, provided that the |
diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko index a928923832d..cc87cbad21a 100644 --- a/etc/tutorials/TUTORIAL.ko +++ b/etc/tutorials/TUTORIAL.ko | |||
| @@ -981,7 +981,7 @@ C-x C-s$(C?M(B (META$(C<h3*(B EDIT$(C<h(B $(CH$@:(B $(C13C<<h0!(B $(C | |||
| 981 | GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L(B $(C@V@88g(B $(CF/A$GQ(B $(CA60G@;(B $(C88A7GR(B | 981 | GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L(B $(C@V@88g(B $(CF/A$GQ(B $(CA60G@;(B $(C88A7GR(B |
| 982 | $(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B: | 982 | $(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B: |
| 983 | 983 | ||
| 984 | Copyright (C) 1985, 1996, 2001-2011 Free Software Foundation, Inc. | 984 | Copyright (C) 1985, 1996, 2001-2012 Free Software Foundation, Inc. |
| 985 | 985 | ||
| 986 | $(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B | 986 | $(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B |
| 987 | $(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B | 987 | $(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B |
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl index 59f54c1b2db..da9724b2c1e 100644 --- a/etc/tutorials/TUTORIAL.nl +++ b/etc/tutorials/TUTORIAL.nl | |||
| @@ -1196,7 +1196,7 @@ het Engelse origineel.) | |||
| 1196 | Deze versie van de inleiding valt onder copyright, net als GNU Emacs. | 1196 | Deze versie van de inleiding valt onder copyright, net als GNU Emacs. |
| 1197 | Je mag deze inleiding verspreiden onder bepaalde voorwaarden: | 1197 | Je mag deze inleiding verspreiden onder bepaalde voorwaarden: |
| 1198 | 1198 | ||
| 1199 | Copyright (C) 1985, 1996-1997, 2001-2011 Free Software Foundation, Inc. | 1199 | Copyright (C) 1985, 1996-1997, 2001-2012 Free Software Foundation, Inc. |
| 1200 | 1200 | ||
| 1201 | Iedereen mag letterlijke kopie雗 van dit document, zowel ontvangen | 1201 | Iedereen mag letterlijke kopie雗 van dit document, zowel ontvangen |
| 1202 | als verspreiden, op elk medium, vooropgesteld dat de | 1202 | als verspreiden, op elk medium, vooropgesteld dat de |
| @@ -1220,7 +1220,7 @@ software te gebruiken, te schrijven en te delen! | |||
| 1220 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1220 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1221 | comes with permission to distribute copies on certain conditions: | 1221 | comes with permission to distribute copies on certain conditions: |
| 1222 | 1222 | ||
| 1223 | Copyright (C) 1985, 1996-1997, 2001-2011 Free Software Foundation, Inc. | 1223 | Copyright (C) 1985, 1996-1997, 2001-2012 Free Software Foundation, Inc. |
| 1224 | 1224 | ||
| 1225 | Permission is granted to anyone to make or distribute verbatim | 1225 | Permission is granted to anyone to make or distribute verbatim |
| 1226 | copies of this document as received, in any medium, provided that | 1226 | copies of this document as received, in any medium, provided that |
diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl index f6859612a49..1f35e16d60e 100644 --- a/etc/tutorials/TUTORIAL.pl +++ b/etc/tutorials/TUTORIAL.pl | |||
| @@ -1209,7 +1209,7 @@ z pomoc Ryszarda Kubiaka i Janusza S. Bienia <jsbien@mail.uw.edu.pl>. | |||
| 1209 | Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem | 1209 | Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem |
| 1210 | autorskim, ale wolno j kopiowa pod nast阷uj眂ymi warunkami: | 1210 | autorskim, ale wolno j kopiowa pod nast阷uj眂ymi warunkami: |
| 1211 | 1211 | ||
| 1212 | Copyright (C) 1985, 1994, 2001-2011 Free Software Foundation, Inc. | 1212 | Copyright (C) 1985, 1994, 2001-2012 Free Software Foundation, Inc. |
| 1213 | 1213 | ||
| 1214 | Zezwala si na wykonywanie lub rozpowszechnianie | 1214 | Zezwala si na wykonywanie lub rozpowszechnianie |
| 1215 | wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym | 1215 | wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym |
diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR index 1328c22f7b3..139789b1d2a 100644 --- a/etc/tutorials/TUTORIAL.pt_BR +++ b/etc/tutorials/TUTORIAL.pt_BR | |||
| @@ -1056,7 +1056,7 @@ Essa vers鉶 do tutorial foi originalmente traduzida por Marcelo Toledo | |||
| 1056 | <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem | 1056 | <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem |
| 1057 | com uma permiss鉶 de distribui玢o de c髉ias nas seguintes condi珲es: | 1057 | com uma permiss鉶 de distribui玢o de c髉ias nas seguintes condi珲es: |
| 1058 | 1058 | ||
| 1059 | Copyright (C) 2004-2011 Free Software Foundation, Inc. | 1059 | Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 1060 | 1060 | ||
| 1061 | Permiss鉶 garantida a qualquer um para fazer ou distribuir c髉ias | 1061 | Permiss鉶 garantida a qualquer um para fazer ou distribuir c髉ias |
| 1062 | integrais deste documento como recebido, em qualquer meio, deixando | 1062 | integrais deste documento como recebido, em qualquer meio, deixando |
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro index a3ce0b79d48..8c31c6c2b4d 100644 --- a/etc/tutorials/TUTORIAL.ro +++ b/etc/tutorials/TUTORIAL.ro | |||
| @@ -1082,7 +1082,7 @@ continuare no㱮ta de copyright original 頽 limba englez. | |||
| 1082 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1082 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1083 | comes with permission to distribute copies on certain conditions: | 1083 | comes with permission to distribute copies on certain conditions: |
| 1084 | 1084 | ||
| 1085 | Copyright (C) 1998, 2001-2011 Free Software Foundation, Inc. | 1085 | Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc. |
| 1086 | 1086 | ||
| 1087 | Permission is granted to anyone to make or distribute verbatim copies | 1087 | Permission is granted to anyone to make or distribute verbatim copies |
| 1088 | of this document as received, in any medium, provided that the | 1088 | of this document as received, in any medium, provided that the |
diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru index f8127a2d82e..16bf56a12d8 100644 --- a/etc/tutorials/TUTORIAL.ru +++ b/etc/tutorials/TUTORIAL.ru | |||
| @@ -1128,7 +1128,7 @@ Dired 邢谧咸雅 琢 显下伊至载 有捎纤 屏侍献 肆粤滔桥 ( 粤酥 | |||
| 1128 | (copyrighted) 幸扇夏稍 锨伊紊夼紊淹 伊有蚁釉伊闻紊 讼猩 酉 | 1128 | (copyrighted) 幸扇夏稍 锨伊紊夼紊淹 伊有蚁釉伊闻紊 讼猩 酉 |
| 1129 | 犹拍绽萆蜕 酉翘鳞盼裳蜕: | 1129 | 犹拍绽萆蜕 酉翘鳞盼裳蜕: |
| 1130 | 1130 | ||
| 1131 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1131 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1132 | 1132 | ||
| 1133 | Permission is granted to anyone to make or distribute verbatim copies | 1133 | Permission is granted to anyone to make or distribute verbatim copies |
| 1134 | of this document as received, in any medium, provided that the | 1134 | of this document as received, in any medium, provided that the |
diff --git a/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk index b75f4c24f0e..891b29d3da7 100644 --- a/etc/tutorials/TUTORIAL.sk +++ b/etc/tutorials/TUTORIAL.sk | |||
| @@ -1074,7 +1074,7 @@ t鷗orialom nap韘an齧 Stuartom Cracraftom pre p魐odn Emacs. | |||
| 1074 | T醫o verzia t鷗orialu je, podobne ako GNU Emacs, chr醤en copyrightom | 1074 | T醫o verzia t鷗orialu je, podobne ako GNU Emacs, chr醤en copyrightom |
| 1075 | a je 鬼ren s povolen韒 distribuova k髉ie za ist齝h podmienok: | 1075 | a je 鬼ren s povolen韒 distribuova k髉ie za ist齝h podmienok: |
| 1076 | 1076 | ||
| 1077 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1077 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1078 | 1078 | ||
| 1079 | Ka綿閙u je zaru鑕n pr醰o vytv醨a a distribuova presn k髉ie tohto | 1079 | Ka綿閙u je zaru鑕n pr醰o vytv醨a a distribuova presn k髉ie tohto |
| 1080 | dokumentu tak, ako ho dostal, na akomko祐ek m閐iu, s t齧, 緀 bude | 1080 | dokumentu tak, ako ho dostal, na akomko祐ek m閐iu, s t齧, 緀 bude |
diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl index e43ac324870..ef1fecbc86a 100644 --- a/etc/tutorials/TUTORIAL.sl +++ b/etc/tutorials/TUTORIAL.sl | |||
| @@ -1106,7 +1106,7 @@ Emacs. V sloven硅ino ga je prevedel Primo Peterlin. | |||
| 1106 | To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo | 1106 | To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo |
| 1107 | razmno緀vanje in raz筰rjanje je dovoljeno pod naslednjimi pogoji: | 1107 | razmno緀vanje in raz筰rjanje je dovoljeno pod naslednjimi pogoji: |
| 1108 | 1108 | ||
| 1109 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1109 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1110 | 1110 | ||
| 1111 | Dovoljeno je izdelovati in raz筰rjati neokrnjene kopije tega spisa | 1111 | Dovoljeno je izdelovati in raz筰rjati neokrnjene kopije tega spisa |
| 1112 | v kakr筺ikoli obliki pod pogojem, da je ohranjena navedba o | 1112 | v kakr筺ikoli obliki pod pogojem, da je ohranjena navedba o |
diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv index 1960d35fff5..ff5ef3cddcd 100644 --- a/etc/tutorials/TUTORIAL.sv +++ b/etc/tutorials/TUTORIAL.sv | |||
| @@ -1119,7 +1119,7 @@ Lidell 鰒ersatte den till Svenska. | |||
| 1119 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1119 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1120 | comes with permission to distribute copies on certain conditions: | 1120 | comes with permission to distribute copies on certain conditions: |
| 1121 | 1121 | ||
| 1122 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1122 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1123 | 1123 | ||
| 1124 | Permission is granted to anyone to make or distribute verbatim copies | 1124 | Permission is granted to anyone to make or distribute verbatim copies |
| 1125 | of this document as received, in any medium, provided that the | 1125 | of this document as received, in any medium, provided that the |
diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th index fae084cd5e8..56ea8404ec5 100644 --- a/etc/tutorials/TUTORIAL.th +++ b/etc/tutorials/TUTORIAL.th | |||
| @@ -964,7 +964,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 964 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 964 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 965 | comes with permission to distribute copies on certain conditions: | 965 | comes with permission to distribute copies on certain conditions: |
| 966 | 966 | ||
| 967 | Copyright (C) 1985, 1996, 2001-2011 Free Software Foundation, Inc. | 967 | Copyright (C) 1985, 1996, 2001-2012 Free Software Foundation, Inc. |
| 968 | 968 | ||
| 969 | Permission is granted to anyone to make or distribute verbatim copies | 969 | Permission is granted to anyone to make or distribute verbatim copies |
| 970 | of this document as received, in any medium, provided that the | 970 | of this document as received, in any medium, provided that the |
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh index da628a3af68..d67cfcf4e82 100644 --- a/etc/tutorials/TUTORIAL.zh +++ b/etc/tutorials/TUTORIAL.zh | |||
| @@ -1049,7 +1049,7 @@ issue here> | |||
| 1049 | 硂セе硉玭㎝ GNU Emacs 妓常琌舦てす砛琘ㄇ兵ン | 1049 | 硂セе硉玭㎝ GNU Emacs 妓常琌舦てす砛琘ㄇ兵ン |
| 1050 | 床ㄤī | 1050 | 床ㄤī |
| 1051 | 1051 | ||
| 1052 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. | 1052 | Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. |
| 1053 | 1053 | ||
| 1054 | Permission is granted to anyone to make or distribute verbatim copies | 1054 | Permission is granted to anyone to make or distribute verbatim copies |
| 1055 | of this document as received, in any medium, provided that the | 1055 | of this document as received, in any medium, provided that the |