Changeset f16e611

Timestamp:

12/10/2022 06:25:47 AM (16 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

a09fa5f

Parents:

524c5e3 (diff), 20d6b70 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Location:

chapter08

Files:

• coreutils.xml (modified) (15 diffs)
• libffi.xml (modified) (1 diff)
• meson.xml (modified) (5 diffs)
• perl.xml (modified) (1 diff)

chapter08/coreutils.xml

@@ -24 +24 @@
     <title/>
 
-    <para>The Coreutils package contains utilities for showing and setting the
-    basic system characteristics.</para>
+    <para>The Coreutils package contains the basic utility programs
+    needed by every operating system.</para>
 
     <segmentedlist>
@@ -49 +49 @@
 
     <note>
-      <para>In the past, many bugs were found in this patch. When reporting new
-      bugs to Coreutils maintainers, please check first if they are reproducible
-      without this patch.</para>
+      <para>Many bugs have been found in this patch. When reporting new
+      bugs to the Coreutils maintainers, please check first to see if 
+      those bugs are reproducible without this patch.</para>
     </note>
 
@@ -76 +76 @@
         <listitem>
           <para>The patch for internationalization has modified the
-          building system of the package, so the configuration files have
-          to be regenerated.</para>
+          build system, so the configuration files must
+          be regenerated.</para>
         </listitem>
       </varlistentry>
@@ -85 +85 @@
         <listitem>
           <para>This environment variable allows the package to be
-          built as the <systemitem class="username">root</systemitem> user.
+          built by the <systemitem class="username">root</systemitem> user.
           </para>
         </listitem>
@@ -94 +94 @@
         <listitem>
           <para>The purpose of this switch is to prevent Coreutils from
-          installing binaries that will be installed by other packages later.
+          installing programs that will be installed by other packages.
           </para>
         </listitem>
@@ -187 +187 @@
         <term><command>[</command></term>
         <listitem>
-          <para>Is an actual command, /usr/bin/[, that is a synonym
+          <para>Is an actual command, /usr/bin/[; it is a synonym
           for the <command>test</command> command</para>
           <indexterm zone="ch-system-coreutils lbracket">
@@ -281 +281 @@
         <listitem>
           <para>Changes the permissions of each file to the given mode; the mode
-          can be either a symbolic representation of the changes to make or an
+          can be either a symbolic representation of the changes to be made, or an
           octal number representing the new permissions</para>
           <indexterm zone="ch-system-coreutils chmod">
@@ -347 +347 @@
         <listitem>
           <para>Splits a given file into several new files, separating them
-          according to given patterns or line numbers and outputting the byte
+          according to given patterns or line numbers, and outputting the byte
           count of each new file</para>
           <indexterm zone="ch-system-coreutils csplit">
@@ -369 +369 @@
         <term><command>date</command></term>
         <listitem>
-          <para>Displays the current time in the given format, or sets the
-          system date</para>
+          <para>Displays the current dae and time in the given format, or sets the
+          system date and time</para>
           <indexterm zone="ch-system-coreutils date">
             <primary sortas="b-date">date</primary>
@@ -426 +426 @@
         <term><command>dirname</command></term>
         <listitem>
-          <para>Strips the non-directory suffix from a file name</para>
+          <para>Extracts the directory portion(s) of the given name(s)</para>
           <indexterm zone="ch-system-coreutils dirname">
             <primary sortas="b-dirname">dirname</primary>
@@ -488 +488 @@
         <term><command>factor</command></term>
         <listitem>
-          <para>Prints the prime factors of all specified integer numbers</para>
+          <para>Prints the prime factors of the specified integers</para>
           <indexterm zone="ch-system-coreutils factor">
             <primary sortas="b-factor">factor</primary>
@@ -593 +593 @@
         <term><command>link</command></term>
         <listitem>
-          <para>Creates a hard link with the given name to a file</para>
+          <para>Creates a hard link (with the given name) to a file</para>
           <indexterm zone="ch-system-coreutils link">
             <primary sortas="b-link">link</primary>
@@ -653 +653 @@
         <term><command>mkfifo</command></term>
         <listitem>
-          <para>Creates First-In, First-Outs (FIFOs), a "named
-          pipe" in UNIX parlance, with the given names</para>
+          <para>Creates First-In, First-Outs (FIFOs), "named
+          pipes" in UNIX parlance, with the given names</para>
           <indexterm zone="ch-system-coreutils mkfifo">
             <primary sortas="b-mkfifo">mkfifo</primary>
@@ -1236 +1236 @@
         <listitem>
           <para>Reports the number of lines, words, and bytes for each given
-          file, as well as a total line when more than one file is given</para>
+          file, as well as grand totals when more than one file is given</para>
           <indexterm zone="ch-system-coreutils wc">
             <primary sortas="b-wc">wc</primary>
@@ -1267 +1267 @@
         <term><command>yes</command></term>
         <listitem>
-          <para>Repeatedly outputs <quote>y</quote> or a given string until
+          <para>Repeatedly outputs <quote>y</quote>, or a given string, until
           killed</para>
           <indexterm zone="ch-system-coreutils yes">

chapter08/libffi.xml

@@ -54 +54 @@
       following command to an architecture name fully implemented by the
       CPU on that system.
-      If this is not done, all applications that link to libffi will trigger
+      If this is not done, all applications that link to
+      <filename class='libraryfile'>libffi</filename> will trigger
       Illegal Operation Errors.</para>
     </note>

chapter08/meson.xml

@@ -24 +24 @@
     <title/>
 
-    <para>Meson is an open source build system meant to be both extremely fast
+    <para>Meson is an open source build system designed to be both extremely fast
     and as user friendly as possible.</para>
 
@@ -37 +37 @@
 
     <tip revision="sysv">
-      <para>This section is not strictly required for LFS if not using
-      systemd. On the other hand, meson/ninja is a powerful build system,
-      which is expected to be used more and more often. It is required for
+      <para>This section is not strictly required when LFS does not use
+      systemd. On the other hand, Meson, along with Ninja, makes
+      a powerful build system combination,
+      which will probably be used more and more often. It is required for
       several packages in <ulink url="&blfs-book;">the BLFS
       book</ulink>.</para>
@@ -57 +58 @@
 <screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
 
-    <para>The test suite requires some packages out of the scope of LFS.</para>
+    <para>The test suite requires some packages outside the scope of LFS.</para>
 
     <para>Install the package:</para>
@@ -71 +72 @@
         <term><parameter>-w dist</parameter></term>
         <listitem>
-           <para>Put the created wheels into the
+           <para>Puts the created wheels into the
            <filename class='directory'>dist</filename> directory.</para>
         </listitem>
@@ -79 +80 @@
         <term><parameter>--find-links dist</parameter></term>
         <listitem>
-           <para>Install wheels from the
+           <para>Installs wheels from the
            <filename class='directory'>dist</filename> directory.</para>
         </listitem>

chapter08/perl.xml

@@ -124 +124 @@
           <para>These settings define where Perl looks for installed
           modules. The LFS editors chose to put them in a directory structure
-          based on the Major.Minor version of Perl (&perl-version-min;) which
-          allows upgrading Perl to newer Patch levels (&perl-version;) without
-          reinstalling all of the modules.</para>
+          based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
+          allows upgrading Perl to newer patch levels (the patch level is
+          the last dot separated part in the full version string like
+          &perl-version;) without reinstalling all of the modules.</para>
         </listitem>
       </varlistentry>