Fix config event subscription methods

Signed-off-by: Nathan Sobo <nathan@github.com>
Fix Config::isDefault
2014-12-19 17:28:33 -08:00 · 2014-12-19 16:47:24 -08:00 · 2014-12-19 16:47:24 -08:00 · 2014-12-19 16:47:18 -08:00 · 2014-12-19 14:20:27 -08:00
@@ -36,7 +36,7 @@ many packages and themes that are stored in other repos under the
 [tabs](https://github.com/atom/tabs),
 [find-and-replace](https://github.com/atom/find-and-replace),
 [language-javascript](https://github.com/atom/language-javascript), and
-[atom-light-ui](https://github.com/atom/atom-light-ui).
+[atom-light-ui](http://github.com/atom/atom-light-ui).

 For more information on how to work with Atom's official packages, see
 [Contributing to Atom Packages](https://atom.io/docs/latest/contributing-to-packages.html)
@@ -74,7 +74,7 @@ For more information on how to work with Atom's official packages, see
 * Limit the first line to 72 characters or less
 * Reference issues and pull requests liberally
 * Consider starting the commit message with an applicable emoji:
-    * :art: `:art:` when improving the format/structure of the code
+    * :lipstick: `:lipstick:` when improving the format/structure of the code
    * :racehorse: `:racehorse:` when improving performance
    * :non-potable_water: `:non-potable_water:` when plugging memory leaks
    * :memo: `:memo:` when writing docs
@@ -87,8 +87,6 @@ For more information on how to work with Atom's official packages, see
    * :white_check_mark: `:white_check_mark:` when adding tests
    * :lock: `:lock:` when dealing with security
    * :arrow_up: `:arrow_up:` when upgrading dependencies
-    * :arrow_down: `:arrow_down:` when downgrading dependencies
-    * :shirt: `:shirt:` when removing linter warnings

 ## CoffeeScript Styleguide

@@ -100,10 +98,6 @@ For more information on how to work with Atom's official packages, see
 * Avoid spaces inside the curly-braces of hash literals:
    * `{a: 1, b: 2}` instead of `{ a: 1, b: 2 }`
 * Include a single line of whitespace between methods.
-* Capitalize initialisms and acronyms in names, except for the first word, which
-  should be lower-case:
-  * `getURI` instead of `getUri`
-  * `uriToOpen` instead of `URIToOpen`

 ## Documentation Styleguide

@@ -1,6 +1,6 @@
 ![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)

-Atom is a hackable text editor for the 21st century, built on [atom-shell](https://github.com/atom/atom-shell), and based on everything we love about our favorite editors. We designed it to be deeply customizable, but still approachable using the default configuration.
+Atom is a hackable text editor for the 21st century, built on [atom-shell](http://github.com/atom/atom-shell), and based on everything we love about our favorite editors. We designed it to be deeply customizable, but still approachable using the default configuration.

 Visit [atom.io](https://atom.io) to learn more or visit the [Atom forum](https://discuss.atom.io).

@@ -9,7 +9,7 @@ about the Atom 1.0 roadmap.

 ## Installing

-### OS X
+### Mac OS X

 Download the latest [Atom release](https://github.com/atom/atom/releases/latest).

@@ -24,8 +24,18 @@ Atom will automatically update when a new release is available.
 You can also download an `atom-windows.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
 The `.zip` version will not automatically update.

-Using [chocolatey](https://chocolatey.org/)? Run `cinst Atom` to install
-the latest version of Atom.
+#### Uninstalling Chocolatey Version
+
+The recommended installation of Atom on Windows used to be using [Chocolatey](https://chocolatey.org/packages/Atom/).
+This is no longer recommended now that the Atom Windows installer & auto-updater
+exists.
+
+To switch from Chocolatey to the new installer:
+  * Upgrade to Atom 0.155 or above by running `cup Atom`
+  * Run `cuninst Atom` to uninstall the Chocolatey version of Atom
+    * This will not delete any of your installed packages or Atom config files.
+  * Download the latest [AtomSetup.exe installer](https://github.com/atom/atom/releases/latest).
+  * Double-click the downloaded file to install Atom

 ### Debian Linux (Ubuntu)

@@ -6,6 +6,6 @@
    "url": "https://github.com/atom/atom.git"
  },
  "dependencies": {
-    "atom-package-manager": "0.135.0"
+    "atom-package-manager": "0.116.0"
  }
 }
@@ -45,24 +45,18 @@ if [ $REDIRECT_STDERR ]; then
 fi

 if [ $OS == 'Mac' ]; then
+  ATOM_PATH="${ATOM_PATH:-/Applications}" # Set ATOM_PATH unless it is already set
  ATOM_APP_NAME=Atom.app

-  if [ -z "${ATOM_PATH}" ]; then
-    # If ATOM_PATH isnt set, check /Applications and then ~/Applications for Atom.app
-    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
-      ATOM_PATH="/Applications"
-    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
-      ATOM_PATH="$HOME/Applications"
-    else
-      # We havent found an Atom.app, use spotlight to search for Atom
-      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
+  # If ATOM_PATH isn't a executable file, use spotlight to search for Atom
+  if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
+    ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
+  fi

-      # Exit if Atom can't be found
-      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
-        echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app."
-        exit 1
-      fi
-    fi
+  # Exit if Atom can't be found
+  if [ -z "$ATOM_PATH" ]; then
+    echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app."
+    exit 1
  fi

  if [ $EXPECT_OUTPUT ]; then
@@ -75,9 +69,9 @@ elif [ $OS == 'Linux' ]; then
  SCRIPT=$(readlink -f "$0")
  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
  ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
-  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
+  DOT_ATOM_DIR="$HOME/.atom"

-  mkdir -p "$ATOM_HOME"
+  mkdir -p "$DOT_ATOM_DIR"

  : ${TMPDIR:=/tmp}

@@ -88,9 +82,9 @@ elif [ $OS == 'Linux' ]; then
    exit $?
  else
    (
-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$DOT_ATOM_DIR/nohup.out" 2>&1
    if [ $? -ne 0 ]; then
-      cat "$ATOM_HOME/nohup.out"
+      cat "$DOT_ATOM_DIR/nohup.out"
      exit $?
    fi
    ) &
@@ -198,7 +198,6 @@ module.exports = (grunt) ->
      outputDir: 'atom-shell'
      downloadDir: atomShellDownloadDir
      rebuild: true  # rebuild native modules after atom-shell is updated
-      token: process.env.ATOM_ACCESS_TOKEN

    'create-windows-installer':
      appDirectory: shellAppDir
@@ -206,8 +205,6 @@ module.exports = (grunt) ->
      authors: 'GitHub Inc.'
      loadingGif: path.resolve(__dirname, '..', 'resources', 'win', 'loading.gif')
      iconUrl: 'https://raw.githubusercontent.com/atom/atom/master/resources/win/atom.ico'
-      setupIcon: path.resolve(__dirname, '..', 'resources', 'win', 'atom.ico')
-      remoteReleases: 'https://atom.io/api/updates'

    shell:
      'kill-atom':
@@ -1,13 +1,13 @@
 # VERSION:        0.1
-# DESCRIPTION:    Create the atom editor in a container
+# DESCRIPTION:    Create the atom editor in a container 
 # AUTHOR:         Jessica Frazelle <jessie@docker.com>
 # COMMENTS:
-#   This file describes how to build the atom editor
+#   This file describes how to build the atom editor 
 #   in a container with all dependencies installed.
 #   Tested on Debian Jessie.
 # USAGE:
 #   # Download atom Dockerfile
-#   wget https://raw.githubusercontent.com/atom/atom/master/Dockerfile
+#   wget http://raw.githubusercontent.com/atom/atom/master/Dockerfile
 #
 #   # Build atom image
 #   docker build -t atom .
@@ -12,19 +12,19 @@
    "fs-plus": "2.x",
    "github-releases": "~0.2.0",
    "grunt": "~0.4.1",
-    "grunt-atom-shell-installer": "^0.21.0",
+    "grunt-atom-shell-installer": "^0.13.0",
    "grunt-cli": "~0.1.9",
    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
-    "grunt-contrib-coffee": "~0.12.0",
+    "grunt-contrib-coffee": "~0.9.0",
    "grunt-contrib-csslint": "~0.1.2",
    "grunt-contrib-less": "~0.8.0",
-    "grunt-cson": "0.14.0",
-    "grunt-download-atom-shell": "~0.11.0",
+    "grunt-cson": "0.10.0",
+    "grunt-download-atom-shell": "~0.10.0",
    "grunt-lesslint": "0.13.0",
    "grunt-peg": "~1.1.0",
    "grunt-shell": "~0.3.1",
    "harmony-collections": "~0.3.8",
-    "legal-eagle": "~0.9.0",
+    "legal-eagle": "~0.6.0",
    "minidump": "~0.8",
    "npm": "~1.4.5",
    "rcedit": "~0.3.0",
@@ -71,7 +71,6 @@ module.exports = (grunt) ->
      path.join('build', 'Release', 'obj')
      path.join('build', 'Release', '.deps')
      path.join('vendor', 'apm')
-      path.join('resources', 'linux')
      path.join('resources', 'mac')
      path.join('resources', 'win')

@@ -144,10 +143,7 @@ module.exports = (grunt) ->
    cp 'spec', path.join(appDir, 'spec')
    cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/
    cp 'static', path.join(appDir, 'static')
-
-    cp path.join('apm', 'node_modules', 'atom-package-manager'), path.join(appDir, 'apm'), filter: filterNodeModule
-    if process.platform isnt 'win32'
-      fs.symlinkSync(path.join('..', '..', 'bin', 'apm'), path.join(appDir, 'apm', 'node_modules', '.bin', 'apm'))
+    cp 'apm', path.join(appDir, 'apm'), filter: filterNodeModule

    if process.platform is 'darwin'
      grunt.file.recurse path.join('resources', 'mac'), (sourcePath, rootDirectory, subDirectory='', filename) ->
@@ -1,3 +1,4 @@
+fs = require 'fs'
 path = require 'path'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
@@ -47,9 +48,9 @@ module.exports = (grunt) ->

        {description} = grunt.file.readJSON('package.json')
        iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
-        executable = path.join(shareDir, 'atom')
+        installDir = path.join(installDir, '.') # To prevent "Exec=/usr/local//share/atom/atom"
        template = _.template(String(fs.readFileSync(desktopFile)))
-        filled = template({description, iconName, executable})
+        filled = template({description, installDir, iconName})

        grunt.file.write(desktopInstallFile, filled)

@@ -35,10 +35,6 @@ module.exports =

      MIT/X11
    """
-  'cheerio@0.15.0':
-    repository: "https://github.com/cheeriojs/cheerio"
-    license: 'MIT'
-    source: 'https://github.com/cheeriojs/cheerio/blob/master/package.json'
  'specificity@0.1.3':
    repository: 'https://github.com/keeganstreet/specificity'
    license: 'MIT'
@@ -79,6 +75,3 @@ module.exports =

      LGPL
    """
-  'core-js@0.4.10':
-    license: 'MIT'
-    source: 'http://rock.mit-license.org linked in source files and bower.json says MIT'
@@ -36,9 +36,8 @@ module.exports = (grunt) ->
    maintainer = 'GitHub <atom@github.com>'
    installDir = '/usr'
    iconName = 'atom'
-    executable = path.join(installDir, 'share', 'atom', 'atom')
    getInstalledSize buildDir, (error, installedSize) ->
-      data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize, executable}
+      data = {name, version, description, section, arch, maintainer, installDir, iconName, installedSize}
      controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
      desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
      icon = path.join('resources', 'atom.png')
@@ -33,9 +33,8 @@ module.exports = (grunt) ->
    installDir = grunt.config.get('atom.installDir')
    shareDir = path.join(installDir, 'share', 'atom')
    iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png')
-    executable = 'atom'

-    data = {name, version, description, installDir, iconName, executable}
+    data = {name, version, description, installDir, iconName}
    specFilePath = fillTemplate(path.join('resources', 'linux', 'redhat', 'atom.spec'), data)
    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)

@@ -10,7 +10,7 @@ module.exports = (grunt) ->
        fullPath = path.join(relativePath, fileName)
      else
        fullPath = fileName
-      longPaths.push(fullPath) if fullPath.length >= 175
+      longPaths.push(fullPath) if fullPath.length >= 200

    longPaths.sort (longPath1, longPath2) -> longPath2.length - longPath1.length

@@ -1,5 +1,4 @@
 path = require 'path'
-fs = require 'fs'

 LessCache = require 'less-cache'

@@ -8,35 +7,14 @@ module.exports = (grunt) ->
    prebuiltConfigurations = [
      ['atom-dark-ui', 'atom-dark-syntax']
      ['atom-dark-ui', 'atom-light-syntax']
-      ['atom-dark-ui', 'one-dark-syntax']
-      ['atom-dark-ui', 'one-light-syntax']
      ['atom-dark-ui', 'solarized-dark-syntax']
      ['atom-dark-ui', 'base16-tomorrow-dark-theme']
      ['atom-dark-ui', 'base16-tomorrow-light-theme']
-
      ['atom-light-ui', 'atom-light-syntax']
      ['atom-light-ui', 'atom-dark-syntax']
-      ['atom-light-ui', 'one-dark-syntax']
-      ['atom-light-ui', 'one-light-syntax']
      ['atom-light-ui', 'solarized-dark-syntax']
      ['atom-light-ui', 'base16-tomorrow-dark-theme']
      ['atom-light-ui', 'base16-tomorrow-light-theme']
-
-      ['one-dark-ui', 'one-dark-syntax']
-      ['one-dark-ui', 'one-light-syntax']
-      ['one-dark-ui', 'atom-dark-syntax']
-      ['one-dark-ui', 'atom-light-syntax']
-      ['one-dark-ui', 'solarized-dark-syntax']
-      ['one-dark-ui', 'base16-tomorrow-dark-theme']
-      ['one-dark-ui', 'base16-tomorrow-light-theme']
-
-      ['one-light-ui', 'one-light-syntax']
-      ['one-light-ui', 'one-dark-syntax']
-      ['one-light-ui', 'atom-light-syntax']
-      ['one-light-ui', 'atom-dark-syntax']
-      ['one-light-ui', 'solarized-dark-syntax']
-      ['one-light-ui', 'base16-tomorrow-dark-theme']
-      ['one-light-ui', 'base16-tomorrow-light-theme']
    ]

    directory = path.join(grunt.config.get('atom.appDir'), 'less-compile-cache')
@@ -47,10 +25,7 @@ module.exports = (grunt) ->
      for theme in configuration
        # TODO Use AtomPackage class once it runs outside of an Atom context
        themePath = path.resolve('node_modules', theme)
-        if fs.existsSync(path.join(themePath, 'stylesheets'))
-          stylesheetsDir = path.join(themePath, 'stylesheets')
-        else
-          stylesheetsDir = path.join(themePath, 'styles')
+        stylesheetsDir = path.join(themePath, 'stylesheets')
        {main} = grunt.file.readJSON(path.join(themePath, 'package.json'))
        main ?= 'index.less'
        mainPath = path.join(themePath, main)
@@ -63,18 +38,10 @@ module.exports = (grunt) ->
        resourcePath: path.resolve('.')
        importPaths: importPaths

-      cssForFile = (file) ->
-        baseVarImports = """
-        @import "variables/ui-variables";
-        @import "variables/syntax-variables";
-        """
-        less = fs.readFileSync(file, 'utf8')
-        lessCache.cssForFile(file, [baseVarImports, less].join('\n'))
-
      for file in @filesSrc
        grunt.verbose.writeln("File #{file.cyan} created in cache.")
-        cssForFile(file)
+        lessCache.readFileSync(file)

      for file in themeMains
        grunt.verbose.writeln("File #{file.cyan} created in cache.")
-        cssForFile(file)
+        lessCache.readFileSync(file)
@@ -68,7 +68,7 @@ getAssets = ->
      ]
    when 'win32'
      assets = [{assetName: 'atom-windows.zip', sourcePath: 'Atom'}]
-      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
+      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg"]
        cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
        assets.push({assetName: squirrelAsset, sourcePath: assetName})
      assets
@@ -101,7 +101,7 @@ getAssets = ->
 logError = (message, error, details) ->
  grunt.log.error(message)
  grunt.log.error(error.message ? error) if error?
-  grunt.log.error(require('util').inspect(details)) if details
+  grunt.log.error(details) if details

 zipAssets = (buildDir, assets, callback) ->
  zip = (directory, sourcePath, assetName, callback) ->
@@ -142,30 +142,7 @@ getAtomDraftRelease = (callback) ->
            firstDraft.assets = assets
            callback(null, firstDraft)
      else
-        createAtomDraftRelease(callback)
-
-createAtomDraftRelease = (callback) ->
-  {version} = require('../../package.json')
-  options =
-    uri: 'https://api.github.com/repos/atom/atom/releases'
-    method: 'POST'
-    headers: defaultHeaders
-    json:
-      tag_name: "v#{version}"
-      name: version
-      draft: true
-      body: """
-        ### Notable Changes
-
-        * Something new
-      """
-
-  request options, (error, response, body='') ->
-    if error? or response.statusCode isnt 201
-      logError("Creating atom/atom draft release failed", error, body)
-      callback(error ? new Error(response.statusCode))
-    else
-      callback(null, body)
+        callback(new Error('No draft release in atom/atom repo'))

 deleteRelease = (release) ->
  options =
@@ -12,18 +12,11 @@ module.exports = (grunt) ->
  packageSpecQueue = null

  logDeprecations = (label, {stderr}={}) ->
-    return unless process.env.JANKY_SHA1
-    stderr ?= ''
-    deprecatedStart = stderr.indexOf('Calls to deprecated functions')
-    return if deprecatedStart is -1
-
-    grunt.log.error(label)
-    stderr = stderr.substring(deprecatedStart)
-    stderr = stderr.replace(/^\s*\[[^\]]+\]\s+/gm, '')
-    stderr = stderr.replace(/source: .*$/gm, '')
-    stderr = stderr.replace(/^"/gm, '')
-    stderr = stderr.replace(/",\s*$/gm, '')
-    grunt.log.error(stderr)
+    if process.env.JANKY_SHA1 and stderr?.indexOf('Calls to deprecated functions') isnt -1
+      grunt.log.error(label)
+      stderr = stderr.replace(/^\[.*\] "/g, '')
+      stderr = stderr.replace(/source: .*$/g, '')
+      grunt.log.error(stderr)

  getAppPath = ->
    contentsDir = grunt.config.get('atom.contentsDir')
@@ -0,0 +1,22 @@
+path = require 'path'
+
+module.exports = (grunt) ->
+  grunt.registerTask 'update-octicons', 'Update octicon font and LESS variables', ->
+    pathToOcticons = path.resolve('..', 'octicons')
+    if grunt.file.isDir(pathToOcticons)
+      # Copy font-file
+      fontSrc = path.join(pathToOcticons, 'octicons', 'octicons.woff')
+      fontDest = path.resolve('static', 'octicons.woff')
+      grunt.file.copy(fontSrc, fontDest)
+
+      # Update Octicon UTF codes
+      glyphsSrc = path.join(pathToOcticons, 'data', 'glyphs.yml')
+      output = []
+      for {css, code} in grunt.file.readYAML(glyphsSrc)
+        output.push "@#{css}: \"\\#{code}\";"
+
+      octiconUtfDest = path.resolve('static', 'variables', 'octicon-utf-codes.less')
+      grunt.file.write(octiconUtfDest, "#{output.join('\n')}\n")
+    else
+      grunt.log.error("octicons repo must be cloned to #{pathToOcticons}")
+      false
@@ -3,7 +3,7 @@
 ## Structure of a Keymap File

 Keymap files are encoded as JSON or CSON files containing nested hashes. They
-work much like style sheets, but instead of applying style properties to elements
+work much like stylesheets, but instead of applying style properties to elements
 matching the selector, they specify the meaning of keystrokes on elements
 matching the selector. Here is an example of some bindings that apply when
 keystrokes pass through `atom-text-editor` elements:
@@ -49,17 +49,19 @@ can be expressed as keystroke patterns separated by spaces.
 Commands are custom DOM events that are triggered when a keystroke matches a
 binding. This allows user interface code to listen for named commands without
 specifying the specific keybinding that triggers it. For example, the following
-code creates a command to insert the current date in an editor:
+code sets up {EditorView} to listen for commands to move the cursor to the first
+character of the current line:

 ```coffee
-atom.commands.add 'atom-text-editor',
-  'user:insert-date': (event) ->
-    editor = @getModel()
-    editor.insertText(new Date().toLocaleString())
+class EditorView
+  listenForEvents: ->
+    @command 'editor:move-to-first-character-of-line', =>
+      @editor.moveToFirstCharacterOfLine()
 ```

-`atom.commands` refers to the global {CommandRegistry} instance where all commands
-are set and consequently picked up by the command palette.
+The `::command` method is basically an enhanced version of jQuery's `::on`
+method that listens for a custom DOM event and adds some metadata to the DOM,
+which is read by the command palette.

 When you are looking to bind new keys, it is often useful to use the command
 palette (`ctrl-shift-p`) to discover what commands are being listened for in a
@@ -67,30 +69,6 @@ given focus context. Commands are "humanized" following a simple algorithm, so a
 command like `editor:fold-current-row` would appear as "Editor: Fold Current
 Row".

-### "Composed" Commands
-
-A common question is, "How do I make a single keybinding execute two or more
-commands?" There isn't any direct support for this in Atom, but it can be
-achieved by creating a custom command that performs the multiple actions
-you desire and then creating a keybinding for that command. For example, let's
-say I want to create a "composed" command that performs a Select Line followed
-by Cut. You could add the following to your `init.coffee`:
-
-```coffee
-atom.commands.add 'atom-text-editor', 'custom:cut-line', ->
-  editor = atom.workspace.getActiveTextEditor()
-  editor.selectLinesContainingCursors()
-  editor.cutSelectedText()
-```
-
-Then let's say we want to map this custom command to `alt-ctrl-z`, you could
-add the following to your keymap:
-
-```coffee
-'atom-text-editor':
-  'alt-ctrl-z': 'custom:cut-line'
-```
-
 ### Specificity and Cascade Order

 As is the case with CSS applying styles, when multiple bindings match for a
@@ -30,8 +30,8 @@ All requests that take parameters require `application/json`.
 Parameters:

 - **page** (optional)
- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to `downloads`
- **direction** (optional) - `asc` or `desc`. Defaults to `desc`. `stars` can only be ordered `desc`
+- **sort** (optional, values: `created_at`, `updated_at`, `downloads`)
+- **direction** (optional, values: `asc`, `desc`)

 Returns a list of all packages in the following format:
 ```json
@@ -61,18 +61,17 @@ Link: <https://www.atom.io/api/packages?page=1>; rel="self",

 By default, results are sorted by download count, descending.

-### Searching packages
-
 #### GET /api/packages/search

 Parameters:

- **q** (required) - Search query
- **page** (optional)
- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to the relevance of the search query.
- **direction** (optional) - `asc` or `desc`. Defaults to `desc`.
+- **q** String query to search
+- **sort** (optional, values: `created_at`, `updated_at`, `downloads`)
+- **direction** (optional, values: `asc`, `desc`)

-Returns results in the same format as [listing packages](#listing-packages).
+Returns a list of all packages in the same format as `/api/packages`.
+
+By default, results sorted by relevance to search query.

 ### Showing package details

@@ -8,7 +8,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
  * C++ toolchain
  * [Git](http://git-scm.com/)
  * [Node.js](http://nodejs.org/download/) v0.10.x
-  * [npm](https://www.npmjs.com/) v1.4.x (bundled with Node.js)
+  * [npm](http://www.npmjs.org/) v1.4.x (bundled with Node.js)
    * `npm -v` to check the version.
    * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2.
      * You might need to run this command as `sudo`, depending on how you have set up [npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).
@@ -26,17 +26,13 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.

 ### Arch

-* `sudo pacman -S gconf base-devel git nodejs libgnome-keyring python2`
+* `sudo pacman -S base-devel git nodejs libgnome-keyring python2`
 * `export PYTHON=/usr/bin/python2` before building Atom.

 ### Slackware

 * `sbopkg -k -i node -i atom`

-### openSUSE
-
-* `sudo zypper install nodejs make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
-
 ## Instructions

 If you have problems with permissions don't forget to prefix with `sudo`
@@ -9,7 +9,7 @@
    * For 64-bit builds of node and native modules you **must** have the
    [Windows 7 64-bit SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279).
    You may also need the [compiler update for the Windows SDK 7.1](http://www.microsoft.com/en-us/download/details.aspx?id=4422)
-  * [Python](https://www.python.org/downloads/) v2.7.
+  * [Python](http://www.python.org/download/) v2.7.
    * The python.exe must be available at `%SystemDrive%\Python27\python.exe`.
      If it is installed elsewhere, you can create a symbolic link to the
      directory containing the python.exe using:
@@ -19,7 +19,7 @@
 ### On Windows 8
  * [Visual Studio Express 2013 for Windows Desktop](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_2)
  * [node.js](http://nodejs.org/download/) v0.10.x
-  * [Python](https://www.python.org/downloads/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp))
+  * [Python](http://www.python.org/download/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp))
  * [GitHub for Windows](http://windows.github.com/)

 ## Instructions
@@ -44,9 +44,9 @@ the editor to see it in action!
  on publishing the package you just created to [atom.io][atomio].

 [atomio]: https://atom.io
-[CSS]: https://en.wikipedia.org/wiki/Cascading_Style_Sheets
-[Less]: http://lesscss.org
-[plist]: https://en.wikipedia.org/wiki/Property_list
-[R]: https://en.wikipedia.org/wiki/R_(programming_language)
+[CSS]: http://en.wikipedia.org/wiki/Cascading_Style_Sheets
+[LESS]: http://lesscss.org
+[plist]: http://en.wikipedia.org/wiki/Property_list
+[R]: http://en.wikipedia.org/wiki/R_(programming_language)
 [TextMate]: http://macromates.com
 [TextMateOrg]: https://github.com/textmate
@@ -6,7 +6,7 @@ theme.
 ### Differences

 TextMate themes use [plist][plist] files while Atom themes use [CSS][CSS] or
-[Less][Less] to style the UI and syntax in the editor.
+[LESS][LESS] to style the UI and syntax in the editor.

 The utility that converts the theme first parses the theme's plist file and
 then creates comparable CSS rules and properties that will style Atom similarly.
@@ -61,8 +61,8 @@ __Syntax Theme__ dropdown menu to enable your new theme.
  on publishing the theme you just created to [atom.io][atomio].

 [atomio]: https://atom.io
-[CSS]: https://en.wikipedia.org/wiki/Cascading_Style_Sheets
-[Less]: http://lesscss.org
-[plist]: https://en.wikipedia.org/wiki/Property_list
+[CSS]: http://en.wikipedia.org/wiki/Cascading_Style_Sheets
+[LESS]: http://lesscss.org
+[plist]: http://en.wikipedia.org/wiki/Property_list
 [TextMate]: http://macromates.com
 [TextMateThemes]: http://wiki.macromates.com/Themes/UserSubmittedThemes
@@ -15,7 +15,7 @@ my-package/
  menus/
  spec/
  snippets/
-  styles/
+  stylesheets/
  index.coffee
  package.json
 ```
@@ -38,10 +38,10 @@ In addition to the regular [npm package.json keys][npm-keys] available, Atom
 package.json files have their own additions.

 - `main` (**Required**): the path to the CoffeeScript file that's the entry point
-to your package.
- `styles` (**Optional**): an Array of Strings identifying the order of the
+to your package
+- `stylesheets` (**Optional**): an Array of Strings identifying the order of the
 style sheets your package needs to load. If not specified, style sheets in the
-_styles_ directory are added alphabetically.
+_stylesheets_ directory are added alphabetically.
 - `keymaps`(**Optional**): an Array of Strings identifying the order of the
 key mappings your package needs to load. If not specified, mappings in the
 _keymaps_ directory are added alphabetically.
@@ -51,24 +51,9 @@ in the _menus_ directory are added alphabetically.
 - `snippets` (**Optional**): an Array of Strings identifying the order of the
 snippets your package needs to load. If not specified, snippets in the
 _snippets_ directory are added alphabetically.
- `activationCommands` (**Optional**): an Array of Strings identifying commands that
+- `activationEvents` (**Optional**): an Array of Strings identifying events that
 trigger your package's activation. You can delay the loading of your package
 until one of these events is triggered.
- `providedServices` (**Optional**): an Object describing the services that your
-package provides, which can be used by other packages. The keys of this object
-are the names of the services, and the values are Objects with the following
-keys:
-  - `description` (**Optional**) a String describing the service
-  - `versions` (**Required**) an Object whose keys are Semver version strings,
-  and whose values are names of methods in your package's top-level module
-  that return a value implementing the service.
- `consumedServices` (**Optional**): an Object describing the services that your
-package uses, which can be provided by other packages. The keys of this object
-are the names of the services, and the values are Objects with the following
-keys:
-  - `versions` (**Required**) an Object whose keys are Semver version ranges
-  and whose values are names of methods in your package's top-level module
-  that are called with values implementing the service.

 ## Source Code

@@ -98,9 +83,9 @@ module's `activate` method so you can restore your view to where the user left
 off.

 - `deactivate()`: This **optional** method is called when the window is shutting
-down, or when your package is being updated or disabled. If your package is
-watching any files, holding external resources, providing commands or subscribing
-to events, release them here.
+down. If your package is watching any files or holding external resources in any
+other way, release them here. If you're just subscribing to things on window,
+you don't need to worry because that's getting torn down anyway.

 ### Simple Package Code

@@ -127,18 +112,19 @@ module.exports =
  serialize: -> # ...
 ```

-Beyond this simple contract, your package has access to [Atom's API][api]. Be aware
-that the Atom 1.0 API is mostly frozen. Refer to the API documentation for what
-is public. That said, please collaborate with us if you need an API that doesn't
-exist. Our goal is to build out Atom's API organically based on the needs of
-package authors like you.
+Beyond this simple contract, your package has access to Atom's API. Be aware
+that since we are early in development, APIs are subject to change and we have
+not yet established clear boundaries between what is public and what is private.
+Also, please collaborate with us if you need an API that doesn't exist. Our goal
+is to build out Atom's API organically based on the needs of package authors
+like you.

 ## Style Sheets

-Style sheets for your package should be placed in the _styles_ directory.
+Style sheets for your package should be placed in the _stylesheets_ directory.
 Any style sheets in this directory will be loaded and attached to the DOM when
-your package is activated. Style sheets can be written as CSS or [Less], but
-Less is recommended.
+your package is activated. Style sheets can be written as CSS or [LESS] (but
+LESS is recommended).

 Ideally, you won't need much in the way of styling. We've provided a standard
 set of components which define both the colors and UI elements for any package
@@ -152,7 +138,7 @@ taken from the active theme's [ui-variables.less][ui-variables]. For more
 information, see the [theme variables docs][theme-variables]. If you follow this
 guideline, your package will look good out of the box with any theme!

-An optional `styleSheets` array in your _package.json_ can list the style sheets
+An optional `stylesheets` array in your _package.json_ can list the style sheets
 by name to specify a loading order; otherwise, style sheets are loaded
 alphabetically.

@@ -366,79 +352,6 @@ to indicate the type your value should be, its default, etc.
 See the [Config API Docs](https://atom.io/docs/api/latest/Config) for more
 details specifying your configuration.

-## Interacting With Other Packages Via Services
-
-Atom packages can interact with each other through versioned APIs called
-*services*. To provide a service, in your `package.json`, specify one or more
-version numbers, each paired with the name of a method on your package's main module:
-
-```json
-{
-  "providedServices": {
-    "my-service": {
-      "description": "Does a useful thing",
-      "versions": {
-        "1.2.3": "provideMyServiceV1",
-        "2.3.4": "provideMyServiceV2",
-      }
-    }
-  }
-}
-```
-
-In your package's main module, implement the methods named above. These methods
-will be called any time a package is activated that consumes their corresponding
-service. They should return a value that implements the service's API.
-
-
-```coffeescript
-module.exports =
-  activate: -> # ...
-
-  provideMyServiceV1: ->
-    adaptToLegacyAPI(myService)
-
-  provideMyServiceV2: ->
-    myService
-```
-
-Similarly, to consume a service, specify one or more [version *ranges*][version-ranges],
-each paired with the name of a method on the package's main module:
-
-```json
-{
-  "consumedServices": {
-    "another-service": {
-      "versions": {
-        "^1.2.3": "consumeAnotherServiceV1",
-        ">=2.3.4 <2.5": "consumeAnotherServiceV2",
-      }
-    }
-  }
-}
-```
-
-These methods will be called any time a package is activated that *provides* their
-corresponding service. They will receive the service object as an argument. You
-will usually need to perform some kind of cleanup in the event that the package
-providing the service is deactivated. To do this, return a `Disposable` from
-your service-consuming method:
-
-```coffeescript
-{Disposable} = require 'atom'
-
-module.exports =
-  activate: -> # ...
-
-  consumeAnotherServiceV1: (service) ->
-    useService(adaptServiceFromLegacyAPI(service))
-    new Disposable -> stopUsingService(service)
-
-  consumeAnotherServiceV2: (service) ->
-    useService(service)
-    new Disposable -> stopUsingService(service)
-```
-
 ## Bundle External Resources

 It's common to ship external resources like images and fonts in the package, to
@@ -489,12 +402,11 @@ registry.
 Run `apm help publish` to see all the available options and `apm help` to see
 all the other available commands.

-[api]: https://atom.io/docs/api/latest
 [file-tree]: https://github.com/atom/tree-view
 [status-bar]: https://github.com/atom/status-bar
 [cs-syntax]: https://github.com/atom/language-coffee-script
-[npm]: https://en.wikipedia.org/wiki/Npm_(software)
-[npm-keys]: https://docs.npmjs.com/files/package.json
+[npm]: http://en.wikipedia.org/wiki/Npm_(software)
+[npm-keys]: https://npmjs.org/doc/json.html
 [git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
 [wrap-guide]: https://github.com/atom/wrap-guide/
 [keymaps]: advanced/keymaps.md
@@ -506,10 +418,9 @@ all the other available commands.
 [underscore]: http://underscorejs.org/
 [jasmine]: http://jasmine.github.io
 [cson]: https://github.com/atom/season
-[Less]: http://lesscss.org
-[ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/styles/ui-variables.less
+[less]: http://lesscss.org
+[ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/stylesheets/ui-variables.less
 [first-package]: your-first-package.html
 [convert-bundle]: converting-a-text-mate-bundle.html
 [convert-theme]: converting-a-text-mate-theme.html
 [json-schema]: http://json-schema.org/
-[version-ranges]: https://docs.npmjs.com/misc/semver#ranges
@@ -1,31 +1,30 @@
 # Creating a Theme

-Atom's interface is rendered using HTML, and it's styled via [Less] which is a
-superset of CSS. Don't worry if you haven't heard of Less before; it's just like
-CSS, but with a few handy extensions.
+Atom's interface is rendered using HTML, and it's styled via [LESS] (a superset
+of CSS). Don't worry if you haven't heard of LESS before; it's just like CSS,
+but with a few handy extensions.

 Atom supports two types of themes: _UI_ and _syntax_.  UI themes style
 elements such as the tree view, the tabs, drop-down lists, and the status bar.
 Syntax themes style the code inside the editor.

 Themes can be installed and changed from the settings view which you can open
-by selecting the _Atom > Preferences..._ menu and navigating to the _Install_
-section and the _Themes_ section on the left hand side.
+by selecting the _Atom > Preferences..._ menu and navigating to the _Themes_
+section on the left hand side.

 ## Getting Started

 Themes are pretty straightforward but it's still helpful to be familiar with
 a few things before starting:

-* Less is a superset of CSS, but it has some really handy features like
+* LESS is a superset of CSS, but it has some really handy features like
  variables. If you aren't familiar with its syntax, take a few minutes
  to [familiarize yourself][less-tutorial].
 * You may also want to review the concept of a _[package.json]_, too. This file
  is used to help distribute your theme to Atom users.
 * Your theme's _package.json_ must contain a `"theme"` key with a value
  of `"ui"` or `"syntax"` for Atom to recognize and load it as a theme.
-* You can find existing themes to install or fork on
-  [atom.io][atomio-themes].
+* You can find existing themes to install or fork on [atom.io](atomio).

 ## Creating a Syntax Theme

@@ -43,10 +42,10 @@ _Motif_ theme listed in the _Syntax Theme_ drop-down. Select it from the menu to
 activate it, now when you open an editor you should see that your new
 _motif-syntax_ theme in action.

-Open up _styles/colors.less_ to change the various colors variables which
+Open up _stylesheets/colors.less_ to change the various colors variables which
 have been already been defined. For example, turn `@red` into `#f4c2c1`.

-Then open _styles/base.less_ and modify the various selectors that have
+Then open _stylesheets/base.less_ and modify the various selectors that have
 been already been defined. These selectors style different parts of code in the
 editor such as comments, strings and the line numbers in the gutter.

@@ -131,13 +130,13 @@ _styleguide_, or use the shortcut `cmd-ctrl-shift-g`.

 ![styleguide-img]

-[atomio-themes]: https://atom.io/themes
-[Less]: http://lesscss.org/
+[atomio]: http://atom.io/packages
+[less]: http://lesscss.org/
 [git]: http://git-scm.com/
 [atom]: https://atom.io/
 [package.json]: ./creating-a-package.html#package-json
 [less-tutorial]: https://speakerdeck.com/danmatthews/less-css
-[devtools-tutorial]: https://developer.chrome.com/devtools/docs/dom-and-styles
+[devtools-tutorial]: https://developers.google.com/chrome-developer-tools/docs/elements
 [ui-variables]: ./theme-variables.html
 [livereload]: https://github.com/atom/dev-live-reload
 [styleguide]: https://github.com/atom/styleguide
@@ -54,7 +54,7 @@ You can also use `apm` to find new packages to install:

 ## Customizing Key Bindings

-Atom keymaps work similarly to style sheets. Just as style sheets use selectors
+Atom keymaps work similarly to stylesheets. Just as stylesheets use selectors
 to apply styles to elements, Atom keymaps use selectors to associate keystrokes
 with events in specific contexts. Here's a small example, excerpted from Atom's
 built-in keymaps:
@@ -100,20 +100,11 @@ namespaces: `core` and `editor`.

 You can open this file in an editor from the _Atom > Open Your Config_ menu.

-### Custom Configuration Location
-
-You can override the location that Atom stores configuration files and folders
-in by setting the `ATOM_HOME` environment variable. The `ATOM_HOME` path will be
-used instead of `~/.atom` when it is set.
-
-This option can be useful when you want to make Atom portable across machines.
-
 ### Configuration Key Reference

 - `core`
  - `disabledPackages`: An array of package names to disable
  - `excludeVcsIgnoredPaths`: Don't search within files specified by _.gitignore_
-  - `followSymlinks`: Follow symlinks when searching and scanning root directory
  - `ignoredNames`: File names to ignore across all of Atom
  - `projectHome`: The directory where projects are assumed to be located
  - `themes`: An array of theme names to load, in cascading order
@@ -177,17 +168,17 @@ For example, to change the color of the cursor, you could add the following
 rule to your _~/.atom/styles.less_ file:

 ```less
-atom-text-editor::shadow .cursor {
+atom-text-editor.is-focused .cursor {
  border-color: pink;
 }
 ```

-Unfamiliar with Less? Read more about it [here][Less].
+Unfamiliar with LESS? Read more about it [here][LESS].

 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
+[LESS]: http://www.lesscss.org
 [CSON]: https://github.com/atom/season
 [CoffeeScript]: http://coffeescript.org/
@@ -3,8 +3,7 @@
 Atom provides several tools to help you understand unexpected behavior and debug problems. This guide describes some of those tools and a few approaches to help you debug and provide more helpful information when [submitting issues]:

 * [Update to the latest version](#update-to-the-latest-version)
-* [Check for linked packages](#check-for-linked-packages)
-* [Check Atom and package settings](#check-atom-and-package-settings)
+* [Check Atom and package settings](#check-atom-and-package-settings) 
 * [Check the keybindings](#check-the-keybindings)
 * [Check if the problem shows up in safe mode](#check-if-the-problem-shows-up-in-safe-mode)
 * [Check your config files](#check-your-config-files)
@@ -25,16 +24,6 @@ $ atom --version

 Head on over to the [list of releases][atom releases] and see if there's a more recent release. You can update to the most recent release by downloading Atom from the releases page, or with the in-app auto-updater. The in-app auto-updater checks for and downloads a new version after you restart Atom, or if you use the Atom > Check for Update menu option.

-## Check for linked packages
-
-If you develop or contribute to Atom packages, there may be left-over packages linked to your `~/.atom/packages` or `~/.atom/dev/packages` directories. You can use:
-
-```shell
-$ apm links
-```
-
-to list all linked development packages. You can remove the links using the `apm unlink` command. See `apm unlink --help` for details.
-
 ## Check Atom and package settings

 In some cases, unexpected behavior might be caused by misconfigured or unconfigured settings in Atom or in one of the packages.
@@ -100,21 +89,6 @@ When an error is thrown in Atom, the developer tools are automatically shown wit

 If you can reproduce the error, use this approach to get the full stack trace. The stack trace might point to a problem in your [Init script][init script or stylesheet] or a specific package you installed, which you can then disable and report an issue on its GitHub repository.

-## Check that you have a build toolchain installed
-
-If you are having issues installing a package using `apm install`, this could be
-because the package has dependencies on libraries that contain native code
-and so you will need to have a C++ compiler and Python installed to be able to
-install it.
-
-You can run `apm install --check` to see if [apm][apm] can build native code on
-your machine.
-
-Check out the pre-requisites in the [build instructions][build-instructions] for
-your platform for more details.
-
-[apm]: https://github.com/atom/apm
-[build-instructions]: https://github.com/atom/atom/tree/master/docs/build-instructions
 [submitting issues]: https://github.com/atom/atom/blob/master/CONTRIBUTING.md#submitting-issues
 [building atom]: https://github.com/atom/atom#building
 [atom releases]: https://github.com/atom/atom/releases
@@ -34,7 +34,7 @@ files. If you are using Git you can use `cmd-shift-b` to search the list of
 files modified and untracked in your project's repository.

 You can also use the tree view to navigate to a file. To open and focus the
-tree view, press `ctrl-0`. The tree view can be toggled open and closed with
+the tree view, press `ctrl-0`. The tree view can be toggled open and closed with
 `cmd-\`.

 #### Adding, Moving, Deleting Files
@@ -11,7 +11,6 @@
 * [Contributing](contributing.md)
 * [Contributing to Core Packages](contributing-to-packages.md)
 * [Debugging](debugging.md)
-* [Your First Package](your-first-package.md)

 ### Advanced Topics

@@ -20,8 +19,6 @@
 * [Keymaps](advanced/keymaps.md)
 * [Serialization](advanced/serialization.md)
 * [Scopes and Scope Descriptors](advanced/scopes-and-scope-descriptors.md)
-* [Theme Variables](theme-variables.md)
-* [apm REST API](apm-rest-api.md)

 ### Upgrading to 1.0 APIs

@@ -47,7 +47,7 @@ If not, there are a few things you should check before publishing:

 Before you publish a package it is a good idea to check ahead of time if
 a package with the same name has already been published to atom.io. You can do
-that by visiting `https://atom.io/packages/my-package` to see if the package
+that by visiting `http://atom.io/packages/my-package` to see if the package
 already exists. If it does, update your package's name to something that is
 available before proceeding.

@@ -73,7 +73,7 @@ and you only need to enter this information the first time you publish. The
 credentials are stored securely in your [keychain][keychain] once you login.

 :tada: Your package is now published and available on atom.io. Head on over to
-`https://atom.io/packages/my-package` to see your package's page.
+`http://atom.io/packages/my-package` to see your package's page.

 With `apm publish`, you can bump the version and publish by using
 ```sh
@@ -107,7 +107,7 @@ Use `patch` when you make a small change like a bug fix that does not add or rem
 [atomio]: https://atom.io
 [github]: https://github.com
 [git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
-[keychain]: https://en.wikipedia.org/wiki/Keychain_(Apple)
+[keychain]: http://en.wikipedia.org/wiki/Keychain_(Apple)
 [repo-guide]: http://guides.github.com/overviews/desktop
 [semver]: http://semver.org
 [your-first-package]: your-first-package.html
@@ -24,7 +24,7 @@ Here's an example `.less` file that a package can define using theme variables:
 ```css
@import "ui-variables";

-.my-selector {
+.my-selector{
  background-color: @base-background-color;
  padding: @component-padding;
 }
@@ -1,625 +0,0 @@
-# Upgrading your package to 1.0 APIs
-
-Atom is rapidly approaching 1.0. Much of the effort leading up to the 1.0 has been cleaning up APIs in an attempt to future proof, and make a more pleasant experience developing packages.
-
-This document will guide you through the large bits of upgrading your package to work with 1.0 APIs.
-
-## TL;DR
-
-We've set deprecation messages and errors in strategic places to help make sure you don't miss anything. You should be able to get 95% of the way to an updated package just by fixing errors and deprecations. There are a couple of things you can do to get the full effect of all the errors and deprecations.
-
-### Use atom-space-pen-views
-
-If you use any class from `require 'atom'` with a `$` or `View` in the name, add the `atom-space-pen-views` module to your package's `package.json` file's dependencies:
-
-```js
-{
-  "dependencies": {
-    "atom-space-pen-views": "^2.0.3"
-  }
-}
-```
-
-Then run `apm install` in your package directory.
-
-### Require views from atom-space-pen-views
-
-Anywhere you are requiring one of the following from `atom` you need to require them from `atom-space-pen-views` instead.
-
-```coffee
-# require these from 'atom-space-pen-views' rather than 'atom'
-$
-$$
-$$$
-View
-TextEditorView
-ScrollView
-SelectListView
-```
-
-So this:
-
-```coffee
-# Old way
-{$, TextEditorView, View, GitRepository} = require 'atom'
-```
-
-Would be replaced by this:
-
-```coffee
-# New way
-{GitRepository} = require 'atom'
-{$, TextEditorView, View} = require 'atom-space-pen-views'
-```
-
-### Run specs and test your package
-
-You wrote specs, right!? Here's where they shine. Run them with `cmd-shift-P`, and search for `run package specs`. It will show all the deprecation messages and errors.
-
-### Update the engines field in package.json
-
-When you are deprecation free and all done converting, upgrade the `engines` field in your package.json:
-
-```json
-{
-  "engines": {
-    "atom": ">=0.174.0 <2.0.0"
-  }
-}
-```
-
-### Examples
-
-We have upgraded all the core packages. Please see [this issue](https://github.com/atom/atom/issues/4011) for a link to all the upgrade PRs.
-
-## Deprecations
-
-All of the methods in Atom core that have changes will emit deprecation messages when called. These messages are shown in two places: your **package specs**, and in **Deprecation Cop**.
-
-### Specs
-
-Just run your specs, and all the deprecations will be displayed in yellow.
-
-![spec-deps](https://cloud.githubusercontent.com/assets/69169/5637943/b85114ba-95b5-11e4-8681-b81ea8f556d7.png)
-
-### Deprecation Cop
-
-Run an atom window in dev mode (`atom -d`) with your package loaded, and open Deprecation Cop (search for `deprecation` in the command palette). Deprecated methods will be appear in Deprecation Cop only after they have been called.
-
-![dep-cop](https://cloud.githubusercontent.com/assets/69169/5637914/6e702fa2-95b5-11e4-92cc-a236ddacee21.png)
-
-When deprecation cop is open, and deprecated methods are called, a `Refresh` button will appear in the top right of the Deprecation Cop interface. So exercise your package, then come back to Deprecation Cop and click the `Refresh` button.
-
-## Upgrading your Views
-
-Previous to 1.0, views were baked into Atom core. These views were based on jQuery and `space-pen`. They looked something like this:
-
-```coffee
-# The old way: getting views from atom
-{$, TextEditorView, View} = require 'atom'
-
-module.exports =
-class SomeView extends View
-  @content: ->
-    @div class: 'find-and-replace', =>
-      @div class: 'block', =>
-        @subview 'myEditor', new TextEditorView(mini: true)
-  #...
-```
-
-### The New
-
-`require 'atom'` no longer provides view helpers or jQuery. Atom core is now 'view agnostic'. The preexisting view system is available from a new npm package: `atom-space-pen-views`.
-
-`atom-space-pen-views` now provides jQuery, `space-pen` views, and Atom specific views:
-
-
-```coffee
-# These are now provided by atom-space-pen-views
-$
-$$
-$$$
-View
-TextEditorView
-ScrollView
-SelectListView
-```
-
-### Adding the module dependencies
-
-To use the new views, you need to specify the `atom-space-pen-views` module in your package's `package.json` file's dependencies:
-
-```js
-{
-  "dependencies": {
-    "atom-space-pen-views": "^2.0.3"
-  }
-}
-```
-
-`space-pen` bundles jQuery. If you do not need `space-pen` or any of the views, you can require jQuery directly.
-
-```js
-{
-  "dependencies": {
-    "jquery": "^2"
-  }
-}
-```
-
-### Converting your views
-
-Sometimes it is as simple as converting the requires at the top of each view page. I assume you read the 'TL;DR' section and have updated all of your requires.
-
-### Upgrading classes extending any space-pen View
-
-#### `afterAttach` and `beforeRemove` updated
-
-The `afterAttach` and `beforeRemove` hooks have been replaced with
-`attached` and `detached` and the semantics have changed.
-
-`afterAttach` was called whenever the node was attached to another DOM node, even if that parent node wasn't present in the DOM. `afterAttach` also was called with a boolean indicating whether or not the element and its parents were on the DOM. Now the `attached` hook is _only_ called when the node and all of its parents are actually on the DOM, and is not called with a boolean.
-
-`beforeRemove` was only called when `$.fn.remove` was called, which was typically used when the node was completely removed from the DOM. The new `detached` hook is called whenever the DOM node is _detached_, which could happen if the node is being detached for reattachment later. In short, if `beforeRemove` is called the node is never coming back. With `detached` it might be attached again later.
-
-```coffee
-# Old way
-{View} = require 'atom'
-class MyView extends View
-  afterAttach: (onDom) ->
-    #...
-
-  beforeRemove: ->
-    #...
-```
-
-```coffee
-# New way
-{View} = require 'atom-space-pen-views'
-class MyView extends View
-  attached: ->
-    # Always called with the equivalent of @afterAttach(true)!
-    #...
-
-  detached: ->
-    #...
-```
-
-#### `subscribe` and `subscribeToCommand` methods removed
-
-The `subscribe` and `subscribeToCommand` methods have been removed. See the Eventing and Disposables section for more info.
-
-### Upgrading to the new TextEditorView
-
-All of the atom-specific methods available on the `TextEditorView` have been moved to the `TextEditor`, available via `TextEditorView::getModel`. See the [`TextEditorView` docs][TextEditorView] and [`TextEditor` docs][TextEditor] for more info.
-
-### Upgrading classes extending ScrollView
-
-The `ScrollView` has very minor changes.
-
-You can no longer use `@off` to remove default behavior for `core:move-up`, `core:move-down`, etc.
-
-```coffee
-# Old way to turn off default behavior
-class ResultsView extends ScrollView
-  initialize: (@model) ->
-    super()
-    # turn off default scrolling behavior from ScrollView
-    @off 'core:move-up'
-    @off 'core:move-down'
-    @off 'core:move-left'
-    @off 'core:move-right'
-```
-
-```coffee
-# New way to turn off default behavior
-class ResultsView extends ScrollView
-  initialize: (@model) ->
-    disposable = super()
-    # turn off default scrolling behavior from ScrollView
-    disposable.dispose()
-```
-
-* Check out [an example](https://github.com/atom/find-and-replace/pull/311/files#diff-9) from find-and-replace.
-* See the [docs][ScrollView] for all the options.
-
-### Upgrading classes extending SelectListView
-
-Your SelectListView might look something like this:
-
-```coffee
-# Old!
-class CommandPaletteView extends SelectListView
-  initialize: ->
-    super()
-    @addClass('command-palette overlay from-top')
-    atom.workspaceView.command 'command-palette:toggle', => @toggle()
-
-  confirmed: ({name, jQuery}) ->
-    @cancel()
-    # do something with the result
-
-  toggle: ->
-    if @hasParent()
-      @cancel()
-    else
-      @attach()
-
-  attach: ->
-    @storeFocusedElement()
-
-    items = [] # TODO: build items
-    @setItems(items)
-
-    atom.workspaceView.append(this)
-    @focusFilterEditor()
-
-  confirmed: ({name, jQuery}) ->
-    @cancel()
-```
-
-This attaches and detaches itself from the dom when toggled, canceling magically detaches it from the DOM, and it uses the classes `overlay` and `from-top`.
-
-The new SelectListView no longer automatically detaches itself from the DOM when cancelled. It's up to you to implement whatever cancel beahavior you want. Using the new APIs to mimic the sematics of the old class, it should look like this:
-
-```coffee
-# New!
-class CommandPaletteView extends SelectListView
-  initialize: ->
-    super()
-    # no more need for the `overlay` and `from-top` classes
-    @addClass('command-palette')
-    atom.commands.add 'atom-workspace', 'command-palette:toggle', => @toggle()
-
-  # You need to implement the `cancelled` method and hide.
-  cancelled: ->
-    @hide()
-
-  confirmed: ({name, jQuery}) ->
-    @cancel()
-    # do something with the result
-
-  toggle: ->
-    # Toggling now checks panel visibility,
-    # and hides / shows rather than attaching to / detaching from the DOM.
-    if @panel?.isVisible()
-      @cancel()
-    else
-      @show()
-
-  show: ->
-    # Now you will add your select list as a modal panel to the workspace
-    @panel ?= atom.workspace.addModalPanel(item: this)
-    @panel.show()
-
-    @storeFocusedElement()
-
-    items = [] # TODO: build items
-    @setItems(items)
-
-    @focusFilterEditor()
-
-  hide: ->
-    @panel?.hide()
-```
-
-* And check out the [conversion of CommandPaletteView][selectlistview-example] as a real-world example.
-* See the [SelectListView docs][SelectListView] for all options.
-
-## Using the model layer rather than the view layer
-
-The API no longer exposes any specialized view objects or view classes. `atom.workspaceView`, and all the view classes: `WorkspaceView`, `EditorView`, `PaneView`, etc. have been globally deprecated.
-
-Nearly all of the atom-specific actions performed by the old view objects can now be managed via the model layer. For example, here's adding a panel to the interface using the `atom.workspace` model instead of the `workspaceView`:
-
-```coffee
-# Old!
-div = document.createElement('div')
-atom.workspaceView.appendToTop(div)
-```
-
-```coffee
-# New!
-div = document.createElement('div')
-atom.workspace.addTopPanel(item: div)
-```
-
-For actions that still require the view, such as dispatching commands or munging css classes, you'll access the view via the `atom.views.getView()` method. This will return a subclass of `HTMLElement` rather than a jQuery object or an instance of a deprecated view class (e.g. `WorkspaceView`).
-
-```coffee
-# Old!
-workspaceView = atom.workspaceView
-editorView = workspaceView.getActiveEditorView()
-paneView = editorView.getPaneView()
-```
-
-```coffee
-# New!
-# Generally, just use the models
-workspace = atom.workspace
-editor = workspace.getActiveTextEditor()
-pane = editor.getPane()
-
-# If you need views, get them with `getView`
-workspaceElement = atom.views.getView(atom.workspace)
-editorElement = atom.views.getView(editor)
-paneElement = atom.views.getView(pane)
-```
-
-## Updating Specs
-
-`atom.workspaceView`, the `WorkspaceView` class and the `EditorView` class have been deprecated. These two objects are used heavily throughout specs, mostly to dispatch events and commands. This section will explain how to remove them while still retaining the ability to dispatch events and commands.
-
-### Removing WorkspaceView references
-
-`WorkspaceView` has been deprecated. Everything you could do on the view, you can now do on the `Workspace` model.
-
-Requiring `WorkspaceView` from `atom` and accessing any methods on it will throw a deprecation warning. Many specs lean heavily on `WorkspaceView` to trigger commands and fetch `EditorView` objects.
-
-Your specs might contain something like this:
-
-```coffee
-# Old!
-{WorkspaceView} = require 'atom'
-describe 'FindView', ->
-  beforeEach ->
-    atom.workspaceView = new WorkspaceView()
-```
-
-Instead, we will use the `atom.views.getView()` method. This will return a plain `HTMLElement`, not a `WorkspaceView` or jQuery object.
-
-```coffee
-# New!
-describe 'FindView', ->
-  workspaceElement = null
-  beforeEach ->
-    workspaceElement = atom.views.getView(atom.workspace)
-```
-
-### Attaching the workspace to the DOM
-
-The workspace needs to be attached to the DOM in some cases. For example, view hooks only work (`attached()` on `View`, `attachedCallback()` on custom elements) when there is a descendant attached to the DOM.
-
-You might see this in your specs:
-
-```coffee
-# Old!
-atom.workspaceView.attachToDom()
-```
-
-Change it to:
-
-```coffee
-# New!
-jasmine.attachToDOM(workspaceElement)
-```
-
-### Removing EditorView references
-
-Like `WorkspaceView`, `EditorView` has been deprecated. Everything you needed to do on the view you are now able to do on the `TextEditor` model.
-
-In many cases, you will not even need to get the editor's view anymore. Any of those instances should be updated to use the `TextEditor` instance instead. You should really only need the editor's view when you plan on triggering a command on the view in a spec.
-
-Your specs might contain something like this:
-
-```coffee
-# Old!
-describe 'Something', ->
-  [editorView] = []
-  beforeEach ->
-    editorView = atom.workspaceView.getActiveView()
-```
-
-We're going to use `atom.views.getView()` again to get the editor element. As in the case of the `workspaceElement`, `getView` will return a subclass of `HTMLElement` rather than an `EditorView` or jQuery object.
-
-```coffee
-# New!
-describe 'Something', ->
-  [editor, editorElement] = []
-  beforeEach ->
-    editor = atom.workspace.getActiveTextEditor()
-    editorElement = atom.views.getView(editor)
-```
-
-### Dispatching commands
-
-Since the `editorElement` objects are no longer `jQuery` objects, they no longer support `trigger()`. Additionally, Atom has a new command dispatcher, `atom.commands`, that we use rather than commandeering jQuery's `trigger` method.
-
-From this:
-
-```coffee
-# Old!
-workspaceView.trigger 'a-package:toggle'
-editorView.trigger 'find-and-replace:show'
-```
-
-To this:
-
-```coffee
-# New!
-atom.commands.dispatch workspaceElement, 'a-package:toggle'
-atom.commands.dispatch editorElement, 'find-and-replace:show'
-```
-
-## Eventing and Disposables
-
-A couple large things changed with respect to events:
-
-1. All model events are now exposed as event subscription methods that return [`Disposable`][disposable] objects
-1. The `subscribe()` method is no longer available on `space-pen` `View` objects
-1. An Emitter is now provided from `require 'atom'`
-
-### Consuming Events
-
-All events from the Atom API are now methods that return a [`Disposable`][disposable] object, on which you can call `dispose()` to unsubscribe.
-
-```coffee
-# Old!
-editor.on 'changed', ->
-```
-
-```coffee
-# New!
-disposable = editor.onDidChange ->
-
-# You can unsubscribe at some point in the future via `dispose()`
-disposable.dispose()
-```
-
-Deprecation warnings will guide you toward the correct methods.
-
-#### Using a CompositeDisposable
-
-You can group multiple disposables into a single disposable with a `CompositeDisposable`.
-
-```coffee
-{CompositeDisposable} = require 'atom'
-
-class Something
-  constructor: ->
-    editor = atom.workspace.getActiveTextEditor()
-    @disposables = new CompositeDisposable
-    @disposables.add editor.onDidChange ->
-    @disposables.add editor.onDidChangePath ->
-
-  destroy: ->
-    @disposables.dispose()
-```
-
-### Removing View::subscribe and Subscriber::subscribe calls
-
-There were a couple permutations of `subscribe()`. In these examples, a `CompositeDisposable` is used as it will commonly be useful where conversion is necessary.
-
-#### subscribe(unsubscribable)
-
-This one is very straight forward.
-
-```coffee
-# Old!
-@subscribe editor.on 'changed', ->
-```
-
-```coffee
-# New!
-disposables = new CompositeDisposable
-disposables.add editor.onDidChange ->
-```
-
-#### subscribe(modelObject, event, method)
-
-When the modelObject is an Atom model object, the change is very simple. Just use the correct event method, and add it to your CompositeDisposable.
-
-```coffee
-# Old!
-@subscribe editor, 'changed', ->
-```
-
-```coffee
-# New!
-disposables = new CompositeDisposable
-disposables.add editor.onDidChange ->
-```
-
-#### subscribe(jQueryObject, selector(optional), event, method)
-
-Things are a little more complicated when subscribing to a DOM or jQuery element. Atom no longer provides helpers for subscribing to elements. You can use jQuery or the native DOM APIs, whichever you prefer.
-
-```coffee
-# Old!
-@subscribe $(window), 'focus', ->
-```
-
-```coffee
-# New!
-{Disposable, CompositeDisposable} = require 'atom'
-disposables = new CompositeDisposable
-
-# New with jQuery
-focusCallback = ->
-$(window).on 'focus', focusCallback
-disposables.add new Disposable ->
-  $(window).off 'focus', focusCallback
-
-# New with native APIs
-focusCallback = ->
-window.addEventListener 'focus', focusCallback
-disposables.add new Disposable ->
-  window.removeEventListener 'focus', focusCallback
-```
-
-### Providing Events: Using the Emitter
-
-You no longer need to require `emissary` to get an emitter. We now provide an `Emitter` class from `require 'atom'`. We have a specific pattern for use of the `Emitter`. Rather than mixing it in, we instantiate a member variable, and create explicit subscription methods. For more information see the [`Emitter` docs][emitter].
-
-```coffee
-# New!
-{Emitter} = require 'atom'
-
-class Something
-  constructor: ->
-    @emitter = new Emitter
-
-  destroy: ->
-    @emitter.dispose()
-
-  onDidChange: (callback) ->
-    @emitter.on 'did-change', callback
-
-  methodThatFiresAChange: ->
-    @emitter.emit 'did-change', {data: 2}
-
-# Using the evented class
-something = new Something
-something.onDidChange (eventObject) ->
-  console.log eventObject.data # => 2
-something.methodThatFiresAChange()
-```
-
-## Subscribing To Commands
-
-`$.fn.command` and `View::subscribeToCommand` are no longer available. Now we use `atom.commands.add`, and collect the results in a `CompositeDisposable`. See [the docs][commands-add] for more info.
-
-```coffee
-# Old!
-atom.workspaceView.command 'core:close core:cancel', ->
-
-# When inside a View class, you might see this
-@subscribeToCommand 'core:close core:cancel', ->
-```
-
-```coffee
-# New!
-@disposables.add atom.commands.add 'atom-workspace',
-  'core:close': ->
-  'core:cancel': ->
-
-# You can register commands directly on individual DOM elements in addition to
-# using selectors. When in a View class, you should have a `@element` object
-# available. `@element` is a plain HTMLElement object
-@disposables.add atom.commands.add @element,
-  'core:close': ->
-  'core:cancel': ->
-```
-
-## Upgrading your stylesheet's selectors
-
-Many selectors have changed, and we have introduced the [Shadow DOM][shadowdom] to the editor. See [Upgrading Your Package Selectors guide][upgrading-selectors] for more information in upgrading your package stylesheets.
-
-## Help us improve this guide!
-
-Did you hit something painful that wasn't in here? Want to reword some bit of it? Find something incorrect? Please edit [this file][guide], and send a pull request. Contributions are greatly appreciated.
-
-
-
-
-[texteditorview]:https://github.com/atom/atom-space-pen-views#texteditorview
-[scrollview]:https://github.com/atom/atom-space-pen-views#scrollview
-[selectlistview]:https://github.com/atom/atom-space-pen-views#selectlistview
-[selectlistview-example]:https://github.com/atom/command-palette/pull/19/files
-[emitter]:https://atom.io/docs/api/latest/Emitter
-[texteditor]:https://atom.io/docs/api/latest/TextEditor
-[disposable]:https://atom.io/docs/api/latest/Disposable
-[commands-add]:https://atom.io/docs/api/latest/CommandRegistry#instance-add
-[upgrading-selectors]:upgrading-your-ui-theme
-[shadowdom]:http://blog.atom.io/2014/11/18/avoiding-style-pollution-with-the-shadow-dom.html
-[guide]:https://github.com/atom/atom/blob/master/docs/upgrading/upgrading-your-package.md
@@ -6,16 +6,19 @@ Syntax themes are specifically intended to style only text editor content, so th

 When theme style sheets are loaded into the text editor's shadow DOM, selectors intended to target the editor from the *outside* no longer make sense. Styles targeting the `.editor` and `.editor-colors` classes instead need to target the `:host` pseudo-element, which matches against the containing `atom-text-editor` node. Check out the [Shadow DOM 201][host-pseudo-element] article for more information about the `:host` pseudo-element.

-Here's an example from Atom's light syntax theme. Note that the `atom-text-editor` selector intended to target the editor from the outside has been retained to allow the theme to keep working during the transition phase when it is possible to disable the shadow DOM.
+Here's an example from Atom's light syntax theme. Note that the previous selectors intended to target the editor from the outside have been retained to allow the theme to keep working during the transition phase when it is possible to disable the shadow DOM.

 ```css
-atom-text-editor, :host { /* :host added */
+.editor-colors, :host { /* :host added */
  background-color: @syntax-background-color;
  color: @syntax-text-color;
+}

+.editor, :host { /* :host added */
  .invisible-character {
    color: @syntax-invisible-character-color;
  }
+
  /* more nested selectors... */
 }
 ```
@@ -1,6 +1,6 @@
 # Upgrading Your UI Theme Or Package Selectors

-In addition to changes in Atom's scripting API, we'll also be making some breaking changes to Atom's DOM structure, requiring style sheets and keymaps in both packages and themes to be updated.
+In addition to changes in Atom's scripting API, we'll also be making some breaking changes to Atom's DOM structure, requiring stylesheets and keymaps in both packages and themes to be updated.

 ## Deprecation Cop

@@ -121,12 +121,12 @@ The selector features discussed above allow you to target shadow DOM content wit

 ```
 my-ui-theme/
-  styles/
+  stylesheets/
    index.less                   # loaded globally
    index.atom-text-editor.less  # loaded in the text editor shadow DOM
 ```

-Check out this [style sheet](https://github.com/atom/decoration-example/blob/master/styles/decoration-example.atom-text-editor.less) from the decoration-example package for an example of context-targeting.
+Check out this [style sheet](https://github.com/atom/decoration-example/blob/master/stylesheets/decoration-example.atom-text-editor.less) from the decoration-example package for an example of context-targeting.

 Inside a context-targeted style sheet, there's no need to use the `::shadow` or `/deep/` expressions. If you want to refer to the element containing the shadow root, you can use the `::host` pseudo-element.

@@ -134,4 +134,4 @@ During the transition phase, style sheets targeting the `atom-text-editor` conte

 [shadow-dom-101]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom
 [shadow-dom-201]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom-201#toc-style-cat-hat
-[find-and-replace]: https://github.com/atom/find-and-replace/blob/95351f261bc384960a69b66bf12eae8002da63f9/styles/find-and-replace.less#L10
+[find-and-replace]: https://github.com/atom/find-and-replace/blob/95351f261bc384960a69b66bf12eae8002da63f9/stylesheets/find-and-replace.less#L10
@@ -1,6 +1,6 @@
 # Writing specs

-Atom uses [Jasmine](http://jasmine.github.io/1.3/introduction.html) as its spec framework. Any new functionality should have specs to guard against regressions.
+Atom uses [Jasmine](http://jasmine.github.io/2.0/introduction.html) as its spec framework. Any new functionality should have specs to guard against regressions.

 ## Create a new spec

@@ -12,7 +12,7 @@ Atom uses [Jasmine](http://jasmine.github.io/1.3/introduction.html) as its spec

 0. Add one or more `describe` methods

-  The `describe` method takes two arguments, a description and a function. If the description explains a behavior it typically begins with `when`; if it is more like a unit test it begins with the method name.
+  The `describe` method takes two arguments, a description and a function. If the description explains a behavior it typically begins with `when` if it is more like a unit test it begins with the method name.

  ```coffee
  describe "when a test is written", ->
@@ -127,10 +127,3 @@ describe "when a test is written", ->
    expect("apples").toEqual("apples")
    expect("oranges").not.toEqual("apples")
 ```
-
-### Running on CI
-
-It is now easy to run the specs in a CI environment like Travis and AppVeyor. See the
-[Travis CI For Your Packages](http://blog.atom.io/2014/04/25/ci-for-your-packages.html)
-and [AppVeyor CI For Your Packages](http://blog.atom.io/2014/07/28/windows-ci-for-your-packages.html)
-posts for more details.
@@ -1,7 +1,7 @@
 # Create Your First Package

 This tutorial will guide you though creating a simple command that replaces the
-selected text with [ascii art](https://en.wikipedia.org/wiki/ASCII_art). When you
+selected text with [ascii art](http://en.wikipedia.org/wiki/ASCII_art). When you
 run our new command with the word "cool" selected, it will be replaced with:

 ```
@@ -72,12 +72,12 @@ command palette or by pressing `ctrl-alt-cmd-l`.

 Now open the command panel and search for the `ascii-art:convert` command. But
 it's not there! To fix this, open _package.json_ and find the property called
-`activationCommands`. Activation Events speed up load time by allowing Atom to
+`activationEvents`. Activation Events speed up load time by allowing Atom to
 delay a package's activation until it's needed. So remove the existing command
-and add `ascii-art:convert` to the `activationCommands` array:
+and add `ascii-art:convert` to the `activationEvents` array:

 ```json
-"activationCommands": ["ascii-art:convert"],
+"activationEvents": ["ascii-art:convert"],
 ```

 First, reload the window by running the command `window:reload`. Now when you
@@ -88,17 +88,17 @@ run the `ascii-art:convert` command it will output 'Hello, World!'
 Now let's add a key binding to trigger the `ascii-art:convert` command. Open
 _keymaps/ascii-art.cson_ and add a key binding linking `ctrl-alt-a` to the
 `ascii-art:convert` command. You can delete the pre-existing key binding since
-you don't need it anymore. When finished, the file will have this:
+you don't need it anymore. When finished, the file will look like this:

 ```coffeescript
 'atom-text-editor':
-  'ctrl-alt-a': 'ascii-art:convert'
+  'cmd-alt-a': 'ascii-art:convert'
 ```

 Notice `atom-text-editor` on the first line. Just like CSS, keymap selectors
 *scope* key bindings so they only apply to specific elements. In this case, our
 binding is only active for elements matching the `atom-text-editor` selector. If
-the Tree View has focus, pressing `ctrl-alt-a` won't trigger the
+the Tree View has focus, pressing `cmd-alt-a` won't trigger the
 `ascii-art:convert` command. But if the editor has focus, the
 `ascii-art:convert` method *will* be triggered. More information on key bindings
 can be found in the [keymaps](advanced/keymaps.html) documentation.
@@ -142,7 +142,7 @@ convert: ->
      selection.insertText("\n#{asciiArt}\n")
 ```

-Select some text in an editor window and hit `ctrl-alt-a`. :tada: You're now an
+Select some text in an editor window and hit `cmd-alt-a`. :tada: You're now an
 ASCII art professional!

 ## Further reading
@@ -1,7 +1,7 @@
 # Your keymap
 #
-# Atom keymaps work similarly to style sheets. Just as style sheets use
-# selectors to apply styles to elements, Atom keymaps use selectors to associate
+# Atom keymaps work similarly to stylesheets. Just as stylesheets use selectors
+# to apply styles to elements, Atom keymaps use selectors to associate
 # keystrokes with events in specific contexts.
 #
 # You can create a new keybinding in this file by typing "key" and then hitting
@@ -12,14 +12,10 @@

 }

-// style the background and foreground colors on the atom-text-editor-element
-// itself
 atom-text-editor {

 }

-// To style other content in the text editor's shadow DOM, use the ::shadow
-// expression
-atom-text-editor::shadow .cursor {
+atom-text-editor .cursor {

 }
@@ -40,11 +40,11 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
  Object.defineProperty module.exports, '$', get: ->
    deprecate """
      Requiring `$` from `atom` is no longer supported.
-      If you are using `space-pen`, please require `$` from `atom-space-pen-views`. Otherwise require `jquery` instead:
-        `{$} = require 'atom-space-pen-views'`
+      If you are using `space-pen`, please require `$` from `space-pen`. Otherwise require `jquery` instead:
+        `{$} = require 'space-pen'`
        or
        `$ = require 'jquery'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Add `"space-pen": "^4"` to your package dependencies.
      Or add `"jquery": "^2"` to your package dependencies.
    """
    $
@@ -52,27 +52,27 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
  Object.defineProperty module.exports, '$$', get: ->
    deprecate """
      Requiring `$$` from `atom` is no longer supported.
-      Please require `atom-space-pen-views` instead:
-        `{$$} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Please require `space-pen` instead:
+        `{$$} = require 'space-pen'`
+      Add `"space-pen": "^4"` to your package dependencies.
    """
    $$

  Object.defineProperty module.exports, '$$$', get: ->
    deprecate """
      Requiring `$$$` from `atom` is no longer supported.
-      Please require `atom-space-pen-views` instead:
-        `{$$$} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Please require `space-pen` instead:
+        `{$$$} = require 'space-pen'`
+      Add `"space-pen": "^4"` to your package dependencies.
    """
    $$$

  Object.defineProperty module.exports, 'View', get: ->
    deprecate """
      Requiring `View` from `atom` is no longer supported.
-      Please require `atom-space-pen-views` instead:
-        `{View} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Please require `space-pen` instead:
+        `{View} = require 'space-pen'`
+      Add `"space-pen": "^4"` to your package dependencies.
    """
    View

@@ -81,7 +81,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
      Requiring `EditorView` from `atom` is no longer supported.
      Please require `TextEditorView` from `atom-space-pen-view` instead:
        `{TextEditorView} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Add `"atom-space-pen-views": "^0"` to your package dependencies.
    """
    require '../src/text-editor-view'

@@ -90,7 +90,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
      Requiring `TextEditorView` from `atom` is no longer supported.
      Please require `TextEditorView` from `atom-space-pen-view` instead:
        `{TextEditorView} = require 'atom-space-pen-views'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Add `"atom-space-pen-views": "^0"` to your package dependencies.
    """
    require '../src/text-editor-view'

@@ -100,7 +100,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
      Please require `ScrollView` from `atom-space-pen-view` instead:
        `{ScrollView} = require 'atom-space-pen-views'`
      Note that the API has changed slightly! Please read the docs at https://github.com/atom/atom-space-pen-views
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Add `"atom-space-pen-views": "^0"` to your package dependencies.
    """
    require '../src/scroll-view'

@@ -110,7 +110,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
      Please require `SelectListView` from `atom-space-pen-view` instead:
        `{SelectListView} = require 'atom-space-pen-views'`
      Note that the API has changed slightly! Please read the docs at https://github.com/atom/atom-space-pen-views
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
+      Add `"atom-space-pen-views": "^0"` to your package dependencies.
    """
    require '../src/select-list-view'

@@ -1,7 +1,7 @@
 {
  "name": "atom",
  "productName": "Atom",
-  "version": "0.178.0",
+  "version": "0.164.0",
  "description": "A hackable text editor for the 21st Century.",
  "main": "./src/browser/main.js",
  "repository": {
@@ -17,143 +17,135 @@
      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
    }
  ],
-  "atomShellVersion": "0.21.0",
+  "atomShellVersion": "0.19.4",
  "dependencies": {
-    "6to5-core": "^3.0.14",
    "async": "0.2.6",
-    "atom-keymap": "^3.1.0",
+    "atom-keymap": "^2.3.0",
    "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
    "clear-cut": "0.4.0",
-    "coffee-script": "1.8.0",
-    "coffeestack": "0.8.0",
-    "color": "^0.7.3",
+    "coffee-script": "1.7.0",
+    "coffeestack": "0.7.0",
    "delegato": "^1",
    "emissary": "^1.3.1",
-    "event-kit": "^1.0.2",
-    "first-mate": "^3.0.0",
-    "fs-plus": "^2.5",
+    "event-kit": "0.8.1",
+    "first-mate": "^2.2.0",
+    "fs-plus": "^2.3.2",
    "fstream": "0.1.24",
    "fuzzaldrin": "^2.1",
-    "git-utils": "^3.0.0",
-    "grim": "1.1.0",
+    "git-utils": "^2.2",
+    "grim": "0.12.0",
    "guid": "0.0.10",
    "jasmine-json": "~0.0",
    "jasmine-tagged": "^1.1.2",
    "jquery": "^2.1.1",
-    "less-cache": "0.21",
+    "less-cache": "0.19.0",
    "marked": "^0.3",
    "mixto": "^1",
    "mkdirp": "0.3.5",
-    "nslog": "^2.0.0",
-    "oniguruma": "^4.0.0",
+    "nslog": "^1.0.1",
+    "oniguruma": "^3.0.4",
    "optimist": "0.4.0",
-    "pathwatcher": "^3.1.0",
+    "pathwatcher": "^2.3.5",
    "property-accessors": "^1",
    "q": "^1.0.1",
    "random-words": "0.0.1",
-    "react-atom-fork": "^0.11.5",
+    "react-atom-fork": "^0.11.1",
    "reactionary-atom-fork": "^1.0.0",
-    "runas": "2.0.0",
-    "scandal": "2.0.0",
-    "scoped-property-store": "^0.16.2",
-    "scrollbar-style": "^2.0.0",
-    "season": "^5.1.2",
+    "runas": "1.0.1",
+    "scandal": "1.0.3",
+    "scoped-property-store": "^0.15.4",
+    "scrollbar-style": "^1.0.2",
+    "season": "^1.0.2",
    "semver": "2.2.1",
    "serializable": "^1",
-    "service-hub": "^0.2.0",
+    "service-hub": "^0.1.0",
    "space-pen": "3.8.2",
-    "stacktrace-parser": "0.1.1",
    "temp": "0.7.0",
-    "text-buffer": "^4.0.0",
+    "text-buffer": "^3.8.2",
    "theorist": "^1.0.2",
    "underscore-plus": "^1.6.6",
    "vm-compatibility-layer": "0.1.0"
  },
  "packageDependencies": {
-    "atom-dark-syntax": "0.26.0",
-    "atom-dark-ui": "0.46.0",
-    "atom-light-syntax": "0.26.0",
-    "atom-light-ui": "0.40.0",
-    "base16-tomorrow-dark-theme": "0.25.0",
-    "base16-tomorrow-light-theme": "0.8.0",
-    "one-dark-ui": "0.3.0",
-    "one-dark-syntax": "0.3.0",
-    "one-light-syntax": "0.3.0",
-    "one-light-ui": "0.2.0",
-    "solarized-dark-syntax": "0.32.0",
-    "solarized-light-syntax": "0.19.0",
-    "archive-view": "0.46.0",
-    "autocomplete": "0.44.0",
-    "autoflow": "0.21.0",
-    "autosave": "0.20.0",
-    "background-tips": "0.22.0",
-    "bookmarks": "0.35.0",
-    "bracket-matcher": "0.71.0",
-    "command-palette": "0.34.0",
-    "deprecation-cop": "0.34.0",
-    "dev-live-reload": "0.41.0",
-    "encoding-selector": "0.17.0",
+    "atom-dark-syntax": "0.23.0",
+    "atom-dark-ui": "0.42.0",
+    "atom-light-syntax": "0.22.0",
+    "atom-light-ui": "0.36.0",
+    "base16-tomorrow-dark-theme": "0.22.0",
+    "base16-tomorrow-light-theme": "0.5.0",
+    "solarized-dark-syntax": "0.29.0",
+    "solarized-light-syntax": "0.13.0",
+    "archive-view": "0.40.0",
+    "autocomplete": "0.34.0",
+    "autoflow": "0.20.0",
+    "autosave": "0.19.0",
+    "background-tips": "0.18.0",
+    "bookmarks": "0.31.0",
+    "bracket-matcher": "0.64.0",
+    "command-palette": "0.30.0",
+    "deprecation-cop": "0.20.0",
+    "dev-live-reload": "0.36.0",
+    "encoding-selector": "0.12.0",
    "exception-reporting": "0.21.0",
-    "find-and-replace": "0.156.0",
-    "fuzzy-finder": "0.65.0",
-    "git-diff": "0.50.0",
-    "go-to-line": "0.30.0",
-    "grammar-selector": "0.44.0",
-    "image-view": "0.48.0",
-    "incompatible-packages": "0.21.0",
-    "keybinding-resolver": "0.27.0",
-    "link": "0.30.0",
-    "markdown-preview": "0.134.0",
-    "metrics": "0.42.0",
-    "notifications": "0.26.0",
-    "open-on-github": "0.32.0",
-    "package-generator": "0.37.0",
-    "release-notes": "0.47.0",
-    "settings-view": "0.174.0",
-    "snippets": "0.72.0",
-    "spell-check": "0.54.0",
-    "status-bar": "0.57.0",
-    "styleguide": "0.43.0",
-    "symbols-view": "0.81.0",
-    "tabs": "0.64.0",
-    "timecop": "0.29.0",
-    "tree-view": "0.154.0",
-    "update-package-dependencies": "0.8.0",
+    "find-and-replace": "0.152.0",
+    "fuzzy-finder": "0.62.0",
+    "git-diff": "0.45.0",
+    "go-to-line": "0.27.0",
+    "grammar-selector": "0.40.0",
+    "image-view": "0.44.0",
+    "incompatible-packages": "0.16.0",
+    "keybinding-resolver": "0.24.0",
+    "link": "0.28.0",
+    "markdown-preview": "0.112.0",
+    "metrics": "0.40.0",
+    "notifications": "0.20.0",
+    "open-on-github": "0.31.0",
+    "package-generator": "0.34.0",
+    "release-notes": "0.43.0",
+    "settings-view": "0.161.0",
+    "snippets": "0.60.0",
+    "spell-check": "0.45.0",
+    "status-bar": "0.54.0",
+    "styleguide": "0.36.0",
+    "symbols-view": "0.70.0",
+    "tabs": "0.58.0",
+    "timecop": "0.24.0",
+    "tree-view": "0.139.0",
+    "update-package-dependencies": "0.7.0",
    "welcome": "0.21.0",
-    "whitespace": "0.28.0",
-    "wrap-guide": "0.31.0",
-    "language-c": "0.38.0",
-    "language-clojure": "0.10.0",
-    "language-coffee-script": "0.39.0",
-    "language-csharp": "0.5.0",
-    "language-css": "0.27.0",
-    "language-gfm": "0.63.0",
-    "language-git": "0.10.0",
-    "language-go": "0.21.0",
-    "language-html": "0.28.0",
+    "whitespace": "0.27.0",
+    "wrap-guide": "0.27.0",
+    "language-c": "0.33.0",
+    "language-clojure": "0.9.0",
+    "language-coffee-script": "0.38.1",
+    "language-css": "0.24.0",
+    "language-gfm": "0.55.0",
+    "language-git": "0.9.0",
+    "language-go": "0.19.1",
+    "language-html": "0.27.0",
    "language-hyperlink": "0.12.2",
-    "language-java": "0.14.0",
-    "language-javascript": "0.56.0",
-    "language-json": "0.12.0",
-    "language-less": "0.24.0",
-    "language-make": "0.13.0",
+    "language-java": "0.13.0",
+    "language-javascript": "0.51.0",
+    "language-json": "0.10.0",
+    "language-less": "0.21.0",
+    "language-make": "0.12.0",
    "language-mustache": "0.11.0",
-    "language-objective-c": "0.15.0",
-    "language-perl": "0.10.0",
-    "language-php": "0.20.0",
-    "language-property-list": "0.8.0",
-    "language-python": "0.30.0",
-    "language-ruby": "0.47.0",
+    "language-objective-c": "0.12.0",
+    "language-perl": "0.9.0",
+    "language-php": "0.18.0",
+    "language-property-list": "0.7.0",
+    "language-python": "0.26.0",
+    "language-ruby": "0.44.0",
    "language-ruby-on-rails": "0.18.0",
-    "language-sass": "0.31.0",
-    "language-shellscript": "0.12.0",
-    "language-source": "0.9.0",
-    "language-sql": "0.14.0",
+    "language-sass": "0.29.0",
+    "language-shellscript": "0.10.1",
+    "language-source": "0.8.0",
+    "language-sql": "0.11.0",
    "language-text": "0.6.0",
-    "language-todo": "0.16.0",
-    "language-toml": "0.15.0",
-    "language-xml": "0.28.0",
-    "language-yaml": "0.22.0"
+    "language-todo": "0.15.0",
+    "language-toml": "0.14.1",
+    "language-xml": "0.25.0",
+    "language-yaml": "0.21.0"
  },
  "private": true,
  "scripts": {
@@ -2,7 +2,7 @@
 Name=Atom
 Comment=<%= description %>
 GenericName=Text Editor
-Exec=<%= executable %> %U
+Exec=<%= installDir %>/share/atom/atom %U
 Icon=<%= iconName %>
 Type=Application
 StartupNotify=true
@@ -1,27 +1,26 @@
 Name:           <%= name %>
 Version:        <%= version %>
 Release:        0.1%{?dist}
-Summary:        <%= description %>
+Summary:        Atom is a hackable text editor for the 21st century
 License:        MIT
 URL:            https://atom.io/
 AutoReqProv:    no # Avoid libchromiumcontent.so missing dependency
-Prefix:         <%= installDir %>

 %description
 <%= description %>

 %install
-mkdir -p %{buildroot}/<%= installDir %>/share/atom/
-cp -r Atom/* %{buildroot}/<%= installDir %>/share/atom/
-mkdir -p %{buildroot}/<%= installDir %>/bin/
-ln -sf ../share/atom/resources/app/apm/node_modules/.bin/apm %{buildroot}/<%= installDir %>/bin/apm
-cp atom.sh %{buildroot}/<%= installDir %>/bin/atom
-chmod 755 %{buildroot}/<%= installDir %>/bin/atom
-mkdir -p %{buildroot}/<%= installDir %>/share/applications/
-cp atom.desktop %{buildroot}/<%= installDir %>/share/applications/
+mkdir -p %{buildroot}/usr/local/share/atom
+cp -r /tmp/atom-build/Atom/* %{buildroot}/usr/local/share/atom
+mkdir -p %{buildroot}/usr/local/bin/
+ln -sf /usr/local/share/atom/resources/app/apm/node_modules/.bin/apm %{buildroot}/usr/local/bin/apm
+cp atom.sh %{buildroot}/usr/local/bin/atom
+chmod 755 atom.sh
+mkdir -p %{buildroot}/usr/local/share/applications/
+mv atom.desktop %{buildroot}/usr/local/share/applications/

 %files
-<%= installDir %>/bin/atom
-<%= installDir %>/bin/apm
-<%= installDir %>/share/atom/
-<%= installDir %>/share/applications/atom.desktop
+/usr/local/bin/atom
+/usr/local/bin/apm
+/usr/local/share/atom/
+/usr/local/share/applications/atom.desktop
@@ -1,3 +1,3 @@
 #!/bin/sh

-"$0/../../app/apm/bin/node.exe" "$0/../../app/apm/lib/cli.js" "$@"
+"$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../../app/apm/node_modules/atom-package-manager/lib/cli.js" "$@"
@@ -18,5 +18,5 @@ FOR %%a IN (%*) DO (
 IF "%EXPECT_OUTPUT%"=="YES" (
  "%~dp0\..\..\atom.exe" %*
 ) ELSE (
-  "%~dp0\..\app\apm\bin\node.exe" "%~dp0\atom.js" %*
+  "%~dp0\..\app\apm\node_modules\atom-package-manager\bin\node.exe" "%~dp0\atom.js" %*
 )
@@ -18,5 +18,5 @@ done
 if [ $EXPECT_OUTPUT ]; then
  "$0/../../../atom.exe" "$@"
 else
-  "$0/../../app/apm/bin/node.exe" "$0/../atom.js" "$@"
+  "$0/../../app/apm/node_modules/atom-package-manager/bin/node.exe" "$0/../atom.js" "$@"
 fi
@@ -48,9 +48,9 @@ function bootstrap() {
  var dedupeNpmCommand = npmPath + npmFlags + 'dedupe';

  if (process.argv.indexOf('--no-quiet') === -1) {
-    buildInstallCommand  += ' --loglevel error';
-    apmInstallCommand    += ' --loglevel error';
-    moduleInstallCommand += ' --loglevel error';
+    buildInstallCommand  += ' --quiet';
+    apmInstallCommand    += ' --quiet';
+    moduleInstallCommand += ' --quiet';
    dedupeApmCommand     += ' --quiet';
    dedupeNpmCommand     += ' --quiet';
    buildInstallOptions.ignoreStdout = true;
@@ -11,7 +11,7 @@ ARCH=`uname -m`

 rpmdev-setuptree

-cp -r $BUILD_DIRECTORY/Atom $RPM_BUILD_ROOT/BUILD
+cp -r $BUILD_DIRECTORY/Atom/* $RPM_BUILD_ROOT/BUILD
 cp $SPEC_FILE $RPM_BUILD_ROOT/SPECS
 cp ./atom.sh $RPM_BUILD_ROOT/BUILD
 cp $DESKTOP_FILE $RPM_BUILD_ROOT/BUILD
@@ -3,4 +3,4 @@
 set -e

 script/build
-script/grunt mkrpm publish-build --stack --install-dir /usr
+script/grunt mkrpm publish-build --stack
@@ -1,41 +0,0 @@
-to5 = require '../src/6to5'
-crypto = require 'crypto'
-
-describe "6to5 transpiler support", ->
-  describe "::create6to5VersionAndOptionsDigest", ->
-    it "returns a digest for the library version and specified options", ->
-      defaultOptions =
-        blacklist: [
-          'useStrict'
-        ]
-        experimental: true
-        optional: [
-          'asyncToGenerator'
-        ]
-        reactCompat: true
-        sourceMap: 'inline'
-      version = '3.0.14'
-      shasum = crypto.createHash('sha1')
-      shasum.update('6to5-core', 'utf8')
-      shasum.update('\0', 'utf8')
-      shasum.update(version, 'utf8')
-      shasum.update('\0', 'utf8')
-      shasum.update('{"blacklist": ["useStrict",],"experimental": true,"optional": ["asyncToGenerator",],"reactCompat": true,"sourceMap": "inline",}')
-      expectedDigest = shasum.digest('hex')
-
-      observedDigest = to5.create6to5VersionAndOptionsDigest(version, defaultOptions)
-      expect(observedDigest).toEqual expectedDigest
-
-  describe "when a .js file starts with 'use 6to5';", ->
-    it "transpiles it using 6to5", ->
-      transpiled = require('./fixtures/6to5/single-quotes.js')
-      expect(transpiled(3)).toBe 4
-
-  describe 'when a .js file starts with "use 6to5";', ->
-    it "transpiles it using 6to5", ->
-      transpiled = require('./fixtures/6to5/double-quotes.js')
-      expect(transpiled(3)).toBe 4
-
-  describe "when a .js file does not start with 'use 6to6';", ->
-    it "does not transpile it using 6to5", ->
-      expect(-> require('./fixtures/6to5/invalid.js')).toThrow()
@@ -117,7 +117,7 @@ class AtomReporter extends View
          @div class: 'result-message fail deprecation-message', =>
            @raw marked(deprecation.message)

-          for stack in deprecation.getStacks()
+          for stack in deprecation.stacks
            fullStack = stack.map ({functionName, location}) ->
              if functionName is '<unknown>'
                "  at #{location}"
@@ -47,13 +47,13 @@ describe "the `atom` global", ->
        updateAvailableHandler.callCount > 0

      runs ->
-        {releaseVersion} = updateAvailableHandler.mostRecentCall.args[0]
+        {releaseVersion, releaseNotes} = updateAvailableHandler.mostRecentCall.args[0]
        expect(releaseVersion).toBe 'version'
+        expect(releaseNotes).toBe 'notes'

  describe "loading default config", ->
    it 'loads the default core config', ->
      expect(atom.config.get('core.excludeVcsIgnoredPaths')).toBe true
-      expect(atom.config.get('core.followSymlinks')).toBe false
      expect(atom.config.get('editor.showInvisibles')).toBe false

  describe "window onerror handler", ->
@@ -1,39 +0,0 @@
-path = require 'path'
-BufferedNodeProcess  = require '../src/buffered-node-process'
-
-describe "BufferedNodeProcess", ->
-  it "executes the script in a new process", ->
-    exit = jasmine.createSpy('exitCallback')
-    output = ''
-    stdout = (lines) -> output += lines
-    error = ''
-    stderr = (lines) -> error += lines
-    args = ['hi']
-    command = path.join(__dirname, 'fixtures', 'script.js')
-
-    new BufferedNodeProcess({command, args, stdout, stderr, exit})
-
-    waitsFor ->
-      exit.callCount is 1
-
-    runs ->
-      expect(output).toBe 'hi'
-      expect(error).toBe ''
-      expect(args).toEqual ['hi']
-
-  it "suppresses deprecations in the new process", ->
-    exit = jasmine.createSpy('exitCallback')
-    output = ''
-    stdout = (lines) -> output += lines
-    error = ''
-    stderr = (lines) -> error += lines
-    command = path.join(__dirname, 'fixtures', 'script-with-deprecations.js')
-
-    new BufferedNodeProcess({command, stdout, stderr, exit})
-
-    waitsFor ->
-      exit.callCount is 1
-
-    runs ->
-      expect(output).toBe 'hi'
-      expect(error).toBe ''
@@ -351,16 +351,11 @@ describe "DisplayBuffer", ->
          expect(displayBuffer.tokenizedLineForScreenRow(1).text).toMatch /^10/

      describe "when there is another display buffer pointing to the same buffer", ->
-        it "does not consider folds to be nested inside of folds from the other display buffer", ->
+        it "does not create folds in the other display buffer", ->
          otherDisplayBuffer = new DisplayBuffer({buffer, tabLength})
-          otherDisplayBuffer.createFold(1, 5)
-
          displayBuffer.createFold(2, 4)
          expect(otherDisplayBuffer.foldsStartingAtBufferRow(2).length).toBe 0

-          expect(displayBuffer.tokenizedLineForScreenRow(2).text).toBe '2'
-          expect(displayBuffer.tokenizedLineForScreenRow(3).text).toBe '5'
-
    describe "when the buffer changes", ->
      [fold1, fold2] = []
      beforeEach ->
@@ -1063,7 +1058,7 @@ describe "DisplayBuffer", ->
    [marker, decoration, decorationProperties] = []
    beforeEach ->
      marker = displayBuffer.markBufferRange([[2, 13], [3, 15]])
-      decorationProperties = {type: 'line-number', class: 'one'}
+      decorationProperties = {type: 'gutter', class: 'one'}
      decoration = displayBuffer.decorateMarker(marker, decorationProperties)

    it "can add decorations associated with markers and remove them", ->
@@ -1084,11 +1079,11 @@ describe "DisplayBuffer", ->
    describe "when a decoration is updated via Decoration::update()", ->
      it "emits an 'updated' event containing the new and old params", ->
        decoration.onDidChangeProperties updatedSpy = jasmine.createSpy()
-        decoration.setProperties type: 'line-number', class: 'two'
+        decoration.setProperties type: 'gutter', class: 'two'

        {oldProperties, newProperties} = updatedSpy.mostRecentCall.args[0]
        expect(oldProperties).toEqual decorationProperties
-        expect(newProperties).toEqual type: 'line-number', class: 'two', id: decoration.id
+        expect(newProperties).toEqual type: 'gutter', class: 'two', id: decoration.id

    describe "::getDecorations(properties)", ->
      it "returns decorations matching the given optional properties", ->
@@ -1,3 +0,0 @@
-"use 6to5";
-
-module.exports = v => v + 1
@@ -1,3 +0,0 @@
-'use 6to6';
-
-module.exports = v => v + 1
@@ -1,3 +0,0 @@
-'use 6to5';
-
-module.exports = v => v + 1
@@ -1,10 +0,0 @@
-module.exports =
-  activate: ->
-
-  deactivate: ->
-
-  consumeFirstServiceV3: ->
-
-  consumeFirstServiceV4: ->
-
-  consumeSecondService: ->
@@ -1,17 +0,0 @@
-{
-  "name": "package-with-consumed-services",
-
-  "consumedServices": {
-    "service-1": {
-      "versions": {
-        ">=0.2 <=0.3.6": "consumeFirstServiceV3",
-        "^0.4.1": "consumeFirstServiceV4"
-      }
-    },
-    "service-2": {
-      "versions": {
-        "0.2.1 || 0.2.2": "consumeSecondService"
-      }
-    }
-  }
-}
@@ -1,5 +0,0 @@
-class TestItem
-  getUri: -> "test"
-
-exports.activate = ->
-  atom.workspace.addOpener -> new TestItem
@@ -1,4 +0,0 @@
-{
-  "name": "package-with-empty-keymap",
-  "version": "1.0.0"
-}
@@ -1,4 +0,0 @@
-{
-  "name": "package-with-empty-menu",
-  "version": "1.0.0"
-}
@@ -1,4 +0,0 @@
-{
-  "name": "package-with-invalid-styles",
-  "version": "1.0.0"
-}
@@ -1 +0,0 @@
-{
@@ -1,13 +0,0 @@
-module.exports =
-  activate: ->
-
-  deactivate: ->
-
-  provideFirstServiceV3: ->
-    'first-service-v3'
-
-  provideFirstServiceV4: ->
-    'first-service-v4'
-
-  provideSecondService: ->
-    'second-service'
@@ -1,19 +0,0 @@
-{
-  "name": "package-with-provided-services",
-
-  "providedServices": {
-    "service-1": {
-      "description": "The first service",
-      "versions": {
-        "0.3.1": "provideFirstServiceV3",
-        "0.4.1": "provideFirstServiceV4"
-      }
-    },
-    "service-2": {
-      "description": "The second service",
-      "versions": {
-        "0.2.1": "provideSecondService"
-      }
-    }
-  }
-}
@@ -1 +0,0 @@
-styleSheets: ['2', '1']
@@ -1 +1 @@
-styleSheets: ['2', '1']
+stylesheets: ['2', '1']
@@ -1,4 +1,4 @@
 {
  "theme": "ui",
-  "styleSheets": ["editor.less"]
+  "stylesheets": ["editor.less"]
 }
@@ -1,4 +1,4 @@
 {
  "theme": "ui",
-  "styleSheets": ["first.css", "second.less", "last.css"]
+  "stylesheets": ["first.css", "second.less", "last.css"]
 }
@@ -1,4 +1,4 @@
 {
  "theme": "syntax",
-  "styleSheets": ["editor.less"]
+  "stylesheets": ["editor.less"]
 }
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Max Brunsfeld	cffe733641	Fix config event subscription methods Signed-off-by: Nathan Sobo <nathan@github.com>	2014-12-19 17:28:33 -08:00
Nathan Sobo	3127171b2b	Fix Config::isDefault	2014-12-19 16:47:24 -08:00
Nathan Sobo	1d48cb641c	Fix Config::save	2014-12-19 16:47:24 -08:00
Nathan Sobo	b7b5852863	Store all settings in the scoped property store There are a few failing specs, but I think they can all be addressed by having a `source` for all properties and using it to target only the user settings in various cases.	2014-12-19 16:47:18 -08:00
Max Brunsfeld	d104e68342	Revert "Revert "Merge pull request #4631 "" This reverts commit `dc2a453986`. Conflicts: spec/config-spec.coffee src/config.coffee	2014-12-19 14:20:27 -08:00