cleanup

Author: justinmk

charter.html

@@ -23,7 +23,7 @@ <h3>Goals</h3>
 <ul>
   <li>Enable <b>new contributors</b>, remove barriers to entry.</li>
   <li>Unblock plugin authors.</li>
-  <li>Develop first-class <b>Lua/LuaJIT</b> scripting alternative to VimL.</li>
+  <li>Deliver a first-class <b>Lua/LuaJIT</b> scripting alternative to Vimscript.</li>
   <li>Target all platforms supported by libuv.</li>
   <li>Leverage ongoing Vim development.</li>
   <li>Optimize <b>out of the box</b>, for new users but especially regular users.</li>
@@ -38,7 +38,7 @@ <h3>Non-goals</h3>
     <li>Vim9script (or anything later than Vimscript v1)</li>
     <li>Turn Vim into an IDE</li>
     <li>Limit third-party applications (such as IDEs!) built with Neovim</li>
-    <li>Deprecate VimL</li>
+    <li>Deprecate Vimscript</li>
     <li>POSIX vi-compatibility</li>
 </ul>
 

index.html

@@ -21,9 +21,9 @@ <h3>Extensible</h3>
       <ul>
         <li>
           API is first-class:
-          <a href="https://neovim.io/doc/user/api.html#api-mapping">discoverable</a>,
-          <a href="https://neovim.io/doc/user/api.html#api-contract">versioned</a>,
-          <a href="https://neovim.io/doc/user/api.html#api-global">documented</a>.
+          <a href="/doc/user/api.html#api-mapping">discoverable</a>,
+          <a href="/doc/user/api.html#api-contract">versioned</a>,
+          <a href="/doc/user/api.html#api-global">documented</a>.
         </li>
         <li>
           <a href="http://msgpack.org/">MessagePack</a> structured communication
@@ -39,7 +39,7 @@ <h3>Extensible</h3>
 
       <h3>Usable</h3>
       <ul>
-        <li>Strong defaults</li>
+        <li>Strong <a href="/doc/user/vim_diff.html#nvim-defaults">defaults</a></li>
         <li>Works the same everywhere: one build-type, one command</li>
         <li>Modern terminal features such as cursor styling, focus events, bracketed paste</li>
         <li>Built-in <a href="https://www.youtube.com/watch?v=xZbMVj9XSUo">terminal emulator</a></li>
@@ -48,7 +48,7 @@ <h3>Usable</h3>
       <h3>Drop-in Vim</h3>
       <ul>
         <li>
-          Fully compatible with Vim's editing model and the Vimscript language.
+          Fully compatible with Vim's editing model and Vimscript v1.
         </li>
         <li>
           Start with
@@ -121,13 +121,12 @@ <h2 id="faqs">FAQ</h2>
 
         <dt>Will Neovim deprecate Vimscript?</dt>
         <dd>
-          No. Lua is built-in, but Vimscript will always be supported
-          with the <b>most advanced Vimscript engine in the world</b>
-          (featuring an AST-producing <a href="https://neovim.io/doc/user/api.html#nvim_parse_expression()">parser</a>).
+          No. Lua is built-in, but Vimscript is supported with the <b>most advanced Vimscript engine in the world</b>
+          (featuring an AST-producing <a href="/doc/user/api.html#nvim_parse_expression()">parser</a>).
         </dd>
 
         <dt>Which plugins does Neovim support?</dt>
-        <dd>Most Vim plugins, and more.
+        <dd>Most Vim 8.x plugins, and more.
             See <a href="https://github.com/neovim/neovim/wiki/Related-projects">related projects</a>
             for plugins and applications that leverage the Neovim API.</dd>
 
@@ -136,40 +135,32 @@ <h2 id="faqs">FAQ</h2>
 
     <div>
       <h2 id="chat">Chat</h2>
-      <p>
-        <a href="https://twitter.com/Neovim" class="twitter-follow-button">Follow &#64;Neovim</a>
-      </p>
-
-      <p>
-        Discuss the project at <a href="https://app.element.io/#/room/#neovim:matrix.org">#neovim:matrix.org</a> or #neovim on irc.libera.chat.
-      </p>
-
-      <p>
-        Contribute code, report bugs and request features at <a href="https://github.com/neovim/neovim">GitHub</a>.
-      </p>
-
-      <p>
-        Ask about usage and configuration at <a href="https://vi.stackexchange.com">vi.stackexchange.com</a>.
-      </p>
+      <ul>
+        <li><a href="https://twitter.com/Neovim" class="twitter-follow-button">Follow &#64;Neovim</a></li>
+        <li>Discuss the project at
+          <a href="https://neovim.discourse.group/">discourse</a>,
+          <a href="https://app.element.io/#/room/#neovim:matrix.org">#neovim:matrix.org</a>
+          or #neovim on <code>irc.libera.chat</code>.
+        </li>
+        <li>Contribute code, report bugs and request features at <a href="https://github.com/neovim/neovim">GitHub</a>.</li>
+        <li>Ask about usage and configuration at <a href="https://vi.stackexchange.com">vi.stackexchange.com</a>.</li>
+      </ul>
     </div>
 
   </div>
 </section>
 
 <section class="front-section">
