clean up the last few sections so that they are consistent

svn path=/main/branches/2.0/; revision=2260

10 files changed, 93 insertions, 114 deletions

diff --git a/man/dispatch-conf.1 b/man/dispatch-conf.1
index 89d4d5da..42174502 100644
--- a/man/dispatch-conf.1
+++ b/man/dispatch-conf.1
@@ -75,19 +75,17 @@ Quit
 .I dispatch-conf.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR make.conf (5), etc-update (1)
-.SH "FILES"
-.TP
-.B /etc/dispatch-conf.conf
-Configuration settings for \fIdispatch-conf\fR are stored here.
 .SH AUTHORS
+.nf
 Jeremy Wohl
-.br
 Karl Trygve Kalleberg <karltk@gentoo.org>
-.br
 Mike Frysinger <vapier@gentoo.org>
-.br
 Grant Goodyear <g2boojum@gentoo.org>
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/dispatch-conf.1,v 1.3.2.1 2004/11/02 23:59:57 vapier Exp $
+.fi
+.SH "FILES"
+.TP
+.B /etc/dispatch-conf.conf
+Configuration settings for \fIdispatch-conf\fR are stored here.
+.SH "SEE ALSO"
+.BR make.conf (5),
+.BR etc-update (1)
diff --git a/man/ebuild.1 b/man/ebuild.1
index f1167ef2..742cf6f2 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -159,6 +159,18 @@ Builds a RedHat RPM package from the files in the temporary
 information is not incorporated into the RPM.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
+.SH "AUTHORS"
+.nf
+Achim Gottinger <achim@gentoo.org>
+Daniel Robbins <drobbins@gentoo.org>
+Nicholas Jones <carpaski@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "FILES"
+.TP
+\fB/etc/make.conf\fR 
+Contains variables for the build\-process and overwrites those
+in make.globals.
 .SH "SEE ALSO"
 .BR emerge (1),
 .BR ebuild (5),
@@ -167,18 +179,3 @@ Please report bugs via http://bugs.gentoo.org/
 The \fI/usr/sbin/ebuild.sh\fR script. 
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
-.SH "FILES"
-.TP
-\fB/etc/make.conf\fR 
-Contains variables for the build\-process and overwrites those
-in make.globals.
-.SH "AUTHORS"
-Achim Gottinger <achim@gentoo.org>
-.br 
-Daniel Robbins <drobbins@gentoo.org>
-.br 
-Nicholas Jones <carpaski@gentoo.org>
-.br 
-Mike Frysinger <vapier@gentoo.org>
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/ebuild.1,v 1.16 2004/09/17 00:17:10 vapier Exp $"
diff --git a/man/ebuild.5 b/man/ebuild.5
index 28acec82..59c202d9 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -16,7 +16,7 @@ Here's a simple example ebuild:
 .nf
 # Copyright 1999\-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id:
+# $Header: $
 
 inherit some_eclass another_eclass
 
@@ -811,14 +811,18 @@ All these functions act like the do* functions, but they only work with one
 file and the file is installed as \fI[new filename]\fR.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR ebuild (1),
-.BR make.conf (5)
+.SH "AUTHORS"
+.nf
+Achim Gottinger <achim@gentoo.org>
+Mark Guertin <gerk@gentoo.org>
+Nicholas Jones <carpaski@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "FILES"
 .TP
 The \fI/usr/sbin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
-.SH "FILES"
 .TP
 \fB/etc/make.conf\fR 
 Contains variables for the build\-process and overwrites those in make.defaults.
@@ -826,12 +830,6 @@ Contains variables for the build\-process and overwrites those in make.defaults.
 \fB/etc/make.globals\fR
 Contains the default variables for the build\-process, you should edit
 \fI/etc/make.conf\fR instead.
