Changeset cc440d3b


Ignore:
Timestamp:
08/07/2014 08:15:54 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd
Children:
b14926b
Parents:
bff5fef
Message:

Merged trunk.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10681 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    rbff5fef rcc440d3b  
    170170
    171171        <seglistitem>
    172           <seg>None</seg>
     172          <seg>Tar, Vim</seg>
    173173        </seglistitem>
    174174      </segmentedlist>
    … …  
    21622162
    21632163        <seglistitem>
    2164          <seg>Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
     2164         <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
    21652165         Grep, Inetutils, Make, Sed, and Texinfo</seg>
    21662166        </seglistitem>
    … …  
    23062306
    23072307        <seglistitem>
    2308          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
    2309          Ncurses, and Sed</seg>
     2308         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, GCC, Glibc,
     2309         Grep, Make, Ncurses, and Sed</seg>
    23102310        </seglistitem>
    23112311      </segmentedlist>

  • chapter01/changelog.xml

    rbff5fef rcc440d3b  
    3737-->
    3838    <listitem>
     39      <para>2014-08-07</para>
     40      <itemizedlist>
     41        <listitem>
     42          <para>[krejzi] - Merged LFS SVN-20140805.</para>
     43        </listitem>
     44      </itemizedlist>
     45    </listitem>
     46
     47    <listitem>
     48      <para>2014-08-05</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[Chris] - Reversed change to Vim's docs location, so that
     52          Vim can find its help files.</para>
     53        </listitem>
     54      </itemizedlist>
     55    </listitem>
     56
     57    <listitem>
    3958      <para>2014-08-03</para>
    4059      <itemizedlist>
    4160        <listitem>
    4261          <para>[krejzi] - Merged LFS SVN-20140803.</para>
     62        </listitem>
     63      </itemizedlist>
     64    </listitem>
     65
     66    <listitem>
     67      <para>2014-08-03</para>
     68      <itemizedlist>
     69        <listitem>
     70          <para>[bdubbs] - Update text about upgrades. Fixes
     71          <ulink url="&lfs-ticket-root;3645">#3645</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Add a fix to gcc identified upstream.</para>
    4375        </listitem>
    4476      </itemizedlist>

  • chapter06/procps.xml

    rbff5fef rcc440d3b  
    5656        <term><parameter>--disable-kill</parameter></term>
    5757        <listitem>
    58           <para>This switch disables building the kill command that
    59           was installed in the util-linux package.</para>
     58          <para>This switch disables building the <command>kill</command>
     59          command that will be installed by the Util-linux package.</para>
    6060        </listitem>
    6161      </varlistentry>

  • chapter06/vim.xml

    rbff5fef rcc440d3b  
    8484    <para>Install the package:</para>
    8585
    86 <screen><userinput remap="install">make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
    87 
    88     <variablelist>
    89       <title>The meaning of the make option:</title>
    90 
    91       <varlistentry>
    92         <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
    93         <listitem>
    94           <para>Tells Vim to install its documentation into
    95           <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
    96           instead of
    97           <filename class="directory">/usr/share/&vim-docdir;/doc</filename>,
    98           for better consistency with the documentation location for other
    99           packages.</para>
    100         </listitem>
    101       </varlistentry>
    102 
    103     </variablelist>
     86<screen><userinput remap="install">make install</userinput></screen>
    10487
    10588    <para>Many users are used to using <command>vi</command> instead of
    … …  
    11396    ln -sv vim.1 $(dirname $L)/vi.1
    11497done</userinput></screen>
     98
     99    <para>By default, Vim's documentation is installed in <filename
     100    class="directory">/usr/share/vim</filename>. The following symlink
     101    allows the documentation to be accessed via <filename
     102    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
     103    it consistent with the location of documentation for other packages:</para>
     104
     105<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
    115106
    116107    <para>If an X Window System is going to be installed on the LFS
    … …  
    196187    <segmentedlist>
    197188      <segtitle>Installed programs</segtitle>
    198       <segtitle>Installed directories</segtitle>
     189      <segtitle>Installed directory</segtitle>
    199190
    200191      <seglistitem>
    … …  
    202193       (link to vim), view (link to vim), vim, vimdiff (link to vim), vimtutor,
    203194       and xxd</seg>
    204         <seg>/usr/share/doc/vim-&vim-version;, /usr/share/vim</seg>
     195        <seg>/usr/share/vim</seg>
    205196      </seglistitem>
    206197    </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.