emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r106397: Fix typos.


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r106397: Fix typos.
Date: Wed, 16 Nov 2011 18:47:25 +0100
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 106397
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-16 18:47:25 +0100
message:
  Fix typos.
modified:
  admin/ChangeLog
  admin/admin.el
  doc/emacs/ChangeLog
  doc/emacs/misc.texi
  doc/emacs/modes.texi
  doc/emacs/msdog.texi
  doc/lispintro/ChangeLog
  doc/lispintro/emacs-lisp-intro.texi
  doc/man/ChangeLog
  doc/man/etags.1
  doc/misc/ChangeLog
  doc/misc/org.texi
  etc/NEWS.19
  etc/NEWS.20
  etc/NEWS.21
  etc/NEWS.23
  etc/TODO
  lib-src/ChangeLog
  lib-src/etags.c
  lisp/ChangeLog
  lisp/ChangeLog.10
  lisp/ChangeLog.12
  lisp/ChangeLog.13
  lisp/ChangeLog.14
  lisp/ChangeLog.5
  lisp/ChangeLog.7
  lisp/ChangeLog.8
  lisp/ChangeLog.9
  lisp/calendar/icalendar.el
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/gnus-uu.el
  lisp/gnus/mailcap.el
  lisp/menu-bar.el
  lisp/org/ChangeLog
  lisp/org/org-agenda.el
  lisp/org/org-bbdb.el
  lisp/org/org-icalendar.el
  lisp/org/org-latex.el
  lisp/printing.el
  lisp/progmodes/gdb-mi.el
  lisp/progmodes/idlw-shell.el
  lisp/progmodes/vhdl-mode.el
  lisp/ps-samp.el
  lisp/textmodes/ispell.el
  src/ChangeLog
  src/ChangeLog.11
  src/nsfns.m
  src/nsterm.h
  src/w32font.c
  src/w32font.h
  src/w32uniscribe.c
  test/ChangeLog
  test/automated/icalendar-tests.el
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-11-15 18:08:38 +0000
+++ b/admin/ChangeLog   2011-11-16 17:47:25 +0000
@@ -1,7 +1,10 @@
+2011-11-16  Juanma Barranquero  <address@hidden>
+
+       * admin.el (manual-dvi): Fix typo.
+
 2011-11-15  Eli Zaretskii  <address@hidden>
 
-       * nt/README-ftp-server: Update the information about PNG
-       libraries.
+       * nt/README-ftp-server: Update the information about PNG libraries.
 
 2011-11-15  Juanma Barranquero  <address@hidden>
 

=== modified file 'admin/admin.el'
--- a/admin/admin.el    2011-09-26 03:02:21 +0000
+++ b/admin/admin.el    2011-11-16 17:47:25 +0000
@@ -330,7 +330,7 @@
 
 (defun manual-dvi (texi-file dest ps-dest)
   "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
-Also generate postscript output in PS-DEST."
+Also generate PostScript output in PS-DEST."
   (call-process "texi2dvi" nil nil nil texi-file "-o" dest)
   (call-process "dvips" nil nil nil dest "-o" ps-dest)
   (call-process "gzip" nil nil nil dest)

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-11-16 12:34:47 +0000
+++ b/doc/emacs/ChangeLog       2011-11-16 17:47:25 +0000
@@ -1,6 +1,9 @@
 2011-11-16  Juanma Barranquero  <address@hidden>
 
        * killing.texi (Rectangles):
+       * misc.texi (Document View):
+       * modes.texi (Choosing Modes):
+       * msdog.texi (Windows Fonts):
        * regs.texi (Rectangle Registers):
        * search.texi (Isearch Yank): Fix typos.
 

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2011-10-06 15:13:45 +0000
+++ b/doc/emacs/misc.texi       2011-11-16 17:47:25 +0000
@@ -236,7 +236,7 @@
 @cindex DVI file
 @cindex PDF file
 @cindex PS file
address@hidden Postscript file
address@hidden PostScript file
 @cindex OpenDocument file
 @cindex Microsoft Office file
 @cindex DocView mode
@@ -244,7 +244,7 @@
 @cindex document viewer (DocView)
 @findex doc-view-mode
 
-DocView mode (@code{doc-view-mode}) is a viewer for DVI, Postscript
+DocView mode (@code{doc-view-mode}) is a viewer for DVI, PostScript
 (PS), PDF, OpenDocument, and Microsoft Office documents.  It provides
 features such as slicing, zooming, and searching inside documents.  It
 works by converting the document to a set of images using the
@@ -257,16 +257,16 @@
 @findex doc-view-toggle-display
 @findex doc-view-toggle-display
 @cindex doc-view-minor-mode
-  When you visit a document file with the exception of Postscript
+  When you visit a document file with the exception of PostScript
 files, Emacs automatically switches to DocView mode if possible
 @footnote{The needed external tools for this document type have to be
 available, emacs needs to run in a graphical frame, and PNG image
 support has to be compiled into emacs.  If any of these requirements
 is not fulfilled, DocView falls back to an appropriate mode.}.  When
-you visit a Postscript file, Emacs switches to PS mode, a major mode
-for editing Postscript files as text; however, it also enables DocView
+you visit a PostScript file, Emacs switches to PS mode, a major mode
+for editing PostScript files as text; however, it also enables DocView
 minor mode, so you can type @kbd{C-c C-c} to view the document with
-DocView.  (PDF and DVI files, unlike Postscript files, are not usually
+DocView.  (PDF and DVI files, unlike PostScript files, are not usually
 human-editable.)  In either case, repeating @kbd{C-c C-c}
 (@code{doc-view-toggle-display}) toggles between DocView and the file
 text.

=== modified file 'doc/emacs/modes.texi'
--- a/doc/emacs/modes.texi      2011-08-29 22:02:21 +0000
+++ b/doc/emacs/modes.texi      2011-11-16 17:47:25 +0000
@@ -368,7 +368,7 @@
 @code{magic-mode-alist}, described above, except that is consulted
 only after @code{auto-mode-alist}.  By default,
 @code{magic-fallback-mode-alist} contains forms that check for image
-files, HTML/XML/SGML files, and Postscript files.
+files, HTML/XML/SGML files, and PostScript files.
 
 @vindex major-mode
   Once a major mode is chosen, Emacs sets the value of the variable

=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi      2011-07-12 01:38:28 +0000
+++ b/doc/emacs/msdog.texi      2011-11-16 17:47:25 +0000
@@ -868,7 +868,7 @@
 @code{gdi} font backend is available on all versions of Windows, and
 supports all fonts that are natively supported by Windows.  The
 @code{uniscribe} font backend is available on Windows 2000 and later,
-and supports Truetype and Opentype fonts.  Some languages requiring
+and supports TrueType and OpenType fonts.  Some languages requiring
 complex layout can only be properly supported by the uniscribe
 backend.  By default, both backends are enabled if supported, with
 @code{uniscribe} taking priority over @code{gdi}.
@@ -914,7 +914,7 @@
 @vindex w32-charset-info-alist
 @item registry
 Specifies the character set registry that the font is
-expected to cover.  Most Truetype and Opentype fonts will be unicode fonts
+expected to cover.  Most TrueType and OpenType fonts will be unicode fonts
 that cover several national character sets, but you can narrow down the
 selection of fonts to those that support a particular character set by
 using a specific registry from @code{w32-charset-info-alist} here.

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2011-04-06 12:18:10 +0000
+++ b/doc/lispintro/ChangeLog   2011-11-16 17:47:25 +0000
@@ -1,3 +1,7 @@
+2011-11-16  Juanma Barranquero  <address@hidden>
+
+       * emacs-lisp-intro.texi (etags): Fix typo.
+
 2011-03-07  Chong Yidong  <address@hidden>
 
        * Version 23.3 released.

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi       2011-11-14 20:23:26 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi       2011-11-16 17:47:25 +0000
@@ -11,7 +11,7 @@
 @c ---------
 @c <<<< For hard copy printing, this file is now
 @c      set for smallbook, which works for all sizes
address@hidden      of paper, and with Postscript figures >>>>
address@hidden      of paper, and with PostScript figures >>>>
 @set smallbook
 @ifset smallbook
 @smallbook
@@ -13656,7 +13656,7 @@
 
 The @code{etags} program handles more than 20 languages, including
 Emacs Lisp, Common Lisp, Scheme, C, C++, Ada, Fortran, HTML, Java,
-LaTeX, Pascal, Perl, Postscript, Python, TeX, Texinfo, makefiles, and
+LaTeX, Pascal, Perl, PostScript, Python, TeX, Texinfo, makefiles, and
 most assemblers.  The program has no switches for specifying the
 language; it recognizes the language in an input file according to its
 file name and contents.

=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2011-11-15 17:37:37 +0000
+++ b/doc/man/ChangeLog 2011-11-16 17:47:25 +0000
@@ -1,3 +1,7 @@
+2011-11-16  Juanma Barranquero  <address@hidden>
+
+       * etags.1: Fix typo.
+
 2011-10-06  Chong Yidong  <address@hidden>
 
        * emacsclient.1: Document how -a "" starts the daemon.

=== modified file 'doc/man/etags.1'
--- a/doc/man/etags.1   2011-01-15 23:16:57 +0000
+++ b/doc/man/etags.1   2011-11-16 17:47:25 +0000
@@ -49,7 +49,7 @@
 \&.  Both forms of the program understand
 the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang,
 Forth, HTML, LaTeX, Emacs Lisp/Common Lisp, Lua, Makefile, Pascal, Perl,
-PHP, Postscript, Python, Prolog, Scheme and
+PHP, PostScript, Python, Prolog, Scheme and
 most assembler\-like syntaxes.
 Both forms read the files specified on the command line, and write a tag
 table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-11-16 12:34:47 +0000
+++ b/doc/misc/ChangeLog        2011-11-16 17:47:25 +0000
@@ -1,3 +1,7 @@
+2011-11-16  Juanma Barranquero  <address@hidden>
+
+       * org.texi (Agenda commands, Exporting Agenda Views): Fix typos.
+
 2011-11-15  Juanma Barranquero  <address@hidden>
 
        * ede.texi (project-am-texinfo):

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2011-11-15 17:37:37 +0000
+++ b/doc/misc/org.texi 2011-11-16 17:47:25 +0000
@@ -8262,7 +8262,7 @@
 @vindex org-agenda-exporter-settings
 Write the agenda view to a file.  Depending on the extension of the selected
 file name, the view will be exported as HTML (extension @file{.html} or
address@hidden), Postscript (extension @file{.ps}), PDF (extension @file{.pdf}),
address@hidden), PostScript (extension @file{.ps}), PDF (extension @file{.pdf}),
 and plain text (any other extension).  When called with a @kbd{C-u} prefix
 argument, immediately open the newly created file.  Use the variable
 @code{org-agenda-exporter-settings} to set options for @file{ps-print} and
@@ -8477,9 +8477,9 @@
 If you are away from your computer, it can be very useful to have a printed
 version of some agenda views to carry around.  Org-mode can export custom
 agenda views as plain text, address@hidden need to install Hrvoje Niksic's
address@hidden, Postscript, address@hidden create PDF output, the
address@hidden, PostScript, address@hidden create PDF output, the
 ghostscript @file{ps2pdf} utility must be installed on the system.  Selecting
-a PDF file will also create the postscript file.}, and iCalendar files.  If
+a PDF file will also create the PostScript file.}, and iCalendar files.  If
 you want to do this only occasionally, use the command
 
 @table @kbd
