ebuild: fetch: Flatten conditionals in _get_fetch_resume_size

[portage.git] / man / etc-update.1

diff --git a/man/etc-update.1 b/man/etc-update.1
index f0a952a8337b955316242a096fc3325fdcb246a4..71900da4a9b827e4c928b6a8c7f28ee5fc4d1b78 100644 (file)
--- a/man/etc-update.1
+++ b/man/etc-update.1
@@ -1,40 +1,52 @@
-.TH "ETC-UPDATE" "1" "Feb 2003" "Portage 2.0.51" "Portage"
-.SH NAME
-etc-update \- handle configuration file updates
-.SH SYNOPSIS
-.B etc-update
-.SH DESCRIPTION
-.I etc-update
-is supposed to be run after merging a new package to see if
+.TH "ETC-UPDATE" "1" "Mar 2012" "Portage VERSION" "Portage"
+.SH "NAME"
+etc\-update \- handle configuration file updates
+.SH "SYNOPSIS"
+.BR etc\-update
+[\fIoptions\fR] [\fI--automode <mode>\fR] [\fIpaths to scan\fR]
+.SH "DESCRIPTION"
+\fIetc\-update\fR is supposed to be run after merging a new package to see if
 there are updates to the configuration files.  If a new
-configuration file will override an old one, 
-.I etc-update 
-will prompt the user for a decision.
+configuration file will override an old one,
+\fIetc\-update\fR will prompt the user for a decision.
 .PP
-.I etc-update
-will check all directories in the \fICONFIG_PROTECT\fR variable.  All
-config files found in \fICONFIG_PROTECT_MASK\fR will automatically be
-updated for you by \fIetc-update\fR.  See \fBmake.conf\fR(5) for more
-information.
-.SH OPTIONS
+\fIetc\-update\fR will check all directories specified on the command
+line.  If no paths are given, then the \fICONFIG_PROTECT\fR variable
+will be used.  All config files found in \fICONFIG_PROTECT_MASK\fR will
+automatically be updated for you by \fIetc\-update\fR.
+See \fBmake.conf\fR(5) for more information.
+.PP
+\fIetc\-update\fR respects the normal \fIPORTAGE_CONFIGROOT\fR and
+\fIEROOT\fR variables for finding the aforementioned config protect variables.
+.SH "OPTIONS"
 .TP
-None.
-.SH "REPORTING BUGS"
-Please report bugs via http://bugs.gentoo.org/
-.SH "SEE ALSO"
-.BR make.conf (5)
-.SH "FILES"
+.BR \-d ", " \-\-debug
+Run with shell tracing enabled.
+.TP
+.BR \-h ", " \-\-help
+Surprisingly, show the help output.
 .TP
-.B /etc/etc-update.conf
-Configuration settings for \fIetc-update\fR are stored here.
+.BR \-p ", " \-\-preen
+Automerge trivial changes only and quit.
 .TP
-.B /etc/dispatch-conf.conf
-Settings for dispatching configuration files right before they're merged.
-.SH AUTHORS
+.BR \-v ", " \-\-verbose
+Show settings and important decision info while running.
+.TP
+.BR "\-\-automode <mode>"
+Select one of the automatic merge modes.  Valid modes are: \-3 \-5 \-7 \-9.
+See the \fI\-\-help\fR text for more details.
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.SH "AUTHORS"
+.nf
 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 $
+.fi
+.SH "FILES"
+.TP
+.B /etc/etc\-update.conf
+Configuration settings for \fIetc\-update\fR are stored here.
+.SH "SEE ALSO"
+.BR dispatch\-conf (1),
+.BR make.conf (5)