Author: krejzi
Date: Mon Aug  4 03:14:13 2014
New Revision: 13820

Log:
Commit forgotten page. Merge trunk.

Added:
   branches/systemd/general/prog/PyYAML-systemd.xml   (contents, props changed)
Modified:
   branches/systemd/general/prog/python-modules-systemd.xml
   branches/systemd/general/sysutils/logrotate.xml
   branches/systemd/x/installing/xterm.xml

Added: branches/systemd/general/prog/PyYAML-systemd.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/systemd/general/prog/PyYAML-systemd.xml    Mon Aug  4 03:14:13 
2014        (r13820)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY PyYAML-download-http 
"http://pyyaml.org/download/pyyaml/PyYAML-&PyYAML-version;.tar.gz";>
+  <!ENTITY PyYAML-download-ftp  " ">
+  <!ENTITY PyYAML-md5sum        "f50e08ef0fe55178479d3a618efe21db">
+  <!ENTITY PyYAML-size          "244 KB">
+  <!ENTITY PyYAML-buildsize     "13 MB">
+  <!ENTITY PyYAML-time          "0.1 SBU">
+]>
+
+  <!-- Begin PyYAML -->
+  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
+
+    <title>PyYAML-&PyYAML-version;</title>
+
+    <indexterm zone="PyYAML">
+      <primary sortas="a-PyYAML">PyYAML</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyYAML Module</title>
+
+      <para>
+        <application>PyYAML</application> is a 
<application>Python</application>
+        module that implements the next generation YAML parser and emitter.
+      </para>
+
+      &lfs75_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &PyYAML-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &PyYAML-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &PyYAML-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &PyYAML-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/> and
+        <xref linkend="yaml"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/PyYAML"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyYAML</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To build the <application>Python 2</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install 
--optimize=1</userinput></screen>
+
+      <para>
+        To build the <application>Python 3</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install 
--optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            _yaml.so
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/yaml and/or
+            /usr/lib/python&python3-majorver;/site-packages/yaml,
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End PyYAML -->

Modified: branches/systemd/general/prog/python-modules-systemd.xml
==============================================================================
--- branches/systemd/general/prog/python-modules-systemd.xml    Mon Aug  4 
02:04:49 2014        (r13819)
+++ branches/systemd/general/prog/python-modules-systemd.xml    Mon Aug  4 
03:14:13 2014        (r13820)
@@ -86,11 +86,11 @@
           <xref linkend="Jinja2"/>
         </para>
       </listitem>
- <!--     <listitem>
+      <listitem>
         <para>
           <xref linkend="PyYAML"/>
         </para>
-      </listitem> -->
+      </listitem>
     </itemizedlist>
   </sect2>
 
@@ -127,7 +127,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="Jinja2-systemd.xml"/>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="PyYAML-systemd.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="PyYAML-systemd.xml"/>
 
 </sect1>

Modified: branches/systemd/general/sysutils/logrotate.xml
==============================================================================
--- branches/systemd/general/sysutils/logrotate.xml     Mon Aug  4 02:04:49 
2014        (r13819)
+++ branches/systemd/general/sysutils/logrotate.xml     Mon Aug  4 03:14:13 
2014        (r13820)
@@ -137,7 +137,7 @@
 # Rotate log files weekly
 weekly
 
-# Don't send mail to anybody
+# Don't mail logs to anybody
 nomail
 
 # If the log file is empty, it will not be rotated

Modified: branches/systemd/x/installing/xterm.xml
==============================================================================
--- branches/systemd/x/installing/xterm.xml     Mon Aug  4 02:04:49 2014        
(r13819)
+++ branches/systemd/x/installing/xterm.xml     Mon Aug  4 03:14:13 2014        
(r13820)
@@ -74,8 +74,8 @@
     <para>Install <application>xterm</application> by running the
     following commands:</para>
 
-<screen><userinput>sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap &amp;&amp;
-echo -e '\tkbs=\\177,' &gt;&gt; terminfo &amp;&amp;
+<screen><userinput>sed -i '/v0/{n;s/new:/new:kb=^?:/}' termcap &amp;&amp;
+printf '\tkbs=\\177,\n' &gt;&gt; terminfo &amp;&amp;
 
 TERMINFO=/usr/share/terminfo \
 ./configure $XORG_CONFIG     \
@@ -97,7 +97,7 @@
     <title>Command Explanations</title>
 
     <para><command>sed -i ... termcap</command>,
-    <command>echo ... >> terminfo</command>: These commands modify the terminal
+    <command>printf ... >> terminfo</command>: These commands modify the 
terminal
     description, so that the Backspace key is expected to send the character
     with ASCII code 127, for consistency with the Linux console.</para>
 
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to