# HG changeset patch
# User wenzelm
# Date 1346871280 -7200
# Node ID fa01a202399c2a071ac19e9dd031ea24e2d094c7
# Parent  bf6f727cb3627b0f29e79c556260173869771115
eliminated potentially confusing terminology of Scala "layer";

diff -r bf6f727cb362 -r fa01a202399c Admin/build
--- a/Admin/build	Wed Sep 05 20:36:13 2012 +0200
+++ b/Admin/build	Wed Sep 05 20:54:40 2012 +0200
@@ -25,7 +25,7 @@
 
     all             all modules below
     browser         graph browser (requires jdk)
-    jars            Isabelle/Scala layer (requires \$ISABELLE_JDK_HOME and \$SCALA_HOME)
+    jars            Isabelle/Scala (requires \$ISABELLE_JDK_HOME and \$SCALA_HOME)
     jars_test       test separate build of jars
     jars_fresh      fresh build of jars
 
diff -r bf6f727cb362 -r fa01a202399c src/Doc/System/Basics.thy
--- a/src/Doc/System/Basics.thy	Wed Sep 05 20:36:13 2012 +0200
+++ b/src/Doc/System/Basics.thy	Wed Sep 05 20:54:40 2012 +0200
@@ -446,8 +446,8 @@
   @{verbatim "-X"} option enables XML-based PGIP communication.
 
   \medskip The @{verbatim "-T"} or @{verbatim "-W"} option makes
-  Isabelle enter a special process wrapper for interaction via the
-  Isabelle/Scala layer, see also @{file
+  Isabelle enter a special process wrapper for interaction via
+  Isabelle/Scala, see also @{file
   "~~/src/Pure/System/isabelle_process.scala"}.  The protocol between
   the ML and JVM process is private to the implementation.
 
diff -r bf6f727cb362 -r fa01a202399c src/Pure/PIDE/document.ML
--- a/src/Pure/PIDE/document.ML	Wed Sep 05 20:36:13 2012 +0200
+++ b/src/Pure/PIDE/document.ML	Wed Sep 05 20:54:40 2012 +0200
@@ -384,7 +384,7 @@
 
 fun init_theory deps node span =
   let
-    (* FIXME provide files via Scala layer, not master_dir *)
+    (* FIXME provide files via Isabelle/Scala, not master_dir *)
     val (dir, header) = read_header node span;
     val master_dir =
       (case try Url.explode dir of
diff -r bf6f727cb362 -r fa01a202399c src/Pure/System/invoke_scala.ML
--- a/src/Pure/System/invoke_scala.ML	Wed Sep 05 20:36:13 2012 +0200
+++ b/src/Pure/System/invoke_scala.ML	Wed Sep 05 20:54:40 2012 +0200
@@ -1,7 +1,7 @@
 (*  Title:      Pure/System/invoke_scala.ML
     Author:     Makarius
 
-JVM method invocation service via Scala layer.
+JVM method invocation service via Isabelle/Scala.
 
 TODO: proper cancellation!
 *)
diff -r bf6f727cb362 -r fa01a202399c src/Pure/System/invoke_scala.scala
--- a/src/Pure/System/invoke_scala.scala	Wed Sep 05 20:36:13 2012 +0200
+++ b/src/Pure/System/invoke_scala.scala	Wed Sep 05 20:54:40 2012 +0200
@@ -1,7 +1,7 @@
 /*  Title:      Pure/System/invoke_scala.scala
     Author:     Makarius
 
-JVM method invocation service via Scala layer.
+JVM method invocation service via Isabelle/Scala.
 */
 
 package isabelle
diff -r bf6f727cb362 -r fa01a202399c src/Pure/build-jars
--- a/src/Pure/build-jars	Wed Sep 05 20:36:13 2012 +0200
+++ b/src/Pure/build-jars	Wed Sep 05 20:54:40 2012 +0200
@@ -166,7 +166,7 @@
 
 if [ "$OUTDATED" = true ]
 then
-  echo "### Building Isabelle/Scala layer ..."
+  echo "### Building Isabelle/Scala ..."
 
   [ "${#UPDATED[@]}" -gt 0 ] && {
     echo "Changed files:"
diff -r bf6f727cb362 -r fa01a202399c src/Tools/jEdit/README.html
--- a/src/Tools/jEdit/README.html	Wed Sep 05 20:36:13 2012 +0200
+++ b/src/Tools/jEdit/README.html	Wed Sep 05 20:54:40 2012 +0200
@@ -67,7 +67,7 @@
 <li>Dockable panels (e.g. <em>Output</em>) are managed as independent
   windows by jEdit, which also allows multiple instances.</li>
 
-<li>Prover process and source files are managed by the Scala layer on
+<li>Prover process and source files are managed by the Isabelle/Scala on
 the editor side.  The prover experiences a mostly timeless and
 stateless environment of formal document content.</li>