From 3bf2fe1cf5c2392d18bb96a409f52dfd375c444f Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Wed, 18 Jun 2003 23:34:04 +0000 Subject: [PATCH] Acknowledge Java, JDK, JRE, and Unix trademarks. Update an xsl file to include the new copyright notice correctly. Submitted by: "Simon L. Nielsen" --- en/gnome/includes.xsl | 4 ++-- en/java/advocacy.sgml | 6 +++--- en/java/dists/10.sgml | 4 ++-- en/java/dists/11.sgml | 6 +++--- en/java/dists/12.sgml | 6 +++--- en/java/dists/13.sgml | 6 +++--- en/java/dists/14.sgml | 6 +++--- en/java/dists/index.sgml | 8 ++++---- en/java/howhelp.sgml | 6 +++--- en/java/index.sgml | 10 +++++----- en/java/install.sgml | 6 +++--- en/java/newsflash.sgml | 6 +++--- en/java/press.sgml | 4 ++-- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/en/gnome/includes.xsl b/en/gnome/includes.xsl index c29e8f2b04..b2d133a877 100644 --- a/en/gnome/includes.xsl +++ b/en/gnome/includes.xsl @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ - @FreeBSD.org
+ @FreeBSD.org
diff --git a/en/java/advocacy.sgml b/en/java/advocacy.sgml index 841a18b2f2..476d60accc 100644 --- a/en/java/advocacy.sgml +++ b/en/java/advocacy.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -9,7 +9,7 @@
-

We would like to have FreeBSD known as the stable Java platform. +

We would like to have FreeBSD known as the stable &java; platform.

Request for Enhancement to Sun:
We have petitioned Sun to provide an official FreeBSD port. We are currently diff --git a/en/java/dists/10.sgml b/en/java/dists/10.sgml index 01a2d21eba..c34cb1f2e4 100644 --- a/en/java/dists/10.sgml +++ b/en/java/dists/10.sgml @@ -1,6 +1,6 @@ - + %includes; ]> @@ -10,7 +10,7 @@
-

JDK 1.0.x

+

&jdk; 1.0.x

Although it is noted below, this distribution is no longer found on freefall.FreeBSD.org. If you can find this port, feel free to use it. :) 

 Announcement
diff --git a/en/java/dists/11.sgml b/en/java/dists/11.sgml
index 6433f1a34f..dd9e7397fe 100644
--- a/en/java/dists/11.sgml
+++ b/en/java/dists/11.sgml
@@ -1,7 +1,7 @@
 
-
-
+
+
  %includes;
 ]>
 
@@ -17,7 +17,7 @@ for ELF (FreeBSD versions 3 or 4) or for older 2.2 releases you can grab
 Patches which were used to build both releases are available
 here.  These are only useful if you have the actual Java source code.
 
-
 In addition, the appropriate internationalized JRE releases are
+
 In addition, the appropriate internationalized JRE™ releases are
 also available.
 
    
 
  • 
diff --git a/en/java/dists/12.sgml b/en/java/dists/12.sgml
index 8a18ca6a14..bea1f88f35 100644
--- a/en/java/dists/12.sgml
+++ b/en/java/dists/12.sgml
@@ -1,7 +1,7 @@
 
-
-
+
+
  %includes;
 ]>
 
@@ -12,7 +12,7 @@

September 18, 2002: Greg Lewis has released a new patchset for -JDK 1.2.2. +&jdk; 1.2.2.

Of most interest to FreeBSD users is the inclusion of JPDA support. The other significant changes are support for both NetBSD and diff --git a/en/java/dists/13.sgml b/en/java/dists/13.sgml index fb40a8c7ae..7e39530d8c 100644 --- a/en/java/dists/13.sgml +++ b/en/java/dists/13.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -13,7 +13,7 @@

February 12, 2003: Greg -Lewis has released an updated patchset (patchlevel 8) for the JDK 1.3.1 +Lewis has released an updated patchset (patchlevel 8) for the &jdk; 1.3.1 software and updated the ports/java/jdk13 port accordingly. The updated patches may be found, as usual, at http://www.eyesbeyond.com/freebsddom/java/jdk13.html diff --git a/en/java/dists/14.sgml b/en/java/dists/14.sgml index f929558306..71d8e4c376 100644 --- a/en/java/dists/14.sgml +++ b/en/java/dists/14.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -13,7 +13,7 @@

