r5rs is in its own collection now

svn: r1159

collects/algol60/doc.txt

@@ -1,8 +1,8 @@
 _Algol 60_
 
-The "Algol 60" language for DrScheme implements the language define by
-the "Revised Report on the Algorithmic Language Algol 60", edited by
-Peter Naur.
+The "Algol 60" language for DrScheme implements the language defined
+by the "Revised Report on the Algorithmic Language Algol 60", edited
+by Peter Naur.
 
 
 The "algol60.ss" library provides an `include-algol' form for including

collects/drscheme/private/language-configuration.ss

@@ -1322,7 +1322,7 @@
                         (string-constant expander-one-line-summary)
                         add-expand-to-front-end))
           (add-language
-           (make-simple '(lib "r5rs.ss" "lang")
+           (make-simple '(lib "r5rs.ss" "r5rs")
                         (list (string-constant professional-languages)
                               (string-constant r5rs-lang-name))
                         (list -1000 -1000)

collects/lang/doc.txt

@@ -2,10 +2,9 @@
 The "lang" collection defines a number of modules that can serve as
 languages for other modules (i.e., as the initial import):
 
- * _r5rs.ss_ - provides R5RS Scheme, plus _#%provide_ (instead of
-   `provide'), _#%require_ (instead of `#%require'), `#%app',
-   `%datum', etc.  The `letrec' of this language is defined exactly as
-   in R5RS, and not as in MzScheme.
+ * _r5rs.ss_ - provides R5RS Scheme, which is defined in the "r5rs"
+   collection.  This file is here only for backward compatibility, use
+   (lib "r5rs.ss" "r5rs") instead.
 
  * _plt-pretty-big-text.ss_ - provides MzScheme plus the
    following MzLib libraries: etc.ss, file.ss, list.ss,

collects/r5rs/doc.txt

@@ -0,0 +1,27 @@
+_R5RS_
+
+The "r5rs.ss" module in the "r5rs" collection implements the language
+defined by the "Revised^5 Report on the Algorithmic Language Scheme".
+In addition, this module provides _#%provide_ (instead of `provide'),
+_#%require_ (instead of `#%require'), `#%app', `%datum', etc.  The
+`letrec' of this language is defined exactly as in R5RS, and not as in
+MzScheme.
+
+The module _r5rs.ss_ module is a language module.  You can use it in
+one of several ways:
+
+* Use the "Standard (R5RS)" language in DrScheme;
+
+* Start MzScheme using bindings from the R5RS language with
+
+    mzscheme -M r5rs
+
+  (but note that MzScheme bindings will still be visible);
+
+* Write code in a module that uses the R5RS language:
+
+    (module foo (lib "r5rs.ss" "r5rs")
+      ...)
+
+  in this case, you can `provide' bindings and `require' other modules
+  by using _#%require_ and _#%provide_.

collects/r6rs/r6rs.ss

@@ -1,6 +1,6 @@
 
 (module r6rs mzscheme
-  (require (prefix r5rs: (lib "r5rs.ss" "lang")))
+  (require (prefix r5rs: (lib "r5rs.ss" "r5rs")))
 
   ;; R5RS values
   (provide car cdr caar cadr cdar cddr

collects/swindle/html-doc.txt

@@ -47,10 +47,9 @@ I'm assuming general knowledge of Scheme, MzScheme and HTML.
 Documentations can be found on the PLT sites (http://www.drscheme.org/),
 
 * The Revised Scheme Report:
-  http://www.cs.rice.edu/CS/PLT/packages/doc/r5rs/index.htm
+  http://download.plt-scheme.org/doc/mzscheme/
 
-* MzScheme:
-  http://www.cs.rice.edu/CS/PLT/packages/doc/mzscheme/index.htm
+* MzScheme: http://www.plt-scheme.org/
 
 Also, good HTML reference can be found at:
   http://www.idocs.com/tags/
@@ -1653,8 +1652,8 @@ What I found most convenient is the following prefix:
 This will make it a /bin/sh script that will just execute mzscheme with
 the correct command-line arguments: `-r' is for running a script: short
 for `-fmv-' which stands for `-f' for loading an argument, `-m' for
-suppressing the banner, `-v' for no interactive read-eval-print loop, and
-`--' to specify that more arguments are passed to the script without
+suppressing the banner, `-v' for no interactive read-eval-print loop,
+and `--' to specify that more arguments are passed to the script without
 further processing.  The first "$0" argument is consumed by the `-f' --
 this is the actual script (the double-quotes are to protect file name
 with spaces from exploding to multiple arguments), and "$@" are other

collects/web-server/servlet-builder.ss

@@ -123,7 +123,7 @@
                       (hash-table-put! table (string->symbol (car name-req)) (cadr name-req)))
                     (list 
                      (list (string-constant r5rs-lang-name)
-                           `(lib "r5rs.ss" "lang"))
+                           `(lib "r5rs.ss" "r5rs"))
                      (list (string-constant beginning-student)
                            `(lib "htdp-beginner.ss" "lang"))
                      (list (string-constant beginning-student/abbrev)