Attachment 90039 Details for Bug 137760 – diff of the edit against the SVN original

[patch] diff of the edit against the SVN original

java.xml.patch (text/plain), 12.16 KB, created by nm (RETIRED) on 2006-06-24 09:09:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nm (RETIRED)

Created: 2006-06-24 09:09:35 UTC

Size: 12.16 KB

patch

obsolete

>--- java.xml.old	2006-06-24 09:06:53.000000000 -0700
>+++ java.xml	2006-06-24 09:03:59.000000000 -0700
>@@ -2,8 +2,8 @@
> 
> <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
> 
>-<guide link="/doc/en/java-user.xml">
>-<title>Gentoo Java User Guide</title>
>+<guide link="/doc/en/java.xml">
>+<title>Gentoo Java Guide</title>
> 
> <author title="Author">
> <mail link="karltk@gentoo.org">Karl Trygve Kalleberg</mail>
>@@ -11,6 +11,9 @@
> <author title="Author">
> <mail link="nichoj@gentoo.org">Joshua Nichols</mail>
> </author>
>+<author title="Editor">
>+ <mail link="nightmorph@gentoo.org">Joshua Saddler</mail>
>+</author>
> 
> <abstract>
> This guide will introduce you to Java and explain how to use Java with Gentoo
>@@ -21,8 +24,8 @@
> 
> <license/>
> 
>-<version>0.1.8</version>
>-<date>2006-05-16</date>
>+<version>0.4</version>
>+<date>2006-06-24</date>
> 
> <chapter>
> <title>What is Java?</title>
>@@ -35,11 +38,11 @@
> language is object-oriented and designed to run on multiple platforms without
> the need of recompiling code for each platform. Although Java can be compiled
> as a native program, much of Java's popularity can be attributed to its
>-portability, along with other features such as garbage collection.
>-To make platform independence possible the Java compiler compiles the Java
>-code to an intermediate representation called "Java bytecode" that runs on a
>-JRE (Java Runtime Environment) and not directly on the operating system.
>-is a JRE for each supported OS that runs natively on the OS.
>+portability, along with other features such as garbage collection. To make
>+platform independence possible the Java compiler compiles the Java code to an
>+intermediate representation called "Java bytecode" that runs on a JRE (Java
>+Runtime Environment) and not directly on the operating system. is a JRE for
>+each supported OS that runs natively on the OS.
> 
> 
> 
>@@ -104,18 +107,19 @@
> -->
> 
> 
>-The default is Blackdown for both the JRE and the JDK , as it is freely ("free as in beer")
>-available without any registration fuss.
>+The default is Blackdown for both the JRE and the JDK, as it is freely ("free
>+as in beer") available without any registration fuss.
> 
> 
> 
>-Both the Sun and the IBM are generally faster, but getting them
>-is a bit more hassle, as you are required to read and accept their license before
>-downloading (IBM additionally requires you to register).
>+Both the Sun and the IBM are generally faster, but getting them is a bit more
>+hassle, as you are required to read and accept their license before downloading
>+(IBM additionally requires you to register).
> 
> 
> 
>-Our ebuilds for the Sun and IBM JRE/JDKs will inform you how to download the appropriate files.
>+Our ebuilds for the Sun and IBM JRE/JDKs will inform you how to download the
>+appropriate files.
> 
> 
> </body>
>@@ -125,12 +129,12 @@
> <body>
> 
> 
>-To install your profile's default JDK, you can run <c>emerge virtual/jdk</c>
>-. Or to install your profile's default JRE, you can <c>emerge virtual/jre</c>.
>+To install your profile's default JDK, you can run <c>emerge virtual/jdk</c>.
>+Or to install your profile's default JRE, you can <c>emerge virtual/jre</c>.
> 
> 
> <note>
>-A JDK also includes a JRE, so if you install a JDK you shouldn't have to also 
>+A JDK also includes a JRE, so if you install a JDK you shouldn't have to also
> have to install a JRE.
> </note>
> 
>@@ -150,8 +154,8 @@
> 
> 
> You should download the indicated file(s) into
>-<path>/usr/portage/distfiles</path>. Once there, you can rerun the
>-emerge command, at which point the JRE/JDK will be begin to install.
>+<path>/usr/portage/distfiles</path>. Once there, you can rerun the emerge
>+command, at which point the JRE/JDK will be begin to install.
> 
> 
> </body>
>@@ -165,13 +169,14 @@
> <body>
> 
> 
>-Gentoo has the ability to have multiple JDKs and JREs installed without causing conflicts.
>+Gentoo has the ability to have multiple JDKs and JREs installed without causing
>+conflicts.
> 
> 
> 
>-Using the <c>java-config</c> tool, you can set the system-wide default (provided you have 
>-root access). Users can also use <c>java-config</c> to set up their own
>-personal default.
>+Using the <c>java-config</c> tool, you can set the system-wide default
>+(provided you have root access). Users can also use <c>java-config</c> to set
>+up their own personal default.
> 
> 
> <note>
>@@ -208,26 +213,26 @@
> </pre>
> 
> 
>-The <e>*</e> indicated this is the current active vm (system-vm or user-vm when
>-set). The name in the brackets <e>"[]"</e> is the handle or ID for that
>+The <e>*</e> indicates this is the current active vm (system-vm or user-vm when
>+set). The name in the brackets (<e>[]</e>) is the handle or ID for that
> particular VM. You use the handle or the number to <c>java-config
> --set-system-vm</c>. Here is an example of how to set the system VM.
> 
> 
> <pre caption="Setting the System VM">
>-<comment>By handle (preferred)</comment>
>+<comment>(By handle (preferred))</comment>
> # java-config --set-system-vm blackdown-jdk-1.4
>-<comment>By number</comment>
>+<comment>(By number)</comment>
> # java-config --set-system-vm 2
> </pre>
> 
> 
>-As a regular user, you can use <c>java-config --set-user-vm</c>
>+As a regular user, you can use <c>java-config --set-user-vm</c>.
> 
> 
> <note>
>-You no longer have to <c>source</c> the profile for updates to the 
>-user/system VM take place.
>+You no longer have to <c>source</c> the profile for updates to the user/system
>+VM take place.
> </note>
> 
> </body>
>@@ -242,34 +247,33 @@
> 
> 
> Because of the wide variety of available VMs, we do not have the resources to
>-test and verify every package works on all of them. So to ensure that every
>-packages merges smoothly, we have defined a list of <e>default / supported
>-vms</e> per arch. You can find them in
>-<path>/usr/share/java-config/config/jdk-defaults.conf</path>. When you are
>+test and verify every package works on all of them. So to ensure that every
>+packages merges smoothly, we have defined a list of <e>default/supported
>+VMs</e> per arch. You can find them in
>+<path>/usr/share/java-config/config/jdk-defaults.conf</path>. When you are
> merging a Java package, and it detects one of the VM in that file is installed,
> it will automatically use that VM, instead of the system-vm.
> 
> 
> 
> The merge time VM switching is also needed when, for example, your system-vm is
>-set a 1.4 VM and the package you are merging requires a 1.5 VM. While merging
>-it will use the preferred 1.5 Vm, leaving your system-vm choice intact.
>+set a 1.4 VM and the package you are merging requires a 1.5 VM. While merging
>+it will use the preferred 1.5 VM, leaving your system-vm choice intact.
> 
> 
> 
> Of course, Gentoo is all about choice, so you can override these defaults in
>-<path>/etc/java-config-2/build/jdk.conf</path> and have complete control over which VM
>-will get used. 
>-Some examples:
>+<path>/etc/java-config-2/build/jdk.conf</path> and have complete control over
>+which VM will get used. Some examples:
> 
> 
> <pre caption="Example /etc/java-config-2/build/jdk.conf">
>-<comment># I Always want it to use a sun-jdk, ie sun-jdk-1.4 for 1.4, sun-jdk-1.5 for 1.5, etc</comment>
>+<comment>(I always want it to use a sun-jdk, ie sun-jdk-1.4 for 1.4, sun-jdk-1.5 for 1.5, etc)</comment>
> *=sun-jdk
> </pre>
> 
> <pre caption="Example /etc/java-config-2/build/jdk.conf">
>-<comment># Always use sun-jdk-1.5 wherever possible (except for when a 1.4 or 1.3 VM is explicitly required</comment>
>+<comment>(Always use sun-jdk-1.5 wherever possible, except for when a 1.4 or 1.3 VM is explicitly required)</comment>
> *=sun-jdk-1.5
> </pre>
> 
>@@ -281,11 +285,10 @@
> 1.5=sun-jdk
> </pre>
> 
>-
> <warn>
>-You do not have to edit this file. If you change these options to use a 
>-unsupported VM, things could possibly break. Bugs reported with a
>-unsupported VM will a lower priority if they aren't present with supported VMs.
>+You do not have to edit this file. If you change these options to use a
>+unsupported VM, things could possibly break. Bugs reported with a unsupported
>+VM will a lower priority if they aren't present with supported VMs.
> </warn>
> 
> </body>
>@@ -297,16 +300,20 @@
> <warn>
> The options explained in this section should be considered deprecated and will
> be most likely be removed in the future. We strongly recommend against using
>-these, because your Java projects or application should ideally manage their own classpaths. If you choose to specify a default CLASSPATH, some applications may behave unexpectedly, because classes they weren't expecting would be on the classpath.
>+these, because your Java projects or application should ideally manage their
>+own classpaths. If you choose to specify a default CLASSPATH, some applications
>+may behave unexpectedly, because classes they weren't expecting would be on the
>+classpath.
> </warn>
> 
> 
>-<c>java-config</c> can also be used to set a system-wide default CLASSPATH, as well a user-specific default CLASSPATH.
>+<c>java-config</c> can also be used to set a system-wide default CLASSPATH, as
>+well a user-specific default CLASSPATH.
> 
> 
> 
>-First, you will want to list available Java libraries installed on your system that might want to be put in your CLASSPATH. 
>-Here is an example of output:
>+First, you will want to list available Java libraries installed on your system
>+that might want to be put in your CLASSPATH. Here is an example of output:
> 
> 
> <pre caption="Listing classes">
>@@ -320,9 +327,8 @@
> </pre>
> 
> 
>-Again, the name in brackets <path>"[]"</path> are the IDs that you have to pass
>-to <c>java-config --set-system-classpath</c>. 
>-Here is an example:
>+Again, the names in brackets (<e>[]</e>) are the IDs that you have to pass to
>+<c>java-config --set-system-classpath</c>. Here is an example:
> 
> 
> <pre caption="Setting classpaths">
>@@ -330,8 +336,8 @@
> </pre>
> 
> <note>
>-The current directory (.) will not be part of the system classpath, as that
>-should be added in your system's login profile.
>+The current directory (<path>.</path>) will not be part of the system
>+classpath, as that should be added in your system's login profile.
> </note>
> 
> 
>@@ -386,12 +392,19 @@
> <ul>
> <li>The java flag adds support for Java in a variety of programs</li>
> <li>
>- The nsplugin flag adds support for Mozilla-like browsers
>- (including Firefox).You will need this for viewing Java applets in your
>- Mozilla-like browser.
>+ The nsplugin flag adds support for Mozilla-like browsers (including
>+ Firefox).You will need this for viewing Java applets in your Mozilla-like
>+ browser.
>+ </li>
>+ <li>
>+ The doc flag will typically install API documentation, as generated
>+ by javadoc.
>+ </li>
>+ <li>
>+ The source flag will install a zip of the package's source code.
>+ This is typicall used to provide your IDE with the source code for the
>+ package.
> </li>
>- <li>The doc flag will typically install API documentation, as generated by javadoc.</li>
>- <li>The source flag will install a zip of the package's source code. This is typicall used to provide your IDE with the source code for the package.</li>
> </ul>
> 
> </body>
>@@ -416,17 +429,23 @@
> <body>
> 
> <ul>
>- <li>The <uri link="http://www.gentoo.org/proj/en/java/">Java Project Page</uri></li>
> <li>
>- The 
>- <uri link="http://news.gmane.org/gmane.linux.gentoo.java">gentoo-java</uri>,
>- <uri link="http://news.gmane.org/gmane.linux.gentoo.user">gentoo-user</uri>,
>+ The <uri link="http://www.gentoo.org/proj/en/java/">Java Project
>+ Page</uri>
>+ </li>
>+ <li>
>+ The <uri
>+ link="http://news.gmane.org/gmane.linux.gentoo.java">gentoo-java</uri>,
>+ <uri
>+ link="http://news.gmane.org/gmane.linux.gentoo.user">gentoo-user</uri>,
> <uri link="http://news.gmane.org/gmane.linux.gentoo.devel">gentoo-dev</uri>
> mailing list archives
> </li>
> <li>#gentoo and #gentoo-java on irc.freenode.net</li>
> <li>
>- <uri link="http://en.wikipedia.org/wiki/Java_programming_language">Wikipedia's entry for Java</uri>
>+ <uri
>+ link="http://en.wikipedia.org/wiki/Java_programming_language">Wikipedia's
>+ entry for Java</uri>
> </li>
> </ul>
> 
>@@ -434,3 +453,4 @@
> </section>
> </chapter>
> </guide>
>+

Actions: View | Diff

Attachments on bug 137760: 90038 | 90039