Skip to content

Commit 6da9d99

Browse files
justinmkjustinmk
committed
cleanup
1 parent 6d5ac9b commit 6da9d99

File tree

5 files changed

+39
-105
lines changed

5 files changed

+39
-105
lines changed

‎charter.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h3>Goals</h3>
2323
<ul>
2424
<li>Enable <b>new contributors</b>, remove barriers to entry.</li>
2525
<li>Unblock plugin authors.</li>
26-
<li>Develop first-class <b>Lua/LuaJIT</b> scripting alternative to VimL.</li>
26+
<li>Deliver a first-class <b>Lua/LuaJIT</b> scripting alternative to Vimscript.</li>
2727
<li>Target all platforms supported by libuv.</li>
2828
<li>Leverage ongoing Vim development.</li>
2929
<li>Optimize <b>out of the box</b>, for new users but especially regular users.</li>
@@ -38,7 +38,7 @@ <h3>Non-goals</h3>
3838
<li>Vim9script (or anything later than Vimscript v1)</li>
3939
<li>Turn Vim into an IDE</li>
4040
<li>Limit third-party applications (such as IDEs!) built with Neovim</li>
41-
<li>Deprecate VimL</li>
41+
<li>Deprecate Vimscript</li>
4242
<li>POSIX vi-compatibility</li>
4343
</ul>
4444

‎index.html

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ <h3>Extensible</h3>
2121
<ul>
2222
<li>
2323
API is first-class:
24-
<a href="https://neovim.io/doc/user/api.html#api-mapping">discoverable</a>,
25-
<a href="https://neovim.io/doc/user/api.html#api-contract">versioned</a>,
26-
<a href="https://neovim.io/doc/user/api.html#api-global">documented</a>.
24+
<a href="/doc/user/api.html#api-mapping">discoverable</a>,
25+
<a href="/doc/user/api.html#api-contract">versioned</a>,
26+
<a href="/doc/user/api.html#api-global">documented</a>.
2727
</li>
2828
<li>
2929
<a href="http://msgpack.org/">MessagePack</a> structured communication
@@ -39,7 +39,7 @@ <h3>Extensible</h3>
3939

4040
<h3>Usable</h3>
4141
<ul>
42-
<li>Strong defaults</li>
42+
<li>Strong <a href="/doc/user/vim_diff.html#nvim-defaults">defaults</a></li>
4343
<li>Works the same everywhere: one build-type, one command</li>
4444
<li>Modern terminal features such as cursor styling, focus events, bracketed paste</li>
4545
<li>Built-in <a href="https://www.youtube.com/watch?v=xZbMVj9XSUo">terminal emulator</a></li>
@@ -48,7 +48,7 @@ <h3>Usable</h3>
4848
<h3>Drop-in Vim</h3>
4949
<ul>
5050
<li>
51-
Fully compatible with Vim's editing model and the Vimscript language.
51+
Fully compatible with Vim's editing model and Vimscript v1.
5252
</li>
5353
<li>
5454
Start with
@@ -121,13 +121,12 @@ <h2 id="faqs">FAQ</h2>
121121

122122
<dt>Will Neovim deprecate Vimscript?</dt>
123123
<dd>
124-
No. Lua is built-in, but Vimscript will always be supported
125-
with the <b>most advanced Vimscript engine in the world</b>
126-
(featuring an AST-producing <a href="https://neovim.io/doc/user/api.html#nvim_parse_expression()">parser</a>).
124+
No. Lua is built-in, but Vimscript is supported with the <b>most advanced Vimscript engine in the world</b>
125+
(featuring an AST-producing <a href="/doc/user/api.html#nvim_parse_expression()">parser</a>).
127126
</dd>
128127

129128
<dt>Which plugins does Neovim support?</dt>
130-
<dd>Most Vim plugins, and more.
129+
<dd>Most Vim 8.x plugins, and more.
131130
See <a href="https://github.com/neovim/neovim/wiki/Related-projects">related projects</a>
132131
for plugins and applications that leverage the Neovim API.</dd>
133132