-.SH "AUTHORS"
-.nf
-Achim Gottinger <achim@gentoo.org>
-Mark Guertin <gerk@gentoo.org>
-Nicholas Jones <carpaski@gentoo.org>
-Mike Frysinger <vapier@gentoo.org>
-.fi
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/ebuild.5,v 1.73.2.8 2005/05/22 09:56:55 vapier Exp $
+.SH "SEE ALSO"
+.BR ebuild (1),
+.BR make.conf (5)
diff --git a/man/emerge.1 b/man/emerge.1
index ada61a98..dc79d6a1 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -486,17 +486,16 @@ Please report any bugs you encounter through our website:
 .LP
 Please include the output of \fBemerge \-\-info\fR when you submit your
 bug report.
-.SH "SEE ALSO"
-.BR "emerge \-\-help",
-.BR ebuild (1),
-.BR ebuild (5),
-.BR make.conf (5),
-.BR portage (5)
-.LP
-A number of helper applications reside in \fI/usr/lib/portage/bin\fR.
-.LP
-The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as 
-\fBequery\fR (a package query tool).
+.SH "AUTHORS"
+.nf
+Daniel Robbins <drobbins@gentoo.org>
+Geert Bevin <gbevin@gentoo.org>
+Achim Gottinger <achim@gentoo.org>
+Nicholas Jones <carpaski@gentoo.org>
+Phil Bordelon <phil@thenexusproject.org>
+Mike Frysinger <vapier@gentoo.org>
+Marius Mauch <genone@gentoo.org>
+.fi
 .SH "FILES"
 .TP
 \fB/var/lib/portage/world\fR 
@@ -536,20 +535,14 @@ and \fBworld\fR classes consult this file.  \fBDo not edit this file\fR.
 \fB/etc/make.globals\fR 
 Contains the default variables for the build process.  \fBDo not edit
 this file\fR.
-.SH "AUTHORS"
-Daniel Robbins <drobbins@gentoo.org>
-.br 
-Geert Bevin <gbevin@gentoo.org>
-.br 
-Achim Gottinger <achim@gentoo.org>
-.br 
-Nicholas Jones <carpaski@gentoo.org>
-.br 
-Phil Bordelon <phil@thenexusproject.org>
-.br 
-Mike Frysinger <vapier@gentoo.org>
-.br 
-Marius Mauch <genone@gentoo.org>
-.br 
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/emerge.1,v 1.70.2.15 2005/08/20 03:56:50 vapier Exp $
+.SH "SEE ALSO"
+.BR "emerge \-\-help",
+.BR ebuild (1),
+.BR ebuild (5),
+.BR make.conf (5),
+.BR portage (5)
+.LP
+A number of helper applications reside in \fI/usr/lib/portage/bin\fR.
+.LP
+The \fBapp\-portage/gentoolkit\fR package contains useful scripts such as 
+\fBequery\fR (a package query tool).
diff --git a/man/env-update.1 b/man/env-update.1
index 13e1a469..8de0f529 100644
--- a/man/env-update.1
+++ b/man/env-update.1
@@ -17,12 +17,10 @@ first.
 .SH OPTIONS 
 .TP
 None.
-.SH AUTHORS
-Daniel Robbins <drobbins@gentoo.org>
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
+.SH AUTHORS
+Daniel Robbins <drobbins@gentoo.org>
 .SH "SEE ALSO"
 .BR emerge (1),
 .BR ldconfig (8)
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/env-update.1,v 1.6 2004/09/17 00:17:10 vapier Exp $
diff --git a/man/etc-update.1 b/man/etc-update.1
index f0a952a8..e035f5c0 100644
--- a/man/etc-update.1
+++ b/man/etc-update.1
@@ -21,8 +21,12 @@ information.
 None.
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR make.conf (5)
+.SH AUTHORS
+.nf
+Jochem Kossen and Leo Lipelis
+Karl Trygve Kalleberg <karltk@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
 .SH "FILES"
 .TP
 .B /etc/etc-update.conf
@@ -30,11 +34,5 @@ Configuration settings for \fIetc-update\fR are stored here.
 .TP
 .B /etc/dispatch-conf.conf
 Settings for dispatching configuration files right before they're merged.
