aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/custom.texi8
-rw-r--r--doc/emacs/trouble.texi2
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi47
-rw-r--r--doc/lispref/frames.texi3
-rw-r--r--doc/misc/ert.texi2
6 files changed, 31 insertions, 33 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a808a96b444..84bb7cf30df 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1711,7 +1711,7 @@
1711 (Table of Resources): Document fontBackend resource. 1711 (Table of Resources): Document fontBackend resource.
1712 1712
1713 * trouble.texi (Quitting): Add other undo bindings to table. 1713 * trouble.texi (Quitting): Add other undo bindings to table.
1714 (DEL Does Not Delete): Note that the erasure key is usually labelled 1714 (DEL Does Not Delete): Note that the erasure key is usually labeled
1715 "Backspace". Remove discussion of obscure Xmodmap issue. 1715 "Backspace". Remove discussion of obscure Xmodmap issue.
1716 1716
17172009-05-07 Chong Yidong <cyd@stupidchicken.com> 17172009-05-07 Chong Yidong <cyd@stupidchicken.com>
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index fd680576b4e..5b98216369d 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -82,7 +82,7 @@ under it. It looks like this, in part:
82@group 82@group
83/- Emacs group: Customization of the One True Editor. -------------\ 83/- Emacs group: Customization of the One True Editor. -------------\
84 [State]: visible group members are all at standard values. 84 [State]: visible group members are all at standard values.
85 85
86 See also [Manual]. 86 See also [Manual].
87 87
88[Editing] : Basic text editing facilities. 88[Editing] : Basic text editing facilities.
@@ -547,7 +547,7 @@ such collections from one computer to another.
547 To define a Custom theme, use @kbd{M-x customize-create-theme}, 547 To define a Custom theme, use @kbd{M-x customize-create-theme},
548which brings up a buffer named @samp{*New Custom Theme*}. At the top 548which brings up a buffer named @samp{*New Custom Theme*}. At the top
549of the buffer is an editable field where you can specify the name of 549of the buffer is an editable field where you can specify the name of
550the theme. Click on the button labelled @samp{Insert Variable} to add 550the theme. Click on the button labeled @samp{Insert Variable} to add
551a variable to the theme, and click on @samp{Insert Face} to add a 551a variable to the theme, and click on @samp{Insert Face} to add a
552face. You can edit these values in the @samp{*New Custom Theme*} 552face. You can edit these values in the @samp{*New Custom Theme*}
553buffer like in an ordinary Customize buffer. To remove an option from 553buffer like in an ordinary Customize buffer. To remove an option from
@@ -1068,7 +1068,7 @@ other context has no special meaning.
1068well as the major modes; in fact, you can use it more than once, first 1068well as the major modes; in fact, you can use it more than once, first
1069to set the major mode and then to enable minor modes which are 1069to set the major mode and then to enable minor modes which are
1070specific to particular buffers. Using @code{mode} for minor modes 1070specific to particular buffers. Using @code{mode} for minor modes
1071is deprecated, though---instead, use @code{eval: (minor-mode 1)}. 1071is deprecated, though---instead, use @code{eval: (minor-mode 1)}.
1072 1072
1073 Often, however, it is a mistake to enable minor modes in file local 1073 Often, however, it is a mistake to enable minor modes in file local
1074variables. Most minor modes, like Auto Fill mode, represent individual user 1074variables. Most minor modes, like Auto Fill mode, represent individual user
@@ -1646,7 +1646,7 @@ ways to use these modifiers; the key labeled @key{Alt} on most
1646keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The 1646keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The
1647standard key bindings in Emacs do not include any characters with 1647standard key bindings in Emacs do not include any characters with
1648these modifiers. However, you can customize Emacs to assign meanings 1648these modifiers. However, you can customize Emacs to assign meanings
1649to them. The modifier bits are labelled as @samp{s-}, @samp{H-} and 1649to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and
1650@samp{A-} respectively. 1650@samp{A-} respectively.
1651 1651
1652 Even if your keyboard lacks these additional modifier keys, you can 1652 Even if your keyboard lacks these additional modifier keys, you can
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index ec159af6f84..ae7550d0fae 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -161,7 +161,7 @@ in the Emacs distribution. Type @kbd{C-h C-f} to read the FAQ; type
161@cindex @key{BACKSPACE} vs @key{DEL} 161@cindex @key{BACKSPACE} vs @key{DEL}
162@cindex usual erasure key 162@cindex usual erasure key
163 163
164 Every keyboard has a large key, usually labelled @key{Backspace}, 164 Every keyboard has a large key, usually labeled @key{Backspace},
165which is ordinarily used to erase the last character that you typed. 165which is ordinarily used to erase the last character that you typed.
166We call this key @dfn{the usual erasure key}. In Emacs, it is 166We call this key @dfn{the usual erasure key}. In Emacs, it is
167supposed to be equivalent to @key{DEL}. 167supposed to be equivalent to @key{DEL}.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 11ceea19eef..841bf8a0c95 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -357,7 +357,7 @@ every node in every chapter.
357* Conclusion:: Now you have the basics. 357* Conclusion:: Now you have the basics.
358* the-the:: An appendix: how to find reduplicated words. 358* the-the:: An appendix: how to find reduplicated words.
359* Kill Ring:: An appendix: how the kill ring works. 359* Kill Ring:: An appendix: how the kill ring works.
360* Full Graph:: How to create a graph with labelled axes. 360* Full Graph:: How to create a graph with labeled axes.
361* Free Software and Free Manuals:: 361* Free Software and Free Manuals::
362* GNU Free Documentation License:: 362* GNU Free Documentation License::
363* Index:: 363* Index::
@@ -793,9 +793,9 @@ The @code{current-kill} Function
793* Digression concerning error:: How to mislead humans, but not computers. 793* Digression concerning error:: How to mislead humans, but not computers.
794* Determining the Element:: 794* Determining the Element::
795 795
796A Graph with Labelled Axes 796A Graph with Labeled Axes
797 797
798* Labelled Example:: 798* Labeled Example::
799* print-graph Varlist:: @code{let} expression in @code{print-graph}. 799* print-graph Varlist:: @code{let} expression in @code{print-graph}.
800* print-Y-axis:: Print a label for the vertical axis. 800* print-Y-axis:: Print a label for the vertical axis.
801* print-X-axis:: Print a horizontal label. 801* print-X-axis:: Print a horizontal label.
@@ -1023,7 +1023,7 @@ the command in parentheses, like this: @kbd{M-C-\}
1023invoke the command; this is called @dfn{rebinding}. @xref{Keymaps, , 1023invoke the command; this is called @dfn{rebinding}. @xref{Keymaps, ,
1024Keymaps}.) The abbreviation @kbd{M-C-\} means that you type your 1024Keymaps}.) The abbreviation @kbd{M-C-\} means that you type your
1025@key{META} key, @key{CTRL} key and @key{\} key all at the same time. 1025@key{META} key, @key{CTRL} key and @key{\} key all at the same time.
1026(On many modern keyboards the @key{META} key is labelled 1026(On many modern keyboards the @key{META} key is labeled
1027@key{ALT}.) 1027@key{ALT}.)
1028Sometimes a combination like this is called a keychord, since it is 1028Sometimes a combination like this is called a keychord, since it is
1029similar to the way you play a chord on a piano. If your keyboard does 1029similar to the way you play a chord on a piano. If your keyboard does
@@ -1031,7 +1031,7 @@ not have a @key{META} key, the @key{ESC} key prefix is used in place
1031of it. In this case, @kbd{M-C-\} means that you press and release your 1031of it. In this case, @kbd{M-C-\} means that you press and release your
1032@key{ESC} key and then type the @key{CTRL} key and the @key{\} key at 1032@key{ESC} key and then type the @key{CTRL} key and the @key{\} key at
1033the same time. But usually @kbd{M-C-\} means press the @key{CTRL} key 1033the same time. But usually @kbd{M-C-\} means press the @key{CTRL} key
1034along with the key that is labelled @key{ALT} and, at the same time, 1034along with the key that is labeled @key{ALT} and, at the same time,
1035press the @key{\} key. 1035press the @key{\} key.
1036 1036
1037In addition to typing a lone keychord, you can prefix what you type 1037In addition to typing a lone keychord, you can prefix what you type
@@ -4749,7 +4749,7 @@ type in the name of the function whose source code you want to see,
4749such as @code{mark-whole-buffer}, and then type @key{RET}. Emacs will 4749such as @code{mark-whole-buffer}, and then type @key{RET}. Emacs will
4750switch buffers and display the source code for the function on your 4750switch buffers and display the source code for the function on your
4751screen. To switch back to your current buffer, type @kbd{C-x b 4751screen. To switch back to your current buffer, type @kbd{C-x b
4752@key{RET}}. (On some keyboards, the @key{META} key is labelled 4752@key{RET}}. (On some keyboards, the @key{META} key is labeled
4753@key{ALT}.) 4753@key{ALT}.)
4754 4754
4755@c !!! 22.1.1 tags table location in this paragraph 4755@c !!! 22.1.1 tags table location in this paragraph
@@ -16962,7 +16962,7 @@ For this reason, I have written enhancements to the basic
16962@code{print-graph-body} function that automatically print labels for 16962@code{print-graph-body} function that automatically print labels for
16963the horizontal and vertical axes. Since the label printing functions 16963the horizontal and vertical axes. Since the label printing functions
16964do not contain much new material, I have placed their description in 16964do not contain much new material, I have placed their description in
16965an appendix. @xref{Full Graph, , A Graph with Labelled Axes}. 16965an appendix. @xref{Full Graph, , A Graph with Labeled Axes}.
16966 16966
16967@node Line Graph Exercise, , Printed Axes, Readying a Graph 16967@node Line Graph Exercise, , Printed Axes, Readying a Graph
16968@section Exercise 16968@section Exercise
@@ -19447,7 +19447,7 @@ whether the kill ring is full or empty. This is an act of
19447exploration. 19447exploration.
19448 19448
19449From the human point of view, the act of exploration and discovery is 19449From the human point of view, the act of exploration and discovery is
19450not necessarily an error, and therefore should not be labelled as one, 19450not necessarily an error, and therefore should not be labeled as one,
19451even in the bowels of a computer. As it is, the code in Emacs implies 19451even in the bowels of a computer. As it is, the code in Emacs implies
19452that a human who is acting virtuously, by exploring his or her 19452that a human who is acting virtuously, by exploring his or her
19453environment, is making an error. This is bad. Even though the computer 19453environment, is making an error. This is bad. Even though the computer
@@ -19760,25 +19760,25 @@ as @code{kill-ring-yank-pointer} do not use this library, possibly
19760because they were written earlier. 19760because they were written earlier.
19761 19761
19762@node Full Graph, Free Software and Free Manuals, Kill Ring, Top 19762@node Full Graph, Free Software and Free Manuals, Kill Ring, Top
19763@appendix A Graph with Labelled Axes 19763@appendix A Graph with Labeled Axes
19764 19764
19765Printed axes help you understand a graph. They convey scale. In an 19765Printed axes help you understand a graph. They convey scale. In an
19766earlier chapter (@pxref{Readying a Graph, , Readying a Graph}), we 19766earlier chapter (@pxref{Readying a Graph, , Readying a Graph}), we
19767wrote the code to print the body of a graph. Here we write the code 19767wrote the code to print the body of a graph. Here we write the code
19768for printing and labelling vertical and horizontal axes, along with the 19768for printing and labeling vertical and horizontal axes, along with the
19769body itself. 19769body itself.
19770 19770
19771@menu 19771@menu
19772* Labelled Example:: 19772* Labeled Example::
19773* print-graph Varlist:: @code{let} expression in @code{print-graph}. 19773* print-graph Varlist:: @code{let} expression in @code{print-graph}.
19774* print-Y-axis:: Print a label for the vertical axis. 19774* print-Y-axis:: Print a label for the vertical axis.
19775* print-X-axis:: Print a horizontal label. 19775* print-X-axis:: Print a horizontal label.
19776* Print Whole Graph:: The function to print a complete graph. 19776* Print Whole Graph:: The function to print a complete graph.
19777@end menu 19777@end menu
19778 19778
19779@node Labelled Example, print-graph Varlist, Full Graph, Full Graph 19779@node Labeled Example, print-graph Varlist, Full Graph, Full Graph
19780@ifnottex 19780@ifnottex
19781@unnumberedsec Labelled Example Graph 19781@unnumberedsec Labeled Example Graph
19782@end ifnottex 19782@end ifnottex
19783 19783
19784Since insertions fill a buffer to the right and below point, the new 19784Since insertions fill a buffer to the right and below point, the new
@@ -19821,9 +19821,9 @@ Here is an example of how a finished graph should look:
19821@end smallexample 19821@end smallexample
19822 19822
19823@noindent 19823@noindent
19824In this graph, both the vertical and the horizontal axes are labelled 19824In this graph, both the vertical and the horizontal axes are labeled
19825with numbers. However, in some graphs, the horizontal axis is time 19825with numbers. However, in some graphs, the horizontal axis is time
19826and would be better labelled with months, like this: 19826and would be better labeled with months, like this:
19827 19827
19828@smallexample 19828@smallexample
19829@group 19829@group
@@ -19838,9 +19838,9 @@ and would be better labelled with months, like this:
19838@end smallexample 19838@end smallexample
19839 19839
19840Indeed, with a little thought, we can easily come up with a variety of 19840Indeed, with a little thought, we can easily come up with a variety of
19841vertical and horizontal labelling schemes. Our task could become 19841vertical and horizontal labeling schemes. Our task could become
19842complicated. But complications breed confusion. Rather than permit 19842complicated. But complications breed confusion. Rather than permit
19843this, it is better choose a simple labelling scheme for our first 19843this, it is better choose a simple labeling scheme for our first
19844effort, and to modify or replace it later. 19844effort, and to modify or replace it later.
19845 19845
19846@need 1200 19846@need 1200
@@ -19864,7 +19864,7 @@ These considerations suggest the following outline for the
19864We can work on each part of the @code{print-graph} function definition 19864We can work on each part of the @code{print-graph} function definition
19865in turn. 19865in turn.
19866 19866
19867@node print-graph Varlist, print-Y-axis, Labelled Example, Full Graph 19867@node print-graph Varlist, print-Y-axis, Labeled Example, Full Graph
19868@comment node-name, next, previous, up 19868@comment node-name, next, previous, up
19869@appendixsec The @code{print-graph} Varlist 19869@appendixsec The @code{print-graph} Varlist
19870@cindex @code{print-graph} varlist 19870@cindex @code{print-graph} varlist
@@ -20391,7 +20391,7 @@ blank spaces and also separated according to the value of the variable
20391The value of the variable @code{X-axis-label-spacing} should itself be 20391The value of the variable @code{X-axis-label-spacing} should itself be
20392measured in units of @code{symbol-width}, since you may want to change 20392measured in units of @code{symbol-width}, since you may want to change
20393the width of the symbols that you are using to print the body of the 20393the width of the symbols that you are using to print the body of the
20394graph without changing the ways the graph is labelled. 20394graph without changing the ways the graph is labeled.
20395 20395
20396@menu 20396@menu
20397* Similarities differences:: Much like @code{print-Y-axis}, but not exactly. 20397* Similarities differences:: Much like @code{print-Y-axis}, but not exactly.
@@ -20722,7 +20722,7 @@ Emacs will print the horizontal axis like this:
20722Now we are nearly ready to print the whole graph. 20722Now we are nearly ready to print the whole graph.
20723 20723
20724The function to print the graph with the proper labels follows the 20724The function to print the graph with the proper labels follows the
20725outline we created earlier (@pxref{Full Graph, , A Graph with Labelled 20725outline we created earlier (@pxref{Full Graph, , A Graph with Labeled
20726Axes}), but with additions. 20726Axes}), but with additions.
20727 20727
20728@need 1250 20728@need 1250
@@ -20857,7 +20857,7 @@ Finally, the code for the @code{print-graph} function:
20857;;; @r{Final version.} 20857;;; @r{Final version.}
20858(defun print-graph 20858(defun print-graph
20859 (numbers-list &optional vertical-step) 20859 (numbers-list &optional vertical-step)
20860 "Print labelled bar graph of the NUMBERS-LIST. 20860 "Print labeled bar graph of the NUMBERS-LIST.
20861The numbers-list consists of the Y-axis values. 20861The numbers-list consists of the Y-axis values.
20862@end group 20862@end group
20863 20863
@@ -21478,7 +21478,7 @@ each column."
21478@group 21478@group
21479(defun print-graph 21479(defun print-graph
21480 (numbers-list &optional vertical-step horizontal-step) 21480 (numbers-list &optional vertical-step horizontal-step)
21481 "Print labelled bar graph of the NUMBERS-LIST. 21481 "Print labeled bar graph of the NUMBERS-LIST.
21482The numbers-list consists of the Y-axis values. 21482The numbers-list consists of the Y-axis values.
21483@end group 21483@end group
21484 21484
@@ -21979,7 +21979,7 @@ each column."
21979@group 21979@group
21980(defun print-graph 21980(defun print-graph
21981 (numbers-list &optional vertical-step horizontal-step) 21981 (numbers-list &optional vertical-step horizontal-step)
21982 "Print labelled bar graph of the NUMBERS-LIST. 21982 "Print labeled bar graph of the NUMBERS-LIST.
21983The numbers-list consists of the Y-axis values. 21983The numbers-list consists of the Y-axis values.
21984@end group 21984@end group
21985 21985
@@ -22275,4 +22275,3 @@ airplane.
22275@c @end iftex 22275@c @end iftex
22276 22276
22277@bye 22277@bye
22278
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index d9399e98a69..d2e86a77112 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2414,7 +2414,7 @@ This function returns the ``vendor'' that provided the X server
2414software (as a string). Really this means whoever distributes the X 2414software (as a string). Really this means whoever distributes the X
2415server. 2415server.
2416 2416
2417When the developers of X labelled software distributors as 2417When the developers of X labeled software distributors as
2418``vendors,'' they showed their false assumption that no system could 2418``vendors,'' they showed their false assumption that no system could
2419ever be developed and distributed noncommercially. 2419ever be developed and distributed noncommercially.
2420@end defun 2420@end defun
@@ -2430,4 +2430,3 @@ This variable's value is @code{t} if no X window manager is in use.
2430The functions @code{x-pixel-width} and @code{x-pixel-height} return the 2430The functions @code{x-pixel-width} and @code{x-pixel-height} return the
2431width and height of an X Window frame, measured in pixels. 2431width and height of an X Window frame, measured in pixels.
2432@end ignore 2432@end ignore
2433
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index d1cecf1347a..d802e4259f5 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -748,7 +748,7 @@ explanation function.
748 748
749Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch} 749Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch}
750are implemented on top of the lower-level test handling code in the 750are implemented on top of the lower-level test handling code in the
751sections of @file{ert.el} labelled ``Facilities for running a single test'', 751sections of @file{ert.el} labeled ``Facilities for running a single test'',
752``Test selectors'', and ``Facilities for running a whole set of tests''. 752``Test selectors'', and ``Facilities for running a whole set of tests''.
753 753
754If you want to write code that works with ERT tests, you should take a 754If you want to write code that works with ERT tests, you should take a