Ignore:
Timestamp:
12/18/2020 01:47:30 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
qt5new
Children:
96f41f4
Parents:
eb30b876 (diff), 42117d4e (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 trunk up to r24000

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/qt5new@24001 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/markupsafe.xml

    reb30b876 r1d087b41  
    7474      <title>Installation of MarkupSafe</title>
    7575
    76       <note>
    77         <para>
    78           Both <application>Python 2</application> and
    79           <application>Python 3</application> modules can
    80           be built and installed without any conflicts.
    81         </para>
    82       </note>
     76      <para>
     77        Install <application>MarkupSafe</application> with the following
     78        commands:
     79      </para>
     80
     81<screen><userinput>python3 setup.py build</userinput></screen>
    8382
    8483      <para>
    85         To build both Python 2 and Python 3 modules, run the following commands:
    86       </para>
    87 
    88 <screen><userinput>python2 setup.py build &amp;&amp;
    89 python3 setup.py build</userinput></screen>
    90 
    91       <para>
    92         To install both modules, run the following commands as the
    93         <systemitem class="username">root</systemitem> user:
     84        Then, as the <systemitem class="username">root</systemitem> user:
    9485      </para>
    9586
    9687<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
    97 <screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
    98 python3 setup.py install --optimize=1</userinput></screen>
     88<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
    9989
    10090    </sect3>
Note: See TracChangeset for help on using the changeset viewer.