* Added a manual page contributed by Jeremy Sanders

  <jeremy@jeremysanders.net>.

3 files changed, 74 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index d53983b..56942b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
 SUBDIRS = src tests
 
-EXTRA_DIST = COPYING README patchelf.spec patchelf.spec.in version
+EXTRA_DIST = COPYING README patchelf.spec patchelf.spec.in version $(man1_MANS)
 
 patchelf.spec: patchelf.spec.in
 	sed -e "s^@version\@^$(VERSION)^g" < patchelf.spec.in > patchelf.spec
 
+man1_MANS = patchelf.1
+
 install-data-local:
 	$(INSTALL) -d $(DESTDIR)$(docdir)
 	$(INSTALL_DATA) README $(DESTDIR)$(docdir)/
diff --git a/README b/README
index ccabc60..5175561 100644
--- a/README
+++ b/README
@@ -57,6 +57,14 @@ This appears to be a bug in binutils
 
 RELEASE HISTORY
 
+0.6 (TBA):
+
+* Support segments with an alignment of 0 (contributed by Zack
+  Weinberg).
+
+* Added a manual page (contributed by Jeremy Sanders
+  <jeremy@jeremysanders.net>).
+
 0.5 (November 4, 2009):
 
 * Various bugfixes.
diff --git a/patchelf.1 b/patchelf.1
new file mode 100644
index 0000000..4865256
--- /dev/null
+++ b/patchelf.1
@@ -0,0 +1,63 @@
+.\" Process this file with
+.\" groff -man -Tascii foo.1
+.\"
+.TH PATCHELF 1 "JUNE 2010" PATCHELF "User Manuals"
+.SH NAME
+patchelf - Modify ELF files
+
+.SH SYNOPSIS
+.B patchelf
+.I OPTION
+.B
+.I FILE
+.B
+
+.SH DESCRIPTION
+
+PatchELF is a simple utility for modifying existing ELF executables
+and libraries.  It can change the dynamic loader ("ELF interpreter")
+of executables and change the RPATH of executables and libraries.
+
+.SH OPTIONS
+
+The single option given operates on a given FILE, editing in place.
+
+.IP "--set-interpreter INTERPRETER"
+Change the dynamic loader ("ELF interpreter") of executable given to
+INTERPRETER.
+
+.IP --print-intepreter
+Prints the ELF interpreter of the executable.
+
+.IP "--set-rpath RPATH"
+Change the RPATH of the executable or library to RPATH.
+
+.IP --shrink-rpath
+Remove from the RPATH all directories that do not contain a
+library referenced by DT_NEEDED fields of the executable or library.
+
+For instance, if an executable references one library libfoo.so, has
+an RPATH "/lib:/usr/lib:/foo/lib", and libfoo.so can only be found
+in /foo/lib, then the new RPATH will be "/foo/lib".
+
+.IP --print-rpath
+Prints the RPATH for an executable or library.
+
+.IP --force-rpath
+Forces the use of the obsolete DT_RPATH in the file instead of
+DT_RUNPATH. By default DT_RPATH is converted to DT_RUNPATH.
+
+.IP --debug
+Prints details of the changes made to the input file.
+
+.IP --version
+Shows the version of patchelf.
+
+.SH AUTHOR
+Eelco Dolstra <e.dolstra@tudelft.nl>
+
+.SH "SEE ALSO"
+.BR elf (5),
+.BR ld.so (8)
+
+