summaryrefslogtreecommitdiff
path: root/doc/ref/guile.texi
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2014-04-28 18:51:21 +0200
committerAndy Wingo <wingo@pobox.com>2014-04-28 18:51:21 +0200
commitd7a67c3e918acd8ca46dc7792a8ca98b33cb94e8 (patch)
tree7ccf125978778d1ac6bb656245305c76db8e02d0 /doc/ref/guile.texi
parent475772ea57c97d0fa0f9ed9303db137d9798ddd3 (diff)
parent4338f2f91e1dd63a40384077d091295d90047926 (diff)
downloadguile-d7a67c3e918acd8ca46dc7792a8ca98b33cb94e8.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: .gitignore doc/example-smob/Makefile doc/ref/api-smobs.texi doc/ref/libguile-concepts.texi doc/ref/libguile-smobs.texi libguile.h libguile/finalizers.c libguile/finalizers.h libguile/goops.c module/language/tree-il/compile-glil.scm module/oop/goops.scm
Diffstat (limited to 'doc/ref/guile.texi')
-rw-r--r--doc/ref/guile.texi10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/ref/guile.texi b/doc/ref/guile.texi
index c43873cff..5f21188fa 100644
--- a/doc/ref/guile.texi
+++ b/doc/ref/guile.texi
@@ -246,7 +246,7 @@ continuations influence the control flow in a C program.
This knowledge should make it straightforward to add new functions to
Guile that can be called from Scheme. Adding new data types is also
-possible and is done by defining @dfn{smobs}.
+possible and is done by defining @dfn{foreign objects}.
The @ref{Programming Overview} section of this part contains general
musings and guidelines about programming with Guile. It explores
@@ -267,7 +267,7 @@ etc. that make up Guile's application programming interface (API),
* Linking Programs With Guile:: More precisely, with the libguile library.
* Linking Guile with Libraries:: To extend Guile itself.
* General Libguile Concepts:: General concepts for using libguile.
-* Defining New Types (Smobs):: Adding new types to Guile.
+* Defining New Foreign Object Types:: Adding new types to Guile.
* Function Snarfing:: A way to define new functions.
* Programming Overview:: An overview of Guile programming.
* Autoconf Support:: Putting m4 to good use.
@@ -277,7 +277,7 @@ etc. that make up Guile's application programming interface (API),
@include libguile-linking.texi
@include libguile-extensions.texi
@include libguile-concepts.texi
-@include libguile-smobs.texi
+@include libguile-foreign-objects.texi
@include libguile-snarf.texi
@include libguile-program.texi
@include libguile-autoconf.texi
@@ -299,7 +299,8 @@ available through both Scheme and C interfaces.
* Snarfing Macros:: Macros for snarfing initialization actions.
* Simple Data Types:: Numbers, strings, booleans and so on.
* Compound Data Types:: Data types for holding other data.
-* Smobs:: Defining new data types in C.
+* Foreign Objects:: Defining new data types in C.
+* Smobs:: Use foreign objects instead.
* Procedures:: Procedures.
* Macros:: Extending the syntax of Scheme.
* Utility Functions:: General utility functions.
@@ -328,6 +329,7 @@ available through both Scheme and C interfaces.
@include api-snarf.texi
@include api-data.texi
@include api-compound.texi
+@include api-foreign-objects.texi
@include api-smobs.texi
@include api-procedures.texi
@include api-macros.texi