. Minor man page tweaks:

  . Remove references to ibm (we have no IBM JDKs in the tree)
  . Remove references to JDK 1.4.2 (only 1.5+ are in the tree)

6 files changed, 11 insertions, 8 deletions

diff --git a/java/javavmwrapper/src/checkvms.1 b/java/javavmwrapper/src/checkvms.1
index 472983b5ec2f..8ccf13babb98 100644
--- a/java/javavmwrapper/src/checkvms.1
+++ b/java/javavmwrapper/src/checkvms.1
@@ -1,6 +1,6 @@
 .\"
 .\" Copyright (C) 2005 Greg Lewis. All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -9,7 +9,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index d2095bc6ec41..76557c9eea43 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
@@ -101,7 +102,6 @@ The selected Java VM must have been released by one of the vendors in the list.
 Currently allowed vendors are
 .Ql bsdjava ,
 .Ql freebsd ,
-.Ql ibm ,
 .Ql openjdk
 and
 .Ql sun .
diff --git a/java/javavmwrapper/src/javavm_opts.conf.5 b/java/javavmwrapper/src/javavm_opts.conf.5
index 5c1cd05d4058..fdf4616e0f0d 100644
--- a/java/javavmwrapper/src/javavm_opts.conf.5
+++ b/java/javavmwrapper/src/javavm_opts.conf.5
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
diff --git a/java/javavmwrapper/src/javavms.5 b/java/javavmwrapper/src/javavms.5
index 063f8835a169..1dd2a3cdb365 100644
--- a/java/javavmwrapper/src/javavms.5
+++ b/java/javavmwrapper/src/javavms.5
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index f6781a1b5d25..11e789ac5ac1 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
@@ -88,7 +89,6 @@ been released by one of the vendors in the list.
 Currently allowed vendors are
 .Ql bsdjava ,
 .Ql freebsd ,
-.Ql ibm ,
 .Ql openjdk
 and
 .Ql sun .
diff --git a/java/javavmwrapper/src/registervm.1 b/java/javavmwrapper/src/registervm.1
index 4e50a0acab52..4ab769dc41db 100644
--- a/java/javavmwrapper/src/registervm.1
+++ b/java/javavmwrapper/src/registervm.1
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
@@ -57,12 +58,12 @@ The location of the Java VM wrapper configuration file.
 .El
 .Sh EXAMPLES
 .Bl -tag -width indent
-.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk.1.4.2/bin/java
-Register %%LOCALBASE%%/jdk1.4.2/bin/java as a possible choice of
+.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk1.6.0/bin/java
+Register %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
-.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk.1.4.2/bin/java
-Remove %%LOCALBASE%%/jdk1.4.2/bin/java as a possible choice of
+.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk1.6.0/bin/java
+Remove %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
 .El