From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-539723-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 458811381FB for <garchives@archives.gentoo.org>; Fri, 28 Dec 2012 21:44:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97D3021C0A5; Fri, 28 Dec 2012 21:44:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBA4AE0724 for <gentoo-commits@lists.gentoo.org>; Fri, 28 Dec 2012 21:44:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5E2233C878 for <gentoo-commits@lists.gentoo.org>; Fri, 28 Dec 2012 21:44:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 358CDE543D for <gentoo-commits@lists.gentoo.org>; Fri, 28 Dec 2012 21:44:18 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <1356731042.a4c4e125ee7fdcedef1903eb9272c76d963978be.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/color.map.5 man/ebuild.1 man/ebuild.5 man/egencache.1 man/emerge.1 man/make.conf.5 man/portage.5 man/quickpkg.1 X-VCS-Directories: man/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a4c4e125ee7fdcedef1903eb9272c76d963978be X-VCS-Branch: master Date: Fri, 28 Dec 2012 21:44:18 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 67fcd13d-71ac-4078-ae6b-867ecd73e1d1 X-Archives-Hash: d4029f6d0e408f932fcae1fdaa3f41a4 commit: a4c4e125ee7fdcedef1903eb9272c76d963978be Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Dec 28 21:36:04 2012 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Dec 28 21:44:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a4c4e125 man pages: refer to /etc/portage/make.conf --- man/color.map.5 | 4 ++-- man/ebuild.1 | 4 ++-- man/ebuild.5 | 4 ++-- man/egencache.1 | 4 ++-- man/emerge.1 | 6 +++--- man/make.conf.5 | 6 +++--- man/portage.5 | 2 +- man/quickpkg.1 | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/man/color.map.5 b/man/color.map.5 index ca6b17d..b5f5a81 100644 --- a/man/color.map.5 +++ b/man/color.map.5 @@ -1,4 +1,4 @@ -.TH "COLOR.MAP" "5" "Mar 2010" "Portage VERSION" "Portage" +.TH "COLOR.MAP" "5" "Dec 2012" "Portage VERSION" "Portage" .SH "NAME" color.map \- custom color settings for Portage .SH "SYNOPSIS" @@ -192,7 +192,7 @@ Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com> .B /etc/portage/color.map Contains variables customizing colors. .TP -.B /etc/make.conf +.B /etc/portage/make.conf Contains other variables. .SH "SEE ALSO" .BR console_codes (4), diff --git a/man/ebuild.1 b/man/ebuild.1 index e74779a..b6a7b30 100644 --- a/man/ebuild.1 +++ b/man/ebuild.1 @@ -1,4 +1,4 @@ -.TH "EBUILD" "1" "Feb 2011" "Portage VERSION" "Portage" +.TH "EBUILD" "1" "Dec 2012" "Portage VERSION" "Portage" .SH "NAME" ebuild \- a low level interface to the Portage system .SH "SYNOPSIS" @@ -212,7 +212,7 @@ Mike Frysinger <vapier@gentoo.org> .fi .SH "FILES" .TP -.B /etc/make.conf +.B /etc/portage/make.conf Contains variables for the build\-process and overwrites those in make.globals. .TP diff --git a/man/ebuild.5 b/man/ebuild.5 index 0045efd..ffc2139 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -1507,12 +1507,12 @@ The \fI/usr/sbin/ebuild.sh\fR script. .TP The helper apps in \fI/usr/lib/portage/bin\fR. .TP -.B /etc/make.conf +.B /etc/portage/make.conf Contains variables for the build\-process and overwrites those in make.defaults. .TP .B /usr/share/portage/config/make.globals Contains the default variables for the build\-process, you should edit -\fI/etc/make.conf\fR instead. +\fI/etc/portage/make.conf\fR instead. .TP .B /etc/portage/color.map Contains variables customizing colors. diff --git a/man/egencache.1 b/man/egencache.1 index 57a509d..7f942c7 100644 --- a/man/egencache.1 +++ b/man/egencache.1 @@ -1,4 +1,4 @@ -.TH "EGENCACHE" "1" "Oct 2010" "Portage VERSION" "Portage" +.TH "EGENCACHE" "1" "Dec 2012" "Portage VERSION" "Portage" .SH "NAME" egencache \- generate metadata cache for ebuild repositories .SH "SYNOPSIS" @@ -150,7 +150,7 @@ Zac Medico <zmedico@gentoo.org> .fi .SH "FILES" .TP -.B /etc/make.conf +.B /etc/portage/make.conf Contains variables. .SH "SEE ALSO" .BR emerge (1), diff --git a/man/emerge.1 b/man/emerge.1 index cd54dab..356bb93 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1040,13 +1040,13 @@ defined in make.globals. Directory exceptions to the CONFIG_PROTECTed directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR. .LP -You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in /etc/make.conf. +You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in \fBmake.conf\fR(5). Then, Portage will mercilessly auto\-update your config files. Alternatively, you can leave Config File Protection on but tell Portage that it can overwrite files in certain specific /etc subdirectories. For example, if you wanted Portage to automatically update your rc scripts and your wget configuration, but didn't want any other changes made without your explicit approval, you'd -add this to /etc/make.conf: +add this to \fBmake.conf\fR(5): .LP .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d" .LP @@ -1090,7 +1090,7 @@ This is like the world file but instead of package atoms it contains packages sets which always begin with the \fB@\fR character. Use \fB/etc/portage/sets/\fR to define user package sets. .TP -.B /etc/make.conf +.B /etc/portage/make.conf Contains variables for the build process, overriding those in \fBmake.globals\fR. .TP diff --git a/man/make.conf.5 b/man/make.conf.5 index 9152ab2..fe873df 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -1,4 +1,4 @@ -.TH "MAKE.CONF" "5" "Oct 2012" "Portage VERSION" "Portage" +.TH "MAKE.CONF" "5" "Dec 2012" "Portage VERSION" "Portage" .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" @@ -915,7 +915,7 @@ be necessary in order to continue a partially downloaded file located at Use \fBROOT\fR to specify the target root filesystem to be used for merging packages or ebuilds. Typically, you should set this setting in the environment rather than in -\fI/etc/make.conf\fR itself. It's commonly used for creating new build +\fImake.conf\fR itself. It's commonly used for creating new build images. Make sure you use an absolute path. Refer to the \fBCross-compilation\fR section of \fBebuild\fR(5) for information about how dependencies are handled for \fBROOT\fR. @@ -999,7 +999,7 @@ Saleem Abdulrasool <compnerd@gentoo.org> Contains variables for the build\-process and overwrites those in make.defaults. .TP .B /usr/share/portage/config/make.globals -Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead. +Contains the default variables for the build\-process, you should edit \fI/etc/portage/make.conf\fR instead. .TP .B /etc/portage/color.map Contains variables customizing colors. diff --git a/man/portage.5 b/man/portage.5 index 067ae68..39ccfb2 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -1,4 +1,4 @@ -.TH "PORTAGE" "5" "Oct 2012" "Portage VERSION" "Portage" +.TH "PORTAGE" "5" "Nov 2012" "Portage VERSION" "Portage" .SH NAME portage \- the heart of Gentoo .SH "DESCRIPTION" diff --git a/man/quickpkg.1 b/man/quickpkg.1 index 7e78c1e..0d30163 100644 --- a/man/quickpkg.1 +++ b/man/quickpkg.1 @@ -66,7 +66,7 @@ Mike Frysinger <vapier@gentoo.org> (revamped version) .fi .SH "FILES" .TP -.B /etc/make.conf +.B /etc/portage/make.conf The \fBPKGDIR\fR variable is defined here. .SH "SEE ALSO" .BR ebuild (5),