@@ -8489,7 +8489,7 @@
 @vindex org-agenda-exporter-settings
 Write the agenda view to a file.  Depending on the extension of the selected
 file name, the view will be exported as HTML (extension @file{.html} or
address@hidden), Postscript (extension @file{.ps}), iCalendar (extension
address@hidden), PostScript (extension @file{.ps}), iCalendar (extension
 @file{.ics}), or plain text (any other extension).  Use the variable
 @code{org-agenda-exporter-settings} to set options for @file{ps-print} and
 for @file{htmlize} to be used during export, for example
@@ -8542,7 +8542,7 @@
 @file{.html}, Org-mode will use the @file{htmlize.el} package to convert
 the buffer to HTML and save it to this file name.  If the extension is
 @file{.ps}, @code{ps-print-buffer-with-faces} is used to produce
-Postscript output.  If the extension is @file{.ics}, iCalendar export is
+PostScript output.  If the extension is @file{.ics}, iCalendar export is
 run export over all files that were used to construct the agenda, and
 limit the export to entries listed in the agenda.  Any other
 extension produces a plain ASCII file.
@@ -8573,7 +8573,7 @@
 @end lisp
 
 @noindent
-This command sets two options for the Postscript exporter, to make it
+This command sets two options for the PostScript exporter, to make it
 print in two columns in landscape format---the resulting page can be cut
 in two and then used in a paper agenda.  The remaining settings modify
 the agenda prefix to omit category and scheduling information, and

=== modified file 'etc/NEWS.19'
--- a/etc/NEWS.19       2011-01-26 08:36:39 +0000
+++ b/etc/NEWS.19       2011-11-16 17:47:25 +0000
@@ -1729,7 +1729,7 @@
 use of etags and TAGS files for languages not supported by etags.
 
 The Emacs manual section on Tags contains explanations and examples
-for Emacs's DEFVAR, VHDL, Cobol, Postscript and TCL.
+for Emacs's DEFVAR, VHDL, Cobol, PostScript and TCL.
 
 ** Various mode-specific commands that used to be bound to C-c LETTER
 have been moved.

=== modified file 'etc/NEWS.20'
--- a/etc/NEWS.20       2011-11-11 10:04:08 +0000
+++ b/etc/NEWS.20       2011-11-16 17:47:25 +0000
@@ -696,7 +696,7 @@
 ** You can specify the printer to use for commands that do printing by
 setting the variable `printer-name'.  Just what a printer name looks
 like depends on your operating system.  You can specify a different
-printer for the Postscript printing commands by setting
+printer for the PostScript printing commands by setting
 `ps-printer-name'.
 
 ** Emacs now supports on-the-fly spell checking by the means of a
@@ -3494,9 +3494,9 @@
 *** Java is tagged like C++.  In addition, "extends" and "implements"
 constructs are tagged.  Files are recognized by the extension .java.
 
-*** Etags can now handle programs written in Postscript.  Files are
-recognized by the extensions .ps and .pdb (Postscript with C syntax).
-In Postscript, tags are lines that start with a slash.
+*** Etags can now handle programs written in PostScript.  Files are
+recognized by the extensions .ps and .pdb (PostScript with C syntax).
+In PostScript, tags are lines that start with a slash.
 
 *** Etags now handles Objective C and Objective C++ code.  The usual C and
 C++ tags are recognized in these languages; in addition, etags

=== modified file 'etc/NEWS.21'
--- a/etc/NEWS.21       2011-11-15 07:55:13 +0000
+++ b/etc/NEWS.21       2011-11-16 17:47:25 +0000
@@ -446,7 +446,7 @@
 
 ** Polish, Czech, German, and French translations of Emacs' reference card
 have been added.  They are named `pl-refcard.tex', `cs-refcard.tex',
-`de-refcard.tex' and `fr-refcard.tex'.  Postscript files are included.
+`de-refcard.tex' and `fr-refcard.tex'.  PostScript files are included.
 
 ** An `Emacs Survival Guide', etc/survival.tex, is available.
 
@@ -2189,7 +2189,7 @@
 
 *** New language Python: def and class at the beginning of a line are tags.
 
-*** .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is
+*** .ss files are Scheme files, .pdb is PostScript with C syntax, .psw is
 for PSWrap.
 
 ** Changes in etags.el

=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23       2011-11-14 23:59:56 +0000
+++ b/etc/NEWS.23       2011-11-16 17:47:25 +0000
@@ -1235,8 +1235,8 @@
 
 PDF and DVI files are now opened in Doc View mode by default.
 
-In Postcript mode, C-c C-c launches Doc View minor mode for viewing
-the postscript file.
+In PostScript mode, C-c C-c launches Doc View minor mode for viewing
+the PostScript file.
 
 ** EasyPG provides an interface to the GNU Privacy Guard (GnuPG).
 It includes a GnuPG keyring browser, cryptographic operations on

=== modified file 'etc/TODO'
--- a/etc/TODO  2011-11-14 20:23:26 +0000
+++ b/etc/TODO  2011-11-16 17:47:25 +0000
@@ -325,7 +325,7 @@
 
 ** Beefed-up syntax-tables.
 *** recognize multi-character syntactic entities like `begin' and `end'.
