Consolidate the DMdA docs into a single chapter.

svn: r14098

collects/deinprogramm/scribblings/DMdA-lib.scrbl

@@ -10,7 +10,7 @@
                      lang/prim))
 
 @(define DMdA @italic{Die Macht der Abstraktion})
-@(define (DMdA-ref s) @secref[#:doc '(lib "deinprogramm/scribblings/deinprogramm-langs.scrbl") s])
+@(define (DMdA-ref s) @secref[#:doc '(lib "deinprogramm/scribblings/deinprogramm.scrbl") s])
 
 Note: This is documentation for the language levels that go with the
 German textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die

collects/deinprogramm/scribblings/deinprogramm-langs.scrbl

@@ -1,25 +0,0 @@
-#lang scribble/doc
-@(require scribblings/htdp-langs/common)
-
-@title{Sprachebenen für @italic{Die Macht der Abstraktion}}
-
-Note: This is documentation for the language levels that go with the
-German textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die
-Macht der Abstraktion}}.
-
-Die Sprachebenen in diesem Handbuch sind für Verwendung mit dem Buch
-the @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der
-Abstraktion}} gedacht.
-
-@table-of-contents[]
-
-@;------------------------------------------------------------------------
-
-@include-section["DMdA-beginner.scrbl"]
-@include-section["DMdA-vanilla.scrbl"]
-@include-section["DMdA-assignments.scrbl"]
-@include-section["DMdA-advanced.scrbl"]
-
-@;------------------------------------------------------------------------
-
-@index-section[]

collects/deinprogramm/scribblings/deinprogramm.scrbl

@@ -0,0 +1,31 @@
+#lang scribble/doc
+
+@(require scribble/manual
+          (for-label scheme))
+
+@title[#:style '(toc) #:tag "deinprogramm"]{Sprachebenen und Material zu @italic{Die Macht der Abstraktion}}
+
+Note: This is documentation for the teachpacks that go with the German
+textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht
+der Abstraktion}}.
+
+Die Sprachebenen und Teachpacks in diesem Handbuch sind für Verwendung
+mit dem Buch the @italic{@link["http://www.deinprogramm.de/dmda/"]{Die
+Macht der Abstraktion}} gedacht.
+
+@table-of-contents[]
+
+@include-section["DMdA-beginner.scrbl"]
+@include-section["DMdA-vanilla.scrbl"]
+@include-section["DMdA-assignments.scrbl"]
+@include-section["DMdA-advanced.scrbl"]
+
+@include-section["ka.scrbl"]
+
+@include-section["image.scrbl"]
+@include-section["world.scrbl"]
+@include-section["turtle.scrbl"]
+@include-section["sound.scrbl"]
+@include-section["line3d.scrbl"]
+
+@index-section[]

collects/deinprogramm/scribblings/info.ss

@@ -1,6 +1,5 @@
 #lang setup/infotab
 
-(define scribblings '(("deinprogramm-langs.scrbl" (multi-page) (language -14))
-		      ("ka.scrbl" (multi-page) (other -10))
+(define scribblings '(("deinprogramm.scrbl" (multi-page) (language -14))
 		      ("DMdA-lib.scrbl")))
 

collects/teachpack/deinprogramm/scribblings/deinprogramm.scrbl

@@ -1,18 +0,0 @@
-#lang scribble/doc
-
-@(require scribble/manual
-          (for-label scheme))
-
-@title[#:style '(toc) #:tag "deinprogramm"]{DeinProgramm-Teachpacks}
-
-Note: This is documentation for the teachpacks that go with the German
-textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht
-der Abstraktion}}.
-
-@table-of-contents[]
-
-@include-section["image.scrbl"]
-@include-section["world.scrbl"]
-@include-section["turtle.scrbl"]
-@include-section["sound.scrbl"]
-@include-section["line3d.scrbl"]

collects/teachpack/deinprogramm/scribblings/info.ss

@@ -1,3 +0,0 @@
-#lang setup/infotab
-
-(define scribblings '(("deinprogramm.scrbl" (multi-page) (library -10))))