Merge branch 'master' into ns-improve-workspace-api-docs

docs/creating-a-package.md

@@ -338,7 +338,7 @@ code depending on whether the tests passed or failed.
 
 ## Publishing
 
-Atom bundles a command line utility called [apm] which can be used to publish
+Atom bundles a command line utility called apm which can be used to publish
 Atom packages to the public registry.
 
 Once your package is written and ready for distribution you can run the
@@ -361,7 +361,6 @@ all the other available commands.
 [cs-syntax]: https://github.com/atom/language-coffee-script
 [npm]: http://en.wikipedia.org/wiki/Npm_(software)
 [npm-keys]: https://npmjs.org/doc/json.html
-[apm]: https://github.com/atom/apm
 [git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
 [wrap-guide]: https://github.com/atom/wrap-guide/
 [keymaps]: advanced/keymaps.md

docs/customizing-atom.md

@@ -1,7 +1,7 @@
 # Customizing Atom
 
 To change a setting, configure a theme, or install a package just open the
-Settings view in the current window by pressing `cmd+,`.
+Settings view in the current window by pressing `cmd-,`.
 
 ## Changing The Theme
 
@@ -86,7 +86,7 @@ currently in use.
 ## Advanced Configuration
 
 Atom loads configuration settings from the `config.cson` file in your _~/.atom_
-directory, which contains CoffeeScript-style JSON:
+directory, which contains [CoffeeScript-style JSON][CSON] (CSON):
 
 ```coffee
 'core':
@@ -141,13 +141,21 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
 ### init.coffee
 
 When Atom finishes loading, it will evaluate _init.coffee_ in your _~/.atom_
-directory, giving you a chance to run arbitrary personal CoffeeScript code to
+directory, giving you a chance to run arbitrary personal [CoffeeScript][] code to
 make customizations. You have full access to Atom's API from code in this file.
 If customizations become extensive, consider [creating a package][creating-a-package].
 
 You can open this file in an editor from the _Atom > Open Your Init Script_
 menu.
 
+For example, if you have the Audio Beep configuration setting enabled, you
+could add the following code to your _~/.atom/init.coffee_ file to have Atom
+greet you with an audio beep every time it loads:
+
+```coffee
+atom.beep()
+```
+
 This file can also be named _init.js_ and contain JavaScript code.
 
 ### styles.less
@@ -174,3 +182,5 @@ This file can also be named _styles.css_ and contain CSS.
 [creating-a-package]: creating-a-package.md
 [create-theme]: creating-a-theme.md
 [LESS]: http://www.lesscss.org
+[CSON]: https://github.com/bevry/cson
+[CoffeeScript]: http://coffeescript.org/

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
     "solarized-dark-syntax": "0.11.0",
     "solarized-light-syntax": "0.7.0",
     "archive-view": "0.26.0",
-    "autocomplete": "0.24.0",
+    "autocomplete": "0.26.0",
     "autoflow": "0.15.0",
     "autosave": "0.12.0",
     "background-tips": "0.9.0",
@@ -69,29 +69,29 @@
     "command-palette": "0.19.0",
     "dev-live-reload": "0.28.0",
     "exception-reporting": "0.17.0",
-    "feedback": "0.27.0",
+    "feedback": "0.28.0",
     "find-and-replace": "0.88.0",
-    "fuzzy-finder": "0.38.0",
+    "fuzzy-finder": "0.39.0",
     "git-diff": "0.25.0",
     "go-to-line": "0.18.0",
     "grammar-selector": "0.22.0",
     "image-view": "0.27.0",
     "keybinding-resolver": "0.11.0",
     "link": "0.20.0",
-    "markdown-preview": "0.43.0",
+    "markdown-preview": "0.44.0",
     "metrics": "0.30.0",
     "open-on-github": "0.23.0",
     "package-generator": "0.29.0",
     "release-notes": "0.26.0",
-    "settings-view": "0.87.0",
-    "snippets": "0.32.0",
+    "settings-view": "0.88.0",
+    "snippets": "0.33.0",
     "spell-check": "0.26.0",
     "status-bar": "0.35.0",
     "styleguide": "0.26.0",
     "symbols-view": "0.41.0",
     "tabs": "0.27.0",
     "timecop": "0.16.0",
-    "tree-view": "0.72.0",
+    "tree-view": "0.74.0",
     "update-package-dependencies": "0.4.0",
     "welcome": "0.11.0",
     "whitespace": "0.16.0",
@@ -105,7 +105,7 @@
     "language-html": "0.10.0",
     "language-hyperlink": "0.8.0",
     "language-java": "0.8.0",
-    "language-javascript": "0.14.0",
+    "language-javascript": "0.15.0",
     "language-json": "0.8.0",
     "language-less": "0.6.0",
     "language-make": "0.9.0",
@@ -115,7 +115,7 @@
     "language-property-list": "0.7.0",
     "language-python": "0.11.0",
     "language-ruby": "0.14.0",
-    "language-ruby-on-rails": "0.9.0",
+    "language-ruby-on-rails": "0.10.0",
     "language-sass": "0.8.0",
     "language-shellscript": "0.7.0",
     "language-source": "0.7.0",

src/editor.coffee

@@ -1733,3 +1733,7 @@ class Editor extends Model
 
   getSelectionMarkerAttributes: ->
     type: 'selection', editorId: @id, invalidate: 'never'
+
+  # Deprecated: Call {::joinLines} instead.
+  joinLine: ->
+    @joinLines()