diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-28 10:57:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-28 10:57:42 +0100 |
commit | f88e9510f06da3e304aa104df89a7d3f261e6034 (patch) | |
tree | 8647f22868d7fa8d4963d02039af88493ebcdc38 | |
parent | c0d928dc2b50f8761b6c782e4dd34a6388d167fe (diff) | |
download | guile-f88e9510f06da3e304aa104df89a7d3f261e6034.tar.gz |
Use version 2.2 in manual examples
* doc/ref/api-evaluation.texi (Load Paths):
* doc/ref/api-options.texi (Build Config):
* doc/ref/guile-invoke.texi (Environment Variables):
* doc/ref/libguile-parallel.texi (Parallel Installations): Use 2.2 in
examples, rather than 2.0.
-rw-r--r-- | doc/ref/api-evaluation.texi | 4 | ||||
-rw-r--r-- | doc/ref/api-options.texi | 12 | ||||
-rw-r--r-- | doc/ref/guile-invoke.texi | 6 | ||||
-rw-r--r-- | doc/ref/libguile-parallel.texi | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/doc/ref/api-evaluation.texi b/doc/ref/api-evaluation.texi index 8d908b738..d9f6135aa 100644 --- a/doc/ref/api-evaluation.texi +++ b/doc/ref/api-evaluation.texi @@ -924,8 +924,8 @@ When @code{primitive-load-path} searches the @code{%load-compiled-path} for a corresponding compiled file for a relative path it does so by appending @code{.go} to the relative path. For example, searching for @code{ice-9/popen} could find -@code{/usr/lib/guile/2.0/ccache/ice-9/popen.go}, and use it instead of -@code{/usr/share/guile/2.0/ice-9/popen.scm}. +@code{/usr/lib/guile/2.2/ccache/ice-9/popen.go}, and use it instead of +@code{/usr/share/guile/2.2/ice-9/popen.scm}. If @code{primitive-load-path} does not find a corresponding @code{.go} file in the @code{%load-compiled-path}, or the @code{.go} file is out of diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi index 8fa4f98a5..b09ae8952 100644 --- a/doc/ref/api-options.texi +++ b/doc/ref/api-options.texi @@ -60,14 +60,14 @@ The @code{effective-version} function returns the version name that should remain unchanged during a stable series. Currently that means that it omits the micro version. The effective version should be used for items like the versioned share directory name -i.e.@: @file{/usr/share/guile/2.0/} +i.e.@: @file{/usr/share/guile/2.2/} @lisp -(version) @result{} "2.0.4" -(effective-version) @result{} "2.0" +(version) @result{} "2.2.0" +(effective-version) @result{} "2.2" (major-version) @result{} "2" -(minor-version) @result{} "0" -(micro-version) @result{} "4" +(minor-version) @result{} "2" +(micro-version) @result{} "0" @end lisp @end deffn @@ -87,7 +87,7 @@ party package) are installed. On Unix-like systems this is usually @file{/usr/share/guile/@var{GUILE_EFFECTIVE_VERSION}}; @noindent -for example @file{/usr/local/share/guile/2.0}. +for example @file{/usr/local/share/guile/2.2}. @end deffn @deffn {Scheme Procedure} %site-dir diff --git a/doc/ref/guile-invoke.texi b/doc/ref/guile-invoke.texi index 207c6f379..29292869f 100644 --- a/doc/ref/guile-invoke.texi +++ b/doc/ref/guile-invoke.texi @@ -365,7 +365,7 @@ Here is an example using the Bash shell that adds the current directory, @example $ export GUILE_LOAD_COMPILED_PATH=".:../my-library" $ guile -c '(display %load-compiled-path) (newline)' -(. ../my-library /usr/local/lib/guile/2.0/ccache) +(. ../my-library /usr/local/lib/guile/2.2/ccache) @end example @item GUILE_LOAD_PATH @@ -384,8 +384,8 @@ directory to @code{%load-path}, and adds the relative directory @example $ env GUILE_LOAD_PATH=".:...:../srfi" \ guile -c '(display %load-path) (newline)' -(. /usr/local/share/guile/2.0 \ -/usr/local/share/guile/site/2.0 \ +(. /usr/local/share/guile/2.2 \ +/usr/local/share/guile/site/2.2 \ /usr/local/share/guile/site \ /usr/local/share/guile \ ../srfi) diff --git a/doc/ref/libguile-parallel.texi b/doc/ref/libguile-parallel.texi index 37a713929..a0e1ea978 100644 --- a/doc/ref/libguile-parallel.texi +++ b/doc/ref/libguile-parallel.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- @c This is part of the GNU Guile Reference Manual. -@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011 +@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011, 2013 @c Free Software Foundation, Inc. @c See the file guile.texi for copying conditions. @@ -11,10 +11,10 @@ @cindex effective version Guile provides strong API and ABI stability guarantees during stable -series, so that if a user writes a program against Guile version 2.0.3, -it will be compatible with some future version 2.0.7. We say in this -case that 2.0 is the @dfn{effective version}, composed of the major and -minor versions, in this case 2 and 0. +series, so that if a user writes a program against Guile version 2.2.3, +it will be compatible with some future version 2.2.7. We say in this +case that 2.2 is the @dfn{effective version}, composed of the major and +minor versions, in this case 2 and 2. Users may install multiple effective versions of Guile, with each version's headers, libraries, and Scheme files under their own |