commit: 0b0aeb084ae51e2df6622b639dbc4fcaede3f302
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 15:00:59 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 06:06:12 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=0b0aeb08
*/*: consistent 'Portage' casing
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
appendices/common-problems/text.xml | 10 +++++-----
archs/amd64/text.xml | 6 +++---
bin/gen-eclass-html.sh | 2 +-
ebuild-writing/common-mistakes/text.xml | 8 ++++----
ebuild-writing/error-handling/text.xml | 4 ++--
ebuild-writing/file-format/text.xml | 4 ++--
ebuild-writing/functions/src_test/text.xml | 4 ++--
ebuild-writing/misc-files/metadata/text.xml | 2 +-
ebuild-writing/use-conditional-code/text.xml | 2 +-
ebuild-writing/variables/text.xml | 2 +-
general-concepts/dependencies/text.xml | 2 +-
general-concepts/filesystem/text.xml | 4 ++--
general-concepts/slotting/text.xml | 2 +-
tools-reference/echo/text.xml | 2 +-
14 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/appendices/common-problems/text.xml
b/appendices/common-problems/text.xml
index a2af22a..4fcdda4 100644
--- a/appendices/common-problems/text.xml
+++ b/appendices/common-problems/text.xml
@@ -15,9 +15,9 @@ and QA notices.
<body>
<p>
-The <c>ebuild.sh</c> part of portage includes a number of checks for common
+The <c>ebuild.sh</c> part of Portage includes a number of checks for common
problems. These can result in a 'QA Notice' message being displayed. You must
-not rely upon portage always generating these messages <d/> they are not a
+not rely upon Portage always generating these messages <d/> they are not a
substitute for proper testing and QA by developers.
</p>
@@ -126,7 +126,7 @@ inheritance occurring. Most commonly:
<ul>
<li>
- When unmerging a package which was installed using an old portage version
that
+ When unmerging a package which was installed using an old Portage version
that
did not record inheritance.
</li>
<li>
@@ -134,7 +134,7 @@ inheritance occurring. Most commonly:
link="::general-concepts/overlay/#Overlay and Eclasses"/>.
</li>
<li>
- When working with a stale portage cache.
+ When working with a stale Portage cache.
</li>
</ul>
@@ -150,7 +150,7 @@ from vapier:
TEXTREL's ... binary files which contain text relocations ... see
'prepstrip' for a full description unsafe files ... basically files that
are setid and writable by Other users i've added the following QA checks to
-portage HEAD (no idea when they'll hit a release): Insecure RUNPATHs ...
+Portage HEAD (no idea when they'll hit a release): Insecure RUNPATHs ...
binary files which have RUNPATH's encoded in them which are in +t
directories Executable stacks ... binary files whose stack is marked with
+x ... will bomb on amd64 for example
diff --git a/archs/amd64/text.xml b/archs/amd64/text.xml
index e4713f5..d615e8f 100644
--- a/archs/amd64/text.xml
+++ b/archs/amd64/text.xml
@@ -301,7 +301,7 @@ And of course it also takes care of the <c>ABI</c> variable.
<p>
Many Makefiles assume that their libraries should go to <c>/usr/lib</c>, or
<c>$(prefix)/lib</c>. This assumption can cause a serious mess if
<c>/usr/lib</c>
-isn't a symlink to <c>/usr/lib64</c>. To find the bad packages, we have a
portage feature
+isn't a symlink to <c>/usr/lib64</c>. To find the bad packages, we have a
Portage feature
called <b>multilib-strict</b>. It will prevent emerge from putting 64bit
libraries
into anything other than <c>(/usr)/lib64</c>.
</p>
@@ -378,7 +378,7 @@ As you can see, this is just a wrapper that decides which
file you need
depending on the parameter <c>-D</c> given to gcc. You'll probably run into
some troubles if you try to compile something by hand and forget to append
<c>-D__x86_64__</c> to your <c>CFLAGS</c>. Of course, this is <b>not
necessary</b> when
-using portage. For an explanation, see the <uri link="::archs/amd64/#The ABI
Variable"/>
+using Portage. For an explanation, see the <uri link="::archs/amd64/#The ABI
Variable"/>
section.
</p>
@@ -390,7 +390,7 @@ section.
<body>
<p>
-Whenever portage builds something on amd64, it has to decide whether it should
+Whenever Portage builds something on amd64, it has to decide whether it should
be 32bit or 64bit. As stated in <uri link="::archs/amd64/#Headers and
Multilib"/>
the <c>__i386__</c> or <c>__x86_64__</c> respectively, is needed in
<c>CDEFINE</c>.
Also, gcc has to know what code it should produce, therefore <c>-m32</c> or
<c>-m64</c>
diff --git a/bin/gen-eclass-html.sh b/bin/gen-eclass-html.sh
index 9486852..7274aa2 100755
--- a/bin/gen-eclass-html.sh
+++ b/bin/gen-eclass-html.sh
@@ -123,7 +123,7 @@ shift $((OPTIND-1))
MANPAGES=()
[[ -n ${NOMAN} ]] || MANPAGES=(
$(/usr/bin/qlist -e eclass-manpages)
- # We also need a couple of portage man pages
+ # We also need a couple of Portage man pages
/usr/share/man/man5/ebuild.5*
/usr/share/man/man5/make.conf.5*
) || exit 1
diff --git a/ebuild-writing/common-mistakes/text.xml
b/ebuild-writing/common-mistakes/text.xml
index 85c0e3f..0d3d441 100644
--- a/ebuild-writing/common-mistakes/text.xml
+++ b/ebuild-writing/common-mistakes/text.xml
@@ -94,7 +94,7 @@ For custom Makefiles you often have to write a patch. Try to
get upstream to inc
option like 'V=1' to enable full verbosity.
</p>
<note>In case you encounter an affected package which uses a build system not
-controllable by portage or eclasses you should file a bug (preferably with a
patch)
+controllable by Portage or eclasses you should file a bug (preferably with a
patch)
and make it block the tracker bug #429308. Solutions above ebuild level are
preferred.</note>
</body>
@@ -129,7 +129,7 @@ This flag is not recommended for releases and should always
be disabled when enc
</li>
</ul>
<p>
-Turning off "-Werror" we will still see the warnings, but there is no reason
that they cause compile failure. Also note that portage already emits QA
notices about gcc warnings that can cause runtime breakage.
+Turning off "-Werror" we will still see the warnings, but there is no reason
that they cause compile failure. Also note that Portage already emits QA
notices about gcc warnings that can cause runtime breakage.
</p>
<p><b>How to fix</b></p>
@@ -192,7 +192,7 @@ The first two lines <e>must</e> look like this:
<p>
You should never redefine those variables. Always use MY_P, MY_PN, MY_PV,
-P0, etc. See other ebuilds that do it in portage for more information. Most
+P0, etc. See other ebuilds that do it in Portage for more information. Most
ebuilds use bash "Parameter Expansion". Please read the man page for bash to
understand how "Parameter Expansion" works.
</p>
@@ -507,7 +507,7 @@ $ diff -u some-package-0.1.0.ebuild
some-package-0.2.0.ebuild > ~/some-packag
<body>
<p>
-If you are submitting a new version for a package in portage, make sure the
+If you are submitting a new version for a package in Portage, make sure the
existing ebuild works and make sure changes are incorporated in the new ebuild
(such as added documentation.) If there are no required changes to the ebuild
from the previous version, then don't attach the ebuild. Just say so in the bug
diff --git a/ebuild-writing/error-handling/text.xml
b/ebuild-writing/error-handling/text.xml
index 3c5289c..110f317 100644
--- a/ebuild-writing/error-handling/text.xml
+++ b/ebuild-writing/error-handling/text.xml
@@ -13,7 +13,7 @@ Decent error handling is important because:
<ul>
<li>
- Errors must be detected <e>before</e> portage tries to install a broken or
+ Errors must be detected <e>before</e> Portage tries to install a broken or
incomplete package onto the live filesystem. If build failures aren't caught,
a working package could be unmerged and replaced with nothing.
</li>
@@ -118,7 +118,7 @@ while read file ; do epatch ${file} ; done < list
<p>
When using pipes, simple conditionals and tests upon <c>$?</c> will not
correctly
detect errors occurring in anything except the final command in the chain. To
get
-around this, <c>bash</c> provides the <c>$PIPESTATUS</c> variable, and portage
+around this, <c>bash</c> provides the <c>$PIPESTATUS</c> variable, and Portage
provides the <c>assert</c> function to check this variable.
</p>
diff --git a/ebuild-writing/file-format/text.xml
b/ebuild-writing/file-format/text.xml
index 2bd6623..e5c3fd3 100644
--- a/ebuild-writing/file-format/text.xml
+++ b/ebuild-writing/file-format/text.xml
@@ -42,12 +42,12 @@ The version section is more complicated. It consists of one
or more numbers
separated by full stop (or period, or dot, or decimal point) characters (eg
<c>1.2.3</c>, <c>20050108</c>). The final number may have a single letter
following it
(e.g. <c>1.2b</c>). This letter should not be used to indicate 'beta' status
<d/>
-portage treats <c>1.2b</c> as being a later version than <c>1.2</c> or
<c>1.2a</c>.
+Portage treats <c>1.2b</c> as being a later version than <c>1.2</c> or
<c>1.2a</c>.
</p>
<p>
There can be a suffix to version indicating the kind of release. In the
following table,
-what portage considers to be the 'lowest' version comes first.
+what Portage considers to be the 'lowest' version comes first.
</p>
<table>
diff --git a/ebuild-writing/functions/src_test/text.xml
b/ebuild-writing/functions/src_test/text.xml
index baf0ad6..0dae1f4 100644
--- a/ebuild-writing/functions/src_test/text.xml
+++ b/ebuild-writing/functions/src_test/text.xml
@@ -51,7 +51,7 @@ src_test() {
src_test() {
cd "${S}"/src/testdir || die
- # Test 49 won't work inside a portage environment
+ # Test 49 won't work inside a Portage environment
sed -i -e 's~test49.out~~g' Makefile || die
# Try to run the non-gui tests only
@@ -79,7 +79,7 @@ for more information.
<p>
Often the default <c>src_test</c> is fine. Sometimes it is necessary
to remove certain tests from the list if they cannot be used with a
-portage environment. Reasons for such a failure could include:
+Portage environment. Reasons for such a failure could include:
</p>
<ul>
diff --git a/ebuild-writing/misc-files/metadata/text.xml
b/ebuild-writing/misc-files/metadata/text.xml
index 6cf7609..0fdf675 100644
--- a/ebuild-writing/misc-files/metadata/text.xml
+++ b/ebuild-writing/misc-files/metadata/text.xml
@@ -493,7 +493,7 @@ as opposed to a URL. Conversely, email addresses specified
in the
</maintainer>
<use>
<flag name="epydoc">Build html API documentation with
epydoc.</flag>
- <flag name="ipc">Use inter-process communication between portage and
running ebuilds.</flag>
+ <flag name="ipc">Use inter-process communication between Portage and
running ebuilds.</flag>
<flag name="pypy2_0">Use pypy-c2.0 as Python
interpreter.</flag>
<flag name="python2">Use python2 as Python interpreter.</flag>
<flag name="python3">Use python3 as Python interpreter.</flag>
diff --git a/ebuild-writing/use-conditional-code/text.xml
b/ebuild-writing/use-conditional-code/text.xml
index b949fc0..aa83cc2 100644
--- a/ebuild-writing/use-conditional-code/text.xml
+++ b/ebuild-writing/use-conditional-code/text.xml
@@ -15,7 +15,7 @@ readable.
<p>
The <c>if [ "`use foo`" ]</c> and <c>if [ -n "`use foo`" ]</c> forms which are
-occasionally seen in older code must <b>not</b> be used. This is because,
since portage-2.1, the 'use' portage helper does not produce any output when
the use flag is enabled or disabled so the [ "`use foo`" ] statement is pretty
much identical to [ "" ] which always evaluates to false.
+occasionally seen in older code must <b>not</b> be used. This is because,
since Portage 2.1, the 'use' Portage helper does not produce any output when
the use flag is enabled or disabled so the [ "`use foo`" ] statement is pretty
much identical to [ "" ] which always evaluates to false.
</p>
<note>
diff --git a/ebuild-writing/variables/text.xml
b/ebuild-writing/variables/text.xml
index b6cebb3..2ba4c4b 100644
--- a/ebuild-writing/variables/text.xml
+++ b/ebuild-writing/variables/text.xml
@@ -282,7 +282,7 @@ The following variables may or must be defined by every
ebuild.
<tr>
<ti><c>RESTRICT</c></ti>
<ti>
- A space-delimited list of portage features to restrict.
+ A space-delimited list of Portage features to restrict.
Valid values are <c>fetch</c>, <c>mirror</c>, <c>strip</c>, <c>test</c> and
<c>userpriv</c>. See <c>man 5 ebuild</c> for details.
</ti>
diff --git a/general-concepts/dependencies/text.xml
b/general-concepts/dependencies/text.xml
index 8cf3999..1b8f425 100644
--- a/general-concepts/dependencies/text.xml
+++ b/general-concepts/dependencies/text.xml
@@ -328,7 +328,7 @@ Blockers added to older ebuilds should not be expected to
be retroactive. If
the user already has the ebuild installed, any changes to the ebuild should not
be expected to make any difference. This means that you should add the
blockers to whichever ebuild is the newest (even if it means that logically it
-would seem backwards). For example, certain versions of portage don't like
+would seem backwards). For example, certain versions of Portage don't like
some versions of bash, but the blocker was put into bash because that was the
newer package that caused the issues.
</p>
diff --git a/general-concepts/filesystem/text.xml
b/general-concepts/filesystem/text.xml
index e76cdcc..729240c 100644
--- a/general-concepts/filesystem/text.xml
+++ b/general-concepts/filesystem/text.xml
@@ -19,7 +19,7 @@ The basic filesystem layout and purpose is as follows:
<ul>
<li><c>/usr/bin</c>: Applications</li>
<li><c>/usr/lib</c>: Libraries</li>
- <li><c>/usr/local</c>: Non-portage applications. <b>Ebuilds must not
install here</b>.</li>
+ <li><c>/usr/local</c>: Non-Portage applications. <b>Ebuilds must not
install here</b>.</li>
<li><c>/usr/sbin</c>: Non-system-critical system administrator
applications</li>
<li><c>/usr/share</c>: Architecture independent application data and
documentation</li>
</ul>
@@ -51,7 +51,7 @@ prebuilt software packages that expect being installed in a
single directory.
</p>
<p>
-The <c>/usr/local</c> hierarchy is for non-portage software. Ebuilds must not
+The <c>/usr/local</c> hierarchy is for non-Portage software. Ebuilds must not
attempt to put anything in here.
</p>
diff --git a/general-concepts/slotting/text.xml
b/general-concepts/slotting/text.xml
index d1adee1..c675e85 100644
--- a/general-concepts/slotting/text.xml
+++ b/general-concepts/slotting/text.xml
@@ -101,7 +101,7 @@ interface changes.
<body>
<p>
-Current versions of portage accept slot and sub-slot names that begin with an
+Current versions of Portage accept slot and sub-slot names that begin with an
alphanumeric character or <c>_</c>, and contain alphanumerics and <c>_</c>,
<c>-</c>, <c>.</c>, and <c>+</c> characters.
</p>
diff --git a/tools-reference/echo/text.xml b/tools-reference/echo/text.xml
index d88faa4..4f1b63b 100644
--- a/tools-reference/echo/text.xml
+++ b/tools-reference/echo/text.xml
@@ -20,7 +20,7 @@ reconsider. It is almost always unnecessary.
</p>
<p>
-First of all, for printing messages in standard portage scripts, you
+First of all, for printing messages in standard Portage scripts, you
can use the <c>einfo</c>, and <c>eerror</c> functions along with their
corresponding functions, <c>einfon</c>, <c>eerrorn</c>, etc, which are
the same as the former, but they won't print the trailing newline
