From afa573781e0c7376b513e75a98deda25bc052489 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 30 Aug 2010 14:28:28 -0700 Subject: [PATCH] Replace the literal portage version in all man page headers with the string 'VERSION' which can be used as a sed template at install time. This will help avoid lots of merge conflicts since these header lines contain both a date and a portage version. --- man/color.map.5 | 2 +- man/dispatch-conf.1 | 2 +- man/ebuild.1 | 2 +- man/ebuild.5 | 2 +- man/egencache.1 | 2 +- man/emaint.1 | 2 +- man/emerge.1 | 2 +- man/env-update.1 | 2 +- man/etc-update.1 | 2 +- man/make.conf.5 | 2 +- man/portage.5 | 2 +- man/quickpkg.1 | 2 +- man/repoman.1 | 2 +- man/xpak.5 | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/man/color.map.5 b/man/color.map.5 index 94f550d7e..2bec86606 100644 --- a/man/color.map.5 +++ b/man/color.map.5 @@ -1,4 +1,4 @@ -.TH "COLOR.MAP" "5" "Aug 2008" "Portage 2.2" "Portage" +.TH "COLOR.MAP" "5" "Aug 2008" "Portage VERSION" "Portage" .SH "NAME" color.map \- custom color settings for Portage .SH "SYNOPSIS" diff --git a/man/dispatch-conf.1 b/man/dispatch-conf.1 index a19ca1fbc..b15629234 100644 --- a/man/dispatch-conf.1 +++ b/man/dispatch-conf.1 @@ -1,4 +1,4 @@ -.TH "DISPATCH-CONF" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "DISPATCH-CONF" "1" "Aug 2008" "Portage VERSION" "Portage" .SH NAME dispatch-conf \- Sanely update configuration files after emerging new packages .SH SYNOPSIS diff --git a/man/ebuild.1 b/man/ebuild.1 index 87fd63b79..002daf31f 100644 --- a/man/ebuild.1 +++ b/man/ebuild.1 @@ -1,4 +1,4 @@ -.TH "EBUILD" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "EBUILD" "1" "Aug 2008" "Portage VERSION" "Portage" .SH "NAME" ebuild \- a low level interface to the Portage system .SH "SYNOPSIS" diff --git a/man/ebuild.5 b/man/ebuild.5 index d9d394309..04001d8f3 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -1,4 +1,4 @@ -.TH "EBUILD" "5" "Aug 2008" "Portage 2.2" "Portage" +.TH "EBUILD" "5" "Aug 2008" "Portage VERSION" "Portage" .SH "NAME" ebuild \- the internal format, variables, and functions in an ebuild script .SH "DESCRIPTION" diff --git a/man/egencache.1 b/man/egencache.1 index f32427bbe..b752d6c87 100644 --- a/man/egencache.1 +++ b/man/egencache.1 @@ -1,4 +1,4 @@ -.TH "EGENCACHE" "1" "March 2009" "Portage 2.2" "Portage" +.TH "EGENCACHE" "1" "March 2009" "Portage VERSION" "Portage" .SH "NAME" egencache \- generate metadata cache for ebuild repositories .SH "SYNOPSIS" diff --git a/man/emaint.1 b/man/emaint.1 index 63854c02e..e2ae5404f 100644 --- a/man/emaint.1 +++ b/man/emaint.1 @@ -1,4 +1,4 @@ -.TH "EMAINT" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "EMAINT" "1" "Aug 2008" "Portage VERSION" "Portage" .SH NAME emaint \- performs system health checks and maintenance .SH SYNOPSIS diff --git a/man/emerge.1 b/man/emerge.1 index c2ce11059..a915eb6f9 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "EMERGE" "1" "Aug 2008" "Portage VERSION" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" diff --git a/man/env-update.1 b/man/env-update.1 index a7d069599..b175379b7 100644 --- a/man/env-update.1 +++ b/man/env-update.1 @@ -1,4 +1,4 @@ -.TH "ENV-UPDATE" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "ENV-UPDATE" "1" "Aug 2008" "Portage VERSION" "Portage" .SH NAME env\-update \- updates environment settings automatically .SH SYNOPSIS diff --git a/man/etc-update.1 b/man/etc-update.1 index 12feff1cb..d7c4a24fe 100644 --- a/man/etc-update.1 +++ b/man/etc-update.1 @@ -1,4 +1,4 @@ -.TH "ETC-UPDATE" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "ETC-UPDATE" "1" "Aug 2008" "Portage VERSION" "Portage" .SH NAME etc-update \- handle configuration file updates .SH SYNOPSIS diff --git a/man/make.conf.5 b/man/make.conf.5 index bed88d6a7..ee0f1c1e9 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -1,4 +1,4 @@ -.TH "MAKE.CONF" "5" "Aug 2010" "Portage 2.2" "Portage" +.TH "MAKE.CONF" "5" "Aug 2010" "Portage VERSION" "Portage" .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" diff --git a/man/portage.5 b/man/portage.5 index f3317da53..d10ef0db0 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -1,4 +1,4 @@ -.TH "PORTAGE" "5" "Aug 2008" "Portage 2.2" "Portage" +.TH "PORTAGE" "5" "Aug 2008" "Portage VERSION" "Portage" .SH NAME portage \- the heart of Gentoo .SH "DESCRIPTION" diff --git a/man/quickpkg.1 b/man/quickpkg.1 index b9260f1f8..25952ee35 100644 --- a/man/quickpkg.1 +++ b/man/quickpkg.1 @@ -1,4 +1,4 @@ -.TH "QUICKPKG" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "QUICKPKG" "1" "Aug 2008" "Portage VERSION" "Portage" .SH NAME quickpkg \- creates portage packages .SH SYNOPSIS diff --git a/man/repoman.1 b/man/repoman.1 index a1d240392..2e0e5a540 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -1,4 +1,4 @@ -.TH "REPOMAN" "1" "Aug 2008" "Portage 2.2" "Portage" +.TH "REPOMAN" "1" "Aug 2008" "Portage VERSION" "Portage" .SH NAME repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree .SH SYNOPSIS diff --git a/man/xpak.5 b/man/xpak.5 index 149ffdeaf..7029e117d 100644 --- a/man/xpak.5 +++ b/man/xpak.5 @@ -1,4 +1,4 @@ -.TH XPAK 5 "March 2009" "Portage 2.2" "Portage" +.TH XPAK 5 "March 2009" "Portage VERSION" "Portage" .SH NAME xpak \- The XPAK Data Format .SH NOTES -- 2.26.2