March 7, 2003: Greg -Lewis has released the third patchset (patchlevel 3) for the JDK 1.4 +Lewis has released the third patchset (patchlevel 3) for the &jdk; 1.4 software. The code is now ready for general testing, although not all features have been implemented (e.g. plugin, NIO). This patchset is the result of a lot of hard work by Alexey diff --git a/en/java/dists/index.sgml b/en/java/dists/index.sgml index a28b7248ba..88ec5f5fc7 100644 --- a/en/java/dists/index.sgml +++ b/en/java/dists/index.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -13,7 +13,7 @@
-This is the official port of Sun's Java Development Kit for FreeBSD. No known significant bugs exist at this time, but there are no guarantees of usability. However, many commercial companies rely on this port, so it should be safe to use. +This is the official port of Sun's &java; Development Kit for FreeBSD. No known significant bugs exist at this time, but there are no guarantees of usability. However, many commercial companies rely on this port, so it should be safe to use. Jump to Java @@ -21,7 +21,7 @@ This is the official port of Sun's Java Development Kit for FreeBSD. No known s

Supported

-

JDK 1.1.x

+

&jdk; 1.1.x

We currently have support for 2.2.x, 3.x and 4-CURRENT FreeBSD Systems for JDK 1.1.8. Included is support for both X and non-X systems as two separate binaries.

JDK 1.2.x

diff --git a/en/java/howhelp.sgml b/en/java/howhelp.sgml index 38f5f68c24..d6e8803798 100644 --- a/en/java/howhelp.sgml +++ b/en/java/howhelp.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -18,7 +18,7 @@

So you want to help, do you?

-

Working on the JDK port requires a firm grasp of C, the FreeBSD architecture, and a lot of time to spare. The changes that need to be made in the code have to do with how FreeBSD differs from Solaris, so if you don't know these, you will not go very far in the port. We have +

Working on the &jdk; port requires a firm grasp of C, the FreeBSD architecture, and a lot of time to spare. The changes that need to be made in the code have to do with how FreeBSD differs from Solaris™, so if you don't know these, you will not go very far in the port. We have had many people say they are willing to help, but when they see what is involved, they drop away.

Having been dutifully warned, here is what you need to do to get involved:

    diff --git a/en/java/index.sgml b/en/java/index.sgml index 10d80be4c8..1ed4624947 100644 --- a/en/java/index.sgml +++ b/en/java/index.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -84,7 +84,7 @@
    -

    This is the official port of Sun's Java Development Kit for +

    This is the official port of Sun's &java; Development Kit for FreeBSD. No known significant bugs exist at this time, but there are no guarantees of usability. However, many commercial companies rely on this port, so it should be safe to use.

    @@ -95,12 +95,12 @@

    We currently have support for 2.2.x, 3.x, 4.x and 5-CURRENT FreeBSD - Systems for JDK 1.1.8. Anything prior to FreeBSD 2.2 (such as FreeBSD + Systems for &jdk; 1.1.8. Anything prior to FreeBSD 2.2 (such as FreeBSD 2.1.7.1) is not supported.

    Newsflash! The FreeBSD Foundation has secured a license from Sun Microsystems to distribute a native FreeBSD version of both the - Java Development Kit (JDK) and the Java Runtime Environment (JRE). + Java Development Kit (JDK) and the Java Runtime Environment (JRE™). Thanks to the great efforts of the FreeBSD Java team, these should be available for inclusion with a future release of FreeBSD. See Newsflash page for details.

    diff --git a/en/java/install.sgml b/en/java/install.sgml index 106b4289b2..746e828064 100644 --- a/en/java/install.sgml +++ b/en/java/install.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -9,7 +9,7 @@
    -

    Installing FreeBSD's JDK is typically straightforward:

    +

    Installing FreeBSD's &jdk; is typically straightforward:

    cd /usr/ports/java/jdk
    make
    make install diff --git a/en/java/newsflash.sgml b/en/java/newsflash.sgml index 765967e1aa..e840e0ae0e 100644 --- a/en/java/newsflash.sgml +++ b/en/java/newsflash.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]> @@ -14,7 +14,7 @@

    • March 7, 2003:
      Greg Lewis has released the -third patchset (patchset 3) in the JDK 1.4 series. See the +third patchset (patchset 3) in the &jdk; 1.4 series. See the JDK 1.4.x page for more details.
    diff --git a/en/java/press.sgml b/en/java/press.sgml index 691c3d0601..407c5de40c 100644 --- a/en/java/press.sgml +++ b/en/java/press.sgml @@ -1,7 +1,7 @@ - - + + %includes; ]>