Changeset 229ed25 for BOOK/final-system/common/perl.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/final-system/common/perl.xml (modified) (7 diffs)

BOOK/final-system/common/perl.xml

@@ -39 +39 @@
       loopback device as well as set a hostname for some of the tests:</para>
 
-      <screen><userinput>ip link set lo up
+  <screen os="a01"><userinput remap="test">ip link set lo up
 hostname clfs</userinput></screen>
     </note>
 
-    <para os="a01">Before starting to configure, create a basic
+    <para os="a02">Before starting to configure, create a basic
     <filename>/etc/hosts</filename> file which will be referenced by one
     of Perl's configuration files as well as used by the testsuite:</para>
 
-<screen os="a02"><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
+<screen os="a03"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
 
     <para os="a">To have full control over the way Perl is set up, you can
@@ -101 +101 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <para os="h">To test the results, issue:
-    <userinput>make test</userinput>.</para>
+    <para os="h">To test the results, issue:</para>
+
+<screen os="h2"><userinput remap="test">make test</userinput></screen>
 
     <para os="j">Install the package:</para>
@@ -120 +121 @@
       <seglistitem>
         <seg>a2p, c2ph, config_data, corelist, cpan, cpan2dist, cpanp,
-        cpanp-run-perl, dprofpp, enc2xs, find2perl, h2ph, h2xs, instmodsh,
+        cpanp-run-perl, enc2xs, find2perl, h2ph, h2xs, instmodsh, json_pp,
         libnetcfg, perl, perl&perl-version; (link to perl), perlbug,
         perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm, pod2html,
         pod2latex, pod2man, pod2text, pod2usage, podchecker, podselect, prove,
-        psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, s2p, shasum,
-        splain, and xsubpp</seg>
+        psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, ptargrep,
+        s2p, shasum, splain, xsubpp, and zipdetails</seg>
         <seg>Several hundred which cannot all be listed here</seg>
         <seg>/usr/lib/perl5</seg>
@@ -213 +214 @@
           <indexterm zone="ch-system-perl cpanp-run-perl">
             <primary sortas="b-cpanp-run-perl">cpanp-run-perl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dprofpp">
-        <term><command>dprofpp</command></term>
-        <listitem>
-          <para>Displays Perl profile data</para>
-          <indexterm zone="ch-system-perl dprofpp">
-            <primary sortas="b-dprofpp">dprofpp</primary>
           </indexterm>
         </listitem>
@@ -282 +273 @@
       </varlistentry>
 
+      <varlistentry id="json_pp">
+        <term><command>json_pp</command></term>
+        <listitem>
+          <para>Converts data between certain input and output formats</para>
+          <indexterm zone="ch-system-perl json_pp">
+            <primary sortas="b-json_pp">json_pp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libnetcfg">
         <term><command>libnetcfg</command></term>
@@ -505 +506 @@
       </varlistentry>
 
+      <varlistentry id="ptargrep">
+        <term><command>ptargrep</command></term>
+        <listitem>
+          <para>A Perl program that applies pattern matching to the contents
+          of files in a tar archive</para>
+          <indexterm zone="ch-system-perl ptargrep">
+            <primary sortas="b-ptargrep">ptargrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="s2p">
         <term><command>s2p</command></term>
@@ -545 +557 @@
       </varlistentry>
 
+      <varlistentry id="zipdetails">
+        <term><command>zipdetails</command></term>
+        <listitem>
+          <para>Displays details about the internal structure of a Zip file</para>
+          <indexterm zone="ch-system-perl zipdetails">
+            <primary sortas="b-zipdetails">zipdetails</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>