diff --git a/collects/scribblings/guide/dialects.scrbl b/collects/scribblings/guide/dialects.scrbl index 41786daaf7..a37420e1ff 100644 --- a/collects/scribblings/guide/dialects.scrbl +++ b/collects/scribblings/guide/dialects.scrbl @@ -45,9 +45,9 @@ does not define a module system. Typical single-file @|r5rs| programs can be converted to PLT Scheme programs by prefixing them with @scheme[#, @hash-lang[] #, @schememodname[r5rs]], but other Scheme systems do not recognize @scheme[#, @hash-lang[] #, -@schememodname[r5rs]] (which is not part of the @|r5rs| standard). The -@exec{plt-r5rs} executable more directly conforms to the @|r5rs| -standard. +@schememodname[r5rs]]. The @exec{plt-r5rs} executable (see +@secref[#:doc '(lib "r5rs/r5rs.scrbl") "plt-r5rs"]) more directly +conforms to the @|r5rs| standard. Aside from the module system, the syntactic forms and functions of @|r5rs| and PLT Scheme differ. Only simple @|r5rs| become PLT Scheme @@ -118,7 +118,7 @@ including the following: ] Each of these languages is used by starting module with the language -name after @hash-lang[]. For example, this source of this very +name after @hash-lang[]. For example, this source of this document starts with @scheme[#, @hash-lang[] scribble/doc]. PLT Scheme users can define their own languages. A language name maps diff --git a/collects/scribblings/reference/bytes.scrbl b/collects/scribblings/reference/bytes.scrbl index a8273f9e88..8e3838c7c8 100644 --- a/collects/scribblings/reference/bytes.scrbl +++ b/collects/scribblings/reference/bytes.scrbl @@ -405,14 +405,15 @@ Windows and Mac OS X. @filepath{iconv.dll} is included with @filepath{libmzsch@italic{VERS}.dll}.} The set of available encodings and combinations varies by platform, -depending on the @exec{iconv} library that is installed. Under -Windows, @filepath{iconv.dll} or @filepath{libiconv.dll} must be in the same -directory as @filepath{libmzsch@italic{VERS}.dll} (where @italic{VERS} is -a version number), in the user's path, in the system directory, or in -the current executable's directory at run time, and the DLL must -either supply @tt{_errno} or link to @filepath{msvcrt.dll} for -@tt{_errno}; otherwise, only the guaranteed combinations are -available.} +depending on the @exec{iconv} library that is installed; the +@scheme[from-name] and @scheme[to-name] arguments are passed on to +@tt{iconv_open}. Under Windows, @filepath{iconv.dll} or +@filepath{libiconv.dll} must be in the same directory as +@filepath{libmzsch@italic{VERS}.dll} (where @italic{VERS} is a version +number), in the user's path, in the system directory, or in the +current executable's directory at run time, and the DLL must either +supply @tt{_errno} or link to @filepath{msvcrt.dll} for @tt{_errno}; +otherwise, only the guaranteed combinations are available.} @defproc[(bytes-close-converter [converter bytes-converter?]) void]{ diff --git a/collects/scribblings/reference/class.scrbl b/collects/scribblings/reference/class.scrbl index adbb77410c..4b066c366f 100644 --- a/collects/scribblings/reference/class.scrbl +++ b/collects/scribblings/reference/class.scrbl @@ -158,6 +158,8 @@ interface is not an object (i.e., there are no ``meta-classes'' or @section[#:tag "createinterface"]{Creating Interfaces} +@guideintro["classes"]{classes, objects, and interfaces} + @defform[(interface (super-interface-expr ...) id ...)]{ Produces an interface. The @scheme[id]s must be mutually distinct. @@ -207,6 +209,8 @@ structure type property's guard, if any).} @section[#:tag "createclass"]{Creating Classes} +@guideintro["classes"]{classes and objects} + @defthing[object% class?]{ A built-in class that has no methods fields, implements only its own