Gentoo Archives: gentoo-doc-cvs

From: "Joshua Saddler (nightmorph)" <nightmorph@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: java.xml
Date: Wed, 23 Dec 2009 08:41:27
Message-Id: E1NNMmX-0001bK-TB@stork.gentoo.org
1 nightmorph 09/12/23 08:41:21
2
3 Modified: java.xml
4 Log:
5 Remove the last of the blackdown references, since it's been removed from the tree
6
7 Revision Changes Path
8 1.47 xml/htdocs/doc/en/java.xml
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/java.xml?rev=1.47&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/java.xml?rev=1.47&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/java.xml?r1=1.46&r2=1.47
13
14 Index: java.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v
17 retrieving revision 1.46
18 retrieving revision 1.47
19 diff -u -r1.46 -r1.47
20 --- java.xml 30 Nov 2009 07:33:31 -0000 1.46
21 +++ java.xml 23 Dec 2009 08:41:21 -0000 1.47
22 @@ -1,8 +1,8 @@
23 <?xml version="1.0" encoding="UTF-8"?>
24 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.46 2009/11/30 07:33:31 nightmorph Exp $ -->
25 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.47 2009/12/23 08:41:21 nightmorph Exp $ -->
26 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
27
28 -<guide link="/doc/en/java.xml">
29 +<guide>
30 <title>Gentoo Java Guide</title>
31
32 <author title="Author">
33 @@ -24,8 +24,8 @@
34 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
35 <license/>
36
37 -<version>0.21</version>
38 -<date>2009-11-29</date>
39 +<version>0.22</version>
40 +<date>2009-12-23</date>
41
42 <chapter>
43 <title>What is Java?</title>
44 @@ -100,11 +100,6 @@
45 <th>JRE</th>
46 </tr>
47 <tr>
48 - <ti>The Blackdown Java Kit</ti>
49 - <ti>dev-java/blackdown-jdk</ti>
50 - <ti>dev-java/blackdown-jre</ti>
51 -</tr>
52 -<tr>
53 <ti>Sun's Java Kit</ti>
54 <ti>dev-java/sun-jdk</ti>
55 <ti>dev-java/sun-jre-bin</ti>
56 @@ -206,10 +201,8 @@
57 <pre caption="Listing available VMs">
58 # <i>java-config --list-available-vms</i>
59 The following VMs are available for generation-2:
60 -1) Blackdown JDK 1.4.2.03 [blackdown-jdk-1.4.2] <comment>(Build Only)</comment>
61 -2) Blackdown JRE 1.4.2.03 [blackdown-jre-1.4.2] <comment>(Build Only)</comment>
62 -3) IcedTea6-bin 1.4.1 [icedtea6-bin]
63 -4) Sun JDK 1.5.0.20 [sun-jdk-1.5] <comment>(Build Only)</comment>
64 +1) IcedTea6-bin 1.4.1 [icedtea6-bin]
65 +2) Sun JDK 1.5.0.20 [sun-jdk-1.5] <comment>(Build Only)</comment>
66 *) Sun JDK 1.6.0.16 [sun-jdk-1.6]
67 </pre>
68
69 @@ -229,11 +222,10 @@
70
71 <pre caption="Setting the System VM">
72 <comment>(By handle (preferred))</comment>
73 -# <i>java-config --set-system-vm blackdown-jdk-1.4</i>
74 -Now using blackdown-jdk-1.4 as your generation-2 system JVM
75 -WARNING: blackdown-jdk-1.4 is marked as a build-only JVM. Using this vm is not recommended.
76 +# <i>java-config --set-system-vm sun-jdk-1.6</i>
77 +Now using sun-jdk-1.6 as your generation-2 system JVM
78 <comment>(By number)</comment>
79 -# <i>java-config --set-system-vm 5</i>
80 +# <i>java-config --set-system-vm 3</i>
81 Now using sun-jdk-1.6 as your generation-2 system JVM
82 </pre>
83
84 @@ -308,16 +300,15 @@
85
86 <pre caption="Example /etc/java-config-2/build/jdk.conf">
87 <comment># For 1.3 I prefer sun-jdk 1.4 but when it is not available, use ibm-jdk-bin,
88 -# For 1.4, use blackdown-jdk, and for 1.5, use sun-jdk </comment>
89 +# For 1.5, use sun-jdk </comment>
90 1.3=sun-jdk-1.4 ibm-jdk-bin
91 -1.4=blackdown-jdk
92 1.5=sun-jdk
93 </pre>
94
95 <warn>
96 -You do not have to edit this file. If you change these options to use a
97 -unsupported VM, things could possibly break. Bugs reported with a unsupported
98 -VM won't be prioritized as much as bugs present within supported VMs.
99 +You do not <e>have</e> to edit this file. If you change these options to use a
100 +unsupported VM, things could possibly break. Bugs reported with a unsupported VM
101 +won't be prioritized as much as bugs present within supported VMs.
102 </warn>
103
104 </body>