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.

diff --git a/man/color.map.5 b/man/color.map.5
index 94f550d7e4a4f207b65f25c9d2febc8670193852..2bec866063262af01b49765ab5365d83600a02b2 100644 (file)
--- 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 a19ca1fbce083ac0767bb2ffc38c1a332b76c3ac..b15629234d3ca60b5488803ff0de0433ab061af6 100644 (file)
--- 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 87fd63b79abf812b8cd1a404bf11709cdb603251..002daf31ff59c285d0e3a3f72d05cf84dd0a180b 100644 (file)
--- 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 d9d3943093a1e3e8a6186cd120e36192e7970780..04001d8f32af3ed401409eca9466e40806229641 100644 (file)
--- 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 f32427bbecd58c4f2397078172fdef83b6f1102e..b752d6c87f4fe3f84a7892a291b74c3bed3da102 100644 (file)
--- 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 63854c02e2e8327a6d90288a135c2ed602f6eec7..e2ae5404ff02c64d4ff3a1fcc5230c433fd68d7e 100644 (file)
--- 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 c2ce11059c2fdaed6ccf6beb4f3dc97995bacb2c..a915eb6f949edf5b22d65d15e16483c547b24067 100644 (file)
--- 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 a7d069599c7d3328049a7b8f33cefe2a7e25688f..b175379b7acc3a1eb9085fb4cdfff959d0a3d25f 100644 (file)
--- 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 12feff1cb83b34d431dc8250fc96316de9e5b27c..d7c4a24fe27fce94a516fab4965a0f7227a475ff 100644 (file)
--- 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 bed88d6a765e43eb97498331a0e21f60fa420895..ee0f1c1e951d6a1c8f566960e07aaf79155fb427 100644 (file)
--- 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 f3317da5345c55d621863184dde7dbc61e024771..d10ef0db06123ed255e7e0f09c6a7266adc2a6b7 100644 (file)
--- 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 b9260f1f8325bba0c9cba50a94b949ce59897117..25952ee353769a8f6154d096504c794cbc187efc 100644 (file)
--- 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 a1d2403927a2df9edfa96632cc302f5db43346cf..2e0e5a540bd9c556d1038c91bc250aeeab2a417b 100644 (file)
--- 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 149ffdeaf699278c64c5ed83dbf388ca2a8002b4..7029e117d69bea833c2277e5e2250b123c61f719 100644 (file)
--- 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