Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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/introduction/common/changelog.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/temp-system/common/vim.xml

    r8c3f58f r6cefbfb  
    9595<screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
    9696
     97    <para os="tv1" >Create a temporary vimrc to make it function more the way you may
     98    expect it to. This is explained more in the final system:</para>
     99
     100<screen os="tv2"><userinput>cat &gt; /tools/etc/vimrc &lt;&lt; "EOF"
     101<literal>" Begin /etc/vimrc
     102
     103set nocompatible
     104set backspace=2
     105set ruler
     106syntax on
     107
     108" End /etc/vimrc</literal>
     109EOF</userinput></screen>
     110
    97111  </sect2>
    98112
Note: See TracChangeset for help on using the changeset viewer.