mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Code Issues Releases Activity

* ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í".

Browse Source
This commit is contained in:
Glenn Morris 2012-02-16 20:37:58 -08:00
parent d3aff6896a
commit 102f1b54d8
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/emacs/ChangeLog
View File

@ -1,5 +1,7 @@
2012-02-17 Glenn Morris <rgm@gnu.org>
* ack.texi, calendar.texi, cal-xtra.texi: Use "Bahá'í".
* calendar.texi: Misc small changes, including updating the dates
of examples.

2
doc/emacs/ack.texi
View File

@ -1330,7 +1330,7 @@ mode for editing VHDL source code.
John Wiegley wrote @file{align.el}, a set of commands for aligning text
according to regular-expression based rules; @file{isearchb.el} for fast
buffer switching; @file{timeclock.el}, a package for keeping track of
time spent on projects; the Baha'i calendar support;
time spent on projects; the Bahá'í calendar support;
@file{pcomplete.el}, a programmable completion facility;
@file{remember.el}, a mode for jotting down things to remember;
@file{eudcb-mab.el}, an address book backend for the Emacs Unified

18
doc/emacs/cal-xtra.texi
View File

@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*-
@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@ -95,7 +95,7 @@ The lists of holidays that Emacs uses are for
general holidays (@code{holiday-general-holidays}),
local holidays (@code{holiday-local-holidays}),
sun- and moon-related holidays (@code{holiday-solar-holidays}),
Baha'i holidays (@code{holiday-bahai-holidays}),
Bahá'í holidays (@code{holiday-bahai-holidays}),
Christian holidays (@code{holiday-christian-holidays}),
Hebrew (Jewish) holidays (@code{holiday-hebrew-holidays}),
Islamic (Muslim) holidays (@code{holiday-islamic-holidays}),
@ -202,7 +202,7 @@ the month (1 specifies the first occurrence, 2 the second occurrence,
@minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and
so on).
You can specify holidays that occur on fixed days of the Baha'i,
You can specify holidays that occur on fixed days of the Bahá'í,
Chinese, Hebrew, Islamic, and Julian calendars too. For example,
@smallexample
@ -419,7 +419,7 @@ the fourth pattern.
@subsection Diary Entries Using non-Gregorian Calendars
As well as entries based on the standard Gregorian calendar, your
diary can have entries based on Baha'i, Hebrew, or Islamic dates.
diary can have entries based on Bahá'í, Hebrew, or Islamic dates.
Recognition of such entries can be time-consuming, however, and since
most people don't use them, you must explicitly enable their use. If
you want the diary to recognize Hebrew-date diary entries, for example,
@ -439,7 +439,7 @@ you must do this:
@end smallexample
@noindent
Similarly, for Islamic and Baha'i entries, add
Similarly, for Islamic and Bahá'í entries, add
@code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries}, or
@code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries}.
@ -448,7 +448,7 @@ Similarly, for Islamic and Baha'i entries, add
@vindex diary-islamic-entry-symbol
These diary entries have the same formats as Gregorian-date diary
entries; except that @code{diary-bahai-entry-symbol} (default @samp{B})
must precede a Baha'i date, @code{diary-hebrew-entry-symbol} (default
must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default
@samp{H}) a Hebrew date, and @code{diary-islamic-entry-symbol} (default
@samp{I}) an Islamic date. Moreover, non-Gregorian month names may not
be abbreviated (because the first three letters are often not unique).
@ -475,7 +475,7 @@ nonmarking if preceded by @code{diary-nonmarking-symbol} (default
Here is a table of commands used in the calendar to create diary
entries that match the selected date and other dates that are similar in
the Baha'i, Hebrew, or Islamic calendars:
the Bahá'í, Hebrew, or Islamic calendars:
@table @kbd
@item i h d
@ -850,7 +850,7 @@ Make a diary entry with today's equivalent Julian calendar date.
@item %%(diary-astro-day-number)
Make a diary entry with today's equivalent astronomical (Julian) day number.
@item %%(diary-bahai-date)
Make a diary entry with today's equivalent Baha'i calendar date.
Make a diary entry with today's equivalent Bahá'í calendar date.
@item %%(diary-chinese-date)
Make a diary entry with today's equivalent Chinese calendar date.
@item %%(diary-coptic-date)

13
doc/emacs/calendar.texi
View File

@ -1,4 +1,4 @@
@c This is part of the Emacs manual.
@c This is part of the Emacs manual. -*- coding: iso-latin-1 -*-
@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@ -517,9 +517,8 @@ the calendar displays holidays in this way. If you want the list of
holidays centered around a different month, use @kbd{C-u M-x
holidays}, which prompts for the month and year.
@c FIXME can we write Baha'i properly?
The holidays known to Emacs include United States holidays and the
major Baha'i, Chinese, Christian, Islamic, and Jewish holidays; also the
major Bahá'í, Chinese, Christian, Islamic, and Jewish holidays; also the
solstices and equinoxes.
@findex list-holidays
@ -757,8 +756,8 @@ days are named by combining one of ten ``celestial stems'' with one of
twelve ``terrestrial branches'' for a total of sixty names that are
repeated in a cycle of sixty.
@cindex Baha'i calendar
The Baha'i calendar system is based on a solar cycle of 19 months with
@cindex Bahá'í calendar
The Bahá'í calendar system is based on a solar cycle of 19 months with
19 days each. The four remaining ``intercalary'' days are placed
between the 18th and 19th months.
@ -798,7 +797,7 @@ Display French Revolutionary date for selected day
(@code{calendar-french-print-date}).
@findex calendar-bahai-print-date
@item p b
Display Baha'i date for selected day
Display Bahá'í date for selected day
(@code{calendar-bahai-print-date}).
@findex calendar-chinese-print-date
@item p C
@ -866,7 +865,7 @@ Move to a date specified in the Julian calendar
Move to a date specified with an astronomical (Julian) day number
(@code{calendar-astro-goto-day-number}).
@item g b
Move to a date specified in the Baha'i calendar
Move to a date specified in the Bahá'í calendar
(@code{calendar-bahai-goto-date}).
@item g h
Move to a date specified in the Hebrew calendar