UltiSnips

Merge lp:~blueyed/ultisnips/fix-doc-typos into lp:~sirver/ultisnips/trunk

  1. fix-doc-typos
  2. Merge into trunk
Proposed by Daniel Hahler
Status: Merged
Merged at revision: 256
Proposed branch: lp:~blueyed/ultisnips/fix-doc-typos
Merge into: lp:~sirver/ultisnips/trunk
Diff against target: 46 lines (+7/-7)
1 file modified
doc/UltiSnips.txt (+7/-7)
To merge this branch: bzr merge lp:~blueyed/ultisnips/fix-doc-typos
Reviewer Review Type Date Requested Status
SirVer Pending
Review via email: mp+52446@code.launchpad.net
To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

Thanks! Applied in r256.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/UltiSnips.txt'
2--- doc/UltiSnips.txt 2011-02-24 22:12:51 +0000
3+++ doc/UltiSnips.txt 2011-03-07 17:55:50 +0000
4@@ -126,10 +126,10 @@
5 for the current filetype. You can easily open them manually of course, this is
6 just a shortcut. There is also a variable called: >
7
8- g:UltiSnipsEditSplit
9+ g:UltiSnipsEditSplit
10
11-which can be set to "normal", "horizontal" or "vertical" that defines if a new
12-window should be opened for the edit.
13+which can be set to "normal" (default), "horizontal" or "vertical" that
14+defines if a new window should be opened for the edit.
15
16 3.2 Global Variables *UltiSnips-global-variables*
17 --------------------
18@@ -245,7 +245,7 @@
19 definition. In the starting line, the description and options are optional.
20
21 If you want to use a multi-word trigger, you can surround the trigger with any
22-single character on each side. eg. >
23+single character on each side. e.g. >
24 snippet "tab trigger" [ "description" [ options ] ]
25 or >
26 snippet !"tab trigger"! [ "description" [ options ] ]
27@@ -264,8 +264,8 @@
28 b Beginning of line - This snippet will only be expanded if you are at
29 the beginning of a line (that is if there are only whitespaces in front
30 of the cursor). Default is to expand snippets at every position, even
31- in the middle of a line. Most of my snippets have this option set, it keeps
32- UltiSnips out of the way.
33+ in the middle of a line. Most of my snippets have this option set, it
34+ keeps UltiSnips out of the way.
35 i Inword expansion - Normally, triggers need whitespace before them to be
36 expanded. With this option, triggers are also expanded in the middle of
37 a word.
38@@ -492,7 +492,7 @@
39 class="link"'. Now, you can either hit backspace, because you do not want to
40 enter a class attribute for this tag or you hit <c-j> to change the class name
41 (which is tab stop $3). When you are satisfied with the first line you hit
42-<c-j> again to finish this snippet and contiue inside the anchor.
43+<c-j> again to finish this snippet and continue inside the anchor.
44
45 a<tab>http://www.google.com<c-j><BS><c-j>hi ->
46 <a href="http://www.google.com">

Subscribers

People subscribed via source and target branches