1 |
nightmorph 11/05/09 21:36:03 |
2 |
|
3 |
Modified: java.xml |
4 |
Log: |
5 |
correct category for icedtea6-bin, remove icedtea since it's only ~arch, remove chapter referencing outdated /proj/en/java/java-upgrade, bug 366257 and bug 366645 |
6 |
|
7 |
Revision Changes Path |
8 |
1.51 xml/htdocs/doc/en/java.xml |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.51&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.51&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?r1=1.50&r2=1.51 |
13 |
|
14 |
Index: java.xml |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v |
17 |
retrieving revision 1.50 |
18 |
retrieving revision 1.51 |
19 |
diff -u -r1.50 -r1.51 |
20 |
--- java.xml 9 May 2011 19:16:31 -0000 1.50 |
21 |
+++ java.xml 9 May 2011 21:36:03 -0000 1.51 |
22 |
@@ -1,6 +1,6 @@ |
23 |
<?xml version="1.0" encoding="UTF-8"?> |
24 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
25 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.50 2011/05/09 19:16:31 nightmorph Exp $ --> |
26 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.51 2011/05/09 21:36:03 nightmorph Exp $ --> |
27 |
|
28 |
<guide> |
29 |
<title>Gentoo Java Guide</title> |
30 |
@@ -24,7 +24,7 @@ |
31 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
32 |
<license/> |
33 |
|
34 |
-<version>1</version> |
35 |
+<version>2</version> |
36 |
<date>2011-05-09</date> |
37 |
|
38 |
<chapter> |
39 |
@@ -57,32 +57,6 @@ |
40 |
</chapter> |
41 |
|
42 |
<chapter> |
43 |
-<title>Before You Begin</title> |
44 |
-<section> |
45 |
-<title>Existing installs</title> |
46 |
-<body> |
47 |
- |
48 |
-<p> |
49 |
-For existing installs, regardless of if you have installed anything Java |
50 |
-before, make sure you have followed the <uri |
51 |
-link="/proj/en/java/java-upgrade.xml">Java Upgrade Guide</uri>. |
52 |
-</p> |
53 |
- |
54 |
-</body> |
55 |
-</section> |
56 |
-<section> |
57 |
-<title>New installs</title> |
58 |
-<body> |
59 |
- |
60 |
-<p> |
61 |
-New installs should require no further preparation. |
62 |
-</p> |
63 |
- |
64 |
-</body> |
65 |
-</section> |
66 |
-</chapter> |
67 |
- |
68 |
-<chapter> |
69 |
<title>Installing a Virtual Machine</title> |
70 |
<section> |
71 |
<title>The choices</title> |
72 |
@@ -115,7 +89,6 @@ |
73 |
</tr> |
74 |
<tr> |
75 |
<ti>The IcedTea Open Java Kit</ti> |
76 |
- <ti>dev-java/icedtea</ti> |
77 |
<ti>dev-java/icedtea6-bin</ti> |
78 |
</tr> |
79 |
</table> |
80 |
@@ -147,8 +120,8 @@ |
81 |
</p> |
82 |
|
83 |
<p> |
84 |
-To avoid any restrictive license hassle, consider installing <c>icedtea6-bin</c> |
85 |
-or <c>icedtea</c>, which are more open Java implementations from the OpenJDK |
86 |
+To avoid any restrictive license hassle, consider installing |
87 |
+<c>icedtea6-bin</c>, which is an open Java implementation from the OpenJDK |
88 |
project. |
89 |
</p> |