comparison man/ChangeLog @ 59549:eda381049620

Fix commit conflicts.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 15 Jan 2005 11:48:58 +0000
parents 4d6252ae9651
children be010c149573
comparison
equal deleted inserted replaced
59548:83df5808ec6b 59549:eda381049620
115 * Makefile.in (MAKEINFO): Specify --force. 115 * Makefile.in (MAKEINFO): Specify --force.
116 116
117 * basic.texi (Moving Point): C-e now runs move-end-of-line. 117 * basic.texi (Moving Point): C-e now runs move-end-of-line.
118 (Undo): Doc undo-outer-limit. 118 (Undo): Doc undo-outer-limit.
119 119
120 2004-12-11 Richard M. Stallman <rms@gnu.org>
121
122 * Makefile.in (MAKEINFO): Add --force.
123
124 2004-12-20 Jay Belanger <belanger@truman.edu> 120 2004-12-20 Jay Belanger <belanger@truman.edu>
125 121
126 * calc.texi (Types Tutorial): Emphasize that you can't divide by 122 * calc.texi (Types Tutorial): Emphasize that you can't divide by
127 zero. 123 zero.
128 124
144 (Retrieving URLs): @var{nil}->@code{nil}. 140 (Retrieving URLs): @var{nil}->@code{nil}.
145 (HTTP language/coding, mailto): Replace "GNU Emacs Manual" with 141 (HTTP language/coding, mailto): Replace "GNU Emacs Manual" with
146 the standard "The GNU Emacs Manual" in fifth argument of @xref's. 142 the standard "The GNU Emacs Manual" in fifth argument of @xref's.
147 (Dealing with HTTP documents): @inforef->@xref. 143 (Dealing with HTTP documents): @inforef->@xref.
148 144
149 >>>>>>> 1.412
150 2004-12-15 Juri Linkov <juri@jurta.org> 145 2004-12-15 Juri Linkov <juri@jurta.org>
151 146
152 * mark.texi (Transient Mark, Mark Ring): M-< and other 147 * mark.texi (Transient Mark, Mark Ring): M-< and other
153 movement commands don't set mark in Transient Mark mode 148 movement commands don't set mark in Transient Mark mode
154 if mark is active. 149 if mark is active.
161 156
162 2004-12-13 Jay Belanger <belanger@truman.edu> 157 2004-12-13 Jay Belanger <belanger@truman.edu>
163 158
164 * calc.texi: Fix some TeX definitions. 159 * calc.texi: Fix some TeX definitions.
165 160
166 >>>>>>> 1.407
167 2004-12-12 Juri Linkov <juri@jurta.org> 161 2004-12-12 Juri Linkov <juri@jurta.org>
168 162
169 * misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d, 163 * misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d,
170 C-x 4 r, C-x 4 d, C-x 5 r, C-x 5 d. 164 C-x 4 r, C-x 4 d, C-x 5 r, C-x 5 d.
171 165
175 2004-12-12 Juri Linkov <juri@jurta.org> 169 2004-12-12 Juri Linkov <juri@jurta.org>
176 170
177 * mark.texi (Marking Objects): Marking commands also extend the 171 * mark.texi (Marking Objects): Marking commands also extend the
178 region when mark is active in Transient Mark mode. 172 region when mark is active in Transient Mark mode.
179 173
180 >>>>>>> 1.403
181 2004-12-09 Luc Teirlinck <teirllm@auburn.edu> 174 2004-12-09 Luc Teirlinck <teirllm@auburn.edu>
182 175
183 * reftex.texi (Imprint): Remove erroneous @value's. 176 * reftex.texi (Imprint): Remove erroneous @value's.
184 177
185 2004-12-08 Luc Teirlinck <teirllm@auburn.edu> 178 2004-12-08 Luc Teirlinck <teirllm@auburn.edu>