INTEGRATION: CWS jl89_DEV300 (1.13.32); FILE MERGED

2008/02/19 10:14:05 ufi 1.13.32.1: makefiles

1 files changed, 3 insertions, 5 deletions

diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index d8605f2724..77492a4b6a 100755
--- a/helpcontent2/source/text/shared/00/00000002.xhp
+++ b/helpcontent2/source/text/shared/00/00000002.xhp
@@ -7,9 +7,9 @@
  *
  *  $RCSfile: 00000002.xhp,v $fileonly,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: rt $ $Date: 2008-02-19 22:51:16 $
+ *  last change: $Author: kz $ $Date: 2008-03-07 11:48:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -118,9 +118,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159125"><bookmark_value>Java; definition</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3159125" xml-lang="en-US" level="2" l10n="U" oldref="92">Java</paragraph>
-<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="93">The Java programming language is a platform independent programming language developed by Sun Microsystems, Inc. (http://www.sun.com) that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code". A .class file is created, which can then be inserted as a "Java Applet" into HTML pages. Several .class files can be combined to a single .jar or .zip file. A Web browser that supports the Java class files can compile the Java programming language code immediately after receipt without the user having to unpack the archive.</paragraph>
-<paragraph role="paragraph" id="par_id3147418" xml-lang="en-US" l10n="U" oldref="94">The basic concept of the Java technology consists of sending a more advanced level of instruction (for example, "draw a line") to the Web browser which then knows how to execute the instruction on the client computer. Thus a program written in the Java programming language can run on any computer which has an interpreter or compiler for the Java programming language, independent of processor type and operating system.</paragraph>
-<paragraph role="paragraph" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="187">Do not confuse "JavaScript" and "Java Applets". JavaScript is a simple, limited script language for Web browsers used, for example, to display animated text. JavaScript describes objects in a language that looks a bit like the Java programming language and lets users optically enhance their HTML pages. "Java Applets", on the other hand, are programs written in the Java programming language and compiled into byte code, as described in the preceding paragraphs.</paragraph>
+<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language developed by Sun Microsystems, Inc. (http://www.sun.com) that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
 </section>
 <section id="plugin">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159153"><bookmark_value>plug-ins; definition</bookmark_value>