--- a/usr/src/man/aimanifest.1m	Mon Aug 06 10:15:40 2012 -0700
+++ b/usr/src/man/aimanifest.1m	Wed Aug 08 15:25:24 2012 -0700
@@ -1,7 +1,6 @@
 '\" te
-.\" Copyright (c) 2011, 2012, Oracle and/or its
-.\" affiliates. All rights reserved.
-.TH aimanifest 1M "04 May 2012" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+.TH aimanifest 1M "19 Jun 2012" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 aimanifest \- Modify an XML file used by Automated Installer (AI)
 .SH SYNOPSIS
@@ -73,8 +72,8 @@
 .na
 \fB\fB-h\fR, \fB--help\fR\fR
 .ad
-.RS 14n
-.rt  
+.sp .6
+.RS 4n
 Show the usage help message.
 .RE
 
@@ -87,8 +86,8 @@
 .na
 \fB\fB-r\fR, \fB--return-path\fR\fR
 .ad
-.RS 21n
-.rt  
+.sp .6
+.RS 4n
 Return the path of the XML element that this \fBaimanifest\fR command creates or operates on. This returned path is a chain of node IDs. You can save this returned path value to use in subsequent calls to \fBaimanifest\fR. Using the path returned by the \fB-r\fR option is more reliable than specifying the path using XML element and attribute values, since the values can change as the AI manifest is being built. See the "Return Paths" section for more information about the path returned by the \fB-r\fR option.
 .RE
 
@@ -101,8 +100,8 @@
 .na
 \fB\fB-i\fR, \fB--incremental\fR\fR
 .ad
-.RS 21n
-.rt  
+.sp .6
+.RS 4n
 Do not clear the \fBAIM_MANIFEST\fR data before adding new data.
 .RE
 
@@ -114,7 +113,7 @@
 .ne 2
 .mk
 .na
-\fB\fBadd [\fB-r\fR | \fB--return-path\fR] \fIpath\fR \fIvalue\fR\fR\fR
+\fB\fBaimanifest add [-r | --return-path] \fIpath\fR \fIvalue\fR\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -176,7 +175,7 @@
 .ne 2
 .mk
 .na
-\fB\fBget [\fB-r\fR | \fB--return-path\fR] \fIpath\fR\fR\fR
+\fB\fBaimanifest get [-r | --return-path] \fIpath\fR\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -189,7 +188,7 @@
 .ne 2
 .mk
 .na
-\fB\fBset [\fB-r\fR | \fB--return-path\fR] \fIpath\fR \fIvalue\fR\fR\fR
+\fB\fBaimanifest set [-r | --return-path] \fIpath\fR \fIvalue\fR\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -206,7 +205,7 @@
 .ne 2
 .mk
 .na
-\fB\fBload [\fB-i\fR | \fB--incremental\fR] \fIfilename\fR\fR\fR
+\fB\fBaimanifest load [-i | --incremental] \fIfilename\fR\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -315,7 +314,7 @@
 .ne 2
 .mk
 .na
-\fB\fBvalidate\fR\fR
+\fB\fBaimanifest validate\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -917,8 +916,8 @@
 .na
 \fB\fBAIM_MANIFEST\fR\fR
 .ad
-.RS 16n
-.rt  
+.sp .6
+.RS 4n
 The value of this environment variable is the location of the AI manifest that is being built.
 .RE
 
@@ -928,8 +927,8 @@
 .na
 \fB\fBAIM_LOGFILE\fR\fR
 .ad
-.RS 16n
-.rt  
+.sp .6
+.RS 4n
 The value of this environment variable is the location of the log file of \fBaimanifest\fR operations.
 .RE
 
@@ -957,7 +956,7 @@
 .SH SEE ALSO
 .sp
 .LP
-installadm(1M), \fBpkg\fR(1)
+\fBinstalladm\fR(1M)
 .sp
 .LP
 Part\ III, \fIInstalling Using an Install Server,\fR in \fIInstalling Oracle Solaris 11 Systems\fR