; Fix recent changes in bibtex.el documentation

* lisp/textmodes/bibtex.el (bibtex-BibTeX-entry-alist)
(bibtex-BibTeX-field-alist): Doc fixes.

* etc/NEWS: Fix format of a new bibtex entry.

(cherry picked from commit b082a8d9510a0fbbc0b92538e87252e6786b9e61)

diff --git a/etc/NEWS b/etc/NEWS
index 4b724592cadb1e425779ff93a20ab8be1647d622..b9e8b7d72128906c8437379496f2fd8c1331593b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -641,7 +641,8 @@ toggle.
 ** BibTeX mode
 
 ---
-*** New user variables 'bibtex-BibTeX-aux-entry-alist',
+*** New user variables facilitate customization.
+Mew user variables 'bibtex-BibTeX-aux-entry-alist',
 'bibtex-biblatex-aux-entry-alist', 'bibtex-BibTeX-aux-opt-alist',
 and 'bibtex-biblatex-aux-opt-alist' facilitate the customization of
 BibTeX and biblatex entries.  These variables now support the definition

diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index d2206876dbde4885d6a968bbbbba336ec5245127..0ea72e3abe9bdceefaa04800ebacf32a88da88a7 100644 (file)
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -448,11 +448,11 @@ If parsing fails, try to set this variable to nil."
       ("howpublished" "The way in which the work was published")
       ("month") ("year") ("note"))))
   "Alist of BibTeX entry types and their associated fields.
-Elements are lists (ENTRY DOC REQUIRED CROSSREF OPTIONAL)
+Elements are lists of the form (ENTRY DOC REQUIRED CROSSREF OPTIONAL)
 or (ENTRY DOC REF-ENTRY).
 
 ENTRY is the type of a BibTeX entry.
-DOC is a brief doc string used for documentation.  If nil ENTRY is used.
+DOC is a brief doc string used for documentation.  If nil, ENTRY is used.
 REF-ENTRY is another entry type, where ENTRY becomes an alias that inherits
 the definition of REF-ENTRY.
 
@@ -875,9 +875,9 @@ Use this, e.g., for custom fields, see Sec. 2.2.4 of the biblatex manual."
     ("crossref" "Reference key of the cross-referenced entry")
     ("key" "Used as label with certain BibTeX styles"))
     "Alist of BibTeX fields.
-Each element is a list (FIELD COMMENT).  COMMENT is a comment used with
-`bibtex-print-help-message' as a default if `bibtex-BibTeX-entry-alist'
-does not define a comment for FIELD."
+Each element is a list of the form (FIELD COMMENT).  COMMENT is
+a comment used with `bibtex-print-help-message' as a default
+if `bibtex-BibTeX-entry-alist' does not define a comment for FIELD."
   :group 'bibtex
   :version "31.1"
   :type 'bibtex-field-alist)