diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts.scrbl index 10b376934c..c1eab95fb8 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts.scrbl @@ -34,11 +34,11 @@ update string-pad-center to show examples via REPL notation: } -@include-section["contracts-intro.scrbl"] -@include-section["contracts-simple-function.scrbl"] -@include-section["contracts-general-function.scrbl"] -@include-section["contracts-first-extended-example.scrbl"] -@include-section["contracts-structure.scrbl"] -@include-section["contracts-exists.scrbl"] -@include-section["contracts-examples.scrbl"] -@include-section["contracts-gotchas.scrbl"] +@include-section["contracts/intro.scrbl"] +@include-section["contracts/simple-function.scrbl"] +@include-section["contracts/general-function.scrbl"] +@include-section["contracts/first-extended-example.scrbl"] +@include-section["contracts/structure.scrbl"] +@include-section["contracts/exists.scrbl"] +@include-section["contracts/examples.scrbl"] +@include-section["contracts/gotchas.scrbl"] diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples.scrbl similarity index 97% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples.scrbl index 9dca1b9449..56c035d171 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require scribble/manual scribble/eval "guide-utils.rkt" "contracts-utils.rkt" +@(require scribble/manual scribble/eval "utils.rkt" (for-label racket/contract racket/gui)) @title[#:tag "contracts-examples"]{Additional Examples} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/1-test.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/1-test.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/1-test.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/1-test.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/1.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/1.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/1.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/1.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/1b.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/1b.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/1b.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/1b.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/2-test.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/2-test.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/2-test.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/2-test.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/2.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/2.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/2.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/2.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/3-test.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/3-test.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/3-test.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/3-test.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/3.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/3.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/3.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/3.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/5-test.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/5-test.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/5-test.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/5-test.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/5.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/5.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/5.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/5.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version1.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version1.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version1.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version1.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version2.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version2.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version2.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version2.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version2a.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version2a.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version2a.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version2a.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version3.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version3.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version3.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version3.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version3a.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version3a.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version3a.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version3a.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version3b.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version3b.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version3b.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version3b.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version4.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version4.rkt similarity index 100% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-examples/ho-version4.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/examples/ho-version4.rkt diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-exists.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/exists.scrbl similarity index 97% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-exists.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/exists.scrbl index 87fdf3fa03..e73cf6f5a0 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-exists.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/exists.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require scribble/manual scribble/eval "guide-utils.rkt" "contracts-utils.rkt" +@(require scribble/manual scribble/eval "utils.rkt" (for-label racket/contract)) @title[#:tag "contracts-exists"]{Abstract Contracts using @racket[#:exists] and @racket[#:∃]} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-first-extended-example.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/first-extended-example.scrbl similarity index 99% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-first-extended-example.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/first-extended-example.scrbl index 169d928c9e..1db56672fb 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-first-extended-example.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/first-extended-example.scrbl @@ -1,7 +1,7 @@ #lang scribble/doc @(require scribble/manual scribble/core scribble/eval - "guide-utils.rkt" "contracts-utils.rkt" + "utils.rkt" (only-in racket/list argmax) (for-label racket/contract)) diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-general-function.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/general-function.scrbl similarity index 99% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-general-function.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/general-function.scrbl index f4c0b3d586..43d11e199a 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-general-function.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/general-function.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require scribble/manual scribble/eval "guide-utils.rkt" "contracts-utils.rkt" +@(require scribble/manual scribble/eval "utils.rkt" (for-label framework/framework racket/contract racket/gui)) @title[#:tag "contracts-general-functions"]{Contracts on Functions in General} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-gotchas.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/gotchas.scrbl similarity index 99% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-gotchas.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/gotchas.scrbl index 2f1b97eb74..06a934450b 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-gotchas.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/gotchas.scrbl @@ -1,6 +1,6 @@ #lang scribble/doc @(require scribble/manual scribble/eval racket/sandbox - "guide-utils.rkt" "contracts-utils.rkt" + "utils.rkt" (for-label racket/contract)) @title[#:tag "contracts-gotchas"]{Gotchas} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-intro.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/intro.scrbl similarity index 98% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-intro.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/intro.scrbl index fe9a823b5e..647a0a566a 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-intro.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/intro.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require scribble/manual scribble/eval "guide-utils.rkt" "contracts-utils.rkt" +@(require scribble/manual scribble/eval "utils.rkt" (for-label racket/contract)) @title[#:tag "contract-boundaries"]{Contracts and Boundaries} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-simple-function.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/simple-function.scrbl similarity index 99% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-simple-function.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/simple-function.scrbl index c4060cab00..31fbca40bf 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-simple-function.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/simple-function.scrbl @@ -2,7 +2,7 @@ @(require scribble/manual scribble/eval scribble/core racket/list scribble/racket - "guide-utils.rkt" "contracts-utils.rkt" + "../guide-utils.rkt" "utils.rkt" (for-label racket/contract)) @title[#:tag "contract-func"]{Simple Contracts on Functions} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-structure.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/structure.scrbl similarity index 99% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-structure.scrbl rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/structure.scrbl index 4b299d2f6b..cc563feb9c 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-structure.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/structure.scrbl @@ -1,5 +1,5 @@ #lang scribble/doc -@(require scribble/manual scribble/eval "guide-utils.rkt" "contracts-utils.rkt" +@(require scribble/manual scribble/eval "../guide-utils.rkt" "utils.rkt" (for-label racket/contract)) @title[#:tag "contracts-struct"]{Contracts on Structures} diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-utils.rkt b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/utils.rkt similarity index 95% rename from pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-utils.rkt rename to pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/utils.rkt index bc40b94cc5..f1a19fde25 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts-utils.rkt +++ b/pkgs/racket-pkgs/racket-doc/scribblings/guide/contracts/utils.rkt @@ -54,7 +54,7 @@ (define-syntax (external-file stx) (syntax-case stx () [(_ filename) - #`(include/reader #,(format "contracts-examples/~a.rkt" (syntax-e #'filename)) + #`(include/reader #,(format "examples/~a.rkt" (syntax-e #'filename)) comment-racketmod-reader)])) (define contract-eval (make-base-eval))