# HG changeset patch # User Richard M. Stallman # Date 954358814 0 # Node ID 844fb933c1aaf7cfac0c2aaac6c22d83fbac3020 # Parent a5e68b6ab63ea2f179b4372b663e025df0c0d90b *** empty log message *** diff -r a5e68b6ab63e -r 844fb933c1aa lispref/customize.texi --- a/lispref/customize.texi Wed Mar 29 19:37:14 2000 +0000 +++ b/lispref/customize.texi Wed Mar 29 19:40:14 2000 +0000 @@ -495,13 +495,16 @@ (defcustom person-data '(("brian" 50 t) ("dorith" 55 nil) ("ken" 52 t)) - "Alist of people, each element has the form (NAME AGE MALE)." + "Alist of basic info about people. +Each element has the form (NAME AGE MALE-FLAG)." :type '(alist :value-type (group age boolean))) (defcustom pets '(("brian") ("dorith" "dog" "guppy") ("ken" "cat")) - "Alist where the KEY is a person, and the VALUE is a list of pets." + "Alist of people's pets. +In an element (KEY . VALUE), KEY is the person's name, +and the VALUE is a list of that person's pets." :type '(alist :value-type (repeat string))) @end smallexample diff -r a5e68b6ab63e -r 844fb933c1aa lispref/doclicense.texi --- a/lispref/doclicense.texi Wed Mar 29 19:37:14 2000 +0000 +++ b/lispref/doclicense.texi Wed Mar 29 19:40:14 2000 +0000 @@ -17,14 +17,14 @@ PREAMBLE The purpose of this License is to make a manual, textbook, or other -written document "free" in the sense of freedom: to assure everyone +written document ``free'' in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without modifying it, either commercially or noncommercially. Secondarily, this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others. -This License is a kind of "copyleft", which means that derivative +This License is a kind of ``copyleft'', which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software. @@ -43,15 +43,15 @@ This License applies to any manual or other work that contains a notice placed by the copyright holder saying it can be distributed -under the terms of this License. The "Document", below, refers to any +under the terms of this License. The ``Document'', below, refers to any such manual or work. Any member of the public is a licensee, and is -addressed as "you". +addressed as ``you''. -A "Modified Version" of the Document means any work containing the +A ``Modified Version'' of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language. -A "Secondary Section" is a named appendix or a front-matter section of +A ``Secondary Section'' is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly @@ -62,15 +62,15 @@ commercial, philosophical, ethical or political position regarding them. -The "Invariant Sections" are certain Secondary Sections whose titles +The ``Invariant Sections'' are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. -The "Cover Texts" are certain short passages of text that are listed, +The ``Cover Texts'' are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. -A "Transparent" copy of the Document means a machine-readable copy, +A ``Transparent'' copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, whose contents can be viewed and edited directly and straightforwardly with generic text editors or (for images composed of @@ -80,7 +80,7 @@ to text formatters. A copy made in an otherwise Transparent file format whose markup has been designed to thwart or discourage subsequent modification by readers is not Transparent. A copy that is -not "Transparent" is called "Opaque". +not ``Transparent'' is called ``Opaque''. Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML @@ -92,10 +92,10 @@ machine-generated HTML produced by some word processors for output purposes only. -The "Title Page" means, for a printed book, the title page itself, +The ``Title Page'' means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in -formats which do not have any title page as such, "Title Page" means +formats which do not have any title page as such, ``Title Page'' means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. @sp1 @@ -183,30 +183,30 @@ G. Preserve in that license notice the full lists of Invariant Sections and required Cover Texts given in the Document's license notice.@* H. Include an unaltered copy of this License.@* -I. Preserve the section entitled "History", and its title, and add to +I. Preserve the section entitled ``History'', and its title, and add to it an item stating at least the title, year, new authors, and publisher of the Modified Version as given on the Title Page. If - there is no section entitled "History" in the Document, create one + there is no section entitled ``History'' in the Document, create one stating the title, year, authors, and publisher of the Document as given on its Title Page, then add an item describing the Modified Version as stated in the previous sentence.@* J. Preserve the network location, if any, given in the Document for public access to a Transparent copy of the Document, and likewise the network locations given in the Document for previous versions - it was based on. These may be placed in the "History" section. + it was based on. These may be placed in the ``History'' section. You may omit a network location for a work that was published at least four years before the Document itself, or if the original publisher of the version it refers to gives permission.@* -K. In any section entitled "Acknowledgements" or "Dedications", +K. In any section entitled ``Acknowledgements'' or ``Dedications'', preserve the section's title, and preserve in the section all the substance and tone of each of the contributor acknowledgements and/or dedications given therein.@* L. Preserve all the Invariant Sections of the Document, unaltered in their text and in their titles. Section numbers or the equivalent are not considered part of the section titles.@* -M. Delete any section entitled "Endorsements". Such a section +M. Delete any section entitled ``Endorsements''. Such a section may not be included in the Modified Version.@* -N. Do not retitle any existing section as "Endorsements" +N. Do not retitle any existing section as ``Endorsements'' or to conflict in title with any Invariant Section.@* @sp1 If the Modified Version includes new front-matter sections or @@ -216,7 +216,7 @@ list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles. -You may add a section entitled "Endorsements", provided it contains +You may add a section entitled ``Endorsements'', provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a @@ -255,11 +255,11 @@ Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work. -In the combination, you must combine any sections entitled "History" +In the combination, you must combine any sections entitled ``History'' in the various original documents, forming one section entitled -"History"; likewise combine any sections entitled "Acknowledgements", -and any sections entitled "Dedications". You must delete all sections -entitled "Endorsements." +``History''; likewise combine any sections entitled ``Acknowledgements'', +and any sections entitled ``Dedications''. You must delete all sections +entitled ``Endorsements.'' @sp1 @item COLLECTIONS OF DOCUMENTS @@ -282,7 +282,7 @@ and independent documents or works, in or on a volume of a storage or distribution medium, does not as a whole count as a Modified Version of the Document, provided no compilation copyright is claimed for the -compilation. Such a compilation is called an "aggregate", and this +compilation. Such a compilation is called an ``aggregate'', and this License does not apply to the other self-contained works thus compiled with the Document, on account of their being thus compiled, if they are not themselves derivative works of the Document. @@ -329,7 +329,7 @@ Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this -License "or any later version" applies to it, you have the option of +License ``or any later version'' applies to it, you have the option of following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version @@ -347,20 +347,20 @@ @smallexample @group - Copyright (C) @var{YEAR} @var{YOUR NAME}. + Copyright (C) @var{year} @var{your name}. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; - with the Invariant Sections being @var{LIST THEIR TITLES}, with the - Front-Cover Texts being @var{LIST}, and with the Back-Cover Texts being @var{LIST}. - A copy of the license is included in the section entitled "GNU - Free Documentation License". + with the Invariant Sections being @var{list their titles}, with the + Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}. + A copy of the license is included in the section entitled ``GNU + Free Documentation License''. @end group @end smallexample -If you have no Invariant Sections, write "with no Invariant Sections" +If you have no Invariant Sections, write ``with no Invariant Sections'' instead of saying which ones are invariant. If you have no -Front-Cover Texts, write "no Front-Cover Texts" instead of -"Front-Cover Texts being @var{LIST}"; likewise for Back-Cover Texts. +Front-Cover Texts, write ``no Front-Cover Texts'' instead of +``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts. If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of