aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2016-12-07 12:39:08 -0800
committerPaul Eggert2016-12-07 12:39:08 -0800
commitfd6632b397316146397dd478a858f0b9a90efeed (patch)
treeb4cf7ad204c611d20db93f846a0b4aebadd06d31 /etc
parent8209e0384441cafb67d779bbd17ea812269ca4cc (diff)
parent9a857b922e03617c533b396705f8019871b33b54 (diff)
downloademacs-fd6632b397316146397dd478a858f0b9a90efeed.tar.gz
emacs-fd6632b397316146397dd478a858f0b9a90efeed.zip
Merge from origin/emacs-25
9a857b9 * admin/authors.el (authors-renamed-files-alist): Addition. 6d27423 Tweak refcard note about documentation location e46a134 Improve treatment of Fortran's "class is"
Diffstat (limited to 'etc')
-rw-r--r--etc/refcards/calccard.tex4
-rw-r--r--etc/refcards/cs-dired-ref.tex7
-rw-r--r--etc/refcards/cs-refcard.tex7
-rw-r--r--etc/refcards/cs-survival.tex5
-rw-r--r--etc/refcards/de-refcard.tex7
-rw-r--r--etc/refcards/dired-ref.tex7
-rw-r--r--etc/refcards/fr-dired-ref.tex7
-rw-r--r--etc/refcards/fr-refcard.tex7
-rw-r--r--etc/refcards/fr-survival.tex5
-rw-r--r--etc/refcards/gnus-refcard.tex3
-rw-r--r--etc/refcards/orgcard.tex3
-rw-r--r--etc/refcards/pl-refcard.tex7
-rw-r--r--etc/refcards/pt-br-refcard.tex7
-rw-r--r--etc/refcards/refcard.tex7
-rw-r--r--etc/refcards/ru-refcard.tex10
-rw-r--r--etc/refcards/sk-dired-ref.tex7
-rw-r--r--etc/refcards/sk-refcard.tex7
-rw-r--r--etc/refcards/sk-survival.tex5
-rw-r--r--etc/refcards/survival.tex5
-rw-r--r--etc/refcards/vipcard.tex7
-rw-r--r--etc/refcards/viperCard.tex7
21 files changed, 48 insertions, 83 deletions
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index e692ca4b7d9..352c7c2a4f1 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -81,8 +81,8 @@
81 81
82Released under the terms of the GNU General Public License version 3 or later. 82Released under the terms of the GNU General Public License version 3 or later.
83 83
84\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 84For more Emacs documentation, and the \TeX{} source for this card,
85 85see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
86\endgroup} 86\endgroup}
87 87
88% make \bye not \outer so that the \def\bye in the \else clause below 88% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index c36167d5619..0cab2957134 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -63,11 +63,8 @@
63 63
64Released under the terms of the GNU General Public License version 3 or later. 64Released under the terms of the GNU General Public License version 3 or later.
65 65
66\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 66For more Emacs documentation, and the \TeX{} source for this card,
67 67see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
68For copies of the GNU Emacs manual, see:
69
70{\tt http://www.gnu.org/software/emacs/\#Manuals}
71\endgroup} 68\endgroup}
72 69
73% make \bye not \outer so that the \def\bye in the \else clause below 70% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 154831029ab..64590fe5923 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -80,11 +80,8 @@
80 80
81Released under the terms of the GNU General Public License version 3 or later. 81Released under the terms of the GNU General Public License version 3 or later.
82 82
83\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 83For more Emacs documentation, and the \TeX{} source for this card,
84 84see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
85For copies of the GNU Emacs manual, see:
86
87{\tt http://www.gnu.org/software/emacs/\#Manuals}
88\endgroup} 85\endgroup}
89 86
90% make \bye not \outer so that the \def\bye in the \else clause below 87% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index 77893aec3ac..6e15f1f514b 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -70,8 +70,9 @@
70 Released under the terms of the GNU General Public License 70 Released under the terms of the GNU General Public License
71 version 3 or later. 71 version 3 or later.
72 72
73 \TeX{} source for this card is distributed with Emacs in 73 For more Emacs documentation, and the \TeX{} source for this card,
74 {\tt etc/refcards/}\par}} 74 see the Emacs distribution, or
75 {\tt http://www.gnu.org/software/emacs}\par}}
75 76
76\hsize 3.2in 77\hsize 3.2in
77\vsize 7.95in 78\vsize 7.95in
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 89636a84509..b6d6c211d9e 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -82,11 +82,8 @@
82Released under the terms of the GNU General Public License 82Released under the terms of the GNU General Public License
83version 3 or later. 83version 3 or later.
84 84
85\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 85For more Emacs documentation, and the \TeX{} source for this card,
86 86see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
87F\"ur Kopien des Handbuchs zu GNU Emacs:
88
89{\tt http://www.gnu.org/software/emacs/\#Manuals}
90\endgroup} 87\endgroup}
91 88
92% make \bye not \outer so that the \def\bye in the \else clause below 89% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 5f8d8babcc3..4b9f41f60b8 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -64,11 +64,8 @@
64 64
65Released under the terms of the GNU General Public License version 3 or later. 65Released under the terms of the GNU General Public License version 3 or later.
66 66
67\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 67For more Emacs documentation, and the \TeX{} source for this card,
68 68see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
69For copies of the GNU Emacs manual, see:
70
71{\tt http://www.gnu.org/software/emacs/\#Manuals}
72\endgroup} 69\endgroup}
73 70
74% make \bye not \outer so that the \def\bye in the \else clause below 71% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 913372bc8cd..d04b362bc2d 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -58,11 +58,8 @@
58Released under the terms of the GNU General Public License 58Released under the terms of the GNU General Public License
59version 3 or later. 59version 3 or later.
60 60
61\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 61For more Emacs documentation, and the \TeX{} source for this card,
62 62see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
63Pour obtenir des copies du manuel de GNU Emacs:
64
65{\tt http://www.gnu.org/software/emacs/\#Manuals}
66\endgroup} 63\endgroup}
67 64
68% make \bye not \outer so that the \def\bye in the \else clause below 65% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index ddaa85befbe..73e630749df 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -78,11 +78,8 @@
78 78
79Released under the terms of the GNU General Public License version 3 or later. 79Released under the terms of the GNU General Public License version 3 or later.
80 80
81\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 81For more Emacs documentation, and the \TeX{} source for this card,
82 82see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
83Pour des copies du manuel GNU Emacs:
84
85{\tt http://www.gnu.org/software/emacs/\#Manuals}
86\endgroup} 83\endgroup}
87 84
88% make \bye not \outer so that the \def\bye in the \else clause below 85% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index a6279e80d40..e2a338e135a 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -65,8 +65,9 @@
65 Released under the terms of the GNU General Public License 65 Released under the terms of the GNU General Public License
66 version 3 or later. 66 version 3 or later.
67 67
68 \TeX{} source for this card is distributed with Emacs in {\tt 68 For more Emacs documentation, and the \TeX{} source for this card,
69 etc/refcards/}\par}} 69 see the Emacs distribution,
70 or {\tt http://www.gnu.org/software/emacs}\par}}
70 71
71\hsize 3.2in 72\hsize 3.2in
72\vsize 7.95in 73\vsize 7.95in
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 46d0d7df225..6e5f2c3614f 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -125,7 +125,8 @@
125 125
126 Released under the terms of the GNU General Public License version 3 or later. 126 Released under the terms of the GNU General Public License version 3 or later.
127 127
128 \TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 128 For more Emacs documentation, and the \TeX{} source for this card,
129 see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
129 130
130 Please send corrections, additions and suggestions to the 131 Please send corrections, additions and suggestions to the
131 current maintainer's email address. \Guide{} last edited on \date. 132 current maintainer's email address. \Guide{} last edited on \date.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index a5a66264557..d814de5372a 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -80,7 +80,8 @@
80\centerline{Released under the terms of the GNU General Public License} 80\centerline{Released under the terms of the GNU General Public License}
81\centerline{version 3 or later.} 81\centerline{version 3 or later.}
82 82
83\centerline{\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}} 83\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
84\centerline{the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}}
84 85
85\endgroup} 86\endgroup}
86 87
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 788bb2abea8..121c79cfc44 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -90,11 +90,8 @@
90 90
91Released under the terms of the GNU General Public License version 3 or later. 91Released under the terms of the GNU General Public License version 3 or later.
92 92
93\TeX{} source for this card is distributed with Emacs in {\tt etc//refcards//} 93For more Emacs documentation, and the \TeX{} source for this card,
94 94see the Emacs distribution, or {\tt http:////www.gnu.org//software//emacs}
95For copies of the GNU Emacs manual, see:
96
97{\tt http:////www.gnu.org//software//emacs//\#Manuals}
98\endgroup} 95\endgroup}
99 96
100% make \bye not \outer so that the \def\bye in the \else clause below 97% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 27849a3d8d3..7f70d8e80ce 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -83,11 +83,8 @@
83 83
84Released under the terms of the GNU General Public License version 3 or later. 84Released under the terms of the GNU General Public License version 3 or later.
85 85
86\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 86For more Emacs documentation, and the \TeX{} source for this card,
87 87see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
88For copies of the GNU Emacs manual, see:
89
90{\tt http://www.gnu.org/software/emacs/\#Manuals}
91\endgroup} 88\endgroup}
92 89
93% make \bye not \outer so that the \def\bye in the \else clause below 90% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 6eefd1560ce..afeaeec63a2 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -81,11 +81,8 @@
81 81
82Released under the terms of the GNU General Public License version 3 or later. 82Released under the terms of the GNU General Public License version 3 or later.
83 83
84\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 84For more Emacs documentation, and the \TeX{} source for this card,
85 85see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
86For copies of the GNU Emacs manual, see:
87
88{\tt http://www.gnu.org/software/emacs/\#Manuals}
89\endgroup} 86\endgroup}
90 87
91% make \bye not \outer so that the \def\bye in the \else clause below 88% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 1d96473fa6c..a72d08138b2 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -54,13 +54,11 @@
54\centerline{Designed by Stephen Gildea} 54\centerline{Designed by Stephen Gildea}
55\centerline{Перевод Alex Ott <alexott@gmail.com>} 55\centerline{Перевод Alex Ott <alexott@gmail.com>}
56 56
57Released under the terms of the GNU General Public License version 3 or later. 57\centerline{Released under the terms of the GNU General Public License
58 version 3 or later.}
58 59
59\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 60\centerline{For more Emacs documentation, and the \TeX{} source for this card,}
60 61\centerline{see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}}
61For copies of the GNU Emacs manual, see:
62
63{\tt http://www.gnu.org/software/emacs/\#Manuals}
64\endgroup} 62\endgroup}
65 63
66\hyphenation{mini-buf-fer} 64\hyphenation{mini-buf-fer}
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 81f112270f0..25f67d0f44b 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -64,11 +64,8 @@
64 64
65Released under the terms of the GNU General Public License version 3 or later. 65Released under the terms of the GNU General Public License version 3 or later.
66 66
67\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 67For more Emacs documentation, and the \TeX{} source for this card,
68 68see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
69For copies of the GNU Emacs manual, see:
70
71{\tt http://www.gnu.org/software/emacs/\#Manuals}
72\endgroup} 69\endgroup}
73 70
74% make \bye not \outer so that the \def\bye in the \else clause below 71% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 27b3a38cd9c..83b27ef6a83 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -81,11 +81,8 @@
81 81
82Released under the terms of the GNU General Public License version 3 or later. 82Released under the terms of the GNU General Public License version 3 or later.
83 83
84\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 84For more Emacs documentation, and the \TeX{} source for this card,
85 85see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
86For copies of the GNU Emacs manual, see:
87
88{\tt http://www.gnu.org/software/emacs/\#Manuals}
89\endgroup} 86\endgroup}
90 87
91% make \bye not \outer so that the \def\bye in the \else clause below 88% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 152009bd86f..27b1a78b47f 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -72,8 +72,9 @@
72 Released under the terms of the GNU General Public License 72 Released under the terms of the GNU General Public License
73 version 3 or later. 73 version 3 or later.
74 74
75 \TeX{} source for this card is distributed with Emacs in 75 For more Emacs documentation, and the \TeX{} source for this card,
76 {\tt etc/refcards/}\par}} 76 see the Emacs distribution,
77 or {\tt http://www.gnu.org/software/emacs}\par}}
77 78
78\hsize 3.2in 79\hsize 3.2in
79\vsize 7.95in 80\vsize 7.95in
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 2d81b309906..1bdeb63d163 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -59,8 +59,9 @@
59 Released under the terms of the GNU General Public License 59 Released under the terms of the GNU General Public License
60 version 3 or later. 60 version 3 or later.
61 61
62 \TeX{} source for this card is distributed with Emacs in 62 For more Emacs documentation, and the \TeX{} source for this card,
63 {\tt etc/refcards/}\par}} 63 see the Emacs distribution,
64 or {\tt http://www.gnu.org/software/emacs}\par}}
64 65
65\hsize 3.2in 66\hsize 3.2in
66\vsize 7.95in 67\vsize 7.95in
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 5eca55cc582..e4edfdbc15c 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -73,11 +73,8 @@
73 73
74Released under the terms of the GNU General Public License version 3 or later. 74Released under the terms of the GNU General Public License version 3 or later.
75 75
76\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 76For more Emacs documentation, and the \TeX{} source for this card,
77 77see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
78For copies of the GNU Emacs manual, see:
79
80{\tt http://www.gnu.org/software/emacs/\#Manuals}
81\endgroup} 78\endgroup}
82 79
83% make \bye not \outer so that the \def\bye in the \else clause below 80% make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index d984ffc484f..66d65efdff1 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -77,11 +77,8 @@
77 77
78Released under the terms of the GNU General Public License version 3 or later. 78Released under the terms of the GNU General Public License version 3 or later.
79 79
80\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/} 80For more Emacs documentation, and the \TeX{} source for this card,
81 81see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
82For copies of the GNU Emacs manual, see:
83
84{\tt http://www.gnu.org/software/emacs/\#Manuals}
85\endgroup} 82\endgroup}
86 83
87% make \bye not \outer so that the \def\bye in the \else clause below 84% make \bye not \outer so that the \def\bye in the \else clause below
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-07 11:43:34 +0000