commit:     c08a1dc1072740182e5c4d059967db697897bed6
Author:     Sebastian Engel <sighunter <AT> gmx <DOT> de>
AuthorDate: Mon Aug 12 09:12:05 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 14:06:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c08a1dc1

Fix multiple typos and grammatical errors

Signed-off-by: Sebastian Engel <sighunter <AT> gmx.de>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ebuild-writing/common-mistakes/text.xml |  2 +-
 ebuild-writing/eapi/text.xml            |  2 +-
 quickstart/text.xml                     |  2 +-
 tasks-reference/pam/text.xml            | 18 +++++++++---------
 tools-reference/echo/text.xml           |  4 ++--
 tools-reference/find/text.xml           |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ebuild-writing/common-mistakes/text.xml 
b/ebuild-writing/common-mistakes/text.xml
index e39e2e6..0b6adb8 100644
--- a/ebuild-writing/common-mistakes/text.xml
+++ b/ebuild-writing/common-mistakes/text.xml
@@ -263,7 +263,7 @@ bug about that ebuild.
 <p>
 You should try not to include version numbers in the SRC_URI and S. Always try
 to use ${PV} or ${P}. It makes maintaining the ebuild much easier. If a version
-number is not consistent with the tarball/source, then use MY_P. An example
+number is not consistent with the tarball/source, then use MY_P. For example
 dev-python/pyopenal fetches a tarball called PyOpenAL, so we redefine it like:
 </p>
 

diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml
index 4943dba..5c2f9b7 100644
--- a/ebuild-writing/eapi/text.xml
+++ b/ebuild-writing/eapi/text.xml
@@ -1009,7 +1009,7 @@ pkg_postrm() {
 </codesample>
 
     <p>
-    In the example provided above, the ebuild needs to be update the icon cache
+    In the example provided above, the ebuild needs to update the icon cache
     upon being installed or uninstalled. By placing the respective tool in
     <c>IDEPEND</c>, the ebuild requests it to be available at the time of
     <c>pkg_postinst</c>. When cross-compiling, the tool will be built for

diff --git a/quickstart/text.xml b/quickstart/text.xml
index 32e3ede..9e22dfd 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -74,7 +74,7 @@ At the top of the ebuild is a header block. This is present 
in all ebuilds.
 </p>
 
 <p>
-Ebuilds are indented using tabs, with each tab representing four places.
+Ebuilds are indented using tabs, with each tab representing four spaces.
 See <uri link="::ebuild-writing/file-format/"/>.
 </p>
 </body>

diff --git a/tasks-reference/pam/text.xml b/tasks-reference/pam/text.xml
index 3094b20..2cc794c 100644
--- a/tasks-reference/pam/text.xml
+++ b/tasks-reference/pam/text.xml
@@ -80,15 +80,15 @@ The statement is composed of 3 or 4 tokens:
     methods.  Some documentation states that we need to specify the full path 
of
     the module, but this creates problems because not all the systems install 
the
     modules in the same place: Linux-PAM on Gentoo is generally set up to load
-    them from <c>/lib/security</c>, but for example on AMD64 this become
+    them from <c>/lib/security</c>, but for example on AMD64 this becomes
     <c>/lib64/security</c>. The
     result is that providing the full path will lead to non-working <c>pamd</c>
-    files, and the right way to handle this is just states the module name <d 
/> the
+    files, and the right way to handle this is to just state the module name 
<d /> the
     PAM implementation will take care of finding the module.
   </li>
   <li>
-    The last token, which can consist of multiple items, describe the 
parameters
-    passed to the module. These are module-dependent.
+    The last token, which can consist of multiple items, describes the
+    parameters passed to the module. These are module-dependent.
   </li>
 </ul>
 <ul>
@@ -124,7 +124,7 @@ source for some services, such as mail and ftp servers.
 
 <p>
 But for desktop systems, all the different services, such as mail servers, ftp
-servers, ssh and so on, just need to authenticate in the same way the users 
logs
+servers, ssh and so on, just need to authenticate in the same way the users log
 in to the system.
 </p>
 
@@ -175,13 +175,13 @@ for <c>pamd</c> files (<c>dopamd</c> and <c>newpamd</c>, 
whose usage is the same
 similar <c>do*</c> and <c>new*</c> functions) and the <c>/etc/security</c> 
files
 (<c>dopamsecurity</c> and <c>newpamsecurity</c>, which need the first argument 
to be
 the subdirectory of <c>/etc/security</c> in which the files are to be 
installed).
-Those groups of functions already takes care of verifying whether the 
<c>pam</c>
+Those groups of functions already take care of verifying whether the <c>pam</c>
 USE flag is made optional for the package <d /> if this is the case, and the 
flag
 is disabled, the <c>pamd</c> files are just skipped.
 </p>
 
 <p>
-Many <c>pamd</c> files just uses one or more auth types from 
<c>system-auth</c> login class,
+Many <c>pamd</c> files just use one or more auth types from <c>system-auth</c> 
login class,
 which is the base one which provides login facilities for most services on
 common desktop systems.  Instead of adding a <c>pamd</c> file in 
<c>${FILESDIR}</c>
 for this, one can use the <c>pamd_mimic_system</c> function. This function 
takes a series
@@ -230,8 +230,8 @@ correct directory to use for the current 
implementation/arch.
 <p>
 When the PAM module doesn't provide a way to install the package by itself, 
such
 as a <c>Makefile</c> or an installation script, there are also the 
<c>dopammod</c> and
-<c>newpammod</c> functions which takes care of install the module in the right
-directory.
+<c>newpammod</c> functions, which take care of installing the module in the
+right directory.
 </p>
 
 </body>

diff --git a/tools-reference/echo/text.xml b/tools-reference/echo/text.xml
index 9a84ab9..f72d833 100644
--- a/tools-reference/echo/text.xml
+++ b/tools-reference/echo/text.xml
@@ -29,9 +29,9 @@ the same as the former, but they won't print the trailing 
newline
 
 <p>
 All usage of the form <c>echo ${somevar} | grep substring</c> just to
-check if the contents of the <c>${somevar}</c> variable
+check if the content of the <c>${somevar}</c> variable
 contains <c>substring</c>, or more often, <c>echo ${somevar} |
-command</c>, are deprecated and should be (and in most cases, can be)
+command</c>, is deprecated and should be (and in most cases, can be)
 used as less as possible: doing so involves for no reason an
 additional shell session and a pipe. The "here strings" section
 describes the preferred way of dealing with such cases.

diff --git a/tools-reference/find/text.xml b/tools-reference/find/text.xml
index 5825a39..0abe239 100644
--- a/tools-reference/find/text.xml
+++ b/tools-reference/find/text.xml
@@ -77,7 +77,7 @@ Useful rules include:
     <ti><c>-maxdepth 3</c></ti>
     <ti>
      Only descend 3 levels into subdirectories.
-     <c>-maxdepth 1</c> will ignore all subdiretories of the specified path.
+     <c>-maxdepth 1</c> will ignore all subdirectories of the specified path.
     </ti>
     <ti>no, GNU and BSD</ti>
   </tr>

Reply via email to