Merge branch 'master' into ns-switch-to-display-layers

docs/build-instructions/windows.md

@@ -45,6 +45,7 @@ This will create the Atom application in the `out\Atom` folder as well as copy i
 ```bash
 ./script/build --build-dir Z:\Some\Temporary\Directory\
 ```
+  * `--no-install` - Skips the installation task after building.
   * `--verbose` - Verbose mode. A lot more information output.
 
 ## Do I have to use GitHub Desktop?

package.json

@@ -75,14 +75,14 @@
     "about": "1.5.0",
     "archive-view": "0.61.1",
     "autocomplete-atom-api": "0.10.0",
-    "autocomplete-css": "0.11.0",
+    "autocomplete-css": "0.11.1",
     "autocomplete-html": "0.7.2",
     "autocomplete-plus": "2.29.2",
     "autocomplete-snippets": "1.10.0",
     "autoflow": "0.27.0",
     "autosave": "0.23.1",
     "background-tips": "0.26.0",
-    "bookmarks": "0.38.3",
+    "bookmarks": "0.39.0",
     "bracket-matcher": "0.82.0",
     "command-palette": "0.38.0",
     "deprecation-cop": "0.54.1",
@@ -121,7 +121,7 @@
     "language-clojure": "0.20.0",
     "language-coffee-script": "0.46.1",
     "language-csharp": "0.12.1",
-    "language-css": "0.36.0",
+    "language-css": "0.36.1",
     "language-gfm": "0.85.0",
     "language-git": "0.12.1",
     "language-go": "0.42.0",
@@ -130,7 +130,7 @@
     "language-java": "0.17.0",
     "language-javascript": "0.110.0",
     "language-json": "0.18.0",
-    "language-less": "0.29.2",
+    "language-less": "0.29.3",
     "language-make": "0.21.1",
     "language-mustache": "0.13.0",
     "language-objective-c": "0.15.1",

src/text-editor.coffee

@@ -1653,7 +1653,7 @@ class TextEditor extends Model
   #
   # * `markerLayer` A {DisplayMarkerLayer} or {MarkerLayer} to decorate.
   # * `decorationParams` The same parameters that are passed to
-  #   {decorateMarker}, except the `type` cannot be `overlay` or `gutter`.
+  #   {TextEditor::decorateMarker}, except the `type` cannot be `overlay` or `gutter`.
   #
   # Returns a {LayerDecoration}.
   decorateMarkerLayer: (markerLayer, decorationParams) ->