Author: kwade
Update of /cvs/docs/release-notes/en_US In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3107/en_US
Modified Files: Java.xml Log Message: Forgot that i) there was a macro in usage for this page and ii) *Dict macros from the Wiki aren't parsed into the page before it is converted to XML; proper name used here and macro replaced back in Docs/Beats/Java.
Index: Java.xml =================================================================== RCS file: /cvs/docs/release-notes/en_US/Java.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Java.xml 12 Apr 2006 13:34:18 -0000 1.2 +++ Java.xml 16 Apr 2006 23:41:14 -0000 1.3 @@ -11,18 +11,19 @@ <title>Java and java-gcj-compat</title>
<para> - A free and open source Java environment is available within this - Fedora Core release, called . includes a tool suite and execution - environment that is capable of building and running many useful - programs that are written in the Java programming language. + A free and open source Java environment is available within this Fedora + Core release, called <code>java-gcj-compat</code>. + <code>java-gcj-compat</code>includes a tool suite and execution + environment that is capable of building and running many useful programs + that are written in the Java programming language. </para>
<note> <title>Fedora Core Does Not Include Java</title> <para> - Java is a trademark of Sun Microsystems. is an entirely free software - stack that is <emphasis role='strong'>not</emphasis> Java, but may run - Java software. + Java is a trademark of Sun Microsystems. <code>java-gcj-compat</code> is + an entirely free software stack that is <emphasis + role='strong'>not</emphasis> Java, but may run Java software. </para> </note>
@@ -36,17 +37,18 @@ </para>
<para> - The Java software packages included in this Fedora release use the - new, integrated environment . These packages include - <emphasis role='strong'>OpenOffice.org Base</emphasis>, - <emphasis role='strong'>Eclipse</emphasis>, and - <emphasis role='strong'>Apache Tomcat</emphasis>. + The Java software packages included in this Fedora release use the new, + integrated environment <code>java-gcj-compat</code>. These packages + include <emphasis role='strong'>OpenOffice.org Base</emphasis>, <emphasis + role='strong'>Eclipse</emphasis>, and <emphasis role='strong'>Apache + Tomcat</emphasis>. </para>
<para> - Refer to the Java FAQ at - <ulink url='http://www.fedoraproject.org/wiki/JavaFAQ'>http://www.fedoraproject.org/wiki/JavaFAQ</ulink> - for more information on the free Java environment in Fedora. + Refer to the Java FAQ at <ulink + url='http://www.fedoraproject.org/wiki/JavaFAQ%27%3Ehttp://www.fedoraproject.org/...</ulink> + for more information on the <code>java-gcj-compat</code> free Java + environment in Fedora. </para>
<tip> @@ -64,15 +66,12 @@ <title>Handling Java and Java-like Packages</title>
<para> - In addition to the free software stack, Fedora Core is designed - to let you install multiple Java implementations and switch - between them using the - <code>alternatives</code> - command line tool. However, every Java system you install must - be packaged using the JPackage Project packaging guidelines to - take advantage of - <code>alternatives</code> - . + In addition to the <code>java-gcj-compat</code> free software stack, + Fedora Core is designed to let you install multiple Java implementations + and switch between them using the <code>alternatives</code> command line + tool. However, every Java system you install must be packaged using the + JPackage Project packaging guidelines to take advantage of + <code>alternatives</code> . </para>
<para>
docs-commits@lists.fedoraproject.org