--- a/jdk/src/solaris/doc/sun/man/man1/orbd.1	Tue May 10 19:57:30 2011 -0700
+++ b/jdk/src/solaris/doc/sun/man/man1/orbd.1	Wed May 11 08:30:46 2011 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,15 +19,12 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH orbd 1 "02 Jun 2010"
+.TH orbd 1 "10 May 2011"
 
 .LP
 .SH "Name"
 orbd \- The Object Request Broker Daemon
 .LP
-.RS 3
-
-.LP
 .LP
 \f3orbd\fP is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment.
 .LP
@@ -36,13 +33,10 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
 .LP
-.RE
 .SH "SYNOPSIS"
 .LP
-
-.LP
 .nf
 \f3
 .fl
@@ -54,8 +48,6 @@
 .LP
 .SH "DESCRIPTION"
 .LP
-
-.LP
 .LP
 The Server Manager included with the \f3orbd\fP tool is used to enable clients to transparently locate and invoke persistent objects on servers in the CORBA environment. The persistent servers, while publishing the persistent object references in the Naming Service, include the port number of the ORBD in the object reference instead of the port number of the Server. The inclusion of an ORBD port number in the object reference for persistent object references has the following advantages:
 .LP
@@ -77,7 +69,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
 .LP
 .SH "OPTIONS"
 .LP
@@ -141,11 +133,11 @@
 .na
 \f2CORBA objects\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The 
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The 
 .na
 \f2name binding\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
 .LP
 .LP
 Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service.
@@ -224,7 +216,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html.
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
 .LP
 .SH "Server Manager"
 .LP
@@ -239,7 +231,7 @@
 .na
 \f2sample tutorial\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
 .LP
 .LP
 Start \f2orbd\fP.
@@ -362,7 +354,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://java.sun.com/javase/6/docs/technotes/guides/idl/jidlNaming.html
+http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
 .br
 .TP 2
 o