Merge b98bc6f95a into a7068ea636

CONTRIBUTING.markdown

@@ -90,26 +90,26 @@ addition or not.
 
 ## Building the site locally
 
-Install Ruby, on macOS you can do it by installing [Homebrew](https://brew.sh/) then
+Install Ruby. On macOS this can be done with [Homebrew](https://brew.sh/).
 
 ```sh
 brew install ruby
+# Install Ruby package manager
+gem install bundler
 ```
 
-then
+Then clone two repos, install dependencies and run.
 
 ```sh
-# Install Ruby bundler
-gem install bundler
-
-# Clone the repo for the website
+# Clone website
 git clone https://github.com/adambard/learnxinyminutes-site
-# and clone the repo with all the content (this repo) into it
+# Clone docs (this repo) nested in website
 git clone https://github.com/<YOUR-USERNAME>/learnxinyminutes-docs ./learnxinyminutes-site/source/docs/
 
-# Install the dependencies and run the site
+# Install dependencies
 cd learnxinyminutes-site
 bundle install
 
+# Run
 bundle exec middleman serve
 ```

vim.html.markdown

@@ -54,6 +54,7 @@ specific points in the file, and for fast editing.
     ?word             # Highlights all occurrences of word before cursor
     n                 # Moves cursor to next occurrence of word after search
     N                 # Moves cursor to previous occurrence of word
+    :nohl             # Clear highlights of last search
 
     :%s/foo/bar/g     # Change 'foo' to 'bar' on every line in the file
     :s/foo/bar/g      # Change 'foo' to 'bar' on the current line