diff options
author | Andy Wingo <wingo@pobox.com> | 2013-10-03 21:35:21 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-10-03 21:35:21 +0200 |
commit | d7928d7c61f297dca574e20bb5815253e90b3a36 (patch) | |
tree | f8b4ac0103eaded5c3b61573212ab0dc5fd5fcd1 /doc/ref | |
parent | ae07b8e70bfc53220d7017bb7edcdb6c329d5bd5 (diff) | |
parent | d7794a9d07ba657a29f7e608c3e558c437806def (diff) | |
download | guile-d7928d7c61f297dca574e20bb5815253e90b3a36.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/deprecated.h
libguile/programs.c
libguile/programs.h
Diffstat (limited to 'doc/ref')
-rw-r--r-- | doc/ref/api-i18n.texi | 2 | ||||
-rw-r--r-- | doc/ref/api-procedures.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ref/api-i18n.texi b/doc/ref/api-i18n.texi index 97474a2ff..fa3fe99d0 100644 --- a/doc/ref/api-i18n.texi +++ b/doc/ref/api-i18n.texi @@ -88,7 +88,7 @@ default @code{C} locale which usually represents conventions in use in the USA): @example -(make-locale (list LC_MESSAGE LC_CTYPE) "sv_SE") +(make-locale (list LC_MESSAGES LC_CTYPE) "sv_SE") @end example The following example combines the use of Esperanto messages and diff --git a/doc/ref/api-procedures.texi b/doc/ref/api-procedures.texi index e11479dc2..7fedadffd 100644 --- a/doc/ref/api-procedures.texi +++ b/doc/ref/api-procedures.texi @@ -297,7 +297,7 @@ list, or @code{#f} if this information is not available. For example: @example -(program-lambda-alist +(program-lambda-list (lambda* (a b #:optional c #:key (d 1) #:rest e) #t)) @result{} @end example |