@@ -136,40 +135,32 @@ <h2 id="faqs">FAQ</h2>
136135

137136
<div>
138137
<h2 id="chat">Chat</h2>
139-
<p>
140-
<a href="https://twitter.com/Neovim" class="twitter-follow-button">Follow &#64;Neovim</a>
141-
</p>
142-
143-
<p>
144-
Discuss the project at <a href="https://app.element.io/#/room/#neovim:matrix.org">#neovim:matrix.org</a> or #neovim on irc.libera.chat.
145-
</p>
146-
147-
<p>
148-
Contribute code, report bugs and request features at <a href="https://github.com/neovim/neovim">GitHub</a>.
149-
</p>
150-
151-
<p>
152-
Ask about usage and configuration at <a href="https://vi.stackexchange.com">vi.stackexchange.com</a>.
153-
</p>
138+
<ul>
139+
<li><a href="https://twitter.com/Neovim" class="twitter-follow-button">Follow &#64;Neovim</a></li>
140+
<li>Discuss the project at
141+
<a href="https://neovim.discourse.group/">discourse</a>,
142+
<a href="https://app.element.io/#/room/#neovim:matrix.org">#neovim:matrix.org</a>
143+
or #neovim on <code>irc.libera.chat</code>.
144+
</li>
145+
<li>Contribute code, report bugs and request features at <a href="https://github.com/neovim/neovim">GitHub</a>.</li>
146+
<li>Ask about usage and configuration at <a href="https://vi.stackexchange.com">vi.stackexchange.com</a>.</li>
147+
</ul>
154148
</div>
155149

156150
</div>
157151
</section>
158152

159153
<section class="front-section">
160-
<div class="container">
161-
<h2 id="sponsor">Support Neovim</h2>
162-
163-
<p>Support the team making Neovim possible!</p>
164-
</div>
165-
<div class="container col3">
154+
<div class="container">
155+
<h2 id="sponsor">Support Neovim</h2>
156+
</div>
157+
<div class="container col3">
166158
<div>
167159
<h3>Sponsor</h3>
168-
<ul>
169-
<li><a href="https://github.com/sponsors/neovim">Github Sponsors (100% to developers)</a></li>
170-
<li><a href="https://opencollective.com/neovim">Open Collective</a></li>
171-
<li><a href="https://salt.bountysource.com/teams/neovim">Bountysource</a></li>
172-
</ul>
160+
<ul>
161+
<li><a href="https://github.com/sponsors/neovim">Github Sponsors (100% to developers)</a></li>
162+
<li><a href="https://opencollective.com/neovim">Open Collective</a></li>
163+
</ul>
173164
</div>
174165

175166
<div>
@@ -188,11 +179,11 @@ <h3>Bitcoin</h3>
188179
</div>
189180

190181
<div>
191-
<h3>Tell Others</h3>
182+
<h3>Marketing</h3>
192183
<p><a href="/logos/neovim-logos.zip">Neovim-logos.zip</a> <span class="light">(1.1 MB)</span></p>
193184
<p class="light small">
194-
The Neovim logo by <a href="http://twitter.com/jasonlong">Jason Long</a> is licensed under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported License</a>.
195-
</p>
185+
Neovim logo by <a href="http://twitter.com/jasonlong">Jason Long</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.
186+
</p>
196187
</div>
197188

198189
</div>

‎polls.html

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎roadmap.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h2>Completed</h2>
5252

