From 69a490c10b4964ea174f31a8b992e034ff3fb270 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@barzilay.org>
Date: Tue, 26 Oct 2010 16:17:09 -0400
Subject: [PATCH] More name improvements: `scribble/text/textlang' ->
 `scribble/text/lang' and the same for `scribble/html/lang'.

---
 collects/meta/web/common/extras.rkt               | 2 +-
 collects/meta/web/common/layout.rkt               | 2 +-
 collects/meta/web/common/links.rkt                | 2 +-
 collects/meta/web/common/main.rkt                 | 4 ++--
 collects/meta/web/common/resources.rkt            | 2 +-
 collects/scribble/html/{htmllang.rkt => lang.rkt} | 5 ++---
 collects/scribble/text/{textlang.rkt => lang.rkt} | 0
 collects/scribble/text/lang/reader.rkt            | 2 +-
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename collects/scribble/html/{htmllang.rkt => lang.rkt} (75%)
 rename collects/scribble/text/{textlang.rkt => lang.rkt} (100%)

diff --git a/collects/meta/web/common/extras.rkt b/collects/meta/web/common/extras.rkt
index b5a8aa44c7..021d377d25 100644
--- a/collects/meta/web/common/extras.rkt
+++ b/collects/meta/web/common/extras.rkt
@@ -1,6 +1,6 @@
 #lang at-exp racket/base
 
-(require scribble/html (only-in scribble/html/htmllang #%top))
+(require scribble/html (only-in scribble/html/lang #%top))
 
 ;; list of a header paragraphs and sub paragraphs (don't use `p' since it looks
 ;; like they should not be nested)
diff --git a/collects/meta/web/common/layout.rkt b/collects/meta/web/common/layout.rkt
index 471c491087..ab1e8bdd00 100644
--- a/collects/meta/web/common/layout.rkt
+++ b/collects/meta/web/common/layout.rkt
@@ -1,6 +1,6 @@
 #lang at-exp racket/base
 
-(require scribble/html (only-in scribble/html/htmllang #%top)
+(require scribble/html (only-in scribble/html/lang #%top)
          (for-syntax racket/base syntax/name)
          "utils.rkt" "resources.rkt")
 
diff --git a/collects/meta/web/common/links.rkt b/collects/meta/web/common/links.rkt
index d995195c07..fb11bed26f 100644
--- a/collects/meta/web/common/links.rkt
+++ b/collects/meta/web/common/links.rkt
@@ -1,6 +1,6 @@
 #lang at-exp racket/base
 
-(require scribble/html (only-in scribble/html/htmllang #%top))
+(require scribble/html (only-in scribble/html/lang #%top))
 
 (define-syntax-rule (define* id E) (begin (define id E) (provide id)))
 
diff --git a/collects/meta/web/common/main.rkt b/collects/meta/web/common/main.rkt
index dfec91c0d6..91ada39cc7 100644
--- a/collects/meta/web/common/main.rkt
+++ b/collects/meta/web/common/main.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
-(require scribble/html/htmllang
+(require scribble/html/lang
          "layout.rkt" "resources.rkt" "extras.rkt" "links.rkt" "utils.rkt")
-(provide (all-from-out scribble/html/htmllang
+(provide (all-from-out scribble/html/lang
                        "layout.rkt" "resources.rkt" "extras.rkt" "links.rkt"
                        "utils.rkt"))
diff --git a/collects/meta/web/common/resources.rkt b/collects/meta/web/common/resources.rkt
index 7535b5ecba..9e963a3f24 100644
--- a/collects/meta/web/common/resources.rkt
+++ b/collects/meta/web/common/resources.rkt
@@ -1,6 +1,6 @@
 #lang at-exp racket/base
 
-(require scribble/html (only-in scribble/html/htmllang #%top))
+(require scribble/html (only-in scribble/html/lang #%top))
 
 ;; These are some resources that are shared across different toplevel
 ;; sites.  They could be included from a single place, but then when one
diff --git a/collects/scribble/html/htmllang.rkt b/collects/scribble/html/lang.rkt
similarity index 75%
rename from collects/scribble/html/htmllang.rkt
rename to collects/scribble/html/lang.rkt
index 4d47215fef..258dd15f9b 100644
--- a/collects/scribble/html/htmllang.rkt
+++ b/collects/scribble/html/lang.rkt
@@ -1,10 +1,9 @@
 #lang racket/base
 
-(require "main.rkt" scribble/text/textlang scribble/text/syntax-utils
+(require "main.rkt" scribble/text/lang scribble/text/syntax-utils
          (for-syntax racket/base))
 
-(provide (except-out (all-from-out scribble/text/textlang)
-                     #%top #%module-begin)
+(provide (except-out (all-from-out scribble/text/lang) #%top #%module-begin)
          (rename-out [top #%top] [module-begin #%module-begin])
          (all-from-out "main.rkt"))
 
diff --git a/collects/scribble/text/textlang.rkt b/collects/scribble/text/lang.rkt
similarity index 100%
rename from collects/scribble/text/textlang.rkt
rename to collects/scribble/text/lang.rkt
diff --git a/collects/scribble/text/lang/reader.rkt b/collects/scribble/text/lang/reader.rkt
index 8c6ab72d47..19581ab14e 100644
--- a/collects/scribble/text/lang/reader.rkt
+++ b/collects/scribble/text/lang/reader.rkt
@@ -1,6 +1,6 @@
 #lang s-exp syntax/module-reader
 
-scribble/text/textlang
+scribble/text/lang
 
 #:read        scribble:read-inside
 #:read-syntax scribble:read-syntax-inside