-*** nested string-delimiters (for Postscript's (foo(bar)baz) strings).
+*** nested string-delimiters (for PostScript's (foo(bar)baz) strings).
 *** support for infix operators (with precedence).
 *** support for the $ (paired delimiter) in parse-partial-sexp.
 *** support for hook-chars whose effect on the parsing-state is specified

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-11-16 12:34:47 +0000
+++ b/lib-src/ChangeLog 2011-11-16 17:47:25 +0000
@@ -4634,9 +4634,9 @@
 
 1997-05-12  Francesco Potortì  <address@hidden>
 
-       * etags.c (Cplusplus_suffixes): .pdb is Postscript with C syntax.
-       (Postscript_suffixes): .ps is Postscript.
-       (lang_names): Add Postscript.
+       * etags.c (Cplusplus_suffixes): .pdb is PostScript with C syntax.
+       (Postscript_suffixes): .ps is PostScript.
+       (lang_names): Add postscript.
        (Postscript_functions): New function.
        (TEX_decode_env): Close minor memory leak.
        (just_read_file): Correct the char number of the tag.

=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c   2011-11-13 07:48:23 +0000
+++ b/lib-src/etags.c   2011-11-16 17:47:25 +0000
@@ -611,7 +611,7 @@
 static const char *Cplusplus_suffixes [] =
   { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
     "M",                       /* Objective C++ */
-    "pdb",                     /* Postscript with C syntax */
+    "pdb",                     /* PostScript with C syntax */
     NULL };
 static const char Cplusplus_help [] =
 "In C++ code, all the tag constructs of C code are tagged.  (Use\n\
@@ -4846,7 +4846,7 @@
 
 
 /*
- * Postscript tags
+ * PostScript tags
  * Just look for lines where the first character is '/'
  * Also look at "defineps" for PSWrap
  * Ideas by:

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-16 16:47:28 +0000
+++ b/lisp/ChangeLog    2011-11-16 17:47:25 +0000
@@ -1,3 +1,23 @@
+2011-11-16  Juanma Barranquero  <address@hidden>
+
+       * menu-bar.el (menu-bar-file-menu):
+       * printing.el (pr-ps-utility):
+       * calendar/icalendar.el (icalendar, icalendar--convert-tz-offset)
+       (icalendar--convert-to-ical, icalendar--convert-ordinary-to-ical)
+       (icalendar--convert-weekly-to-ical, icalendar--convert-yearly-to-ical)
+       (icalendar--convert-sexp-to-ical, icalendar--convert-block-to-ical)
+       (icalendar--convert-float-to-ical, icalendar--convert-date-to-ical)
+       (icalendar--convert-cyclic-to-ical)
+       (icalendar--convert-anniversary-to-ical, icalendar-import-buffer)
+       (icalendar--convert-ical-to-diary)
+       (icalendar--convert-recurring-to-diary)
+       (icalendar--convert-non-recurring-all-day-to-diary)
+       (icalendar-import-format-sample):
+       * progmodes/idlw-shell.el (idlwave-shell-mode):
+       * progmodes/vhdl-mode.el (vhdl-mode, vhdl-print-two-column)
+       (vhdl-print-customize-faces, vhdl-mode, vhdl-ps-print-settings)
+       (vhdl-ps-print-init): Fix typos.
+
 2011-11-16  Ken Manheimer  <address@hidden>
 
        * allout-widgets.el: (file metadata): Attribute copyright to FSF
@@ -497,7 +517,7 @@
        * progmodes/cc-defs.el: Update "virtual semicolon" comments.
 
        * progmodes/cc-engine.el (c-crosses-statement-barrier-p):
-       Recode to scan one line at time rather than having \n and \r
+       Recode to scan one line at a time rather than having \n and \r
        explicitly in c-stmt-delim-chars (for some modes, e.g. AWK).
        (c-forward-label): Amend for virtual semicolons.
        (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions.

=== modified file 'lisp/ChangeLog.10'
--- a/lisp/ChangeLog.10 2011-11-16 12:34:47 +0000
+++ b/lisp/ChangeLog.10 2011-11-16 17:47:25 +0000
@@ -2339,7 +2339,7 @@
        skips encoded regions.  Allow user to skip saving Fcc messages with
        large attachments.  Fixed region skipping bug with multi-line
        comments - e.g.  tex $ regions spanning multiple lines.
-       Added support for postscript and uuencoded regions.
+       Added support for PostScript and uuencoded regions.
        Redundant dictionary file names purged.
        Dictionary definition field name changed from "Character Set"
        to "Coding System".  Fixed bug in reloading dictionaries.
@@ -2374,7 +2374,7 @@
        (ispell-valid-dictionary-list): New function returning all valid
        dictionaries on machine.
        (ispell-checking-message): Documentation string improved.
-       (ispell-skip-region-alist): Add uuencoded and postscript region
+       (ispell-skip-region-alist): Add uuencoded and PostScript region
        skipping.  Improve http/e-mail/file regexp to not match `/.\w'.
        (ispell-html-skip-alists): New variable for html region support.
        (ispell-send-string): Remove redundant xemacs check.
@@ -2402,7 +2402,7 @@
        html skipping pushed to alists.
        (ispell-get-line): Add support for multi-line comment regions.
        (ispell): Check that variables to continue spelling are bound.
-       (ispell-message-text-end): Postscript and uuencoded regions now
+       (ispell-message-text-end): PostScript and uuencoded regions now
        supported as MIME regions, rather than as end-of-message region.
        (ispell-mime-multipartp): New function supporting MIME.
        (ispell-mime-skip-part): New function supporting MIME.

=== modified file 'lisp/ChangeLog.12'
--- a/lisp/ChangeLog.12 2011-11-16 12:34:47 +0000
+++ b/lisp/ChangeLog.12 2011-11-16 17:47:25 +0000
@@ -938,7 +938,7 @@
 2007-03-20  David Kastrup  <address@hidden>
 
        * files.el (magic-mode-alist): Require literal "%!PS" string for
-       magic postscript file detection.
+       magic PostScript file detection.
 
 2007-03-20  Richard Stallman  <address@hidden>
 

=== modified file 'lisp/ChangeLog.13'
--- a/lisp/ChangeLog.13 2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.13 2011-11-16 17:47:25 +0000
@@ -16,7 +16,7 @@
        * international/fontset.el (script-representative-chars): Add cham
        and tai-viet.
        (setup-default-fontset): Add iso10646-1 font for latin and ipa.
-       Add fontconfig spec for cjk-misc.  Explicitly specify font font
+       Add fontconfig spec for cjk-misc.  Explicitly specify font
        for U+E000..U+F8FF.
 
        * international/characters.el (script-list): Add cham.
@@ -16414,7 +16414,7 @@
 2007-05-16  Stefan Monnier  <address@hidden>
 
        * files.el (magic-mode-alist, magic-fallback-mode-alist):
-       Move the *ml, Postscript, and XmCD entries to the fallback part.
+       Move the *ml, PostScript, and XmCD entries to the fallback part.
 
        * files.el (magic-fallback-mode-alist):
        Rename from file-start-mode-alist.

=== modified file 'lisp/ChangeLog.14'
--- a/lisp/ChangeLog.14 2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.14 2011-11-16 17:47:25 +0000
@@ -2885,11 +2885,11 @@
 2009-01-25  Craig Markwardt  <address@hidden>
 
        * calendar/icalendar.el (icalendar-uid-format): New defcustom
-       variable to allow the user to choose icalendar UID format.
+       variable to allow the user to choose iCalendar UID format.
        (icalendar--diarytime-to-isotime): Bug fix, now times in the range
        12:00am-12:59am are correctly converted to 0000-0059, instead of 12pm.
        (icalendar-export-region, icalendar--create-uid): Use custom
-       function to compute icalendar UID for each entry.
+       function to compute iCalendar UID for each entry.
        (icalendar--parse-summary-and-rest): Bug fix for parsing of lines
        with description, location, etc. fields (need to keep active count
        of fields encountered).  Another bug fix to the regex that matches

=== modified file 'lisp/ChangeLog.5'
--- a/lisp/ChangeLog.5  2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.5  2011-11-16 17:47:25 +0000
@@ -196,7 +196,7 @@
        (ispell-required-version): Documentation changes.
        (ispell-skip-sgml): Documentation changes.
        (ispell-command-loop): `mode-line-format' now shows misspelled word.
-       (ispell-message-text-end): Can now process postscript version 1.
+       (ispell-message-text-end): Can now process PostScript version 1.
        (ispell-message-start-skip): New variable for block skips, set up for
        pgp and forward blocks.
        (ispell-message-end-skip): New variable for block skips, set up for
@@ -5507,7 +5507,7 @@
 
 1994-10-26  Michael Ernst  <address@hidden>
 
-       * ispell.el (ispell-message-text-end): Match Postscript 3 like 2.
+       * ispell.el (ispell-message-text-end): Match PostScript 3 like 2.
 
 1994-10-26  Ed Reingold  <address@hidden>
 

=== modified file 'lisp/ChangeLog.7'
--- a/lisp/ChangeLog.7  2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.7  2011-11-16 17:47:25 +0000
@@ -22110,7 +22110,7 @@
 1996-09-27  Jacques Duthen  <address@hidden>
 
        * ps-print.el
-       (ps-print-prologue-1): Fix bug in postscript comment lines.
+       (ps-print-prologue-1): Fix bug in PostScript comment lines.
        (ps-nb-pages): Call ps-setup _before_ switching to the other
        buffer, because of buffer variables.
 
@@ -22123,7 +22123,7 @@
        (ps-page-height-i, ps-page-width-i): Variables deleted.
        (ps-print-prologue): Variable deleted.
        (ps-print-prologue-1, ps-print-prologue-2): New variables.
-       Major rewrite of the postscript code to handle landscape mode,
+       Major rewrite of the PostScript code to handle landscape mode,
        multiple columns and new font management.
        (ps-landscape-mode, ps-number-of-columns, ps-inter-column): New
        variables.
@@ -22136,7 +22136,7 @@
        (ps-header-font, ps-landscape-page-height): New internal variables.
        (ps-top-margin): Change its semantics.  It is now really the top
        margin, not anymore twice the top margin.
-       (/ReportAllFontInfo): New postscript function to get all the font
+       (/ReportAllFontInfo): New PostScript function to get all the font
        families of the printer.
        (ps-setup): New function.
        (ps-line-lengths, ps-nb-pages-buffer, ps-nb-pages-region): New

=== modified file 'lisp/ChangeLog.8'
--- a/lisp/ChangeLog.8  2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.8  2011-11-16 17:47:25 +0000
@@ -434,7 +434,7 @@
        for Emacs 20.4 and the earlier versions.
        (ps-mule-init-external-library): Just require a feature for
        external libraries.
-       (ps-mule-prologue): Postscript code modified for new composition.
+       (ps-mule-prologue): PostScript code modified for new composition.
        (ps-mule-find-wrappoint): New arg COMPOSITION.
        (ps-mule-plot-string): Delete code for composite characters.
        (ps-mule-plot-composition): New function.
@@ -447,7 +447,7 @@
        (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar,
        ps-mule-prepare-cmpchar-font): Deleted.
        (ps-mule-string-encoding): New arg NO-SETFONT.
-       (ps-mule-bitmap-prologue): In Postscript code of BuildGlyphCommon,
+       (ps-mule-bitmap-prologue): In PostScript code of BuildGlyphCommon,
        check Composing, not Cmpchar.
        (ps-mule-initialize): Set ps-mule-composition-prologue-generated
        to nil.

=== modified file 'lisp/ChangeLog.9'
--- a/lisp/ChangeLog.9  2011-11-15 17:37:37 +0000
+++ b/lisp/ChangeLog.9  2011-11-16 17:47:25 +0000
@@ -1754,7 +1754,7 @@
        number, column number and buffer-percent part of the mode-line.
 
        * image.el (image-type-regexps): Allow whitespace at the start
-       of the image data for XPM, XBM and Postscript, which are
+       of the image data for XPM, XBM and PostScript, which are
        text files.
        (image-jpeg-p): Correct calculation of next field offset.
 
@@ -5955,7 +5955,7 @@
 2001-01-29  Gerd Moellmann  <address@hidden>
 
        * menu-bar.el (menu-bar-files-menu): Add menu items for
-       Postscript printing in black and white.
+       PostScript printing in black and white.
 
        * mail/rmail.el (rmail-ignored-headers): Add X-Sign, X-BeenThere,
        X-Mailman-Version, Precedence, List-Help, List-Post,

=== modified file 'lisp/calendar/icalendar.el'
--- a/lisp/calendar/icalendar.el        2011-11-14 20:23:26 +0000
+++ b/lisp/calendar/icalendar.el        2011-11-16 17:47:25 +0000
@@ -112,7 +112,7 @@
 ;; Customizables
 ;; ======================================================================
 (defgroup icalendar nil
-  "Icalendar support."
+  "iCalendar support."
   :prefix "icalendar-"
   :group 'calendar)
 
@@ -474,9 +474,9 @@
                    (week (if (eq day -1)
                              byday
                            (substring byday 0 -2))))
-               ;; "Translate" the icalendar way to specify the last
+               ;; "Translate" the iCalendar way to specify the last
                ;; (sun|mon|...)day in month to the tzset way.
-               (if (string= week "-1")  ; last day as icalendar calls it
+               (if (string= week "-1")  ; last day as iCalendar calls it
                    (setq week "5"))     ; last day as tzset calls it
               (concat "M" bymonth "." week "." (if (eq day -1) "0"
                                                  (int-to-string day))
@@ -907,7 +907,7 @@
                                               "\\\\," "," string)))))
 
 ;; ======================================================================
-;; Export -- convert emacs-diary to icalendar
+;; Export -- convert emacs-diary to iCalendar
 ;; ======================================================================
 
 ;;;###autoload
@@ -1063,7 +1063,7 @@
     found-error))
 
 (defun icalendar--convert-to-ical (nonmarker entry-main)
-  "Convert a diary entry to icalendar format.
+  "Convert a diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (or
@@ -1194,7 +1194,7 @@
 
 ;; subroutines for icalendar-export-region
 (defun icalendar--convert-ordinary-to-ical (nonmarker entry-main)
-  "Convert \"ordinary\" diary entry to icalendar format.
+  "Convert \"ordinary\" diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match
@@ -1291,7 +1291,7 @@
     result))
 
 (defun icalendar--convert-weekly-to-ical (nonmarker entry-main)
-  "Convert weekly diary entry to icalendar format.
+  "Convert weekly diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (and (string-match (concat nonmarker
@@ -1373,7 +1373,7 @@
     nil))
 
 (defun icalendar--convert-yearly-to-ical (nonmarker entry-main)
-  "Convert yearly diary entry to icalendar format.
+  "Convert yearly diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1453,7 +1453,7 @@
     nil))
 
 (defun icalendar--convert-sexp-to-ical (nonmarker entry-main)
-  "Convert complex sexp diary entry to icalendar format -- unsupported!
+  "Convert complex sexp diary entry to iCalendar format -- unsupported!
 
 FIXME!
 
@@ -1480,7 +1480,7 @@
          nil)))
 
 (defun icalendar--convert-block-to-ical (nonmarker entry-main)
-  "Convert block diary entry to icalendar format.
+  "Convert block diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1556,7 +1556,7 @@
     nil))
 
 (defun icalendar--convert-float-to-ical (nonmarker entry-main)
-  "Convert float diary entry to icalendar format -- partially unsupported!
+  "Convert float diary entry to iCalendar format -- partially unsupported!
 
   FIXME! DAY from diary-float yet unimplemented.
 
@@ -1619,7 +1619,7 @@
     nil))
 
 (defun icalendar--convert-date-to-ical (nonmarker entry-main)
-  "Convert `diary-date' diary entry to icalendar format -- unsupported!
+  "Convert `diary-date' diary entry to iCalendar format -- unsupported!
 
 FIXME!
 
@@ -1635,7 +1635,7 @@
     nil))
 
 (defun icalendar--convert-cyclic-to-ical (nonmarker entry-main)
-  "Convert `diary-cyclic' diary entry to icalendar format.
+  "Convert `diary-cyclic' diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1709,7 +1709,7 @@
     nil))
 
 (defun icalendar--convert-anniversary-to-ical (nonmarker entry-main)
-  "Convert `diary-anniversary' diary entry to icalendar format.
+  "Convert `diary-anniversary' diary entry to iCalendar format.
 NONMARKER is a regular expression matching the start of non-marking
 entries.  ENTRY-MAIN is the first line of the diary entry."
   (if (string-match (concat nonmarker
@@ -1783,7 +1783,7 @@
     nil))
 
 ;; ======================================================================
-;; Import -- convert icalendar to emacs-diary
+;; Import -- convert iCalendar to emacs-diary
 ;; ======================================================================
 
 ;;;###autoload
@@ -1825,19 +1825,19 @@
   (interactive)
   (save-current-buffer
     ;; prepare ical
-    (message "Preparing icalendar...")
+    (message "Preparing iCalendar...")
     (set-buffer (icalendar--get-unfolded-buffer (current-buffer)))
     (goto-char (point-min))
-    (message "Preparing icalendar...done")
+    (message "Preparing iCalendar...done")
     (if (re-search-forward "^BEGIN:VCALENDAR\\s-*$" nil t)
         (let (ical-contents ical-errors)
           ;; read ical
-          (message "Reading icalendar...")
+          (message "Reading iCalendar...")
           (beginning-of-line)
           (setq ical-contents (icalendar--read-element nil nil))
-          (message "Reading icalendar...done")
+          (message "Reading iCalendar...done")
           ;; convert ical
-          (message "Converting icalendar...")
+          (message "Converting iCalendar...")
           (setq ical-errors (icalendar--convert-ical-to-diary
                              ical-contents
                              diary-file do-not-ask non-marking))
@@ -1848,11 +1848,11 @@
                 (save-current-buffer
                   (set-buffer b)
                   (save-buffer)))))
-          (message "Converting icalendar...done")
+          (message "Converting iCalendar...done")
           ;; return t if no error occurred
           (not ical-errors))
       (message
-       "Current buffer does not contain icalendar contents!")
+       "Current buffer does not contain iCalendar contents!")
       ;; return nil, i.e. import did not work
       nil)))
 
@@ -2056,12 +2056,12 @@
           (set-buffer (get-buffer-create "*icalendar-errors*"))
           (erase-buffer)
           (insert error-string)))
-    (message "Converting icalendar...done")
+    (message "Converting iCalendar...done")
     found-error))
 
 ;; subroutines for importing
 (defun icalendar--convert-recurring-to-diary (e dtstart-dec start-t end-t)
-  "Convert recurring icalendar event E to diary format.
+  "Convert recurring iCalendar event E to diary format.
 
 DTSTART-DEC is the DTSTART property of E.
 START-T is the event's start time in diary format.
@@ -2274,7 +2274,7 @@
     result))
 
 (defun icalendar--convert-non-recurring-all-day-to-diary (event start-d end-d)
-  "Convert non-recurring icalendar EVENT to diary format.
+  "Convert non-recurring iCalendar EVENT to diary format.
 
 DTSTART is the decoded DTSTART property of E.
 Argument START-D gives the first day.
@@ -2339,7 +2339,7 @@
 ;; Examples
 ;; ======================================================================
 (defun icalendar-import-format-sample (event)
-  "Example function for formatting an icalendar EVENT."
+  "Example function for formatting an iCalendar EVENT."
   (format (concat "SUMMARY=`%s' DESCRIPTION=`%s' LOCATION=`%s' ORGANIZER=`%s' "
                   "STATUS=`%s' URL=`%s' CLASS=`%s'")
           (or (icalendar--get-event-property event 'SUMMARY) "")

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-11-16 12:34:47 +0000
+++ b/lisp/gnus/ChangeLog       2011-11-16 17:47:25 +0000
@@ -1,5 +1,9 @@
 2011-11-16  Juanma Barranquero  <address@hidden>
 
+       * gnus-sum.el (gnus-summary-make-menu-bar):
+       * gnus-uu.el (gnus-uu-decode-postscript)
+       (gnus-uu-decode-postscript-and-save):
+       * mailcap.el (mailcap-print-command):
        * registry.el (registry-lookup, registry-lookup-breaks-before-lexbind):
        Fix typos.
 
@@ -20058,7 +20062,7 @@
        * mail-source.el (mail-source-delete-crash-box): Refactor.
        (mail-source-fetch): Use it.
        (mail-source-fetch-file): Ditto.
-       (mail-source-fetch-directory): Run postscript in loop.
+       (mail-source-fetch-directory): Run PostScript in loop.
        (mail-source-fetch-pop): Delete.
        (mail-source-fetch-maildir): Ditto.
        (mail-source-fetch-imap): Ditto.

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-11-13 07:48:23 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-11-16 17:47:25 +0000
@@ -2529,7 +2529,7 @@
              ["Unshar and save" gnus-uu-decode-unshar-and-save t]
              ["Save" gnus-uu-decode-save t]
              ["Binhex" gnus-uu-decode-binhex t]
-             ["Postscript" gnus-uu-decode-postscript t]
+             ["PostScript" gnus-uu-decode-postscript t]
              ["All MIME parts" gnus-summary-save-parts t])
             ("Cache"
              ["Enter article" gnus-cache-enter-article t]

=== modified file 'lisp/gnus/gnus-uu.el'
--- a/lisp/gnus/gnus-uu.el      2011-11-14 20:23:26 +0000
+++ b/lisp/gnus/gnus-uu.el      2011-11-16 17:47:25 +0000
@@ -727,7 +727,7 @@
 ;; All PostScript functions written by Erik Selberg <address@hidden>.
 
 (defun gnus-uu-decode-postscript (&optional n)
-  "Gets postscript of the current article."
+  "Gets PostScript of the current article."
   (interactive "P")
   (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n))
 
@@ -738,7 +738,7 @@
     (gnus-uu-decode-postscript n)))
 
 (defun gnus-uu-decode-postscript-and-save (n dir)
-  "Extracts postscript and saves the current article."
+  "Extracts PostScript and saves the current article."
   (interactive
    (list current-prefix-arg
         (file-name-as-directory

=== modified file 'lisp/gnus/mailcap.el'
--- a/lisp/gnus/mailcap.el      2011-08-26 09:01:56 +0000
+++ b/lisp/gnus/mailcap.el      2011-11-16 17:47:25 +0000
@@ -82,7 +82,7 @@
                         (list lpr-switches)
                       lpr-switches)))
             " ")
-  "Shell command (including switches) used to print Postscript files.")
+  "Shell command (including switches) used to print PostScript files.")
 
 ;; Postpone using defcustom for this as it's so big and we essentially
 ;; have to have two copies of the data around then.  Perhaps just

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2011-10-30 01:56:03 +0000
+++ b/lisp/menu-bar.el  2011-11-16 17:47:25 +0000
@@ -116,21 +116,21 @@
       menu-bar-separator)
 
     (define-key menu [ps-print-region]
-      `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region
+      `(menu-item ,(purecopy "PostScript Print Region (B+W)") ps-print-region
                   :enable mark-active
                   :help ,(purecopy "Pretty-print marked region in black and 
white to PostScript printer")))
     (define-key menu [ps-print-buffer]
-      `(menu-item ,(purecopy "Postscript Print Buffer (B+W)") ps-print-buffer
+      `(menu-item ,(purecopy "PostScript Print Buffer (B+W)") ps-print-buffer
                   :enable (menu-bar-menu-frame-live-and-visible-p)
                   :help ,(purecopy "Pretty-print current buffer in black and 
white to PostScript printer")))
     (define-key menu [ps-print-region-faces]
-      `(menu-item ,(purecopy "Postscript Print Region")
+      `(menu-item ,(purecopy "PostScript Print Region")
                   ps-print-region-with-faces
                   :enable mark-active
                   :help ,(purecopy
                           "Pretty-print marked region to PostScript printer")))
     (define-key menu [ps-print-buffer-faces]
-      `(menu-item ,(purecopy "Postscript Print Buffer")
+      `(menu-item ,(purecopy "PostScript Print Buffer")
                   ps-print-buffer-with-faces
                   :enable (menu-bar-menu-frame-live-and-visible-p)
                   :help ,(purecopy "Pretty-print current buffer to PostScript 
printer")))

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2011-11-16 12:34:47 +0000
+++ b/lisp/org/ChangeLog        2011-11-16 17:47:25 +0000
@@ -1,7 +1,13 @@
 2011-11-16  Juanma Barranquero  <address@hidden>
 
-       * org-agenda.el (org-create-marker-find-array):
+       * org-agenda.el (org-agenda-add-entry-text-descriptive-links)
+       (org-agenda-custom-commands, org-write-agenda, org-check-for-org-mode)
+       (org-search-syntax-table, org-modify-diary-entry-string)
+       (org-write-agenda):
+       * org-bbdb.el (org-bbdb-anniv-export-ical):
        * org-bibtex.el (org-bibtex-fields):
+       * org-icalendar.el (org-icalendar-date-time-format):
+       * org-latex.el (org-export-latex-inline-image-extensions):
        * org-list.el (org-list-insert-item): Fix typos.
 
 2011-11-11  Juanma Barranquero  <address@hidden>
@@ -61,7 +67,7 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-publish.el (org-publish-index-generate-theindex): rename
+       * org-publish.el (org-publish-index-generate-theindex): Rename
        from `org-publish-index-generate-theindex.inc'.  Use the file
        theindex.org directly instead of including theindex.inc.
        (org-publish-projects): Don't delete .orgx files.
@@ -141,7 +147,7 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org.el (org-timestamp-change): keep point in the same category
+       * org.el (org-timestamp-change): Keep point in the same category
        when updating a time-stamp.  This requires to be careful, as,
        depending on the locale, name of day might change of length during
        the process.
@@ -592,7 +598,7 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org.el (org-in-block-p): new function.
+       * org.el (org-in-block-p): New function.
 
        * org-footnote.el (org-footnote-forbidden-blocks): New variable.
        (org-footnote-in-valid-context-p): New function.
@@ -886,131 +892,131 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-action): offer to create
+       * org-footnote.el (org-footnote-action): Offer to create
        definition when none is found.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-re): avoid matching inactive
+       * org-footnote.el (org-footnote-re): Avoid matching inactive
        time-stamps or check-box cookies.
-       (org-footnote-next-reference-or-definition): adapt to the new regexp.
+       (org-footnote-next-reference-or-definition): Adapt to the new regexp.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-exp.el (org-export-preprocess-string): if the last subtree
+       * org-exp.el (org-export-preprocess-string): If the last subtree
        is commented, footnotes inserted during normalizing at the end of
        the buffer may get deleted. This patch ensures deletion comes
        first, normalization second.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-exp.el (org-export-footnotes-data): change docstring.
-       (org-export-footnotes-seen): renamed from
+       * org-exp.el (org-export-footnotes-data): Change docstring.
+       (org-export-footnotes-seen): Rename from
        org-export-footnotes-markers.
 
-       * org-ascii.el (org-export-as-ascii): apply change.
-
-       * org-docbook.el (org-export-as-docbook): apply change.
-
-       * org-footnote.el (org-footnote-normalize): apply change.
-
-       * org-html.el (org-export-as-html): apply change.
-
-       * org-latex.el (org-export-as-latex): apply change.
+       * org-ascii.el (org-export-as-ascii): Apply change.
+
+       * org-docbook.el (org-export-as-docbook): Apply change.
+
+       * org-footnote.el (org-footnote-normalize): Apply change.
+
+       * org-html.el (org-export-as-html): Apply change.
+
+       * org-latex.el (org-export-as-latex): Apply change.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-latex.el (org-export-latex-preprocess): rely on
+       * org-latex.el (org-export-latex-preprocess): Rely on
        `org-export-footnotes-markers' to retreive definition of the
        current footnote during export.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-normalize): remember footnotes
+       * org-footnote.el (org-footnote-normalize): Remember footnotes
        seen so far by the exporter when choosing the new marker.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-normalize): make use of
+       * org-footnote.el (org-footnote-normalize): Make use of
        `org-footnote-insert-pos-for-preprocessor'.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-normalize): add `org-footnote'
+       * org-footnote.el (org-footnote-normalize): Add `org-footnote'
        property to footnote markers when preparing for exportation.
 
-       * org-html.el (org-export-as-html): read new property to decide
+       * org-html.el (org-export-as-html): Read new property to decide
        when to export a footnote.
 
-       * org-docbook.el (org-export-as-docbook): read new property to
+       * org-docbook.el (org-export-as-docbook): Read new property to
        decide when to export a footnote.
 
-       * org-latex.el (org-export-latex-preprocess): ensure footnote at
+       * org-latex.el (org-export-latex-preprocess): Ensure footnote at
        column 0 cannot end a list containing it by adding
        `original-indentation' property to it.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-exp.el (org-export-preprocess-string): normalize footnotes
+       * org-exp.el (org-export-preprocess-string): Normalize footnotes
        before marking lists ending.
 
-       * org-latex.el (org-export-latex-preprocess): work with labels as
+       * org-latex.el (org-export-latex-preprocess): Work with labels as
        strings and not as numbers.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-docbook.el (org-export-docbook-footnote-separator): new
-       variable
-       (org-export-as-docbook): add a separator between footnotes.
-
-       * org-html.el (org-export-html-footnote-separator): new variable.
-       (org-export-as-html): add a separator between footnotes.
-
-       * org-latex.el (org-export-latex-footnote-separator): new
-       variable.
-       (org-export-latex-preprocess): add a separator between footnotes.
+       * org-docbook.el (org-export-docbook-footnote-separator): New
+       variable.
+       (org-export-as-docbook): Add a separator between footnotes.
+
+       * org-html.el (org-export-html-footnote-separator): New variable.
+       (org-export-as-html): Add a separator between footnotes.
+
+       * org-latex.el (org-export-latex-footnote-separator): New
+       variable.
+       (org-export-latex-preprocess): Add a separator between footnotes.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
        * org-exp.el (org-export-footnotes-markers)
-       (org-export-footnotes-data): new variables.
-       (org-export-preprocess-string): use a more explicit argument.
+       (org-export-footnotes-data): New variables.
+       (org-export-preprocess-string): Use a more explicit argument.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-goto-definition): now, determining
+       * org-footnote.el (org-footnote-goto-definition): Now, determining
        if point is at a footnote reference is entirely determined by
        `org-footnote-at-reference-p'. No need to check if pattern isn't
        at beginning of the line elsewhere.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-next-reference-or-definition): new
+       * org-footnote.el (org-footnote-next-reference-or-definition): New
        function.
 
-       * org.el (org-activate-footnote-links): activate the whole
+       * org.el (org-activate-footnote-links): Activate the whole
        footnote, but only fontify its label.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-normalize): make use of changes to
+       * org-footnote.el (org-footnote-normalize): Make use of changes to
        `org-footnote-at-reference-p' and creation of various functions..
        Also comment code.
-       (org-footnote-get-next-reference, org-footnote-delete-references,
-       org-footnote-delete-definitions): new functions
-       (org-footnote-goto-previous-reference, org-footnote-all-labels,
-       org-insert-footnote-reference-near-definition, org-footnote-delete):
-       rewrite to use org-footnote-get-next-reference.
+       (org-footnote-get-next-reference, org-footnote-delete-references)
+       (org-footnote-delete-definitions): New functions.
+       (org-footnote-goto-previous-reference, org-footnote-all-labels)
+       (org-insert-footnote-reference-near-definition, org-footnote-delete):
+       Rewrite to use org-footnote-get-next-reference.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-footnote.el (org-footnote-re): don't end an inline footnote
+       * org-footnote.el (org-footnote-re): Don't end an inline footnote
        at unrelated closing square brackets.
-       (org-footnote-at-reference-p): improve accuracy of the function to
+       (org-footnote-at-reference-p): Improve accuracy of the function to
        determine if point is at a reference and to extract definition of an
        inline footnote.
-       (org-footnote-all-labels, org-footnote-action, org-footnote-delete,
-       org-footnote-auto-adjust-maybe): make use of previous function.
+       (org-footnote-all-labels, org-footnote-action, org-footnote-delete)
+       (org-footnote-auto-adjust-maybe): Make use of previous function.
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
@@ -1064,14 +1070,14 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-list.el (org-cycle-item-indentation): cycling back to
+       * org-list.el (org-cycle-item-indentation): Cycling back to
        original position deleted any additional information in the item,
        like a counter or a tag.
 
 2011-07-28  Pieter Praet  <address@hidden>
 
        * org-crypt.el (org-crypt-disable-auto-save): New defcustom.
-       (org-decrypt-entry): before decrypting, check whether
+       (org-decrypt-entry): Before decrypting, check whether
        `auto-save-mode' is enabled for the current buffer, and act on it
        according to how `org-crypt-disable-auto-save' is set.  Remove
        comment re "encrypt[ing] Org auto-saved buffers".  Remove on-init
@@ -1255,29 +1261,29 @@
 
 2011-07-28  Eric Schulte  <address@hidden>
 
-       * ob-C.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-python.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'.
-
-       * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'.
+       * ob-C.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-asymptote.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-awk.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-clojure.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-haskell.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-latex.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-lisp.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-ocaml.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-perl.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-python.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-ruby.el (ob-tangle): Initialize variable from `ob-tangle'.
+
+       * ob-tangle.el (ob-tangle): Initialize variable from `ob-tangle'.
 
 2011-07-28  Eric Schulte  <address@hidden>
 
@@ -1300,12 +1306,12 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-list.el (org-reset-checkbox-state-subtree): make the command
+       * org-list.el (org-reset-checkbox-state-subtree): Make the command
        more robust, and correctly update check-boxes in the whole
        sub-tree.
-       (org-update-checkbox-count): fix bug accumulating count of checkboxes
+       (org-update-checkbox-count): Fix bug accumulating count of checkboxes
        when walking a subtree.
-       (org-update-checkbox-count-maybe): add an optional argument passed to
+       (org-update-checkbox-count-maybe): Add an optional argument passed to
        org-update-checkbox-count.
 
 2011-07-28  Ted Zlatanov  <address@hidden>
@@ -1331,9 +1337,9 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-list.el (org-list-parse-list): replace transitional
+       * org-list.el (org-list-parse-list): Replace transitional
        check-boxes with "[CBTRANS]" string during parsing.
-       (org-list-to-generic): use the new property `:cbtrans' to configure
+       (org-list-to-generic): Use the new property `:cbtrans' to configure
        export string for transitional check-boxes.
 
 2011-07-28  Carsten Dominik  <address@hidden>
@@ -2799,7 +2805,7 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-html.el (org-export-as-html): fix export of email.
+       * org-html.el (org-export-as-html): Fix export of email.
 
 2011-07-28  Eric Schulte  <address@hidden>
 
@@ -2820,11 +2826,11 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-crypt.el: remove useless TODO in comments.
+       * org-crypt.el: Remove useless TODO in comments.
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-html.el (org-export-as-html): the default postamble now only
+       * org-html.el (org-export-as-html): The default postamble now only
        export a date paragraph if `org-export-time-stamp-file' is
        non-nil.
 
@@ -2930,9 +2936,9 @@
 
 2011-07-28  Manuel Giraud  <address@hidden>
 
-       * org-html.el (org-format-org-table-html): fix anchors in HTML
+       * org-html.el (org-format-org-table-html): Fix anchors in HTML
        export (thanks to <address@hidden>)
-       (org-html-protect): fix a  bug that prevents some target to be
+       (org-html-protect): Fix a  bug that prevents some target to be
        rendered correctly.
 
 2011-07-28  Bastien Guerry  <address@hidden>
@@ -3017,15 +3023,15 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-capture.el (org-capture-put-target-region-and-position): New
-       function to store information about the target buffer.
+       * org-capture.el (org-capture-put-target-region-and-position):
+       New function to store information about the target buffer.
        (org-capture-set-target-location): Use it.
-       (org-capture-finalize): restore the target buffer in its
+       (org-capture-finalize): Restore the target buffer in its
        possibly narrowed state.  Also restore the cursor position.
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-crypt.el (auto-save-default): make sure entries are
+       * org-crypt.el (auto-save-default): Make sure entries are
        encrypted before auto-saving.
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
@@ -3041,7 +3047,7 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org.el (org-narrow-to-subtree): ensure `org-back-to-heading'
+       * org.el (org-narrow-to-subtree): Ensure `org-back-to-heading'
        will move point to a real heading and not an inline task by
        wraping function into a `org-with-limited-levels' macro.
 
@@ -3065,7 +3071,7 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-table.el (org-table-fix-formulas-confirm): new custom
+       * org-table.el (org-table-fix-formulas-confirm): New custom
        variable.
        (org-table-insert-column, org-table-delete-column)
        (org-table-move-column, org-table-move-row)
@@ -3095,14 +3101,14 @@
 
 2011-07-28  Lawrence Mitchell  <address@hidden>
 
-       * org-latex.el: place \title \author \date before
+       * org-latex.el: Place \title \author \date before
        \begin{document}.
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
        * org-html.el (org-export-html-preamble)
-       (org-export-html-postamble): now default to `nil'.
-       (org-export-as-html): when :html-pre/postamble is nil, fall
+       (org-export-html-postamble): Now default to `nil'.
+       (org-export-as-html): When :html-pre/postamble is nil, fall
        back on the default pre/postamble, which depends on the
        :author-info, :email-info, :creator-info options.
 
@@ -3123,7 +3129,7 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org.el (org-move-subtree-down): leave the cursor at the same
+       * org.el (org-move-subtree-down): Leave the cursor at the same
        column we were at.
 
 2011-07-28  Bastien Guerry  <address@hidden>
@@ -3136,7 +3142,7 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-exp.el (org-export-remove-headline-metadata): bugfix: don't
+       * org-exp.el (org-export-remove-headline-metadata): Bugfix: don't
        case-fold-search to avoid mixing TODO keywords with real headline
        words.
 
@@ -3162,7 +3168,7 @@
 2011-07-28  Bastien Guerry  <address@hidden>
 
        * org-html.el (org-export-html-postamble-format)
-       (org-export-html-preamble-format): explain how to escape the
+       (org-export-html-preamble-format): Explain how to escape the
        `%' character.
 
 2011-07-28  Bastien Guerry  <address@hidden>
@@ -3339,14 +3345,14 @@
 2011-07-28  Eric Schulte  <address@hidden>
 
        * ob-latex.el (org-babel-execute:latex): Add imagemagick options,
-       and for file types other than png and pdf it uses imagemagick to
-       convert a compiled pdf file to the desired file type.
-       (convert-pdf): Convert a pdf file to a new file type using
+       and for file types other than png and PDF it uses imagemagick to
+       convert a compiled PDF file to the desired file type.
+       (convert-pdf): Convert a PDF file to a new file type using
        imagemagick.
 
 2011-07-28  Puneeth Chaganti  <address@hidden>
 
-       * org-capture.el (org-capture-fill-template): fix bug with the
+       * org-capture.el (org-capture-fill-template): Fix bug with the
        display of interactive prompt in templates expansion.
 
 2011-07-28  Reiner Steib  <address@hidden>
@@ -3603,7 +3609,7 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-list.el (org-list-struct): when a line has org-example
+       * org-list.el (org-list-struct): When a line has org-example
        property, skip the entire block.  This is needed during export,
        for example when src blocks in org markup contain lists, and are
        returned verbatim because org isn't in the list of interpreted
@@ -3712,7 +3718,7 @@
        * org-capture.el (org-capture-place-item): Reflect changes to
        `org-item-beginning-re'.
 
-       * org-docbook.el (org-export-docbook-list-line): handle New type
+       * org-docbook.el (org-export-docbook-list-line): Handle New type
        of items.
 
        * org-exp.el (org-export-mark-list-end)
@@ -4171,7 +4177,7 @@
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
-       * org-html.el (org-export-as-html): expand the HTML title.
+       * org-html.el (org-export-as-html): Expand the HTML title.
 
 2011-07-28  Bastien Guerry  <address@hidden>
 
@@ -4951,7 +4957,7 @@
 
 2011-07-28  Nicolas Goaziou  <address@hidden>
 
-       * org-exp.el (org-export-mark-list-ending): insert additional
+       * org-exp.el (org-export-mark-list-ending): Insert additional
        newline characters if end-list-marker is at a wrong position.
 
 2011-07-28  Eric Schulte  <address@hidden>
@@ -5792,7 +5798,7 @@
 
 2010-12-11  Nicolas Goaziou  <address@hidden>
 
-       * org-exp.el (org-export-preprocess-string): delaying code block
+       * org-exp.el (org-export-preprocess-string): Delay code block
        processing a bit to allow correct list parsing in the export string.
 
 2010-12-11  Christopher Allan Webber  <address@hidden>
@@ -5849,7 +5855,7 @@
 
 2010-12-11  Eric Schulte  <address@hidden>
 
-       * ob-lob.el (org-babel-lob-get-info): including pass-through
+       * ob-lob.el (org-babel-lob-get-info): Include pass-through
        header arguments in results variable header argument string.
 
 2010-12-11  David Maus  <address@hidden>
@@ -5873,7 +5879,7 @@
 
 2010-12-11  Nicolas Goaziou  <address@hidden>
 
-       * org.el (org-indent-line-function): simplify code and remove bug that
+       * org.el (org-indent-line-function): Simplify code and remove bug that
        would insert a tab at the beginning of the line when trying to
        indent the item.
 
@@ -5897,7 +5903,7 @@
 
 2010-12-11  Eric Schulte  <address@hidden>
 
-       * ob-calc.el (org-babel-execute:calc): support for variables --
+       * ob-calc.el (org-babel-execute:calc): Support for variables --
        converts :var variables in calc variables.
 
 2010-12-11  Carsten Dominik  <address@hidden>
@@ -7475,7 +7481,7 @@
 
 2010-11-11  Eric Schulte  <address@hidden>
 
-       * ob-tangle.el: autoload org-babel-tangle-lang-exts from ob-tangle.
+       * ob-tangle.el: Autoload org-babel-tangle-lang-exts from ob-tangle.
 
 2010-11-11  Dan Davison  <address@hidden>
 
@@ -8437,7 +8443,7 @@
 
 2010-11-11  Eric Schulte  <address@hidden>
 
-       * ob-scheme.el: very preliminary support for evaluating scheme
+       * ob-scheme.el: Very preliminary support for evaluating scheme
        code blocks.
 
        * org.el (org-babel-load-languages): Adding scheme.
@@ -8547,7 +8553,7 @@
 
        * ob-latex.el (org-babel-execute:latex): Adding new ":fit" and
        ":border" header arguments which both use the "preview" latex
-       package to fit the resulting pdf image to the figure.
+       package to fit the resulting PDF image to the figure.
 
 2010-11-11  David Maus  <address@hidden>
 
@@ -8606,8 +8612,8 @@
 
 2010-11-11  David Maus  <address@hidden>
 
-       * org-agenda.el (org-write-agenda): Delete postscript file after
-       creating conversion to pdf.
+       * org-agenda.el (org-write-agenda): Delete PostScript file after
+       creating conversion to PDF.
 
 2010-11-11  David Maus  <address@hidden>
 
@@ -17058,7 +17064,7 @@
        * org.el (org-entry-get-multivalued-property)
        (org-entry-protect-space, org-entry-restore-space):
        New functions.
-       (org-file-apps-defaults-macosx): Let postscript files be opened by
+       (org-file-apps-defaults-macosx): Let PostScript files be opened by
        preview.
        (org-time-stamp-inactive): Call `org-time-stamp'.
        (org-time-stamp): New argument `inactive'.  Also edit inacive

=== modified file 'lisp/org/org-agenda.el'
--- a/lisp/org/org-agenda.el    2011-11-16 12:34:47 +0000
+++ b/lisp/org/org-agenda.el    2011-11-16 17:47:25 +0000
@@ -156,7 +156,7 @@
   "Non-nil means export org-links as descriptive links in agenda added text.
 This variable applies to the text added to the agenda when
 `org-agenda-add-entry-text-maxlines' is larger than 0.
-When this variable nil, the URL will (also) be shown."
+When this variable is nil, the URL will (also) be shown."
   :group 'org-agenda
   :type 'boolean)
 
@@ -339,7 +339,7 @@
 
 key      The key (one or more characters as a string) to be associated
          with the command.
-desc     A description of the command, when omitted or nil, a default
+desc     A description of the command; when omitted or nil, a default
          description is built using MATCH.
 type     The command type, any of the following symbols:
           agenda      The daily/weekly agenda.
@@ -354,7 +354,7 @@
 match    What to search for:
           - a single keyword for TODO keyword searches
           - a tags match expression for tags searches
-          - a word search expression for text searches.
+          - a word search expression for text searches
           - a regular expression for occur searches
           For all other commands, this should be the empty string.
 settings  A list of option settings, similar to that in a let form, so like
@@ -363,7 +363,7 @@
 files     A list of files file to write the produced agenda buffer to
           with the command `org-store-agenda-views'.
           If a file name ends in \".html\", an HTML version of the buffer
-          is written out.  If it ends in \".ps\", a postscript version is
+          is written out.  If it ends in \".ps\", a PostScript version is
           produced.  Otherwise, only the plain text is written to the file.
 
 You can also define a set of commands, to create a composite agenda buffer.
@@ -2744,8 +2744,8 @@
 (defun org-write-agenda (file &optional open nosettings)
   "Write the current buffer (an agenda view) as a file.
 Depending on the extension of the file name, plain text (.txt),
-HTML (.html or .htm) or Postscript (.ps) is produced.
-If the extension is .ics, run icalendar export over all files used
+HTML (.html or .htm) or PostScript (.ps) is produced.
+If the extension is .ics, run iCalendar export over all files used
 to construct the agenda and limit the export to entries listed in the
 agenda now.
 With prefix argument OPEN, open the new file immediately.
@@ -2793,7 +2793,7 @@
              ((string-match "\\.ps\\'" file)
               (require 'ps-print)
               (ps-print-buffer-with-faces file)
-              (message "Postscript written to %s" file))
+              (message "PostScript written to %s" file))
              ((string-match "\\.pdf\\'" file)
               (require 'ps-print)
               (ps-print-buffer-with-faces
@@ -2997,7 +2997,7 @@
             (member (point) (cdr a)))))))
 
 (defun org-check-for-org-mode ()
-  "Make sure current buffer is in org-mode.  Error if not."
+  "Make sure current buffer is in Org-mode.  Error if not."
   (or (org-mode-p)
       (error "Cannot execute org-mode agenda command on buffer in %s"
             major-mode)))
@@ -3715,9 +3715,9 @@
 (defvar org-todo-only nil)
 
 (defvar org-search-syntax-table nil
-  "Special syntax table for org-mode search.
-In this table, we have single quotes not as word constituents, to
-that when \"+Ameli\" is searched as a work, it will also match \"Ameli's\"")
+  "Special syntax table for Org-mode search.
+In this table, we have single quotes not as word constituents, so
+that when \"+Ameli\" is searched as a word, it will also match \"Ameli's\"")
 
 (defun org-search-syntax-table ()
   (unless org-search-syntax-table
@@ -4425,7 +4425,7 @@
           (setq string (org-modify-diary-entry-string string))))))
 
 (defun org-modify-diary-entry-string (string)
-  "Add text properties to string, allowing org-mode to act on it."
+  "Add text properties to string, allowing Org-mode to act on it."
   (org-add-props string nil
     'mouse-face 'highlight
     'help-echo (if buffer-file-name

=== modified file 'lisp/org/org-bbdb.el'
--- a/lisp/org/org-bbdb.el      2011-08-18 20:41:06 +0000
+++ b/lisp/org/org-bbdb.el      2011-11-16 17:47:25 +0000
@@ -357,7 +357,7 @@
          (bbdb-record-name (car (bbdb-completing-read-record "Name: ")))))
 
 (defun org-bbdb-anniv-export-ical ()
-  "Extract anniversaries from BBDB and convert them to icalendar format."
+  "Extract anniversaries from BBDB and convert them to iCalendar format."
   (require 'bbdb)
   (require 'diary-lib)
   (unless (hash-table-p org-bbdb-anniv-hash)

=== modified file 'lisp/org/org-icalendar.el'
--- a/lisp/org/org-icalendar.el 2011-08-18 20:41:06 +0000
+++ b/lisp/org/org-icalendar.el 2011-11-16 17:47:25 +0000
@@ -204,7 +204,7 @@
   (if org-icalendar-use-UTC-date-time
       ":%Y%m%dT%H%M%SZ"
     ":%Y%m%dT%H%M%S")
-  "Format-string for exporting icalendar DATE-TIME.
+  "Format-string for exporting iCalendar DATE-TIME.
 See `format-time-string' for a full documentation.  The only
 difference is that `org-icalendar-timezone' is used for %Z.
 

=== modified file 'lisp/org/org-latex.el'
--- a/lisp/org/org-latex.el     2011-08-18 20:41:06 +0000
+++ b/lisp/org/org-latex.el     2011-11-16 17:47:25 +0000
@@ -304,8 +304,8 @@
 
 (defcustom org-export-latex-href-format "\\href{%s}{%s}"
   "A printf format string to be applied to href links.
-The format must contain either two %s instances or just one.  
-If it contains two %s instances, the first will be filled with 
+The format must contain either two %s instances or just one.
+If it contains two %s instances, the first will be filled with
 the link, the second with the link description.  If it contains
 only one, the %s will be filled with the link."
   :group 'org-export-latex
@@ -594,7 +594,7 @@
   "Extensions of image files that can be inlined into LaTeX.
 Note that the image extension *actually* allowed depend on the way the
 LaTeX file is processed.  When used with pdflatex, pdf, jpg and png images
-are OK.  When processing through dvi to Postscript, only ps and eps are
+are OK.  When processing through dvi to PostScript, only ps and eps are
 allowed.  The default we use here encompasses both."
   :group 'org-export-latex
   :type '(repeat (string :tag "Extension")))
@@ -2203,7 +2203,7 @@
                ;; a LaTeX issue, but we here implement a work-around anyway.
                (setq path (org-export-latex-protect-amp path)
                      desc (org-export-latex-protect-amp desc)))
-             (insert 
+             (insert
               (if (string-match "%s.*%s" org-export-latex-href-format)
                   (format org-export-latex-href-format path desc)
                 (format org-export-latex-href-format path))))

=== modified file 'lisp/printing.el'
--- a/lisp/printing.el  2011-07-14 14:54:32 +0000
+++ b/lisp/printing.el  2011-11-16 17:47:25 +0000
@@ -4667,7 +4667,7 @@
   "Interactively select a PostScript utility."
   (interactive)
   (pr-menu-set-utility-title
-   (pr-complete-alist "Postscript utility"
+   (pr-complete-alist "PostScript utility"
                      pr-ps-utility-alist pr-ps-utility)))
 
 

=== modified file 'lisp/progmodes/gdb-mi.el'
--- a/lisp/progmodes/gdb-mi.el  2011-11-15 17:37:37 +0000
+++ b/lisp/progmodes/gdb-mi.el  2011-11-16 17:47:25 +0000
@@ -25,7 +25,7 @@
 
 ;;; Credits:
 
-;; This file was written by by Nick Roberts following the general design
+;; This file was written by Nick Roberts following the general design
 ;; used in gdb-ui.el for Emacs 22.1 - 23.1.  It is currently being developed
 ;; by Dmitry Dzhus <address@hidden> as part of the Google Summer
 ;; of Code 2009 Project "Emacs GDB/MI migration".

=== modified file 'lisp/progmodes/idlw-shell.el'
--- a/lisp/progmodes/idlw-shell.el      2011-11-15 07:55:13 +0000
+++ b/lisp/progmodes/idlw-shell.el      2011-11-16 17:47:25 +0000
@@ -939,7 +939,7 @@
    -------------------------------
    Info documentation for this package is available.  Use \\[idlwave-info]
    to display (complain to your sysadmin if that does not work).
-   For Postscript and HTML versions of the documentation, check IDLWAVE's
+   For PostScript and HTML versions of the documentation, check IDLWAVE's
    homepage at URL `http://idlwave.org'.
    IDLWAVE has customize support - see the group `idlwave'.
 

=== modified file 'lisp/progmodes/vhdl-mode.el'
--- a/lisp/progmodes/vhdl-mode.el       2011-11-15 17:37:37 +0000
+++ b/lisp/progmodes/vhdl-mode.el       2011-11-16 17:47:25 +0000
@@ -58,7 +58,7 @@
 ;;   - Word/keyword completion
 ;;   - Block commenting
 ;;   - Code fixing/alignment/beautification
-;;   - Postscript printing
+;;   - PostScript printing
 ;;   - VHDL'87/'93 and VHDL-AMS supported
 ;;   - Comprehensive menu
 ;;   - Fully customizable
@@ -1752,7 +1752,7 @@
 
 (defcustom vhdl-print-two-column t
   "*Non-nil means print code in two columns and landscape format.
-Adjusts settings in a way that postscript printing (\"File\" menu, `ps-print')
+Adjusts settings in a way that PostScript printing (\"File\" menu, `ps-print')
 prints VHDL files in a nice two-column landscape style.
 
 NOTE: Activate the new setting by restarting Emacs.
@@ -1761,7 +1761,7 @@
   :group 'vhdl-print)
 
 (defcustom vhdl-print-customize-faces t
-  "*Non-nil means use an optimized set of faces for postscript printing.
+  "*Non-nil means use an optimized set of faces for PostScript printing.
 
 NOTE: Activate the new setting by restarting Emacs.
       Overrides `ps-print' settings locally."
@@ -4567,10 +4567,10 @@
 
 
   PRINTING:
-    Postscript printing with different faces (an optimized set of faces is
+    PostScript printing with different faces (an optimized set of faces is
     used if `vhdl-print-customize-faces' is non-nil) or colors \(if
     `ps-print-color-p' is non-nil) is possible using the standard Emacs
-    postscript printing commands.  Option `vhdl-print-two-column' defines
+    PostScript printing commands.  Option `vhdl-print-two-column' defines
     appropriate default settings for nice landscape two-column printing.
     The paper format can be set by option `ps-paper-type'.  Do not forget to
     switch `ps-print-color-p' to nil for printing on black-and-white
@@ -12913,10 +12913,10 @@
   (font-lock-mode t))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Initialization for postscript printing
+;; Initialization for PostScript printing
 
 (defun vhdl-ps-print-settings ()
-  "Initialize custom face and page settings for postscript printing."
+  "Initialize custom face and page settings for PostScript printing."
   ;; define custom face settings
   (unless (or (not vhdl-print-customize-faces)
              ps-print-color-p)
@@ -12951,7 +12951,7 @@
       (set (make-local-variable 'ps-right-margin) 40.0))))
 
 (defun vhdl-ps-print-init ()
-  "Initialize postscript printing."
+  "Initialize PostScript printing."
   (if (featurep 'xemacs)
       (when (boundp 'ps-print-color-p)
        (vhdl-ps-print-settings))

=== modified file 'lisp/ps-samp.el'
--- a/lisp/ps-samp.el   2011-02-03 07:21:56 +0000
+++ b/lisp/ps-samp.el   2011-11-16 17:47:25 +0000
@@ -237,7 +237,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; If zeroconf is enabled, all CUPS printers can be detected.  The
-;; "Postscript printer" menu will be modified dynamically, as printers
+;; "PostScript printer" menu will be modified dynamically, as printers
 ;; are added or removed.
 
 ;; Preconditions:
@@ -257,7 +257,7 @@
 (require 'printing)
 (require 'zeroconf)
 
-;; Add a Postscript printer to the "Postscript printer" menu.
+;; Add a PostScript printer to the "PostScript printer" menu.
 (defun ps-add-printer (service)
   (let ((name (zeroconf-service-name service))
        (text (zeroconf-service-txt service))
@@ -267,7 +267,7 @@
     ;; `text' is an array of key=value strings like ("Duplex=T" "Copies=T").
     (dolist (string text)
       (let ((split (split-string string "=" t)))
-       ;; If it is a Postscript printer, there must be a string like
+       ;; If it is a PostScript printer, there must be a string like
        ;; "pdl=application/postscript,application/vnd.hp-PCL,...".
        (when (and (string-equal "pdl" (car split))
                   (string-match "application/postscript" (cadr split)))
@@ -288,7 +288,7 @@
                                    "-H" (format "%s:%s" addr port))))
       (pr-update-menus t))))
 
-;; Remove a printer from the "Postscript printer" menu.
+;; Remove a printer from the "PostScript printer" menu.
 (defun ps-remove-printer (service)
   (setq pr-ps-printer-alist
        (delete (assoc (intern (zeroconf-service-name service))

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2011-11-14 21:00:24 +0000
+++ b/lisp/textmodes/ispell.el  2011-11-16 17:47:25 +0000
@@ -3503,7 +3503,7 @@
             '(
               ;; Don't spell check signatures
               "^-- $"
-              ;; Matches postscript files.
+              ;; Matches PostScript files.
               ;;"^%!PS-Adobe-[123].0"
               ;; Matches uuencoded text
               ;;"^begin [0-9][0-9][0-9] .*\nM.*\nM.*\nM"

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-16 12:34:47 +0000
+++ b/src/ChangeLog     2011-11-16 17:47:25 +0000
@@ -1,6 +1,7 @@
 2011-11-16  Juanma Barranquero  <address@hidden>
 
-       * window.c (syms_of_window) <window-combination-limit>: Fix typo.
+       * nsfns.m (Fns_font_name):
+       * window.c (syms_of_window) <window-combination-limit>: Fix typos.
 
 2011-11-16  Martin Rudalics  <address@hidden>
 

=== modified file 'src/ChangeLog.11'
--- a/src/ChangeLog.11  2011-11-14 21:00:24 +0000
+++ b/src/ChangeLog.11  2011-11-16 17:47:25 +0000
@@ -23551,7 +23551,7 @@
        STORE_XCHARB a valid l-value.
 
        * w32term.c (w32_native_per_char_metric): Swap width and rbearing
-       calculations for non-Truetype fonts.
+       calculations for non-TrueType fonts.
        (x_draw_glyph_string): Sync with xterm.c.
        (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]:
        Remove redundant code.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2011-11-14 06:27:12 +0000
+++ b/src/nsfns.m       2011-11-16 17:47:25 +0000
@@ -1846,7 +1846,7 @@
 
 
 DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0,
-       doc: /* Determine font postscript or family name for font NAME.
+       doc: /* Determine font PostScript or family name for font NAME.
 NAME should be a string containing either the font name or an XLFD
 font descriptor.  If string contains `fontset' and not
 `fontset-startup', it is left alone. */)

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2011-09-09 01:06:52 +0000
+++ b/src/nsterm.h      2011-11-16 17:47:25 +0000
@@ -447,7 +447,7 @@
 {
   struct font font;
 
-  char *name;  /* postscript name, uniquely identifies on NS systems */
+  char *name;  /* PostScript name, uniquely identifies on NS systems */
   float width;  /* this and following metrics stored as float rather than int 
*/
   float height;
   float underpos;

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2011-11-14 23:59:56 +0000
+++ b/src/w32font.c     2011-11-16 17:47:25 +0000
@@ -1284,8 +1284,8 @@
             {
               /* Only truetype fonts will have information about what
                  scripts they support.  This probably means the user
-                 will have to force Emacs to use raster, postscript
-                 or atm fonts for non-ASCII text.  */
+                 will have to force Emacs to use raster, PostScript
+                 or ATM fonts for non-ASCII text.  */
               if (type & TRUETYPE_FONTTYPE)
                 {
                   Lisp_Object support
@@ -1464,7 +1464,7 @@
   /* Helvetica is mapped to Arial in Windows, but if a Type-1 Helvetica is
      installed, we run into problems with the Uniscribe backend which tries
      to avoid non-truetype fonts, and ends up mixing the Type-1 Helvetica
-     with Arial's characteristics, since that attempt to use Truetype works
+     with Arial's characteristics, since that attempt to use TrueType works
      some places, but not others.  */
   if (!xstrcasecmp (font->lfFaceName, "helvetica"))
     {

=== modified file 'src/w32font.h'
--- a/src/w32font.h     2011-01-25 04:08:28 +0000
+++ b/src/w32font.h     2011-11-16 17:47:25 +0000
@@ -20,8 +20,8 @@
 #define EMACS_W32FONT_H
 
 
-/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for Postscript OpenType fonts,
-   bit 18 for Truetype OpenType fonts, bit 20 for Type1 fonts.  */
+/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for PostScript OpenType fonts,
+   bit 18 for TrueType OpenType fonts, bit 20 for Type1 fonts.  */
 #ifndef NTM_PS_OPENTYPE
 #define NTM_PS_OPENTYPE 0x00020000
 #endif
@@ -84,4 +84,3 @@
 Lisp_Object intern_font_name (char *);
 
 #endif
-

=== modified file 'src/w32uniscribe.c'
--- a/src/w32uniscribe.c        2011-03-23 16:25:38 +0000
+++ b/src/w32uniscribe.c        2011-11-16 17:47:25 +0000
@@ -507,7 +507,7 @@
           if (SUCCEEDED (result) && nglyphs == 1)
             {
              /* Some fonts return .notdef glyphs instead of failing.
-                (Truetype spec reserves glyph code 0 for .notdef)  */
+                (TrueType spec reserves glyph code 0 for .notdef)  */
              if (glyphs[0])
                code = glyphs[0];
             }
@@ -961,4 +961,3 @@
 
   register_font_driver (&uniscribe_font_driver, NULL);
 }
-

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2011-11-16 12:34:47 +0000
+++ b/test/ChangeLog    2011-11-16 17:47:25 +0000
@@ -1,5 +1,7 @@
 2011-11-16  Juanma Barranquero  <address@hidden>
 
+       * automated/icalendar-tests.el (icalendar-tests--get-ical-event)
+       (icalendar-tests--test-export, icalendar-tests--do-test-export):
        * cedet/srecode-tests.el (srecode-field-utest-impl): Fix typo.
 
 2011-10-30  Ulf Jasper  <address@hidden>

=== modified file 'test/automated/icalendar-tests.el'
--- a/test/automated/icalendar-tests.el 2011-07-26 15:36:04 +0000
+++ b/test/automated/icalendar-tests.el 2011-11-16 17:47:25 +0000
@@ -39,7 +39,7 @@
 ;; ======================================================================
 
 (defun icalendar-tests--get-ical-event (ical-string)
-  "Return icalendar event for ICAL-STRING."
+  "Return iCalendar event for ICAL-STRING."
   (save-excursion
     (with-temp-buffer
       (insert ical-string)
@@ -219,7 +219,7 @@
     (should (string=  
"\nDTSTART;VALUE=DATE:20100215\nDTEND;VALUE=DATE:20100216"
                       (car result)))
     (should (string= "subject" (cadr result)))
-  
+
     ;; with time
     (setq result (icalendar--convert-ordinary-to-ical
                   "&?" "&2010 2 15 12:34-23:45 s"))
@@ -424,7 +424,7 @@
 Argument INPUT-ISO iso style diary string.
 Argument INPUT-EUROPEAN european style diary string.
 Argument INPUT-AMERICAN american style diary string.
-Argument EXPECTED-OUTPUT expected icalendar result string.
+Argument EXPECTED-OUTPUT expected iCalendar result string.
 
 European style input data must use german month names.  American
 and ISO style input data must use english month names."
@@ -467,7 +467,7 @@
 (defun icalendar-tests--do-test-export (input expected-output)
   "Actually perform export test.
 Argument INPUT input diary string.
-Argument EXPECTED-OUTPUT expected icalendar result string."
+Argument EXPECTED-OUTPUT expected iCalendar result string."
   (let ((temp-file (make-temp-file "icalendar-tests-ics")))
     (unwind-protect
        (progn
@@ -732,7 +732,7 @@
    "&9/19/2003 non-recurring allday\n")
   (icalendar-tests--test-import
    ;; do not remove the trailing blank after "long"!
-   "SUMMARY:long 
+   "SUMMARY:long
  summary
 DTSTART;VALUE=DATE:20030919"
    "&2003/9/19 long summary\n"
@@ -1041,7 +1041,7 @@
    "&2011/7/23 event-1\n"
    "&23/7/2011 event-1\n"
    "&7/23/2011 event-1\n")
-  
+
   (icalendar-tests--test-import
    "BEGIN:VCALENDAR
 PRODID:-//Emacs//NONSGML icalendar.el//EN
@@ -1111,7 +1111,7 @@
        (progn
          ;; step 1: import
          (icalendar-import-buffer temp-diary t t)
-         
+
          ;; step 2: export what was just imported
          (save-excursion
            (find-file temp-diary)
@@ -1399,7 +1399,7 @@
    "DTSTART;VALUE=DATE:20050606
 DTEND;VALUE=DATE:20050609
 SUMMARY:ff")
-  
+
   ;; export 2004-10-28 anniversary entries
   (icalendar-tests--test-export
    nil


reply via email to

[Prev in Thread] Current Thread [Next in Thread]