From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1C6F158089 for ; Sat, 11 Nov 2023 07:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03B242BC038; Sat, 11 Nov 2023 07:24:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBD1D2BC037 for ; Sat, 11 Nov 2023 07:24:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E53E335D8D for ; Sat, 11 Nov 2023 07:24:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 332BC1364 for ; Sat, 11 Nov 2023 07:24:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699687442.dfc192ba206c334a388bebb7e8b046bed98c0101.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/color.map.5 man/ebuild.5 man/emerge.1 man/emirrordist.1 man/make.conf.5 man/portage.5 X-VCS-Directories: man/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dfc192ba206c334a388bebb7e8b046bed98c0101 X-VCS-Branch: master Date: Sat, 11 Nov 2023 07:24:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 065bd6a3-c042-4e82-b83a-0a567d74ae4c X-Archives-Hash: 50998d4a4d6e48ec4021dd5642a9dbbd commit: dfc192ba206c334a388bebb7e8b046bed98c0101 Author: Sam James gentoo org> AuthorDate: Sat Nov 11 05:56:45 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 11 07:24:02 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfc192ba man: fix typos Thanks to codespell. Signed-off-by: Sam James gentoo.org> man/color.map.5 | 6 +++--- man/ebuild.5 | 8 ++++---- man/emerge.1 | 10 +++++----- man/emirrordist.1 | 2 +- man/make.conf.5 | 6 +++--- man/portage.5 | 14 +++++++------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/man/color.map.5 b/man/color.map.5 index eccb0c5a97..80446175d4 100644 --- a/man/color.map.5 +++ b/man/color.map.5 @@ -17,16 +17,16 @@ pattern]\fR .SH "VARIABLES" .TP \fBNORMAL\fR = \fI"normal"\fR -Defines color used for some words occuring in other contexts than those below. +Defines color used for some words occurring in other contexts than those below. .TP \fBBAD\fR = \fI"red"\fR -Defines color used for some words occuring in bad context. +Defines color used for some words occurring in bad context. .TP \fBBRACKET\fR = \fI"blue"\fR Defines color used for brackets. .TP \fBGOOD\fR = \fI"green"\fR -Defines color used for some words occuring in good context. +Defines color used for some words occurring in good context. .TP \fBHILITE\fR = \fI"teal"\fR Defines color used for highlighted words. diff --git a/man/ebuild.5 b/man/ebuild.5 index cce5451755..aad189bb00 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -408,7 +408,7 @@ Contains the path to the directory in which package-specific auxiliary files are located. Do not modify this variable. .TP .B EBUILD_PHASE -Contains the abreviated name of the phase function that is +Contains the abbreviated name of the phase function that is currently executing, such as "setup", "unpack", "compile", or "preinst". .TP @@ -476,7 +476,7 @@ source source\-build which is scheduled for merge .TP .B PROVIDES_EXCLUDE\fR = \fI[space delimited list of fnmatch patterns]\fR Sonames and file paths matched by these fnmatch patterns will be -excluded during genertion of \fBPROVIDES\fR metadata (see +excluded during generation of \fBPROVIDES\fR metadata (see \fBportage\fR(5)). Patterns are delimited by whitespace, and it is possible to create patterns containing quoted whitespace. .TP @@ -553,7 +553,7 @@ Defines the ebuild API version to which this package conforms. If not defined then it defaults to "0". If portage does not recognize the EAPI value then it will mask the package and refuse to perform any operations with it since this means that a newer version of portage -needs to be installed first. For maximum backward compatiblity, a +needs to be installed first. For maximum backward compatibility, a package should conform to the lowest possible EAPI. Note that anyone who uses the \fBebuild\fR(1) command with this package will be required to have a version of portage that recognizes the EAPI to @@ -961,7 +961,7 @@ end the function with a call to \fBdie\fR. .TP .B pkg_setup This function can be used if the package needs specific setup actions or -checks to be preformed before anything else. +checks to be performed before anything else. .br Initial working directory: $PORTAGE_TMPDIR .TP diff --git a/man/emerge.1 b/man/emerge.1 index 667138ff3a..e18bc9e257 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -457,7 +457,7 @@ with resolving inconsistent USE flag settings, this option is automatically enabled unless the \fB\-\-usepkgonly\fR option is enabled. If \fB\-\-binpkg\-respect\-use\fR is given explicitly, then it implies \fB\-\-autounmask\-use=n\fR, because these options -naturally oppose eachother. +naturally oppose each other. .TP .BR "\-\-buildpkg [ y | n ]" ", " \-b Tells emerge to build binary packages for all ebuilds processed in @@ -654,7 +654,7 @@ that can pull unbuilt ebuilds into the dependency graph, since unbuilt ebuilds do not have any soname dependency metadata, making it impossible to determine whether an unresolved soname dependency can be satisfied. Therefore, \fB\-\-usepkgonly\fR (or \fB\-\-getbinpkgonly\fR) must be -used in order to enable soname depedency resolution when installing +used in order to enable soname dependency resolution when installing packages. .TP .BR "\-\-ignore\-world [ y | n ]" @@ -678,7 +678,7 @@ this option. Assume that packages may have implicit dependencies on packages which belong to the @system set. This option is enabled by default. One of the effects of disabling this option is to allow the \-\-jobs option to -spawn jobs without accounting for the possiblity of implicit dependencies +spawn jobs without accounting for the possibility of implicit dependencies on packages that belong to the @system set. .TP .BR \-j\ [JOBS] ", " \-\-jobs[=JOBS] @@ -931,7 +931,7 @@ mode whenever a new slot is installed. This option is enabled by default. NOTE: If you want to skip all rebuilds involving slot\-operator -dependecies (including those that involve sub\-slot changes alone), +dependencies (including those that involve sub\-slot changes alone), then \fI\-\-ignore\-built\-slot\-operator\-deps=y\fR is the option that you are looking for, since \fI\-\-rebuild\-if\-new\-slot\fR does not affect rebuilds triggered by sub\-slot changes alone. @@ -1328,7 +1328,7 @@ permanent, you can put them in /etc/portage/package.use instead. If \fBemerge \-\-update @system\fR or \fBemerge \-\-update @world\fR fails with an error message, it may be that an ebuild uses some newer feature not present in this version of \fBemerge\fR. You -can use \fBemerge \-\-update sys-apps/portage\fR to upgrade to the lastest +can use \fBemerge \-\-update sys-apps/portage\fR to upgrade to the latest version, which should support any necessary new features. .SH "MASKED PACKAGES" \fINOTE: Please use caution when using development packages. Problems diff --git a/man/emirrordist.1 b/man/emirrordist.1 index 37a56a8bb9..51b04c4885 100644 --- a/man/emirrordist.1 +++ b/man/emirrordist.1 @@ -21,7 +21,7 @@ Perform a trial run with no changes made (typically combined with \fI\-v\fR or \fI\-vv\fR). .TP \fB\-v\fR, \fB\-\-verbose\fR -Display extra information on stderr (multiple occurences +Display extra information on stderr (multiple occurrences increase verbosity). .TP \fB\-\-ignore\-default\-opts\fR diff --git a/man/make.conf.5 b/man/make.conf.5 index 045882a17a..7e564c089f 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -332,7 +332,7 @@ should not be disabled by default. .RS .TP .B assume\-digests -When commiting work to cvs with \fBrepoman\fR(1), assume that all existing +When committing work to cvs with \fBrepoman\fR(1), assume that all existing SRC_URI digests are correct. This feature also affects digest generation via \fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the \fIdigest\fR feature is enabled). Existing digests for files that do not exist @@ -421,7 +421,7 @@ Enable a special progress indicator when \fBemerge\fR(1) is calculating dependencies. .TP .B case\-insensitive\-fs -Use case\-insensitive file name comparisions when merging and unmerging +Use case\-insensitive file name comparisons when merging and unmerging files. Most users should not enable this feature, since most filesystems are case\-sensitive. You should only enable this feature if you are using portage to install files to a case\-insensitive filesystem. @@ -711,7 +711,7 @@ bits removed while files that are setgid have the other read bit removed. See also \fIsuidctl\fR below. .TP .B sign -When commiting work to cvs with \fBrepoman\fR(1), sign the Manifest with +When committing work to cvs with \fBrepoman\fR(1), sign the Manifest with a GPG key. Read about the \fIPORTAGE_GPG_KEY\fR variable in \fBmake.conf\fR(5). .TP diff --git a/man/portage.5 b/man/portage.5 index dae4d47206..d8990bf416 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -919,7 +919,7 @@ only. .BR repos.conf Specifies \fIsite\-specific\fR repository configuration information. .br -Configuration specified in \fBrepos.conf\fR can be overriden by +Configuration specified in \fBrepos.conf\fR can be overridden by \fBPORTAGE_REPOSITORIES\fR environmental variable, which has the same format as \fBrepos.conf\fR. @@ -1106,12 +1106,12 @@ Extra options to give to mercurial when updating repository (hg pull). Enable read\-copy\-update (RCU) behavior for sync operations. The current latest immutable version of a repository will be referenced by a symlink found where the repository would normally be located (see the \fBlocation\fR -setting). Repository consumers should resolve the cannonical path of this +setting). Repository consumers should resolve the canonical path of this symlink before attempt to access the repository, and all operations should be read\-only, since the repository is considered immutable. Updates occur by atomic replacement of the symlink, which causes new consumers to use the new immutable version, while any earlier consumers continue to use the -cannonical path that was resolved earlier. This option requires +canonical path that was resolved earlier. This option requires sync\-allow\-hardlinks and sync\-rcu\-store\-dir options to be enabled, and currently also requires that sync\-type is set to rsync. This option is disabled by default, since the symlink usage would require special handling @@ -1321,7 +1321,7 @@ sync\-uri = :pserver:anonymous@anoncvs.gentoo.org:/var/cvsroot sync\-cvs\-repo = gentoo\-x86 auto\-sync = yes -# Overlay 'voip' syncronized with layman's plug-in sync module +# Overlay 'voip' synchronized with layman's plug-in sync module [voip] location = /var/lib/layman/voip sync\-type = laymanator @@ -1646,7 +1646,7 @@ A list of all the packages which will be displayed when you run `emerge info`. A list of all the variables which will be displayed when you run `emerge info`. .TP .BR license_groups -This contains groups of licenses that may be specifed in the +This contains groups of licenses that may be specified in the \fBACCEPT_LICENSE\fR variable (see \fBmake.conf\fR(5)). Refer to GLEP 23 for further information: \fIhttps://www.gentoo.org/glep/glep-0023.html\fR. @@ -1856,7 +1856,7 @@ all objects that the package installed onto your system. Contains information about the sonames that a package provides, which is automatically generated from the files that it installs. The sonames may have been filtered by the \fBPROVIDES_EXCLUDE\fR \fBebuild\fR(5) -variable. A multilib category, followed by a colon, always preceeds a +variable. A multilib category, followed by a colon, always precedes a list of one or more sonames. .I Example: @@ -1870,7 +1870,7 @@ automatically generated from the files that it installs. The sonames may have been filtered by the \fBREQUIRES_EXCLUDE\fR \fBebuild\fR(5) variable. Any sonames that a package provides are automatically excluded from \fBREQUIRES\fR. A multilib category, followed by a colon, always -preceeds a list of one or more sonames. +precedes a list of one or more sonames. .I Example: .nf