Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2022-09-15 00:30:10 +02:00
commit a28ea0a572
3 changed files with 7 additions and 5 deletions

View File

@ -48,8 +48,8 @@
as well:</para> as well:</para>
<screen><userinput>cat &gt; /etc/hosts &lt;&lt; EOF <screen><userinput>cat &gt; /etc/hosts &lt;&lt; EOF
127.0.0.1 localhost $(hostname) <literal>127.0.0.1 localhost $(hostname)
::1 localhost ::1 localhost</literal>
EOF</userinput></screen> EOF</userinput></screen>
<para>In order for user <systemitem class="username">root</systemitem> to be <para>In order for user <systemitem class="username">root</systemitem> to be

View File

@ -53,6 +53,8 @@
<screen><userinput remap="configure">PAGE=<replaceable>&lt;paper_size&gt;</replaceable> ./configure --prefix=/usr</userinput></screen> <screen><userinput remap="configure">PAGE=<replaceable>&lt;paper_size&gt;</replaceable> ./configure --prefix=/usr</userinput></screen>
<para>Build the package:</para>
<screen><userinput remap="make">make</userinput></screen> <screen><userinput remap="make">make</userinput></screen>
<para>This package does not come with a test suite.</para> <para>This package does not come with a test suite.</para>

View File

@ -116,10 +116,10 @@
well. If desired, suppress these warnings by running the following well. If desired, suppress these warnings by running the following
commands:</para> commands:</para>
<screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF <screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF
[global] <literal>[global]
root-user-action = ignore root-user-action = ignore
disable-pip-version-check = true disable-pip-version-check = true</literal>
EOF EOF
</userinput></screen> </userinput></screen>
<!-- <!--