Gentoo Archives: gentoo-doc-cvs

From: "Jan Kundrat (jkt)" <jkt@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: java.xml
Date: Tue, 06 Jul 2010 11:51:34
Message-Id: 20100706115128.591A82CE14@corvid.gentoo.org
jkt         10/07/06 11:51:28

  Modified:             java.xml
  Log:
  #325885, speak about the system VM and the merge VM. Patch by Caster.

Revision  Changes    Path
1.49                 xml/htdocs/doc/en/java.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?r1=1.48&r2=1.49

Index: java.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- java.xml	31 Mar 2010 23:38:40 -0000	1.48
+++ java.xml	6 Jul 2010 11:51:28 -0000	1.49
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.48 2010/03/31 23:38:40 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.49 2010/07/06 11:51:28 jkt Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide>
@@ -24,8 +24,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>0.22</version>
-<date>2009-12-23</date>
+<version>0.23</version>
+<date>2010-07-06</date>
 
 <chapter>
 <title>What is Java?</title>
@@ -259,33 +259,31 @@
 </body>
 </section>
 <section id="preferred-vm">
-<title>Preferred VM</title>
+<title>Preferred Build VM</title>
 <body>
 
 <p>
-While merging Java packages, the VM can and will be switched as necessary.
+While merging Java packages, the VM used for building can sometimes be different
+from the one currently set as the system VM.
 </p>
 
 <p>
-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-2/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.
+This merge time VM switching is needed when, for example, your system-vm is
+set to a 1.6 VM and the package you are merging requires a 1.5 VM. While merging
+it will select and use a 1.5 VM, leaving your system-vm choice intact.
 </p>
 
 <p>
-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.
+To define which VM is selected when a switch is needed, we have created a list of <e>default/supported
+VMs</e> per arch. You can find them in
+<path>/usr/share/java-config-2/config/jdk-defaults.conf</path>. 
 </p>
 
 <p>
-Of course, Gentoo is all about choice, so you can override these defaults in
+Of course, Gentoo is all about choice, so you can override these defaults (and even your
+selected system VM) in
 <path>/etc/java-config-2/build/jdk.conf</path> and have complete control over
-which VM will get used. Some examples:
+which VM will get used for merging. Some examples:
 </p>
 
 <pre caption="Example /etc/java-config-2/build/jdk.conf">
@@ -307,8 +305,10 @@
 
 <warn>
 You do not <e>have</e> to edit this file. If you change these options to use a
-unsupported VM, things could possibly break. Bugs reported with a unsupported VM
-won't be prioritized as much as bugs present within supported VMs.
+unsupported VM, things could possibly break. 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.
+Bugs reported with a unsupported VM won't be prioritized as much as bugs present within
+supported VMs.
 </warn>
 
 </body>