5353
<h3><a href="https://github.com/neovim/neovim/milestone/19">0.5</a></h3>
5454
<ul>
55-
<li><a href="https://neovim.io/doc/lua-resources/">Expanded Lua API and user config</a> (<code>init.lua</code></li>)
55+
<li><a href="https://neovim.io/doc/lua-resources/">Expanded Lua API and user config</a> (<code>init.lua</code>)</li>
5656
<li><a href="https://neovim.io/doc/lsp">Built-in Language Server Protocol (LSP) support</a></li>
5757
<li><a href="https://neovim.io/doc/treesitter">Tree-sitter integration</a> (experimental)</li>
5858
<li>Decorations API improvements: extmarks, virtual text, highlights</li>
@@ -70,7 +70,7 @@ <h3><a href="https://github.com/neovim/neovim/milestone/21?closed=1">0.4</a></h3
7070
<h3><a href="https://github.com/neovim/neovim/milestone/18?closed=1">0.3.x</a></h3>
7171
<ul>
7272
<li>API: <a href="https://neovim.io/doc/user/api.html#api-buffer-updates">buffer update events</a></li>
73-
<li>VimL expression parser: <code>nvim_parse_expression()</code></li>
73+
<li>Vimscript expression parser: <code>nvim_parse_expression()</code></li>
7474
<li>Windows: <a href="https://github.com/neovim/neovim/wiki/Building-Neovim#windows--msvc">MSVC support</a></li>
7575
<li><a href="https://github.com/neovim/neovim/milestone/15?closed=1">0.2.1</a> Built-in Lua:<code>vim.api</code>, <code>:lua</code>,
7676
<code>nvim_execute_lua()</code>, …</li>

‎sponsors.html

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,23 @@ <h2>FAQ</h2>
1818
<dt>How can I sponsor Neovim?</dt>
1919
<dd>
2020
<p>
21-
Neovim operates a <a href="https://salt.bountysource.com/teams/neovim">Bountysource campaign</a>
21+
Neovim operates a <a href="https://github.com/sponsors/neovim">campaign</a>
2222
to fund ongoing development. This makes it possible for core
2323
developers to work full-time for a month or longer, accelerating
24-
projects like Lua integration, the VimL engine, extended marks,
25-
embedded terminal, job control, and the RPC API.
24+
projects like Lua stdlib, treesitter parser engine, LSP framework,
25+
extended marks, embedded terminal, job control, RPC API, and remote UIs.
2626
</p>
2727
</dd>
28-
<dt>Who are the current sponsors?</dt>
28+
<dt>Who are the sponsors?</dt>
2929
<dd>
3030
<p>
3131
Current sponsors are featured in the left column of this page. These
3232
are companies or individuals contributing a monthly amount to help
33-
<a href="https://salt.bountysource.com/teams/neovim">support Neovim</a>.
34-
</p>
35-
</dd>
36-
37-
<dt>How can I list a URL with my sponsor entry?</dt>
38-
<dd>
39-
<p>
40-
If you're pledging $5/month or more and want to have your URL listed,
41-
<a href="https://github.com/neovim/neovim.github.io/pulls">send a pull request</a>
42-
with a new entry for your Bountysource slug in the
43-
<a href="https://github.com/neovim/neovim.github.io/blob/master/js/sponsors-override.js">js/sponsors-override.js</a>
44-
file. If you don't have a GitHub account, you can write to the
45-
<a href="https://groups.google.com/forum/#!forum/neovim">Neovim mailing list</a>.
46-
</p>
47-
<p>
48-
You can obtain your Bountysource slug with the following command:
49-
</p>
50-
<pre><code>curl --header 'Accept: application/vnd.bountysource+json; version=2' 'https://api.bountysource.com/supporters?team_slug=neovim&amp;per_page=10000&amp;page=1' 2&gt; /dev/null | python -m json.tool | grep -C5 $NAME | grep slug</code></pre>
51-
52-
<p>
53-
Replace <code>$NAME</code> by your Bountysource display name as shown in the sponsor list.
33+
<a href="https://github.com/sponsors/neovim">support Neovim</a>.
5434
</p>
5535
</dd>
5636

37+
<h2>Thanks</h2>
5738
<dt>Thanks to the original fundraiser sponsors!</dt>
5839
<dd>
5940
<p>

0 commit comments

Comments
 (0)