-	<div class="container">
-		<h2 id="sponsor">Support Neovim</h2>
-
-		<p>Support the team making Neovim possible!</p>
-	</div>
-	<div class="container col3">
+  <div class="container">
+    <h2 id="sponsor">Support Neovim</h2>
+  </div>
+  <div class="container col3">
     <div>
       <h3>Sponsor</h3>
-			<ul>
-				<li><a href="https://github.com/sponsors/neovim">Github Sponsors (100% to developers)</a></li>
-				<li><a href="https://opencollective.com/neovim">Open Collective</a></li>
-				<li><a href="https://salt.bountysource.com/teams/neovim">Bountysource</a></li>
-			</ul>
+      <ul>
+        <li><a href="https://github.com/sponsors/neovim">Github Sponsors (100% to developers)</a></li>
+        <li><a href="https://opencollective.com/neovim">Open Collective</a></li>
+      </ul>
     </div>
 
     <div>
@@ -188,11 +179,11 @@ <h3>Bitcoin</h3>
     </div>
 
     <div>
-      <h3>Tell Others</h3>
+      <h3>Marketing</h3>
       <p><a href="/logos/neovim-logos.zip">Neovim-logos.zip</a> <span class="light">(1.1 MB)</span></p>
       <p class="light small">
-				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>.
-			</p>
+      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>.
+      </p>
     </div>
 
   </div>

polls.html

@@ -52,7 +52,7 @@ <h2>Completed</h2>
 
 <h3><a href="https://github.com/neovim/neovim/milestone/19">0.5</a></h3>
 <ul>
-  <li><a href="https://neovim.io/doc/lua-resources/">Expanded Lua API and user config</a> (<code>init.lua</code></li>)
+  <li><a href="https://neovim.io/doc/lua-resources/">Expanded Lua API and user config</a> (<code>init.lua</code>)</li>
   <li><a href="https://neovim.io/doc/lsp">Built-in Language Server Protocol (LSP) support</a></li>
   <li><a href="https://neovim.io/doc/treesitter">Tree-sitter integration</a> (experimental)</li>
   <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
 <h3><a href="https://github.com/neovim/neovim/milestone/18?closed=1">0.3.x</a></h3>
 <ul>
   <li>API: <a href="https://neovim.io/doc/user/api.html#api-buffer-updates">buffer update events</a></li>
-  <li>VimL expression parser: <code>nvim_parse_expression()</code></li>
+  <li>Vimscript expression parser: <code>nvim_parse_expression()</code></li>
   <li>Windows: <a href="https://github.com/neovim/neovim/wiki/Building-Neovim#windows--msvc">MSVC support</a></li>
   <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>,
      <code>nvim_execute_lua()</code>, …</li>

roadmap.html

@@ -18,42 +18,23 @@ <h2>FAQ</h2>
       <dt>How can I sponsor Neovim?</dt>
       <dd>
         <p>
-          Neovim operates a <a href="https://salt.bountysource.com/teams/neovim">Bountysource campaign</a>
+          Neovim operates a <a href="https://github.com/sponsors/neovim">campaign</a>
           to fund ongoing development. This makes it possible for core
           developers to work full-time for a month or longer, accelerating
-          projects like Lua integration, the VimL engine, extended marks,
-          embedded terminal, job control, and the RPC API.
+          projects like Lua stdlib, treesitter parser engine, LSP framework,
+          extended marks, embedded terminal, job control, RPC API, and remote UIs.
         </p>
       </dd>
-      <dt>Who are the current sponsors?</dt>
+      <dt>Who are the sponsors?</dt>
       <dd>
         <p>
           Current sponsors are featured in the left column of this page. These
           are companies or individuals contributing a monthly amount to help
-          <a href="https://salt.bountysource.com/teams/neovim">support Neovim</a>.
-        </p>
-      </dd>
-
-      <dt>How can I list a URL with my sponsor entry?</dt>
-      <dd>
-        <p>
-          If you're pledging $5/month or more and want to have your URL listed,
-          <a href="https://github.com/neovim/neovim.github.io/pulls">send a pull request</a>
-          with a new entry for your Bountysource slug in the
-          <a href="https://github.com/neovim/neovim.github.io/blob/master/js/sponsors-override.js">js/sponsors-override.js</a>
-          file. If you don't have a GitHub account, you can write to the
-          <a href="https://groups.google.com/forum/#!forum/neovim">Neovim mailing list</a>.
-        </p>
-        <p>
-          You can obtain your Bountysource slug with the following command:
-        </p>
-        <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>
-
-        <p>
-          Replace <code>$NAME</code> by your Bountysource display name as shown in the sponsor list.
+          <a href="https://github.com/sponsors/neovim">support Neovim</a>.
         </p>
       </dd>
 
+      <h2>Thanks</h2>
       <dt>Thanks to the original fundraiser sponsors!</dt>
       <dd>
         <p>