From ae6cf4da07b7b92432eaedafd115eea72d0c0adb Mon Sep 17 00:00:00 2001 From: Guillaume Marceau Date: Thu, 7 Jul 2011 00:41:11 -0400 Subject: [PATCH] Little tweaks to the *SL documentation (cherry picked from commit 91d5c924158250e39a3a555a5416c3ab591c40c3) --- collects/scribblings/htdp-langs/advanced.scrbl | 5 ++++- collects/scribblings/htdp-langs/beginner-abbr.scrbl | 7 +++++-- collects/scribblings/htdp-langs/beginner.scrbl | 2 +- collects/scribblings/htdp-langs/htdp-langs.scrbl | 2 +- collects/scribblings/htdp-langs/intermediate-lambda.scrbl | 5 ++++- collects/scribblings/htdp-langs/intermediate.scrbl | 5 ++++- collects/teachpack/error-composition.scrbl | 5 +++-- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/collects/scribblings/htdp-langs/advanced.scrbl b/collects/scribblings/htdp-langs/advanced.scrbl index bfff957080..1edfd1eafc 100644 --- a/collects/scribblings/htdp-langs/advanced.scrbl +++ b/collects/scribblings/htdp-langs/advanced.scrbl @@ -2,7 +2,7 @@ @(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt" (for-label lang/htdp-advanced)) -@title[#:style 'toc #:tag "advanced"]{Advanced Student} +@title[#:tag "advanced"]{Advanced Student} @declare-exporting[lang/htdp-advanced] @@ -266,6 +266,9 @@ Like @racket[when], but the @racket[body-expression] is evaluated when the @section[#:tag "advanced-common-syntax"]{Common Syntax} +The following syntaxes behave the same in the @emph{Advanced} +level as they did in the @secref["intermediate-lam"] level. + @(intermediate-forms lambda quote diff --git a/collects/scribblings/htdp-langs/beginner-abbr.scrbl b/collects/scribblings/htdp-langs/beginner-abbr.scrbl index 300ebdc800..9fa8c600e3 100644 --- a/collects/scribblings/htdp-langs/beginner-abbr.scrbl +++ b/collects/scribblings/htdp-langs/beginner-abbr.scrbl @@ -4,7 +4,7 @@ -@title[#:style 'toc #:tag "beginner-abbr"]{Beginning Student with List Abbreviations} +@title[#:tag "beginner-abbr"]{Beginning Student with List Abbreviations} @declare-exporting[lang/htdp-beginner-abbr] @@ -108,7 +108,10 @@ also be written with @racket[unquote-splicing].} @; ---------------------------------------------------------------------- -@section[#:tag "beginner-abbr-common-syntax"]{Common Syntax} +@section[#:tag "beginner-abbr-common-syntax"]{Common Syntaxes} + +The following syntaxes behave the same in the @emph{Beginner with List +Abbreviations} level as they did in the @secref["beginner"] level. @(define-forms/normal define) @(define-form/explicit-lambda define lambda) diff --git a/collects/scribblings/htdp-langs/beginner.scrbl b/collects/scribblings/htdp-langs/beginner.scrbl index e989a85f04..00d23b408e 100644 --- a/collects/scribblings/htdp-langs/beginner.scrbl +++ b/collects/scribblings/htdp-langs/beginner.scrbl @@ -3,7 +3,7 @@ (for-label lang/htdp-beginner)) -@title[#:style 'toc #:tag "beginner"]{Beginning Student} +@title[#:tag "beginner"]{Beginning Student} @declare-exporting[lang/htdp-beginner #:use-sources (lang/htdp-beginner lang/private/teachprims)] diff --git a/collects/scribblings/htdp-langs/htdp-langs.scrbl b/collects/scribblings/htdp-langs/htdp-langs.scrbl index 2e3131b163..345de96d32 100644 --- a/collects/scribblings/htdp-langs/htdp-langs.scrbl +++ b/collects/scribblings/htdp-langs/htdp-langs.scrbl @@ -1,7 +1,7 @@ #lang scribble/doc @(require "common.rkt" (for-label lang/htdp-beginner)) -@title[#:tag "top"]{@italic{How to Design Programs} Languages} +@title[#:style 'toc #:tag "top"]{@italic{How to Design Programs} Languages} The languages documented in this manual are provided by DrRacket to be used with the @italic{@link["http://www.htdp.org/"]{How to Design diff --git a/collects/scribblings/htdp-langs/intermediate-lambda.scrbl b/collects/scribblings/htdp-langs/intermediate-lambda.scrbl index 979ba4ad2c..c4946f79df 100644 --- a/collects/scribblings/htdp-langs/intermediate-lambda.scrbl +++ b/collects/scribblings/htdp-langs/intermediate-lambda.scrbl @@ -2,7 +2,7 @@ @(require "common.rkt" "std-grammar.rkt" "prim-ops.rkt" (for-label lang/htdp-intermediate-lambda)) -@title[#:style 'toc #:tag "intermediate-lam"]{Intermediate Student with Lambda} +@title[#:tag "intermediate-lam"]{Intermediate Student with Lambda} @declare-exporting[lang/htdp-intermediate-lambda] @@ -92,6 +92,9 @@ the function.} @section[#:tag "intm-w-lambda-common-syntax"]{Common Syntax} +The following syntaxes behave the same in the @emph{Intermediate with Lambda} +level as they did in the @secref["intermediate"] level. + @(define-forms/normal define) @(prim-forms ("intermediate-lam") diff --git a/collects/scribblings/htdp-langs/intermediate.scrbl b/collects/scribblings/htdp-langs/intermediate.scrbl index f6d006c662..f3321fde37 100644 --- a/collects/scribblings/htdp-langs/intermediate.scrbl +++ b/collects/scribblings/htdp-langs/intermediate.scrbl @@ -3,7 +3,7 @@ (for-label lang/htdp-intermediate)) -@title[#:style 'toc #:tag "intermediate"]{Intermediate Student} +@title[#:tag "intermediate"]{Intermediate Student} @declare-exporting[lang/htdp-intermediate] @@ -65,6 +65,9 @@ @section[#:tag "intermediate-common-syntax"]{Common Syntax} +The following syntaxes behave the same in the @emph{Intermediate} level as they +did in the @secref["beginner-abbr"] level. + @(define-forms/normal define) @(define-form/explicit-lambda define lambda) diff --git a/collects/teachpack/error-composition.scrbl b/collects/teachpack/error-composition.scrbl index aea7e1e251..7e901ac114 100755 --- a/collects/teachpack/error-composition.scrbl +++ b/collects/teachpack/error-composition.scrbl @@ -101,9 +101,10 @@ not appreciate anyway). @list[@para{function header} @para{@samp{after define}, @samp{after the name}, @samp{after the first argument}, ...}] - @list[@para{keyword} + @list[@para{keyword, form, syntax} @para{mention the construct directly by name, such as - @samp{expected a variable but found a cond}}] + @samp{expected a variable but found a cond}. Use @samp{syntax} + only when talking about many constructs in aggregate.}] @list[@para{built-in} @para{Nothing --- avoid this term}] @list[@para{macro} @para{Nothing --- avoid this term}]]]