* nlmconv.1: new man page

	* objcopy.1:  fixed format errors

3 files changed, 128 insertions, 39 deletions

diff --git a/binutils/.Sanitize b/binutils/.Sanitize
index c4712c2..ed17d8c 100644
--- a/binutils/.Sanitize
+++ b/binutils/.Sanitize
@@ -50,6 +50,7 @@ is-ranlib.c
 is-strip.c
 maybe-ranlib.c
 maybe-strip.c
+nlmconv.1
 nlmconv.c
 nlmconv.h
 nlmheader.y
diff --git a/binutils/nlmconv.1 b/binutils/nlmconv.1
new file mode 100644
index 0000000..8e95ec8
--- /dev/null
+++ b/binutils/nlmconv.1
@@ -0,0 +1,106 @@
+.\" Copyright (c) 1991 Free Software Foundation
+.\" See section COPYING for conditions for redistribution
+.TH nlmconv 1 "June 1993" "cygnus support" "GNU Development Tools"
+.de BP
+.sp
+.ti \-.2i
+\(**
+..
+
+.SH NAME
+nlmconv\(em\&converts object code into an NLM
+
+.SH SYNOPSIS
+.hy 0
+.na
+.TP
+.B nlmconv
+.RB "[\|" \-I\ \fIformat\fB\ |\ \-\-input\-format=\fIformat\fR "\|]" 
+.RB "[\|" \-O\ \fIformat\fB\ |\ \-\-output\-format=\fIformat\fR "\|]" 
+.RB "[\|" \-T\ \fIheaderfile\fB\ |\ \-\-header\-file=\fIheaderfile\fR "\|]" 
+.RB "[\|" \-V\ |\ \-\-version\fR "\|]" 
+.RB "[\|" \-\-help\fR "\|]" 
+.B infile
+.B outfile
+.SH DESCRIPTION
+.B nlmconv
+converts the relocatable object file 
+.B infile
+into the NetWare Loadable Module 
+.BR outfile ,
+optionally reading 
+.I headerfile
+for NLM header information.  For instructions on writing the NLM
+command file language used in header files, see 
+.IR "The NetWare Tool Maker Specification Manual" ,
+available from Novell, Inc.
+.B nlmconv
+currently only works with i386 object files in 
+.BR COFF ,
+.BR ELF ,
+or
+.B a.out
+format.
+.br
+.B nlmconv
+uses the GNU Binary File Descriptor library to read 
+.IR infile .
+.SH OPTIONS
+.TP
+.B \-I \fIformat\fR, \fB\-\-input\-format=\fIformat
+Consider the source file's object format to be 
+.IR format ,
+rather than attempting to deduce it.
+.TP
+.B \-O \fIformat\fR, \fB\-\-output\-format=\fIformat
+Write the output file using the object format 
+.IR format .
+.B nlmconv
+infers the output format based on the input format, e.g. for an i386
+input file the output format is
+.IR nlm32\-i386 .
+.TP
+.B \-T \fIheaderfile\fR, \fB\-\-header\-file=\fIheaderfile
+Reads 
+.I headerfile
+for NLM header information.  For instructions on writing the NLM
+command file language used in header files, see 
+.IR "The NetWare Tool Maker Specification Manual" ,
+available from Novell, Inc.
+.TP
+.B \-V\fR, \fB\-\-version
+Show the version number of
+.B nlmconv
+and exit.
+.TP
+.B \-h\fR, \fB\-\-help
+Show a summary of the options to
+.B nlmconv
+and exit.
+.SH "SEE ALSO"
+.RB "`\|" binutils "\|'" 
+entry in 
+.B
+info\c
+\&; 
+.I
+The GNU Binary Utilities\c
+\&, Roland H. Pesch (June 1993).
+
+.SH COPYING
+Copyright (c) 1993 Free Software Foundation, Inc.
+.PP
+Permission is granted to make and distribute verbatim copies of
+this manual provided the copyright notice and this permission notice
+are preserved on all copies.
+.PP
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided that the
+entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+.PP
+Permission is granted to copy and distribute translations of this
+manual into another language, under the above conditions for modified
+versions, except that this permission notice may be included in
+translations approved by the Free Software Foundation instead of in
+the original English.
diff --git a/binutils/objcopy.1 b/binutils/objcopy.1
index 64d1c36..40bfb1a 100644
--- a/binutils/objcopy.1
+++ b/binutils/objcopy.1
@@ -8,25 +8,25 @@
 ..
 
 .SH NAME
-objcopy \- copy and translate object files
+objcopy\(em\&copy and translate object files
 
 .SH SYNOPSIS
 .hy 0
 .na
 .TP
 .B objcopy
-.RB "[\|" \-F \fIformat\fB | \-\-format=\fIformat\fB "\|]" 
-.RB "[\|" \-I \fIformat\fB | \-\-input\-format=\fIformat\fB "\|]" 
-.RB "[\|" \-O \fIformat\fB | \-\-output\-format=\fIformat\fB "\|]" 
-.RB "[\|" \-S | \-\-strip\-all "\|]" 
-.RB "[\|" \-g | \-\-strip\-debug "\|]" 
-.RB "[\|" \-x | \-\-discard\-all "\|]" 
-.RB "[\|" \-X | \-\-discard\-locals "\|]" 
-.RB "[\|" \-v | \-\-verbose "\|]" 
-.RB "[\|" \-V | \-\-version "\|]" 
-.RB "[\|" \-\-help "\|]" 
+.RB "[\|" \-F\ \fIformat\fB\ |\ \-\-format=\fIformat\fR "\|]" 
+.RB "[\|" \-I\ \fIformat\fB\ |\ \-\-input\-format=\fIformat\fR "\|]" 
+.RB "[\|" \-O\ \fIformat\fB\ |\ \-\-output\-format=\fIformat\fR "\|]" 
+.RB "[\|" \-S\ |\ \-\-strip\-all\fR "\|]" 
+.RB "[\|" \-g\ |\ \-\-strip\-debug\fR "\|]" 
+.RB "[\|" \-x\ |\ \-\-discard\-all\fR "\|]" 
+.RB "[\|" \-X\ |\ \-\-discard\-locals\fR "\|]" 
+.RB "[\|" \-v\ |\ \-\-verbose\fR "\|]" 
+.RB "[\|" \-V\ |\ \-\-version\fR "\|]" 
+.RB "[\|" \-\-help\fR "\|]" 
 .B infile
-.RB "[\|" outfile "\|]" 
+.RB "[\|" outfile\fR "\|]" 
 .SH DESCRIPTION
 The GNU 
 .B objcopy
@@ -57,57 +57,39 @@ name of the input file.
 
 .SH OPTIONS
 .TP
-.B \-I \fIformat
-.TP
-.B \-\-input\-format=\fIformat
+.B \-I \fIformat\fR, \fB\-\-input\-format=\fIformat
 Consider the source file's object format to be 
 .IR format ,
 rather than attempting to deduce it.
 .TP
-.B \-O \fIformat
-.TP
-.B \-\-output\-format=\fIformat
+.B \-O \fIformat\fR, \fB\-\-output\-format=\fIformat
 Write the output file using the object format 
 .IR format .
 .TP
-.B \-F \fIformat\fB
-.TP
-.B \-\-format=\fIformat
+.B \-F \fIformat\fR, \fB\-\-format=\fIformat
 Use 
 .I format
 as the object format for both the input and the output file; i.e.
 simply transfer data from source to destination with no translation.
 .TP
-.B \-S
-.TP
-.B \-\-strip\-all
+.B \-S\fR, \fB\-\-strip\-all
 Do not copy relocation and symbol information from the source file.
 .TP
-.B \-g
-.TP
-.B \-\-strip\-debug
+.B \-g\fR, \fB\-\-strip\-debug
 Do not copy debugging symbols from the source file.
 .TP
-.B \-x
-.TP
-.B \-\-discard\-all
+.B \-x\fR, \fB \-\-discard\-all
 Do not copy non-global symbols from the source file.
 .TP
-.B \-X
-.TP
-.B \-\-discard\-locals
+.B \-X\fR, \fB\-\-discard\-locals
 Do not copy compiler-generated local symbols. (These usually start
 with "L" or ".").
 .TP
-.B \-v
-.TP
-.B \-\-verbose
+.B \-v\fR, \fB\-\-verbose
 Verbose output: list all object files modified.  In the case of
 archives, "\fBobjcopy \-V\fR" lists all members of the archive.
 .TP
-.B \-V
-.TP
-.B \-\-version
+.B \-V\fR, \fB\-\-version
 Show the version number of
 .B objcopy
 and exit.