Changeset b733933

Timestamp:

09/01/2023 03:57:45 PM (13 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0

Parents:

ef7de52 (diff), 511e498 (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 branch 'trunk' into 12.0

Files:

• general/sysutils/unzip.xml (modified) (1 diff)
• networking/connect/advanced-network.xml (modified) (1 diff)
• pst/sgml/docbook-utils.xml (modified) (1 diff)
• x/installing/x7driver-libinput.xml (modified) (1 diff)
• x/installing/xorg-config.xml (modified) (2 diffs)
• x/lib/qt5.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (1 diff)
• xsoft/other/xdg-utils.xml (modified) (1 diff)

general/sysutils/unzip.xml

@@ -221 +221 @@
       targets such as linux and linux_noasm) which creates a flags file that
       is then used in the build. This ensures that the 32-bit x86 build
-      receives the right flags to unzip files which which are larger than 2GB
+      receives the right flags to unzip files which are larger than 2GB
       when extracted.
     </para>

networking/connect/advanced-network.xml

@@ -37 +37 @@
 
       <para>
-        In this section we are are going to discuss how to set up a network
+        In this section we are going to discuss how to set up a network
         bridge using <command>systemd-networkd</command>. In the examples
         below, <replaceable>eth0</replaceable> represents the external

pst/sgml/docbook-utils.xml

@@ -168 +168 @@
     <para>
       <option>docdir=/usr/share/doc</option>: This option is placed on the
-      <command>make install</command> line because is is not
+      <command>make install</command> line because is not
       recognized by <command>configure</command>.
     </para>

x/installing/x7driver-libinput.xml

@@ -34 +34 @@
         The <application>X.Org Libinput Driver</application> is a thin wrapper
         around libinput and allows for libinput to be used for input devices in
-        X. This driver can be used as as drop-in replacement for evdev and
+        X. This driver can be used as drop-in replacement for evdev and
         synaptics.
       </para>

x/installing/xorg-config.xml

@@ -20 +20 @@
     <note>
       <para>
-        Before starting Xorg for the first time, is is useful to
+        Before starting Xorg for the first time, is useful to
         rebuild the library cache by running <userinput>ldconfig</userinput>
         as the <systemitem class="username">root</systemitem> user.
@@ -28 +28 @@
     <note>
       <para>
-        Before starting Xorg for the first time, is is often needed to
+        Before starting Xorg for the first time, is often needed to
         reboot the system to ensure all appropriate daemons are started
         and appropriate security issues are properly set.

x/lib/qt5.xml

@@ -953 +953 @@
         <listitem>
           <para>
-            imports a a variety of 3D model formats and exports into fast-to-load,
+            imports a variety of 3D model formats and exports into fast-to-load,
             optimized glTF assets embedded into Qt resource files
           </para>

x/lib/qtwebengine.xml

@@ -161 +161 @@
         even if they are not available to the current task because the build
         terminal has been restricted with 'taskset'.  In BLFS, this package
-        takes more time to build than than any other.  In one example,
+        takes more time to build than any other.  In one example,
         the build of this package crashed at about the 90 percent point
         due to an out of memory problem on a system with 24 cores and 32 GB

xsoft/other/xdg-utils.xml

@@ -28 +28 @@
 
     <para>
-      <application>xdg-utils</application> is a a set of command line
+      <application>xdg-utils</application> is a set of command line
       tools that assist applications with a variety of desktop integration tasks.
       It is required for Linux Standards Base (LSB) conformance.