-.SH AUTHORS
-Jochem Kossen and Leo Lipelis
-.br
-Karl Trygve Kalleberg <karltk@gentoo.org>
-.br
-Mike Frysinger <vapier@gentoo.org>
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/etc-update.1,v 1.9 2004/09/17 00:17:10 vapier Exp $
+.SH "SEE ALSO"
+.BR make.conf (5)
diff --git a/man/make.conf.5 b/man/make.conf.5
index 8dc71c9c..220077b8 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -363,15 +363,12 @@ Defaults to "env:pkg:conf:auto:defaults".
 
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR emerge (1),
-.BR portage (5),
-.BR ebuild (1),
-.BR ebuild (5)
-.TP
-The \fI/usr/sbin/ebuild.sh\fR script. 
-.TP
-The helper apps in \fI/usr/lib/portage/bin\fR.
+.SH "AUTHORS"
+.nf
+Daniel Robbins <drobbins@gentoo.org>
+Nicholas Jones <carpaski@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
 .SH "FILES"
 .TP
 \fB/etc/make.conf\fR 
@@ -385,11 +382,12 @@ Contains a list of all global USE flags.
 .TP
 \fB/usr/portage/profiles/use.local.desc\fR
 Contains a list of all local USE variables.
-.SH "AUTHORS"
-Daniel Robbins <drobbins@gentoo.org>
-.br 
-Nicholas Jones <carpaski@gentoo.org>
-.br 
-Mike Frysinger <vapier@gentoo.org>
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/make.conf.5,v 1.44.2.4 2005/06/04 04:53:13 vapier Exp $
+.SH "SEE ALSO"
+.BR emerge (1),
+.BR portage (5),
+.BR ebuild (1),
+.BR ebuild (5)
+.TP
+The \fI/usr/sbin/ebuild.sh\fR script. 
+.TP
+The helper apps in \fI/usr/lib/portage/bin\fR.
diff --git a/man/portage.5 b/man/portage.5
index a6ba379c..a4ca7a77 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -583,14 +583,14 @@ dev\-libs/uclibc
 app\-cdr/cdemu
 .fi
 .RE
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
 Marius Mauch <genone@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
 Drake Wyrm <wyrm@haell.com>
 .fi
-.SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
 .SH "SEE ALSO"
 .BR emerge (1),
 .BR ebuild (1),
diff --git a/man/quickpkg.1 b/man/quickpkg.1
index fb362986..c5e508db 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -41,16 +41,15 @@ planeshift
 =net-www/apache-2*
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR ebuild (5),
-.BR make.conf (5)
+.SH AUTHORS
+.nf
+Terry Chan (original author)
+Mike Frysinger <vapier@gentoo.org> (revamped version)
+.fi
 .SH "FILES"
 .TP
 .B /etc/make.conf
 The \fBPKGDIR\fR variable is defined here.
-.SH AUTHORS
-Terry Chan (original author)
-.br
-Mike Frysinger <vapier@gentoo.org> (revamped version)
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/quickpkg.1,v 1.3 2004/09/17 00:17:10 vapier Exp $
+.SH "SEE ALSO"
+.BR ebuild (5),
+.BR make.conf (5)
diff --git a/man/repoman.1 b/man/repoman.1
index 19145de9..b603aebf 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -117,11 +117,11 @@ The ebuild does not have a DESCRIPTION variable.
 .TP
 .BR SLOT.missing
 The ebuild does not have a SLOT variable.
-.SH AUTHORS
-Daniel Robbins <drobbins@gentoo.org>
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
+.SH AUTHORS
+.nf
+Daniel Robbins <drobbins@gentoo.org>
+.fi
 .SH "SEE ALSO"
 .BR emerge (1)
-.SH "CVS HEADER"
-$Id: /var/cvsroot/gentoo-src/portage/man/repoman.1,v 1.7.2.1 2005/01/30 12:12:26 vapier Exp $