Add proper line decorations to initial state

Handle 'onlyNonEmpty' option for line decorations
Handle 'onlyEmpty' option for line decorations
2014-08-06 11:52:45 -06:00 · 2014-08-06 11:26:14 -06:00 · 2014-08-06 11:24:16 -06:00 · 2014-08-06 11:16:01 -06:00 · 2014-08-06 11:13:21 -06:00 · 2014-08-06 11:13:05 -06:00
@@ -1 +0,0 @@
-v0.10.33
@@ -1 +0,0 @@
-2.7.6
@@ -12,21 +12,19 @@ propose changes to this document in a pull request.
 ## Submitting Issues

 * Check the [debugging guide](https://atom.io/docs/latest/debugging) for tips
-  on debugging. You might be able to find the cause of the problem and fix
+  on debugging. You might be able to find the cause of the problem and fix 
  things yourself.
 * Include the version of Atom you are using and the OS.
 * Include screenshots and animated GIFs whenever possible; they are immensely
  helpful.
 * Include the behavior you expected and other places you've seen that behavior
  such as Emacs, vi, Xcode, etc.
-* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools
+* Check the dev tools (`alt-cmd-i`) for errors to include. If the dev tools 
  are open _before_ the error is triggered, a full stack trace for the error
  will be logged. If you can reproduce the error, use this approach to get the
  full stack trace and include it in the issue.
 * On Mac, check Console.app for stack traces to include if reporting a crash.
 * Perform a cursory search to see if a similar issue has already been submitted.
-* Please setup a [profile picture](https://help.github.com/articles/how-do-i-set-up-my-profile-picture)
-  to make yourself recognizable and so we can all get to know each other better.

 ### Package Repositories

@@ -36,7 +34,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)
@@ -64,8 +62,6 @@ For more information on how to work with Atom's official packages, see
    * Use `path.join()` to concatenate filenames.
    * Use `os.tmpdir()` rather than `/tmp` when you need to reference the
      temporary directory.
-* Using a plain `return` when returning explicitly at the end of a function.
-    * Not `return null`, `return undefined`, `null`, or `undefined`

 ## Git Commit Messages

@@ -74,7 +70,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
@@ -86,9 +82,6 @@ For more information on how to work with Atom's official packages, see
    * :green_heart: `:green_heart:` when fixing the CI build
    * :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,30 +93,33 @@ 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

-* Use [AtomDoc](https://github.com/atom/atomdoc).
+* Use [TomDoc](http://tomdoc.org).
 * Use [Markdown](https://daringfireball.net/projects/markdown).
 * Reference methods and classes in markdown with the custom `{}` notation:
    * Reference classes with `{ClassName}`
    * Reference instance methods with `{ClassName::methodName}`
    * Reference class methods with `{ClassName.methodName}`
+    * Delegate to comments elsewhere with `{Delegates to: ClassName.methodName}`
+      style notation.

 ### Example

 ```coffee
 # Public: Disable the package with the given name.
 #
-# * `name`    The {String} name of the package to disable.
-# * `options` (optional) The {Object} with disable options (default: {}):
-#   * `trackTime`     A {Boolean}, `true` to track the amount of time taken.
-#   * `ignoreErrors`  A {Boolean}, `true` to catch and ignore errors thrown.
-# * `callback` The {Function} to call after the package has been disabled.
+# This method emits multiple events:
+#
+# * `package-will-be-disabled` - before the package is disabled.
+# * `package-disabled`         - after the package is disabled.
+#
+# name     - The {String} name of the package to disable.
+# options  - The {Object} with disable options (default: {}):
+#   :trackTime - `true` to track the amount of time disabling took.
+#   :ignoreErrors - `true` to catch and ignore errors thrown.
+# callback - The {Function} to call after the package has been disabled.
 #
 # Returns `undefined`.
 disablePackage: (name, options, callback) ->
@@ -1,22 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Image to build Atom and create a .rpm file
-
-# Base docker image
-FROM fedora:20
-
-# Install dependencies
-RUN yum install -y \
-    make \
-    gcc \
-    gcc-c++ \
-    glibc-devel \
-    git-core \
-    libgnome-keyring-devel \
-    rpmdevtools
-
-# Install node
-RUN curl -sL https://rpm.nodesource.com/setup | bash -
-RUN yum install -y nodejs
-
-ADD . /atom
-WORKDIR /atom
@@ -1,15 +1,12 @@
 ![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).
-
-Visit [issue #3684](https://github.com/atom/atom/issues/3684) to learn more
-about the Atom 1.0 roadmap.
+Visit [atom.io](https://atom.io) to learn more.

 ## Installing

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

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

@@ -17,37 +14,16 @@ Atom will automatically update when a new release is available.

 ### Windows

-Download the latest [AtomSetup.exe installer](https://github.com/atom/atom/releases/latest).
+Install the [Atom chocolatey package](https://chocolatey.org/packages/Atom).

-Atom will automatically update when a new release is available.
+1. Install [chocolatey](https://chocolatey.org).
+2. Close and reopen your command prompt or PowerShell window.
+3. Run `cinst Atom`
+4. In the future run `cup Atom` to upgrade to the latest release.

-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.
-
-### Debian Linux (Ubuntu)
-
-Currently only a 64-bit version is available.
-
-1. Download `atom-amd64.deb` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
-2. Run `sudo dpkg --install atom-amd64.deb` on the downloaded package.
-3. Launch Atom using the installed `atom` command.
-
-The Linux version does not currently automatically update so you will need to
-repeat these steps to upgrade to future releases.
-
-### Red Hat Linux (Fedora, CentOS, Red Hat)
-
-Currently only a 64-bit version is available.
-
-1. Download `atom.x86_64.rpm` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
-2. Run `sudo yum localinstall atom.x86_64.rpm` on the downloaded package.
-3. Launch Atom using the installed `atom` command.
-
-The Linux version does not currently automatically update so you will need to
-repeat these steps to upgrade to future releases.
+You can also download a `.zip` file from the [releases page](https://github.com/atom/atom/releases/latest).
+The Windows version does not currently automatically update so you will need to
+manually upgrade to future releases by re-downloading the `.zip` file.

 ## Building

@@ -1,11 +1,11 @@
 {
  "name": "atom-bundled-apm",
-  "description": "Atom's bundled apm",
+  "description": "Atom's bundled APM",
  "repository": {
    "type": "git",
    "url": "https://github.com/atom/atom.git"
  },
  "dependencies": {
-    "atom-package-manager": "0.135.0"
+    "atom-package-manager": "0.88.0"
  }
 }
@@ -45,39 +45,35 @@ 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'" | head -1 | xargs 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
    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@"
    exit $?
  else
-    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
+    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ "$@"
  fi
 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"
+  if [ ! -d "$DOT_ATOM_DIR" ]; then
+    mkdir -p "$DOT_ATOM_DIR"
+  fi

  : ${TMPDIR:=/tmp}

@@ -88,9 +84,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
    ) &
@@ -1,6 +1,6 @@
 require '../src/window'
 Atom = require '../src/atom'
-window.atom = Atom.loadOrCreate('spec')
+atom = new Atom()
 atom.show() unless atom.getLoadSettings().exitWhenDone
 window.atom = atom

@@ -9,4 +9,5 @@ window.atom = atom
 atom.openDevTools()

 document.title = "Benchmark Suite"
-runSpecSuite('../benchmark/benchmark-suite', atom.getLoadSettings().logFile)
+benchmarkSuite = require.resolve('./benchmark-suite')
+runSpecSuite(benchmarkSuite, true)
@@ -1,10 +1,7 @@
 require '../spec/spec-helper'

 path = require 'path'
-{$} = require '../src/space-pen-extensions'
-{Point} = require 'atom'
-_ = require 'underscore-plus'
-fs = require 'fs-plus'
+{$, _, Point, fs} = require 'atom'
 Project = require '../src/project'
 TokenizedBuffer = require '../src/tokenized-buffer'

@@ -104,7 +101,7 @@ $.fn.resultOfTrigger = (type) ->
  event.result

 $.fn.enableKeymap = ->
-  @on 'keydown', (e) -> window.keymap.handleKeyEvent(e)
+  @on 'keydown', (e) => window.keymap.handleKeyEvent(e)

 $.fn.attachToDom = ->
  $('#jasmine-content').append(this)
@@ -1,7 +1,5 @@
 require './benchmark-helper'
-{$} = require '../src/space-pen-extensions'
-_ = require 'underscore-plus'
-{WorkspaceView} = require 'atom'
+{$, _, WorkspaceView} = require 'atom'
 TokenizedBuffer = require '../src/tokenized-buffer'

 describe "editorView.", ->
@@ -9,7 +7,7 @@ describe "editorView.", ->

  beforeEach ->
    atom.workspaceViewParentSelector = '#jasmine-content'
-    atom.workspaceView = atom.views.getView(atom.workspace).__spacePenView
+    atom.workspaceView = new WorkspaceView
    atom.workspaceView.attachToDom()

    atom.workspaceView.width(1024)
@@ -55,7 +53,7 @@ describe "editorView.", ->

    describe "at-end.", ->
      beforeEach ->
-        editorView.moveToBottom()
+        editorView.moveCursorToBottom()

      benchmark "insert-delete", ->
        editorView.insertText('"')
@@ -64,8 +62,8 @@ describe "editorView.", ->
    describe "empty-vs-set-innerHTML.", ->
      [firstRow, lastRow] = []
      beforeEach ->
-        firstRow = editorView.getModel().getFirstVisibleScreenRow()
-        lastRow = editorView.getModel().getLastVisibleScreenRow()
+        firstRow = editorView.getFirstVisibleScreenRow()
+        lastRow = editorView.getLastVisibleScreenRow()

      benchmark "build-gutter-html.", 1000, ->
        editorView.gutter.renderLineNumbers(null, firstRow, lastRow)
@@ -99,13 +97,13 @@ describe "editorView.", ->
      describe "multiple-lines.", ->
        [firstRow, lastRow] = []
        beforeEach ->
-          firstRow = editorView.getModel().getFirstVisibleScreenRow()
-          lastRow = editorView.getModel().getLastVisibleScreenRow()
+          firstRow = editorView.getFirstVisibleScreenRow()
+          lastRow = editorView.getLastVisibleScreenRow()

        benchmark "cache-entire-visible-area", 100, ->
          for i in [firstRow..lastRow]
            line = editorView.lineElementForScreenRow(i)[0]
-            editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.getModel().lineTextForBufferRow(i).length))
+            editorView.positionLeftForLineAndColumn(line, i, Math.max(0, editorView.lineLengthForBufferRow(i)))

    describe "text-rendering.", ->
      beforeEach ->
@@ -180,7 +178,7 @@ describe "editorView.", ->
        atom.workspaceView.openSync('huge.js')

      benchmark "moving-to-eof.", 1, ->
-        editorView.moveToBottom()
+        editorView.moveCursorToBottom()

      describe "on-first-line.", ->
        benchmark "inserting-newline", 5, ->
@@ -197,11 +195,11 @@ describe "editorView.", ->
        endPosition = null

        beforeEach ->
-          editorView.moveToBottom()
+          editorView.moveCursorToBottom()
          endPosition = editorView.getCursorScreenPosition()

        benchmark "move-to-beginning-of-word", ->
-          editorView.moveToBeginningOfWord()
+          editorView.moveCursorToBeginningOfWord()
          editorView.setCursorScreenPosition(endPosition)

        benchmark "insert", ->
@@ -1,56 +0,0 @@
-#!/usr/bin/env coffee
-
-{spawn, exec} = require 'child_process'
-fs = require 'fs'
-os = require 'os'
-path = require 'path'
-_ = require 'underscore-plus'
-temp = require 'temp'
-
-directoryToOpen = temp.mkdirSync('browser-process-startup-')
-socketPath = path.join(os.tmpdir(), 'atom.sock')
-numberOfRuns = 10
-
-deleteSocketFile = ->
-  try
-    fs.unlinkSync(socketPath) if fs.existsSync(socketPath)
-  catch error
-    console.error(error)
-
-launchAtom = (callback) ->
-  deleteSocketFile()
-
-  cmd = 'atom'
-  args = ['--safe', '--new-window', '--foreground', directoryToOpen]
-  atomProcess = spawn(cmd, args)
-
-  output = ''
-  startupTimes = []
-  dataListener = (data) ->
-    output += data
-    if match = /App load time: (\d+)/.exec(output)
-      startupTime = parseInt(match[1])
-      atomProcess.stderr.removeListener 'data', dataListener
-      atomProcess.kill()
-      exec 'pkill -9 Atom', (error) ->
-        console.error(error) if error?
-        callback(startupTime)
-
-  atomProcess.stderr.on 'data', dataListener
-
-startupTimes = []
-collector = (startupTime) ->
-  startupTimes.push(startupTime)
-  if startupTimes.length < numberOfRuns
-    launchAtom(collector)
-  else
-    maxTime = _.max(startupTimes)
-    minTime = _.min(startupTimes)
-    totalTime = startupTimes.reduce (previousValue=0, currentValue) -> previousValue + currentValue
-    console.log "Startup Runs: #{startupTimes.length}"
-    console.log "First run time: #{startupTimes[0]}ms"
-    console.log "Max time: #{maxTime}ms"
-    console.log "Min time: #{minTime}ms"
-    console.log "Average time: #{Math.round(totalTime/startupTimes.length)}ms"
-
-launchAtom(collector)
@@ -6,6 +6,7 @@ os = require 'os'
 # modules work under node v0.11.x.
 require 'vm-compatibility-layer'

+fm = require 'json-front-matter'
 _ = require 'underscore-plus'

 packageJson = require '../package.json'
@@ -21,9 +22,9 @@ module.exports = (grunt) ->
  grunt.loadNpmTasks('grunt-contrib-csslint')
  grunt.loadNpmTasks('grunt-contrib-coffee')
  grunt.loadNpmTasks('grunt-contrib-less')
+  grunt.loadNpmTasks('grunt-markdown')
  grunt.loadNpmTasks('grunt-shell')
  grunt.loadNpmTasks('grunt-download-atom-shell')
-  grunt.loadNpmTasks('grunt-atom-shell-installer')
  grunt.loadNpmTasks('grunt-peg')
  grunt.loadTasks('tasks')

@@ -38,7 +39,6 @@ module.exports = (grunt) ->
  tmpDir = os.tmpdir()
  appName = if process.platform is 'darwin' then 'Atom.app' else 'Atom'
  buildDir = grunt.option('build-dir') ? path.join(tmpDir, 'atom-build')
-  buildDir = path.resolve(buildDir)
  installDir = grunt.option('install-dir')

  home = if process.platform is 'win32' then process.env.USERPROFILE else process.env.HOME
@@ -60,9 +60,7 @@ module.exports = (grunt) ->
    contentsDir = shellAppDir
    appDir = path.join(shellAppDir, 'resources', 'app')
    installDir ?= process.env.INSTALL_PREFIX ? '/usr/local'
-    killCommand ='pkill -9 atom'
-
-  installDir = path.resolve(installDir)
+    killCommand ='pkill -9 Atom'

  coffeeConfig =
    glob_to_multiple:
@@ -119,10 +117,7 @@ module.exports = (grunt) ->

  for child in fs.readdirSync('node_modules') when child isnt '.bin'
    directory = path.join('node_modules', child)
-    metadataPath = path.join(directory, 'package.json')
-    continue unless grunt.file.isFile(metadataPath)
-
-    {engines, theme} = grunt.file.readJSON(metadataPath)
+    {engines, theme} = grunt.file.readJSON(path.join(directory, 'package.json'))
    if engines?.atom?
      coffeeConfig.glob_to_multiple.src.push("#{directory}/**/*.coffee")
      lessConfig.glob_to_multiple.src.push("#{directory}/**/*.less")
@@ -135,7 +130,7 @@ module.exports = (grunt) ->

    atom: {appDir, appName, symbolsDir, buildDir, contentsDir, installDir, shellAppDir}

-    docsOutputDir: 'docs/output'
+    docsOutputDir: 'docs/output/api'

    coffee: coffeeConfig

@@ -149,7 +144,12 @@ module.exports = (grunt) ->

    coffeelint:
      options:
-        configFile: 'coffeelint.json'
+        no_empty_param_list:
+          level: 'error'
+        max_line_length:
+          level: 'ignore'
+        indentation:
+          level: 'ignore'
      src: [
        'dot-atom/**/*.coffee'
        'exports/**/*.coffee'
@@ -193,21 +193,31 @@ module.exports = (grunt) ->
        'static/**/*.less'
      ]

+    markdown:
+      guides:
+        files: [
+          expand: true
+          cwd: 'docs'
+          src: '**/*.md'
+          dest: 'docs/output/'
+          ext: '.html'
+        ]
+        options:
+          template: 'docs/template.jst'
+          templateContext:
+            tag: "v#{major}.#{minor}"
+          markdownOptions:
+            gfm: true
+          preCompile: (src, context) ->
+            parsed = fm.parse(src)
+            _.extend(context, parsed.attributes)
+            parsed.body
+
    'download-atom-shell':
      version: packageJson.atomShellVersion
      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
-      outputDirectory: path.join(buildDir, 'installer')
-      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':
@@ -220,18 +230,9 @@ module.exports = (grunt) ->
  grunt.registerTask('compile', ['coffee', 'prebuild-less', 'cson', 'peg'])
  grunt.registerTask('lint', ['coffeelint', 'csslint', 'lesslint'])
  grunt.registerTask('test', ['shell:kill-atom', 'run-specs'])
+  grunt.registerTask('ci', ['output-disk-space', 'download-atom-shell', 'build', 'dump-symbols', 'set-version', 'check-licenses', 'lint', 'test', 'codesign', 'publish-build'])
  grunt.registerTask('docs', ['markdown:guides', 'build-docs'])

-  ciTasks = ['output-disk-space', 'download-atom-shell', 'build']
-  ciTasks.push('dump-symbols') if process.platform isnt 'win32'
-  ciTasks.push('set-version', 'check-licenses', 'lint')
-  ciTasks.push('mkdeb') if process.platform is 'linux'
-  ciTasks.push('create-windows-installer') if process.platform is 'win32'
-  ciTasks.push('test') if process.platform is 'darwin'
-  ciTasks.push('codesign')
-  ciTasks.push('publish-build')
-  grunt.registerTask('ci', ciTasks)
-
  defaultTasks = ['download-atom-shell', 'build', 'set-version']
  defaultTasks.push 'install' unless process.platform is 'linux'
  grunt.registerTask('default', defaultTasks)
@@ -1,50 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create the atom editor in a container
-# AUTHOR:         Jessica Frazelle <jessie@docker.com>
-# COMMENTS:
-#   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
-#
-#   # Build atom image
-#   docker build -t atom .
-#
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     -e DISPLAY=unix$DISPLAY atom
-#
-
-DOCKER-VERSION 1.3
-
-# Base docker image
-FROM debian:jessie
-MAINTAINER Jessica Frazelle <jessie@docker.com>
-
-# Install dependencies
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    ca-certificates \
-    curl \
-    git \
-    libasound2 \
-    libgconf-2-4 \
-    libgnome-keyring-dev \
-    libgtk2.0-0 \
-    libnss3 \
-    libxtst6 \
-    --no-install-recommends
-
-# install node
-RUN curl -sL https://deb.nodesource.com/setup | bash -
-RUN apt-get install -y nodejs
-
-# clone atom
-RUN git clone https://github.com/atom/atom /src
-WORKDIR /src
-RUN git fetch && git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-RUN script/build && script/grunt install
-
-# Autorun atom
-CMD /usr/local/bin/atom --foreground --log-file /var/log/atom.log && tail -f /var/log/atom.log
@@ -7,32 +7,33 @@
  },
  "dependencies": {
    "async": "~0.2.9",
-    "donna": "1.0.7",
+    "biscotto": ">=2.1.1 <3.0",
    "formidable": "~1.0.14",
    "fs-plus": "2.x",
    "github-releases": "~0.2.0",
    "grunt": "~0.4.1",
-    "grunt-atom-shell-installer": "^0.21.0",
    "grunt-cli": "~0.1.9",
-    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
-    "grunt-contrib-coffee": "~0.12.0",
+    "grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git",
+    "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.8.0",
    "grunt-lesslint": "0.13.0",
+    "grunt-markdown": "~0.4.0",
    "grunt-peg": "~1.1.0",
    "grunt-shell": "~0.3.1",
    "harmony-collections": "~0.3.8",
-    "legal-eagle": "~0.9.0",
-    "minidump": "~0.8",
+    "json-front-matter": "~0.1.3",
+    "legal-eagle": "~0.4.0",
+    "minidump": "~0.7",
+    "normalize-package-data": "0.2.12",
    "npm": "~1.4.5",
-    "rcedit": "~0.3.0",
+    "rcedit": "~0.1.2",
+    "read-package-json": "1.1.8",
    "request": "~2.27.0",
    "rimraf": "~2.2.2",
    "runas": "~1.0.1",
-    "tello": "1.0.4",
-    "temp": "~0.8.1",
    "underscore-plus": "1.x",
    "unzip": "~0.1.9",
    "vm-compatibility-layer": "~0.1.0"
@@ -11,7 +11,6 @@ module.exports = (grunt) ->
    appDir = grunt.config.get('atom.appDir')

    rm shellAppDir
-    rm path.join(buildDir, 'installer')
    mkdir path.dirname(buildDir)

    if process.platform is 'darwin'
@@ -21,9 +20,7 @@ module.exports = (grunt) ->

    mkdir appDir

-    if process.platform isnt 'win32'
-      cp 'atom.sh', path.join(appDir, 'atom.sh')
-
+    cp 'atom.sh', path.join(appDir, 'atom.sh')
    cp 'package.json', path.join(appDir, 'package.json')

    packageDirectories = []
@@ -71,7 +68,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 +140,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) ->
@@ -155,12 +148,12 @@ module.exports = (grunt) ->
          grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))

    if process.platform is 'win32'
-      cp path.join('resources', 'win', 'atom.cmd'), path.join(shellAppDir, 'resources', 'cli', 'atom.cmd')
-      cp path.join('resources', 'win', 'atom.sh'), path.join(shellAppDir, 'resources', 'cli', 'atom.sh')
-      cp path.join('resources', 'win', 'atom.js'), path.join(shellAppDir, 'resources', 'cli', 'atom.js')
-      cp path.join('resources', 'win', 'apm.sh'), path.join(shellAppDir, 'resources', 'cli', 'apm.sh')
+      # Set up chocolatey ignore and gui files
+      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
+      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
+      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''

-    dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug']
+    dependencies = ['compile', "generate-license:save"]
    dependencies.push('copy-info-plist') if process.platform is 'darwin'
    dependencies.push('set-exe-icon') if process.platform is 'win32'
    grunt.task.run(dependencies...)
@@ -1,3 +1,4 @@
+
 module.exports = (grunt) ->
  grunt.registerTask 'check-licenses', 'Report the licenses of all dependencies', ->
    legalEagle = require 'legal-eagle'
@@ -12,7 +13,7 @@ module.exports = (grunt) ->
    legalEagle options, (err, summary) ->
      if err?
        console.error(err)
-        process.exit 1
+        exit 1

      for key of summary
        delete summary[key] if key.match /^atom@/
@@ -1,5 +1,4 @@
 path = require 'path'
-fs = require 'fs-plus'

 module.exports = (grunt) ->
  {spawn} = require('./task-helpers')(grunt)
@@ -26,21 +25,12 @@ module.exports = (grunt) ->
    switch process.platform
      when 'darwin'
        cmd = 'codesign'
-        args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
+        args = ['-f', '-v', '-s', 'Developer ID Application: GitHub', grunt.config.get('atom.shellAppDir')]
        spawn {cmd, args}, (error) -> callback(error)
      when 'win32'
        spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
          cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
          args = [path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')]
-
-          spawn {cmd, args}, (error) ->
-            return callback(error) if error?
-
-            setupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'AtomSetup.exe')
-            if fs.isFileSync(setupExePath)
-              args = [setupExePath]
-              spawn {cmd, args}, (error) -> callback(error)
-            else
-              callback()
+          spawn {cmd, args}, (error) -> callback(error)
      else
        callback()
@@ -1,54 +0,0 @@
-path = require 'path'
-CSON = require 'season'
-fs = require 'fs-plus'
-_ = require 'underscore-plus'
-
-module.exports = (grunt) ->
-  {spawn, rm} = require('./task-helpers')(grunt)
-
-  grunt.registerTask 'compile-packages-slug', 'Add bundled package metadata information to the main package.json file', ->
-    appDir = fs.realpathSync(grunt.config.get('atom.appDir'))
-
-    modulesDirectory = path.join(appDir, 'node_modules')
-    packages = {}
-
-    for moduleDirectory in fs.listSync(modulesDirectory)
-      continue if path.basename(moduleDirectory) is '.bin'
-
-      metadataPath = path.join(moduleDirectory, 'package.json')
-      metadata = grunt.file.readJSON(metadataPath)
-      continue unless metadata?.engines?.atom?
-
-      moduleCache = metadata._atomModuleCache ? {}
-
-      rm metadataPath
-      _.remove(moduleCache.extensions?['.json'] ? [], 'package.json')
-
-      for property in ['_from', '_id', 'dist', 'readme', 'readmeFilename']
-        delete metadata[property]
-
-      pack = {metadata, keymaps: {}, menus: {}}
-
-      if metadata.main
-        mainPath = require.resolve(path.resolve(moduleDirectory, metadata.main))
-        pack.main = path.relative(appDir, mainPath)
-
-      for keymapPath in fs.listSync(path.join(moduleDirectory, 'keymaps'), ['.cson', '.json'])
-        relativePath = path.relative(appDir, keymapPath)
-        pack.keymaps[relativePath] = CSON.readFileSync(keymapPath)
-        rm keymapPath
-
-      for menuPath in fs.listSync(path.join(moduleDirectory, 'menus'), ['.cson', '.json'])
-        relativePath = path.relative(appDir, menuPath)
-        pack.menus[relativePath] = CSON.readFileSync(menuPath)
-        rm menuPath
-
-      packages[metadata.name] = pack
-
-      for extension, paths of moduleCache.extensions
-        delete moduleCache.extensions[extension] if paths.length is 0
-
-    metadata = grunt.file.readJSON(path.join(appDir, 'package.json'))
-    metadata._atomPackages = packages
-
-    grunt.file.write(path.join(appDir, 'package.json'), JSON.stringify(metadata))
@@ -1,45 +1,162 @@
 path = require 'path'

+async = require 'async'
 fs = require 'fs-plus'
-_ = require 'underscore-plus'
-
-donna = require 'donna'
-tello = require 'tello'
-
-moduleBlacklist = [
-  'space-pen'
-]
+request = require 'request'

 module.exports = (grunt) ->
-  getClassesToInclude = ->
-    modulesPath = path.resolve(__dirname, '..', '..', 'node_modules')
-    classes = {}
-    fs.traverseTreeSync modulesPath, (modulePath) ->
-      return false if modulePath.match(/node_modules/g).length > 1 # dont need the dependencies of the dependencies
-      return false if path.basename(modulePath) in moduleBlacklist
-      return true unless path.basename(modulePath) is 'package.json'
-      return true unless fs.isFileSync(modulePath)
+  {rm} = require('./task-helpers')(grunt)

-      apiPath = path.join(path.dirname(modulePath), 'api.json')
-      if fs.isFileSync(apiPath)
-        _.extend(classes, grunt.file.readJSON(apiPath).classes)
-      true
-    classes
-
-  sortClasses = (classes) ->
-    sortedClasses = {}
-    for className in Object.keys(classes).sort()
-      sortedClasses[className] = classes[className]
-    sortedClasses
+  cmd = path.join('node_modules', '.bin', 'coffee')
+  commonArgs = [path.join('build', 'node_modules', '.bin', 'biscotto'), '--']
+  opts =
+    stdio: 'inherit'

  grunt.registerTask 'build-docs', 'Builds the API docs in src', ->
+    done = @async()
+
    docsOutputDir = grunt.config.get('docsOutputDir')

-    metadata = donna.generateMetadata(['.'])
-    api = tello.digest(metadata)
-    _.extend(api.classes, getClassesToInclude())
-    api.classes = sortClasses(api.classes)
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        rm(docsOutputDir)
+        args = [
+          commonArgs...
+          '--title', 'Atom API Documentation'
+          '-o', docsOutputDir
+          '-r', 'docs/README.md'
+          '--stability', '1'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)

-    apiJson = JSON.stringify(api, null, 2)
-    apiJsonPath = path.join(docsOutputDir, 'api.json')
-    grunt.file.write(apiJsonPath, apiJson)
+  grunt.registerTask 'lint-docs', 'Generate stats about the doc coverage', ->
+    done = @async()
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
+
+  grunt.registerTask 'missing-docs', 'Generate stats about the doc coverage', ->
+    done = @async()
+    downloadIncludes (error, includePaths) ->
+      if error?
+        done(error)
+      else
+        args = [
+          commonArgs...
+          '--noOutput'
+          '--missing'
+          'src/'
+          includePaths...
+        ]
+        grunt.util.spawn({cmd, args, opts}, done)
+
+  grunt.registerTask 'copy-docs', 'Copies over latest API docs to atom-docs', ->
+    done = @async()
+
+    fetchTag = (args..., callback) ->
+      cmd = 'git'
+      args = ['describe', '--abbrev=0', '--tags']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
+
+    copyDocs = (tag, callback) ->
+      cmd = 'cp'
+      args = ['-r', 'docs/output/', "../atom.io/public/docs/api/#{tag}/"]
+
+      fs.exists "../atom.io/public/docs/api/", (exists) ->
+        if exists
+          grunt.util.spawn {cmd, args}, (error, result) ->
+            if error?
+              callback(error)
+            else
+              callback(null, tag)
+        else
+          grunt.log.error "../atom.io/public/docs/api/ doesn't exist"
+          return false
+
+    grunt.util.async.waterfall [fetchTag, copyDocs], done
+
+  grunt.registerTask 'deploy-docs', 'Publishes latest API docs to atom-docs.githubapp.com', ->
+    done = @async()
+    docsRepoArgs = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/']
+
+    fetchTag = (args..., callback) ->
+      cmd = 'git'
+      args = ['describe', '--abbrev=0', '--tags']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim().split('.')[0..1].join('.'))
+
+    stageDocs = (tag, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'add', "public/#{tag}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    fetchSha = (args..., callback) ->
+      cmd = 'git'
+      args = ['rev-parse', 'HEAD']
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
+
+    commitChanges = (sha, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'commit', "-m Update API docs to #{sha}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushOrigin = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'origin', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushHeroku = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'heroku', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    grunt.util.async.waterfall [fetchTag, stageDocs, fetchSha, commitChanges, pushOrigin, pushHeroku], done
+
+downloadFileFromRepo = ({repo, file}, callback) ->
+  uri = "https://raw.github.com/atom/#{repo}/master/#{file}"
+  request uri, (error, response, contents) ->
+    return callback(error) if error?
+    downloadPath = path.join('docs', 'includes', repo, file)
+    fs.writeFile downloadPath, contents, (error) ->
+      callback(error, downloadPath)
+
+downloadIncludes = (callback) ->
+  includes = [
+    {repo: 'atom-keymap', file: 'src/keymap-manager.coffee'}
+    {repo: 'atom-keymap', file: 'src/key-binding.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar.coffee'}
+    {repo: 'first-mate',  file: 'src/grammar-registry.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/directory.coffee'}
+    {repo: 'node-pathwatcher', file: 'src/file.coffee'}
+    {repo: 'space-pen',   file: 'src/space-pen.coffee'}
+    {repo: 'text-buffer', file: 'src/marker.coffee'}
+    {repo: 'text-buffer', file: 'src/point.coffee'}
+    {repo: 'text-buffer', file: 'src/range.coffee'}
+    {repo: 'text-buffer', file: 'src/text-buffer.coffee'}
+    {repo: 'theorist',    file: 'src/model.coffee'}
+  ]
+
+  async.map(includes, downloadFileFromRepo, callback)
@@ -1,39 +0,0 @@
-path = require 'path'
-fs = require 'fs-plus'
-ModuleCache = require '../../src/module-cache'
-
-module.exports = (grunt) ->
-  grunt.registerTask 'generate-module-cache', 'Generate a module cache for all core modules and packages', ->
-    appDir = grunt.config.get('atom.appDir')
-
-    {packageDependencies} = grunt.file.readJSON('package.json')
-
-    for packageName, version of packageDependencies
-      ModuleCache.create(path.join(appDir, 'node_modules', packageName))
-
-    ModuleCache.create(appDir)
-
-    metadata = grunt.file.readJSON(path.join(appDir, 'package.json'))
-
-    metadata._atomModuleCache.folders.forEach (folder) ->
-      if '' in folder.paths
-        folder.paths = [
-          ''
-          'exports'
-          'spec'
-          'src'
-          'src/browser'
-          'static'
-          'vendor'
-        ]
-
-    # Reactionary does not have an explicit react dependency
-    metadata._atomModuleCache.folders.push
-      paths: [
-        'node_modules/reactionary-atom-fork/lib'
-      ]
-      dependencies: {
-        'react-atom-fork': metadata.dependencies['react-atom-fork']
-      }
-
-    grunt.file.write(path.join(appDir, 'package.json'), JSON.stringify(metadata))
@@ -1,8 +1,8 @@
+fs = require 'fs'
 path = require 'path'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 runas = null
-temp = require 'temp'

 module.exports = (grunt) ->
  {cp, mkdir, rm} = require('./task-helpers')(grunt)
@@ -22,16 +22,12 @@ module.exports = (grunt) ->
    else if process.platform is 'darwin'
      rm installDir
      mkdir path.dirname(installDir)
-
-      tempFolder = temp.path()
-      mkdir tempFolder
-      cp shellAppDir, tempFolder
-      fs.renameSync(tempFolder, installDir)
+      cp shellAppDir, installDir
    else
      binDir = path.join(installDir, 'bin')
      shareDir = path.join(installDir, 'share', 'atom')

-      iconName = path.join(shareDir,'resources', 'app', 'resources', 'atom.png')
+      iconName = path.join(shareDir,'resources','app','resources','atom.png')

      mkdir binDir
      cp 'atom.sh', path.join(binDir, 'atom')
@@ -39,17 +35,17 @@ module.exports = (grunt) ->
      mkdir path.dirname(shareDir)
      cp shellAppDir, shareDir

-      # Create atom.desktop if installation not in temporary folder
+      # Create Atom.desktop if installation not in temporary folder
      tmpDir = if process.env.TMPDIR? then process.env.TMPDIR else '/tmp'
      if installDir.indexOf(tmpDir) isnt 0
-        desktopFile = path.join('resources', 'linux', 'atom.desktop.in')
-        desktopInstallFile = path.join(installDir, 'share', 'applications', 'atom.desktop')
+        desktopFile = path.join('resources', 'linux', 'Atom.desktop.in')
+        desktopInstallFile = path.join(installDir, 'share', 'applications', 'Atom.desktop')

        {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'
@@ -64,21 +60,3 @@ module.exports =
        ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
        IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
      """
-
-  'jschardet@1.1.0':
-    license: 'LGPL'
-    source: 'README.md in the repository'
-    sourceText: """
-      JsChardet
-      =========
-
-      Port of python's chardet (http://chardet.feedparser.org/).
-
-      License
-      -------
-
-      LGPL
-    """
-  'core-js@0.4.10':
-    license: 'MIT'
-    source: 'http://rock.mit-license.org linked in source files and bower.json says MIT'
@@ -13,16 +13,8 @@ module.exports = (grunt) ->
    grunt.file.write(outputPath, filled)
    outputPath

-  getInstalledSize = (buildDir, callback) ->
-    cmd = 'du'
-    args = ['-sk', path.join(buildDir, 'Atom')]
-    spawn {cmd, args}, (error, {stdout}) ->
-      installedSize = stdout.split(/\s+/)?[0] or '200000' # default to 200MB
-      callback(null, installedSize)
-
  grunt.registerTask 'mkdeb', 'Create debian package', ->
    done = @async()
-    buildDir = grunt.config.get('atom.buildDir')

    if process.arch is 'ia32'
      arch = 'i386'
@@ -36,18 +28,13 @@ 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}
-      controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
-      desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
-      icon = path.join('resources', 'atom.png')
+    data = {name, version, description, section, arch, maintainer, installDir, iconName}

-      cmd = path.join('script', 'mkdeb')
-      args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
-      spawn {cmd, args}, (error) ->
-        if error?
-          done(error)
-        else
-          grunt.log.ok "Created #{buildDir}/atom-#{version}-#{arch}.deb"
-          done()
+    controlFilePath = fillTemplate(path.join('resources', 'linux', 'debian', 'control'), data)
+    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'Atom.desktop'), data)
+    icon = path.join('resources', 'atom.png')
+    buildDir = grunt.config.get('atom.buildDir')
+
+    cmd = path.join('script', 'mkdeb')
+    args = [version, arch, controlFilePath, desktopFilePath, icon, buildDir]
+    spawn({cmd, args}, done)
@@ -1,49 +0,0 @@
-fs = require 'fs'
-path = require 'path'
-_ = require 'underscore-plus'
-
-module.exports = (grunt) ->
-  {spawn, rm, mkdir} = require('./task-helpers')(grunt)
-
-  fillTemplate = (filePath, data) ->
-    template = _.template(String(fs.readFileSync("#{filePath}.in")))
-    filled = template(data)
-
-    outputPath = path.join(grunt.config.get('atom.buildDir'), path.basename(filePath))
-    grunt.file.write(outputPath, filled)
-    outputPath
-
-  grunt.registerTask 'mkrpm', 'Create rpm package', ->
-    done = @async()
-
-    if process.arch is 'ia32'
-      arch = 'i386'
-    else if process.arch is 'x64'
-      arch = 'amd64'
-    else
-      return done("Unsupported arch #{process.arch}")
-
-    {name, version, description} = grunt.file.readJSON('package.json')
-    buildDir = grunt.config.get('atom.buildDir')
-
-    rpmDir = path.join(buildDir, 'rpm')
-    rm rpmDir
-    mkdir rpmDir
-
-    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}
-    specFilePath = fillTemplate(path.join('resources', 'linux', 'redhat', 'atom.spec'), data)
-    desktopFilePath = fillTemplate(path.join('resources', 'linux', 'atom.desktop'), data)
-
-    cmd = path.join('script', 'mkrpm')
-    args = [specFilePath, desktopFilePath, buildDir]
-    spawn {cmd, args}, (error) ->
-      if error?
-        done(error)
-      else
-        grunt.log.ok "Created rpm package in #{rpmDir}"
-        done()
@@ -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)
@@ -17,30 +17,18 @@ defaultHeaders =

 module.exports = (gruntObject) ->
  grunt = gruntObject
-  {cp} = require('./task-helpers')(grunt)

  grunt.registerTask 'publish-build', 'Publish the built app', ->
-    tasks = []
-    tasks.push('build-docs', 'prepare-docs') if process.platform is 'darwin'
-    tasks.push('upload-assets') if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH is 'master'
+    return if process.env.JANKY_SHA1 and process.env.JANKY_BRANCH isnt 'master'
+    tasks = ['upload-assets']
+    tasks.unshift('build-docs', 'prepare-docs') if process.platform is 'darwin'
    grunt.task.run(tasks)

-  grunt.registerTask 'prepare-docs', 'Move api.json to atom-api.json', ->
-    docsOutputDir = grunt.config.get('docsOutputDir')
-    buildDir = grunt.config.get('atom.buildDir')
-    cp path.join(docsOutputDir, 'api.json'), path.join(buildDir, 'atom-api.json')
+  grunt.registerTask 'prepare-docs', 'Move the build docs to the build dir', ->
+    fs.copySync(grunt.config.get('docsOutputDir'), path.join(grunt.config.get('atom.buildDir'), 'atom-docs'))

  grunt.registerTask 'upload-assets', 'Upload the assets to a GitHub release', ->
-    doneCallback = @async()
-    startTime = Date.now()
-    done = (args...) ->
-      elapsedTime = Math.round((Date.now() - startTime) / 100) / 10
-      grunt.log.ok("Upload time: #{elapsedTime}s")
-      doneCallback(args...)
-
-    unless token
-      return done(new Error('ATOM_ACCESS_TOKEN environment variable not set'))
-
+    done = @async()
    buildDir = grunt.config.get('atom.buildDir')
    assets = getAssets()

@@ -54,54 +42,21 @@ module.exports = (gruntObject) ->
          uploadAssets(release, buildDir, assets, done)

 getAssets = ->
-  {cp} = require('./task-helpers')(grunt)
-
-  {version} = grunt.file.readJSON('package.json')
-  buildDir = grunt.config.get('atom.buildDir')
-
-  switch process.platform
-    when 'darwin'
-      [
-        {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
-        {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
-        {assetName: 'atom-api.json', sourcePath: 'atom-api.json'}
-      ]
-    when 'win32'
-      assets = [{assetName: 'atom-windows.zip', sourcePath: 'Atom'}]
-      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
-        cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
-        assets.push({assetName: squirrelAsset, sourcePath: assetName})
-      assets
-    when 'linux'
-      if process.arch is 'ia32'
-        arch = 'i386'
-      else
-        arch = 'amd64'
-
-      # Check for a Debian build
-      sourcePath = "#{buildDir}/atom-#{version}-#{arch}.deb"
-      assetName = "atom-#{arch}.deb"
-
-      # Check for a Fedora build
-      unless fs.isFileSync(sourcePath)
-        rpmName = fs.readdirSync("#{buildDir}/rpm")[0]
-        sourcePath = "#{buildDir}/rpm/#{rpmName}"
-        if process.arch is 'ia32'
-          arch = 'i386'
-        else
-          arch = 'x86_64'
-        assetName = "atom.#{arch}.rpm"
-
-      cp sourcePath, path.join(buildDir, assetName)
-
-      [
-        {assetName, sourcePath}
-      ]
+  if process.platform is 'darwin'
+    [
+      {assetName: 'atom-mac.zip', sourcePath: 'Atom.app'}
+      {assetName: 'atom-mac-symbols.zip', sourcePath: 'Atom.breakpad.syms'}
+      {assetName: 'atom-docs.zip', sourcePath: 'atom-docs'}
+    ]
+  else
+    [
+      {assetName: 'atom-windows.zip', sourcePath: 'Atom'}
+    ]

 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) ->
@@ -115,7 +70,7 @@ zipAssets = (buildDir, assets, callback) ->
      callback(error)

  tasks = []
-  for {assetName, sourcePath} in assets when path.extname(assetName) is '.zip'
+  for {assetName, sourcePath} in assets
    fs.removeSync(path.join(buildDir, assetName))
    tasks.push(zip.bind(this, buildDir, sourcePath, assetName))
  async.parallel(tasks, callback)
@@ -127,45 +82,10 @@ getAtomDraftRelease = (callback) ->
      logError('Fetching atom/atom releases failed', error, releases)
      callback(error)
    else
-      [firstDraft] = releases.filter ({draft}) -> draft
-      if firstDraft?
-        options =
-          uri: firstDraft.assets_url
-          method: 'GET'
-          headers: defaultHeaders
-          json: true
-        request options, (error, response, assets=[]) ->
-          if error? or response.statusCode isnt 200
-            logError('Fetching draft release assets failed', error, assets)
-            callback(error ? new Error(response.statusCode))
-          else
-            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)
+      for release in releases when release.draft
+        callback(null, release)
+        return
+      callback(new Error('No draft release in atom/atom repo'))

 deleteRelease = (release) ->
  options =
@@ -32,7 +32,7 @@ module.exports = (grunt) ->
      packageJsonPath = path.join(appDir, 'package.json')
      packageJson = require(packageJsonPath)
      packageJson.version = version
-      packageJsonString = JSON.stringify(packageJson)
+      packageJsonString = JSON.stringify(packageJson, null, 2)
      fs.writeFileSync(packageJsonPath, packageJsonString)

      if process.platform is 'darwin'
@@ -45,8 +45,8 @@ module.exports = (grunt) ->

        strings =
          CompanyName: 'GitHub, Inc.'
-          FileDescription: 'Atom'
-          LegalCopyright: 'Copyright (C) 2014 GitHub, Inc. All rights reserved'
+          FileDescription: 'The hackable editor'
+          LegalCopyright: 'Copyright (C) 2013 GitHub, Inc. All rights reserved'
          ProductName: 'Atom'
          ProductVersion: version

@@ -2,50 +2,26 @@ fs = require 'fs'
 path = require 'path'

 _ = require 'underscore-plus'
-async = require 'async'

-concurrency = 2
+async = require 'async'

 module.exports = (grunt) ->
  {isAtomPackage, spawn} = require('./task-helpers')(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)
-
-  getAppPath = ->
-    contentsDir = grunt.config.get('atom.contentsDir')
-    switch process.platform
-      when 'darwin'
-        path.join(contentsDir, 'MacOS', 'Atom')
-      when 'linux'
-        path.join(contentsDir, 'atom')
-      when 'win32'
-        path.join(contentsDir, 'atom.exe')
-
  runPackageSpecs = (callback) ->
    failedPackages = []
    rootDir = grunt.config.get('atom.shellAppDir')
+    contentsDir = grunt.config.get('atom.contentsDir')
    resourcePath = process.cwd()
-    appPath = getAppPath()
-
-    # Ensure application is executable on Linux
-    fs.chmodSync(appPath, '755') if process.platform is 'linux'
+    if process.platform is 'darwin'
+      appPath = path.join(contentsDir, 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      appPath = path.join(contentsDir, 'atom.exe')

    packageSpecQueue = async.queue (packagePath, callback) ->
-      if process.platform in ['darwin', 'linux']
+      if process.platform is 'darwin'
        options =
          cmd: appPath
          args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{path.join(packagePath, 'spec')}"]
@@ -68,7 +44,6 @@ module.exports = (grunt) ->
          fs.unlinkSync(path.join(packagePath, 'ci.log'))

        failedPackages.push path.basename(packagePath) if error
-        logDeprecations("#{path.basename(packagePath)} Specs", results)
        callback()

    modulesDirectory = path.resolve('node_modules')
@@ -78,15 +53,19 @@ module.exports = (grunt) ->
      continue unless isAtomPackage(packagePath)
      packageSpecQueue.push(packagePath)

-    packageSpecQueue.concurrency = concurrency - 1
+    packageSpecQueue.concurrency = 1
    packageSpecQueue.drain = -> callback(null, failedPackages)

  runCoreSpecs = (callback) ->
-    appPath = getAppPath()
+    contentsDir = grunt.config.get('atom.contentsDir')
+    if process.platform is 'darwin'
+      appPath = path.join(contentsDir, 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      appPath = path.join(contentsDir, 'atom.exe')
    resourcePath = process.cwd()
    coreSpecsPath = path.resolve('spec')

-    if process.platform in ['darwin', 'linux']
+    if process.platform is 'darwin'
      options =
        cmd: appPath
        args: ['--test', "--resource-path=#{resourcePath}", "--spec-directory=#{coreSpecsPath}"]
@@ -101,8 +80,7 @@ module.exports = (grunt) ->
        fs.unlinkSync('ci.log')
      else
        # TODO: Restore concurrency on Windows
-        packageSpecQueue.concurrency = concurrency
-        logDeprecations('Core Specs', results)
+        packageSpecQueue.concurrency = 2

      callback(null, error)

@@ -112,7 +90,7 @@ module.exports = (grunt) ->

    # TODO: This should really be parallel on both platforms, however our
    # fixtures step on each others toes currently.
-    if process.platform in ['darwin', 'linux']
+    if process.platform is 'darwin'
      method = async.parallel
    else if process.platform is 'win32'
      method = async.series
@@ -120,13 +98,14 @@ module.exports = (grunt) ->
    method [runCoreSpecs, runPackageSpecs], (error, results) ->
      [coreSpecFailed, failedPackages] = results
      elapsedTime = Math.round((Date.now() - startTime) / 100) / 10
-      grunt.log.ok("Total spec time: #{elapsedTime}s using #{concurrency} cores")
+      grunt.verbose.writeln("Total spec time: #{elapsedTime}s")
      failures = failedPackages
      failures.push "atom core" if coreSpecFailed

      grunt.log.error("[Error]".red + " #{failures.join(', ')} spec(s) failed") if failures.length > 0

      if process.platform is 'win32' and process.env.JANKY_SHA1
-        done()
+        # Package specs are still flaky on Windows CI
+        done(!coreSpecFailed)
      else
        done(!coreSpecFailed and failedPackages.length == 0)
@@ -53,9 +53,8 @@ module.exports = (grunt) ->
    proc = childProcess.spawn(options.cmd, options.args, options.opts)
    proc.stdout.on 'data', (data) -> stdout.push(data.toString())
    proc.stderr.on 'data', (data) -> stderr.push(data.toString())
-    proc.on 'error', (processError) -> error ?= processError
    proc.on 'close', (exitCode, signal) ->
-      error ?= new Error(signal) if exitCode != 0
+      error = new Error(signal) if exitCode != 0
      results = {stderr: stderr.join(''), stdout: stdout.join(''), code: exitCode}
      grunt.log.error results.stderr if exitCode != 0
      callback(error, results, exitCode)
@@ -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
@@ -1,17 +0,0 @@
-{
-  "max_line_length": {
-    "level": "ignore"
-  },
-  "no_empty_param_list": {
-    "level": "error"
-  },
-  "arrow_spacing": {
-    "level": "error"
-  },
-  "no_interpolation_in_single_quotes": {
-    "level": "error"
-  },
-  "no_debugger": {
-    "level": "error"
-  }
-}
@@ -1,5 +1,60 @@
-# Welcome to the Atom Docs
+# Welcome to the Atom API Documentation

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

-TODO: Write when docs move to a dedicated repo.
+## FAQ
+
+### Where do I start?
+
+Check out [EditorView][EditorView] and [Editor][Editor] classes for a good
+overview of the main editor API.
+
+### How do I access these classes?
+
+Check out the [Atom][Atom] class docs to see what globals are available and
+what they provide.
+
+You can also require many of these classes in your package via:
+
+```coffee
+{EditorView} = require 'atom'
+```
+
+The classes available from `require 'atom'` are:
+  * [BufferedProcess][BufferedProcess]
+  * [BufferedNodeProcess][BufferedNodeProcess]
+  * [EditorView][EditorView]
+  * [Git][Git]
+  * [Point][Point]
+  * [Range][Range]
+  * [ScrollView][ScrollView]
+  * [SelectListView][SelectListView]
+  * [View][View]
+  * [WorkspaceView][WorkspaceView]
+  * [Workspace][Workspace]
+
+### How do I create a package?
+
+You probably want to read the [creating a package][creating-a-package]
+doc first and come back here when you are done.
+
+### Where are the node docs?
+
+Atom ships with node 0.11.10 and the comprehensive node API docs are available
+[here][node-docs].
+
+[Atom]: ../classes/Atom.html
+[BufferedProcess]: ../classes/BufferedProcess.html
+[BufferedNodeProcess]: ../classes/BufferedNodeProcess.html
+[Editor]: ../classes/Editor.html
+[EditorView]: ../classes/EditorView.html
+[Git]: ../classes/Git.html
+[Point]: ../classes/Point.html
+[Range]: ../classes/Range.html
+[ScrollView]: ../classes/ScrollView.html
+[SelectListView]: ../classes/SelectListView.html
+[View]: ../classes/View.html
+[WorkspaceView]: ../classes/WorkspaceView.html
+[Workspace]: ../classes/Workspace.html
+[creating-a-package]: https://atom.io/docs/latest/creating-a-package
+[node-docs]: http://nodejs.org/docs/v0.11.10/api
@@ -11,34 +11,32 @@ value of a namespaced config key with `atom.config.get`:
@showInvisibles() if atom.config.get "editor.showInvisibles"
 ```

-Or you can subscribe via `atom.config.observe` to track changes from any view
-object.
+Or you can use the `::subscribe` with `atom.config.observe` to track changes
+from any view object.

 ```coffeescript
-{View} = require 'space-pen'
-
 class MyView extends View
-  attached: ->
-    @fontSizeObserveSubscription =
-      atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
-        @adjustFontSize()
-
-  detached: ->
-    @fontSizeObserveSubscription.dispose()
+  initialize: ->
+    @subscribe atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+      @adjustFontSize()
 ```

 The `atom.config.observe` method will call the given callback immediately with
 the current value for the specified key path, and it will also call it in the
-future whenever the value of that key path changes. If you only want to invoke
-the callback when the next time the value changes, use `atom.config.onDidChange`
-instead.
+future whenever the value of that key path changes.

-Subscription methods return *disposable* subscription objects. Note in the
-example above how we save the subscription to the `@fontSizeObserveSubscription`
-instance variable and dispose of it when the view is detached. To group multiple
-subscriptions together, you can add them all to a
-[`CompositeDisposable`][composite-disposable] that you dispose when the view is
-detached.
+Subscriptions made with `::subscribe` are automatically canceled when the
+view is removed. You can cancel config subscriptions manually via the
+`off` method on the subscription object that `atom.config.observe` returns.
+
+```coffeescript
+fontSizeSubscription = atom.config.observe 'editor.fontSize', (newValue, {previous}) =>
+  @adjustFontSize()
+
+# ... later on
+
+fontSizeSubscription.off() # Stop observing
+```

 ### Writing Config Settings

@@ -50,9 +48,19 @@ but you can programmatically write to it with `atom.config.set`:
 atom.config.set("core.showInvisibles", true)
 ```

-If you're exposing package configuration via specific key paths, you'll want to
-associate them with a schema in your package's main module. Read more about
-schemas in the [config API docs][config-api].
+You should never mutate the value of a config key, because that would circumvent
+the notification of observers. You can however use methods like `pushAtKeyPath`,
+`unshiftAtKeyPath`, and `removeAtKeyPath` to manipulate mutable config values.

-[composite-disposable]: https://atom.io/docs/api/latest/CompositeDisposable
-[config-api]: https://atom.io/docs/api/latest/Config
+```coffeescript
+atom.config.pushAtKeyPath("core.disabledPackages", "wrap-guide")
+atom.config.removeAtKeyPath("core.disabledPackages", "terminal")
+```
+
+You can also use `setDefaults`, which will assign default values for keys that
+are always overridden by values assigned with `set`. Defaults are not written
+out to the the `config.json` file to prevent it from becoming cluttered.
+
+```coffeescript
+atom.config.setDefaults("editor", fontSize: 18, showInvisibles: true)
+```
@@ -0,0 +1,34 @@
+# Globals
+
+Atom exposes several services through singleton objects accessible via the
+`atom` global:
+
+* atom
+  * workspace:
+      Manipulate and query the state of the user interface for the current
+      window. Open editors, manipulate panes.
+  * workspaceView:
+      Similar to workspace, but provides access to the root of all views in the
+      current window.
+  * project:
+      Access the directory associated with the current window. Load editors,
+      perform project-wide searches, register custom openers for special file
+      types.
+  * config:
+      Read, write, and observe user configuration settings.
+  * keymap:
+      Add and query the currently active keybindings.
+  * deserializers:
+      Deserialize instances from their state objects and register deserializers.
+  * packages:
+      Activate, deactivate, and query user packages.
+  * themes:
+      Activate, deactivate, and query user themes.
+  * contextMenu:
+      Register context menus.
+  * menu:
+      Register application menus.
+  * pasteboard:
+      Read from and write to the system pasteboard.
+  * syntax:
+      Assign and query syntactically-scoped properties.
@@ -3,32 +3,32 @@
 ## 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:
+keystrokes pass through elements with the class `.editor`:

 ```coffee
-'atom-text-editor':
+'.editor':
  'cmd-delete': 'editor:delete-to-beginning-of-line'
  'alt-backspace': 'editor:delete-to-beginning-of-word'
  'ctrl-A': 'editor:select-to-first-character-of-line'
  'ctrl-shift-e': 'editor:select-to-end-of-line'
  'cmd-left': 'editor:move-to-first-character-of-line'

-'atom-text-editor:not([mini])'
+'.editor:not(.mini)'
  'cmd-alt-[': 'editor:fold-current-row'
  'cmd-alt-]': 'editor:unfold-current-row'
 ```

 Beneath the first selector are several bindings, mapping specific *keystroke
-patterns* to *commands*. When an element with the `atom-text-editor` class is focused and
+patterns* to *commands*. When an element with the `.editor` class is focused and
 `cmd-delete` is pressed, an custom DOM event called
-`editor:delete-to-beginning-of-line` is emitted on the `atom-text-editor` element.
+`editor:delete-to-beginning-of-line` is emitted on the `.editor` element.

 The second selector group also targets editors, but only if they don't have the
-`mini` attribute. In this example, the commands for code folding don't really
-make sense on mini-editors, so the selector restricts them to regular editors.
+`.mini` class. In this example, the commands for code folding don't really make
+sense on mini-editors, so the selector restricts them to regular editors.

 ### Keystroke Patterns

@@ -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.moveCursorToFirstCharacterOfLine()
 ```

-`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
@@ -113,7 +91,7 @@ the current keystroke sequence and continue searching from its parent. If you
 want to remove a binding from a keymap you don't control, such as keymaps in
 Atom core or in packages, use the `unset!` directive.

-For example, the following code removes the keybinding for `a` in the Tree View,
+For example, the following code removes the keybinding for `a` in the Tree View, 
 which is normally used to trigger the `tree-view:add-file` command:

 ```coffee
@@ -1,87 +0,0 @@
-# Scoped Settings, Scopes and Scope Descriptors
-
-Atom supports language-specific settings. You can soft wrap only Markdown files, or set the tab length to 4 in Python files.
-
-Language-specific settings are a subset of something more general we call "scoped settings". Scoped settings allow targeting down to a specific syntax token type. For example, you could conceivably set a setting to target only Ruby comments, only code inside Markdown files, or even only JavaScript function names.
-
-## Scope names in syntax tokens
-
-Each token in the editor has a collection of scope names. For example, the aformentioned JavaScript function name might have the scope names `function` and `name`. An open paren might have the scope names `punctuation`, `parameters`, `begin`.
-
-Scope names work just like CSS classes. In fact, in the editor, scope names are attached to a token's DOM node as CSS classes.
-
-Take this piece of JavaScript:
-
-```js
-function functionName() {
-  console.log('Log it out');
-}
-```
-
-In the dev tools, the first line's markup looks like this.
-
-![screen shot 2014-10-14 at 11 21 35 am](https://cloud.githubusercontent.com/assets/69169/4634321/2b1b923c-53cf-11e4-9268-6e57bcb14ec8.png)
-
-All the class names on the spans are scope names. Any scope name can be used to target a setting's value.
-
-## Scope Selectors
-
-Scope selectors allow you to target specific tokens just like a CSS selector targets specific nodes in the DOM. Some examples:
-
-```coffee
-'.source.js' # selects all javascript tokens
-'.source.js .function.name' # selects all javascript function names
-'.function.name' # selects all function names in any language
-```
-
-[Config::set][config-set] accepts a `scopeSelector`. If you'd like to set a setting for JavaScript function names, you can give it the js function name `scopeSelector`:
-
-```coffee
-atom.config.set('.source.js .function.name', 'my-package.my-setting', 'special value')
-```
-
-## Scope Descriptors
-
-A scope descriptor is an [Object][scope-descriptor] that wraps an `Array` of
-`String`s. The Array describes a path from the root of the syntax tree to a
-token including _all_ scope names for the entire path.
-
-In our JavaScript example above, a scope descriptor for the function name token would be:
-
-```coffee
-['source.js', 'meta.function.js', 'entity.name.function.js']
-```
-
-[Config::get][config-get] accepts a `scopeDescriptor`. You can get the value for your setting scoped to JavaScript function names via:
-
-```coffee
-scopeDescriptor = ['source.js', 'meta.function.js', 'entity.name.function.js']
-value = atom.config.get(scopeDescriptor, 'my-package.my-setting')
-```
-
-But, you do not need to generate scope descriptors by hand. There are a couple methods available to get the scope descriptor from the editor:
-
-* [Editor::getRootScopeDescriptor][editor-getRootScopeDescriptor] to get the language's descriptor. eg. `[".source.js"]`
-* [Editor::scopeDescriptorForBufferPosition][editor-scopeDescriptorForBufferPosition] to get the descriptor at a specific position in the buffer.
-* [Cursor::getScopeDescriptor][cursor-getScopeDescriptor] to get a cursor's descriptor based on position. eg. if the cursor were in the name of the method in our example it would return `["source.js", "meta.function.js", "entity.name.function.js"]`
-
-Let's revisit our example using these methods:
-
-```coffee
-editor = atom.workspace.getActiveTextEditor()
-cursor = editor.getLastCursor()
-valueAtCursor = atom.config.get(cursor.getScopeDescriptor(), 'my-package.my-setting')
-valueForLanguage = atom.config.get(editor.getRootScopeDescriptor(), 'my-package.my-setting')
-```
-
-
-[config]:https://atom.io/docs/api/latest/Config
-[config-get]:https://atom.io/docs/api/latest/Config#instance-get
-[config-set]:https://atom.io/docs/api/latest/Config#instance-set
-[config-observe]:https://atom.io/docs/api/latest/Config#instance-observe
-
-[editor-getRootScopeDescriptor]:https://atom.io/docs/api/latest/TextEditor#instance-getRootScopeDescriptor
-[editor-scopeDescriptorForBufferPosition]:https://atom.io/docs/api/latest/TextEditor#instance-scopeDescriptorForBufferPosition
-
-[cursor-getScopeDescriptor]:https://atom.io/docs/api/latest/Cursor#instance-getScopeDescriptor
-[scope-descriptor]:https://atom.io/docs/api/latest/ScopeDescriptor
@@ -0,0 +1,58 @@
+## Atom's View System
+
+### SpacePen Basics
+
+Atom's view system is built around the [SpacePen] view framework. SpacePen
+view objects inherit from the jQuery prototype, and wrap DOM nodes
+
+View objects are actually jQuery wrappers around DOM fragments, supporting all
+the typical jQuery traversal and manipulation methods. In addition, view objects
+have methods that are view-specific. For example, you could call both general
+and view-specific on the global `atom.workspaceView` instance:
+
+```coffeescript
+atom.workspaceView.find('.editor.active') # standard jQuery method
+atom.workspaceView.getActiveEditor()      # view-specific method
+```
+
+If you retrieve a jQuery wrapper for an element associated with a view, use the
+`.view()` method to retrieve the element's view object:
+
+```coffeescript
+# this is a plain jQuery object; you can't call view-specific methods
+editorElement = atom.workspaceView.find('.editor.active')
+
+# get the view object by calling `.view()` to call view-specific methods
+editorView = editorElement.view()
+editorView.setCursorBufferPosition([1, 2])
+```
+
+Refer to the [SpacePen] documentation for more details.
+
+### WorkspaceView
+
+The root of Atom's view hierarchy is a global called `atom.workspaceView`, which is a
+singleton instance of the `WorkspaceView` view class. The root view fills the entire
+window, and contains every other view. If you open Atom's inspector with
+`alt-cmd-i`, you can see the internal structure of `WorkspaceView`:
+
+![WorkspaceView in the inspector][workspaceview-inspector]
+
+#### Panes
+
+The `WorkspaceView` contains `prependToBottom/Top/Left/Right` and
+`appendToBottom/Top/Left/Right` methods, which are used to add Tool Panels. Tool
+panels are elements that take up screen real estate not devoted to text editing.
+In the example above, the `TreeView` is appended to the left, and the
+`CommandPanel` is appended to the top.
+
+```coffeescript
+# place a view to the left of the panes
+atom.workspaceView.appendToLeft(new MyView)
+
+# place a view below the panes
+atom.workspaceView.appendToBottom(new MyOtherView)
+```
+
+[spacepen]: http://github.com/nathansobo/space-pen
+[workspaceView-inspector]: https://f.cloud.github.com/assets/1424/1091631/1932c2d6-166b-11e3-8adf-9690fe82d3b8.png
@@ -30,8 +30,6 @@ 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`

 Returns a list of all packages in the following format:
 ```json
@@ -59,21 +57,6 @@ Link: <https://www.atom.io/api/packages?page=1>; rel="self",
      <https://www.atom.io/api/packages?page=2>; rel="next"
 ```

-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`.
-
-Returns results in the same format as [listing packages](#listing-packages).
-
 ### Showing package details

 #### GET /api/packages/:package_name
@@ -8,98 +8,51 @@ 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).
  * development headers for [GNOME Keyring](https://wiki.gnome.org/Projects/GnomeKeyring)

 ### Ubuntu / Debian
-
-* `sudo apt-get install build-essential git libgnome-keyring-dev fakeroot`
+* `sudo apt-get install build-essential git libgnome-keyring-dev`
 * Instructions for  [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os).

-### Fedora / CentOS / RHEL
-
-* `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
+### Fedora
+* `sudo yum --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel`
 * Instructions for [Node.js](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#fedora).

 ### Arch
-
-* `sudo pacman -S gconf base-devel git nodejs libgnome-keyring python2`
+* `sudo pacman -S base-devel git nodejs libgnome-keyring`
 * `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`

-1. Clone the Atom repository:
-
-  ```sh
-  git clone https://github.com/atom/atom
-  cd atom
-  ```
-
-2. Checkout the latest Atom release:
-
-  ```sh
-  git fetch -p
-  git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
-  ```
-
-3. Build Atom:
-
-  ```sh
-  script/build
-  ```
-
-  This will create the atom application at `$TMPDIR/atom-build/Atom`.
-
-4. Install the `atom` and `apm` commands to `/usr/local/bin` by executing:
-
-  ```sh
-  sudo script/grunt install
-  ```
-
-  To use the newly installed Atom, quit and restart all running Atom instances.
-
-5. *Optionally*, you may generate distributable packages of Atom at `$TMPDIR/atom-build`. Currenty, `.deb` and `.rpm` package types are supported. To create a `.deb` package run:
-
-  ```sh
-  script/grunt mkdeb
-  ```
-
-  To create an `.rpm` package run
-
-  ```sh
-  script/grunt mkrpm
-  ```
-
-## Advanced Options
-
-### Custom install directory
+Create the atom application at `$TMPDIR/atom-build/Atom`:

 ```sh
-sudo script/grunt install --install-dir /install/atom/here
+script/build
 ```

-### Custom build directory
+Install the `atom` and `apm` commands to `/usr/local/bin`:

 ```sh
-script/build --build-dir /build/atom/here
+sudo script/grunt install
 ```

+Generate a `.deb` package at `$TMPDIR/atom-build`: (*optional*)
+
+```sh
+script/grunt mkdeb
+```
+
+Use the newly installed atom by restarting any running atom instances.
+
 ## Troubleshooting

-### TypeError: Unable to watch path
+### Exception: "TypeError: Unable to watch path"

 If you get following error with a big traceback right after Atom starts:

@@ -117,7 +70,7 @@ this is the reason for this error you can issue
 and restart Atom.  If Atom now works fine, you can make this setting permanent:

  ```sh
-  echo 32768 | sudo tee -a /proc/sys/fs/inotify/max_user_watches
+  echo 32768 > /proc/sys/fs/inotify/max_user_watches
  ```

 See also https://github.com/atom/atom/issues/2082.
@@ -129,31 +82,6 @@ have Node.js installed, or node isn't identified as Node.js on your machine.
 If it's the latter, entering `sudo ln -s /usr/bin/nodejs /usr/bin/node` into
 your terminal may fix the issue.

-#### You can also use Alternatives
-
-On some variants (mostly Debian based distros) it's preferable for you to use
-Alternatives so that changes to the binary paths can be fixed or altered easily:
-
-```sh
-sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 1 --slave /usr/bin/js js /usr/bin/nodejs
-```
-
-### AttributeError: 'module' object has no attribute 'script_main'
-
-If you get following error with a big traceback while building Atom:
-
-  ```
-  sys.exit(gyp.script_main()) AttributeError: 'module' object has no attribute 'script_main' gyp ERR!
-  ```
-
-you need to uninstall the system version of gyp.
-
-On Fedora you would do the following:
-
-  ```sh
-  sudo yum remove gyp
-  ```
-
 ### Linux build error reports in atom/atom
 * Use [this search](https://github.com/atom/atom/search?q=label%3Abuild-error+label%3Alinux&type=Issues)
  to get a list of reports about build errors on Linux.
@@ -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
@@ -36,7 +36,7 @@
 ## Why do I have to use GitHub for Windows?

 You don't. You can use your existing Git! GitHub for Windows's Git Shell is just
-easier to set up.
+easier to set up. 

 If you _prefer_ using your existing Git installation, make sure git's cmd directory is in your PATH env variable (e.g. `C:\Program Files (x86)\Git\cmd`) before you open your powershell or command window.
 Note that you may have to open your command window as administrator. For powershell that doesn't seem to always be the case, though.
@@ -66,19 +66,6 @@ If none of this works, do install Github for Windows and use its Git shell. Make
    * https://github.com/TooTallNate/node-gyp/issues/297
    * https://code.google.com/p/gyp/issues/detail?id=393

-* `script/build` stops at installing runas with 'Failed at the runas@0.5.4 install script.'
-
-  See the next item.
-
-* `error MSB8020: The build tools for Visual Studio 2010 (Platform Toolset = 'v100') cannot be found.`
-
-  * If you're building atom with Visual Studio 2013 try executing the following
-    command in your Git shell and then re-run `script/build`:
-
-    ```
-    $env:GYP_MSVS_VERSION=2013
-    ```
-
 * Other `node-gyp` errors on first build attempt, even though the right node and python versions are installed.
  * Do try the build command one more time, as experience shows it often works on second try in many of these cases.

@@ -9,27 +9,22 @@ in the proper package's repository.

 ### Cloning

-The first step is creating your own clone.
+The first step is creating your own clone. You can of course do this manually
+with git, or you can use the `apm develop` command to create a clone based on
+the package's `repository` field in the `package.json`.

-For example, if you want to make changes to the `tree-view` package, fork the repo on your github account, then clone it:
+For example, if you want to make changes to the `tree-view` package, run the
+following command:

 ```
-> git clone git@github.com:your-username/tree-view.git
-```
-
-Next install all the dependencies:
-
-```
-> cd tree-view
-> apm install
+> apm develop tree-view
+Cloning https://github.com/atom/tree-view ✓
 Installing modules ✓
+~/.atom/dev/packages/tree-view -> ~/github/tree-view
 ```

-Now you can link it to development mode so when you run an Atom window with `atom --dev`, you will use your fork instead of the built in package:
-
-```
-> apm link -d
-```
+This clones the `tree-view` repository to `~/github`. If you prefer a different
+path, specify it via the `ATOM_REPOS_HOME` environment variable.

 ### Running in Development Mode

@@ -51,4 +46,7 @@ from the package directory to create and remove dev-mode symlinks.

 ### Installing Dependencies

-You'll want to keep dependencies up to date by running `apm update` after pulling any upstream changes.
+Finally, you need to install the cloned package's dependencies by running
+`apm install` within the package directory. This step is also performed
+automatically the first time you run `apm develop`, but you'll want to keep
+dependencies up to date by running `apm update` after pulling upstream changes.
@@ -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
-style sheets your package needs to load. If not specified, style sheets in the
-_styles_ directory are added alphabetically.
+to your package
+- `stylesheets` (**Optional**): an Array of Strings identifying the order of the
+stylesheets your package needs to load. If not specified, stylesheets in the
+_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,33 +112,34 @@ 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
+## Stylesheets

-Style sheets for your package should be placed in the _styles_ 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.
+Stylesheets for your package should be placed in the _stylesheets_ directory.
+Any stylesheets in this directory will be loaded and attached to the DOM when
+your package is activated. Stylesheets 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
-that fits into Atom seamlessly. You can view all of Atom's UI components by
-opening the styleguide: open the command palette (`cmd-shift-P`) and search for
-_styleguide_, or just type `cmd-ctrl-shift-G`.
+that fits into Atom seamlessly. You can view all of Atom's UI components by opening
+the styleguide: open the command palette (`cmd-shift-P`) and search for _styleguide_,
+or just type `cmd-ctrl-shift-G`.

-If you _do_ need special styling, try to keep only structural styles in the
-package style sheets. If you _must_ specify colors and sizing, these should be
-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!
+If you _do_ need special styling, try to keep only structural styles in the package
+stylesheets. If you _must_ specify colors and sizing, these should be 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
-by name to specify a loading order; otherwise, style sheets are loaded
+An optional `stylesheets` array in your _package.json_ can list the stylesheets
+by name to specify a loading order; otherwise, stylesheets are loaded
 alphabetically.

 ## Keymaps
@@ -171,9 +157,9 @@ loaded in alphabetical order. An optional `keymaps` array in your _package.json_
 can specify which keymaps to load and in what order.


-Keybindings are executed by determining which element the keypress occurred on.
-In the example above, `changer:magic` command is executed when pressing `ctrl-V`
-on the `.tree-view-scroller` element.
+Keybindings are executed by determining which element the keypress occurred on. In
+the example above, `changer:magic` command is executed when pressing `ctrl-V` on
+the `.tree-view-scroller` element.

 See the [main keymaps documentation][keymaps] for more detailed information on
 how keymaps work.
@@ -209,8 +195,7 @@ with your package that aren't tied to a specific element:
 ```

 To add your own item to the application menu, simply create a top level `menu`
-key in any menu configuration file in _menus_. This can be a JSON or [CSON]
-file.
+key in any menu configuration file in _menus_. This can be a JSON or [CSON] file.

 The menu templates you specify are merged with all other templates provided
 by other packages in the order which they were loaded.
@@ -222,44 +207,37 @@ specific parts of the interface, like adding a file in the tree-view:

 ```coffeescript
 'context-menu':
-  '.tree-view': [
-    {label: 'Add file', command: 'tree-view:add-file'}
-  ]
-  'atom-workspace': [
-    {label: 'Inspect Element', command: 'core:inspect'}
-  ]
+  '.tree-view':
+    'Add file': 'tree-view:add-file'
+  '.workspace':
+    'Inspect Element': 'core:inspect'
 ```

 To add your own item to the application menu simply create a top level
 `context-menu` key in any menu configuration file in _menus_. This can be a
 JSON or [CSON] file.

-Context menus are created by determining which element was selected and then
-adding all of the menu items whose selectors match that element (in the order
-which they were loaded). The process is then repeated for the elements until
-reaching the top of the DOM tree.
+Context menus are created by determining which element was selected and
+then adding all of the menu items whose selectors match that element (in
+the order which they were loaded). The process is then repeated for the
+elements until reaching the top of the DOM tree.

 In the example above, the `Add file` item will only appear when the focused item
 or one of its parents has the `tree-view` class applied to it.

 You can also add separators and submenus to your context menus. To add a
-submenu, provide a `submenu` key instead of a command. To add a separator, add
-an item with a single `type: 'separator'` key/value pair.
+submenu, pass in another object instead of a command. To add a separator, use
+`-` for the command of the item.

 ```coffeescript
 'context-menu':
-  'atom-workspace': [
-    {
-      label: 'Text'
-      submenu: [
-        {label: 'Inspect Element', command: 'core:inspect'}
-        {type: 'separator'}
-        {label: 'Selector All', command: 'core:select-all'}
-        {type: 'separator'}
-        {label: 'Deleted Selected Text', command: 'core:delete'}
-      ]
-    }
-  ]
+  '.workspace':
+    'Inspect Element': 'core:inspect'
+    'Separator': '-'
+    'Text':
+      'Select All': 'core:select-all'
+      'Another Separator': '-'
+      'Deleted Selected Text': 'core:delete'
 ```

 ## Snippets
@@ -343,102 +321,6 @@ extensions your grammar supports:
 ]
 ```

-## Adding Configuration Settings
-
-You can support config settings in your package that are editable in the
-settings view. Specify a `config` key in your package main:
-
-```coffeescript
-module.exports =
-  # Your config schema!
-  config:
-    someInt:
-      type: 'integer'
-      default: 23
-      minimum: 1
-  activate: (state) -> # ...
-  # ...
-```
-
-To define the configuration, we use [json schema][json-schema] which allows you
-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 +371,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 +387,8 @@ 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.

@@ -60,8 +59,6 @@ window in dev mode. To open a Dev Mode Atom window run `atom --dev .` in the
 terminal, use `cmd-shift-o` or use the _View > Developer > Open in Dev Mode_
 menu. When you edit your theme, changes will instantly be reflected!

-> Note: It's advised to _not_ specify a `font-family` in your syntax theme because it will override the Font Family field in Atom's settings. If you still like to recommend a font that goes well with your theme, we recommend you do so in your README.
-
 ## Creating an Interface Theme

 Interface themes **must** provide a `ui-variables.less` file which contains all
@@ -131,13 +128,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,16 +54,16 @@ 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:

 ```coffee
-'atom-text-editor':
+'.editor':
  'enter': 'editor:newline'

-'atom-text-editor[mini] input':
+'.mini.editor input':
  'enter': 'core:confirm'
 ```

@@ -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
@@ -127,6 +118,7 @@ This option can be useful when you want to make Atom portable across machines.
      - `cr`: Carriage return (for Microsoft-style line endings)
      - `eol`: `\n` characters
      - `space`: Leading and trailing space characters
+  - `normalizeIndentOnPaste`: Enable/disable conversion of pasted tabs to spaces
  - `preferredLineLength`: Identifies the length of a line (defaults to `80`)
  - `showInvisibles`: Whether to render placeholders for invisible characters (defaults to `false`)
  - `showIndentGuide`: Show/hide indent indicators within the editor
@@ -177,17 +169,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 {
+.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
@@ -9,9 +9,7 @@
 * [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
 * [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)
-* [Contributing to Core Packages](contributing-to-packages.md)
 * [Debugging](debugging.md)
-* [Your First Package](your-first-package.md)

 ### Advanced Topics

@@ -19,11 +17,4 @@
 * [Developing Node Modules](advanced/node-modules.md)
 * [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
-
-* [Upgrading Your UI Theme Or Package Selectors](upgrading/upgrading-your-ui-theme.md)
-* [Upgrading Your Syntax Theme](upgrading/upgrading-your-syntax-theme.md)
+* [View System](advanced/view-system.md)
@@ -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
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="../../assets/js/html5shiv.js"></script>
+      <script src="../../assets/js/respond.min.js"></script>
+    <![endif]-->
+
+    <title>Atom - <%= title %></title>
+    <style>
+      /*github.com style (c) Vasily Polovnyov <vast@whiteants.net>*/
+      pre code {
+        display: block; padding: 0.5em;
+        color: #333;
+        background: #f8f8ff
+      }
+      pre .comment,
+      pre .template_comment,
+      pre .diff .header,
+      pre .javadoc {
+        color: #998;
+        font-style: italic
+      }
+      pre .keyword,
+      pre .css .rule .keyword,
+      pre .winutils,
+      pre .javascript .title,
+      pre .nginx .title,
+      pre .subst,
+      pre .request,
+      pre .status {
+        color: #333;
+        font-weight: bold
+      }
+      pre .number,
+      pre .hexcolor,
+      pre .ruby .constant {
+        color: #099;
+      }
+      pre .string,
+      pre .tag .value,
+      pre .phpdoc,
+      pre .tex .formula {
+        color: #d14
+      }
+      pre .title,
+      pre .id {
+        color: #900;
+        font-weight: bold
+      }
+      pre .javascript .title,
+      pre .lisp .title,
+      pre .clojure .title,
+      pre .subst {
+        font-weight: normal
+      }
+      pre .class .title,
+      pre .haskell .type,
+      pre .vhdl .literal,
+      pre .tex .command {
+        color: #458;
+        font-weight: bold
+      }
+      pre .tag,
+      pre .tag .title,
+      pre .rules .property,
+      pre .django .tag .keyword {
+        color: #000080;
+        font-weight: normal
+      }
+      pre .attribute,
+      pre .variable,
+      pre .lisp .body {
+        color: #008080
+      }
+      pre .regexp {
+        color: #009926
+      }
+      pre .class {
+        color: #458;
+        font-weight: bold
+      }
+      pre .symbol,
+      pre .ruby .symbol .string,
+      pre .lisp .keyword,
+      pre .tex .special,
+      pre .prompt {
+        color: #990073
+      }
+      pre .built_in,
+      pre .lisp .title,
+      pre .clojure .built_in {
+        color: #0086b3
+      }
+      pre .preprocessor,
+      pre .pi,
+      pre .doctype,
+      pre .shebang,
+      pre .cdata {
+        color: #999;
+        font-weight: bold
+      }
+      pre .deletion {
+        background: #fdd
+      }
+      pre .addition {
+        background: #dfd
+      }
+      pre .diff .change {
+        background: #0086b3
+      }
+      pre .chunk {
+        color: #aaa
+      }
+
+      body {
+        padding-top: 50px;
+      }
+    </style>
+  </head>
+  <body>
+   <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="/<%= tag %>/index.html">Atom Documentation</a>
+        </div>
+        <div class="collapse navbar-collapse">
+          <ul class="nav navbar-nav">
+            <li><a href="/docs/api/<%= tag %>/api/index.html">API</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+    <div class="container">
+      <%= content %>
+    </div>
+  </body>
+</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
@@ -1,24 +0,0 @@
-# Upgrading Your Syntax Theme
-
-Text editor content is now rendered in the shadow DOM, which shields it from being styled by global style sheets to protect against accidental style pollution. For more background on the shadow DOM, check out the [Shadow DOM 101][shadow-dom-101] on HTML 5 Rocks.
-
-Syntax themes are specifically intended to style only text editor content, so they are automatically loaded directly into the text editor's shadow DOM when it is enabled. This happens automatically when the the theme's `package.json` contains a `theme: "syntax"` declaration, so you don't need to change anything to target the appropriate context.
-
-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.
-
-```css
-atom-text-editor, :host { /* :host added */
-  background-color: @syntax-background-color;
-  color: @syntax-text-color;
-
-  .invisible-character {
-    color: @syntax-invisible-character-color;
-  }
-  /* more nested selectors... */
-}
-```
-
-[shadow-dom-101]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom
-[host-pseudo-element]: http://www.html5rocks.com/en/tutorials/webcomponents/shadowdom-201#toc-style-host
@@ -1,137 +0,0 @@
-# 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.
-
-## Deprecation Cop
-
-Deprecation cop will list usages of deprecated selector patterns to guide you. You can access it via the command palette (`cmd-shift-p`, then search for `Deprecation`). It breaks the deprecations down by package:
-
-![dep-cop](https://cloud.githubusercontent.com/assets/69169/5078860/d38a5df4-6e64-11e4-95b6-eb585ee9bbfc.png)
-
-## Custom Tags
-
-Rather than adding classes to standard HTML elements to indicate their role, Atom now uses custom element names. For example, `<div class="workspace">` has now been replaced with `<atom-workspace>`. Selectors should be updated accordingly. Note that tag names have lower specificity than classes in CSS, so you'll need to take care in converting things.
-
-Old Selector        | New Selector
--------------------|--------------------------------
-`.editor`           | `atom-text-editor`
-`.editor.mini`      | `atom-text-editor[mini]`
-`.workspace`        | `atom-workspace`
-`.horizontal`       | `atom-workspace-axis.horizontal`
-`.vertical`         | `atom-workspace-axis.vertical`
-`.pane-container`   | `atom-pane-conatiner`
-`.pane`             | `atom-pane`
-`.tool-panel`       | `atom-panel`
-`.panel-top`        | `atom-panel.top`
-`.panel-bottom`     | `atom-panel.bottom`
-`.panel-left`       | `atom-panel.left`
-`.panel-right`      | `atom-panel.right`
-`.overlay`          | `atom-panel.modal`
-
-## Supporting the Shadow DOM
-
-Text editor content is now rendered in the shadow DOM, which shields it from being styled by global style sheets to protect against accidental style pollution. For more background on the shadow DOM, check out the [Shadow DOM 101][shadow-dom-101] on HTML 5 Rocks. If you need to style text editor content in a UI theme, you'll need to circumvent this protection for any rules that target the text editor's content. Some examples of the kinds of UI theme styles needing to be updated:
-
-* Highlight decorations
-* Gutter decorations
-* Line decorations
-* Scrollbar styling
-* Anything targeting a child selector of `.editor`
-
-During a transition phase, it will be possible to enable or disable the text editor's shadow DOM in the settings, so themes will need to be compatible with both approaches.
-
-### Shadow DOM Selectors
-
-Chromium provides two tools for bypassing shadow boundaries, the `::shadow` pseudo-element and the `/deep/` combinator. For an in-depth explanation of styling the shadow DOM, see the [Shadow DOM 201][shadow-dom-201] article on HTML 5 Rocks.
-
-#### ::shadow
-
-The `::shadow` pseudo-element allows you to bypass a single shadow root. For example, say you want to update a highlight decoration for a linter package. Initially, the style looks as follows:
-
-```css
-// Without shadow DOM support
-atom-text-editor .highlight.my-linter {
-  background: hotpink;
-}
-```
-
-In order for this style to apply with the shadow DOM enabled, you will need to add a second selector with the `::shadow` pseudo-element. You should leave the original selector in place so your theme continues to work with the shadow DOM disabled during the transition period.
-
-```css
-// With shadow DOM support
-atom-text-editor .highlight.my-linter,
-atom-text-editor::shadow .highlight.my-linter {
-  background: hotpink;
-}
-```
-
-Check out the [find-and-replace][find-and-replace] package for another example of using `::shadow` to pierce the shadow DOM.
-
-#### /deep/
-
-The `/deep/` combinator overrides *all* shadow boundaries, making it useful for rules you want to apply globally such as scrollbar styling. Here's a snippet containing scrollbar styling for the Atom Dark UI theme before shadow DOM support:
-
-```css
-// Without shadow DOM support
-.scrollbars-visible-always {
-  ::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-  }
-
-  ::-webkit-scrollbar-track,
-  ::-webkit-scrollbar-corner {
-    background: @scrollbar-background-color;
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: @scrollbar-color;
-    border-radius: 5px;
-    box-shadow: 0 0 1px black inset;
-  }
-}
-```
-
-To style scrollbars even inside of the shadow DOM, each rule needs to be prefixed with `/deep/`. We use `/deep/` instead of `::shadow` because we don't care about the selector of the host element in this case. We just want our styling to apply everywhere.
-
-```css
-// With shadow DOM support using /deep/
-.scrollbars-visible-always {
-  /deep/ ::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-  }
-
-  /deep/ ::-webkit-scrollbar-track,
-  /deep/ ::-webkit-scrollbar-corner {
-    background: @scrollbar-background-color;
-  }
-
-  /deep/ ::-webkit-scrollbar-thumb {
-    background: @scrollbar-color;
-    border-radius: 5px;
-    box-shadow: 0 0 1px black inset;
-  }
-}
-```
-
-### Context-Targeted Style Sheets
-
-The selector features discussed above allow you to target shadow DOM content with specific selectors, but Atom also allows you to target a specific shadow DOM context with an entire style sheet. The context into which a style sheet is loaded is based on the file name. If you want to load a style sheet into the editor, name it with the `.atom-text-editor.less` or `.atom-text-editor.css` extensions.
-
-```
-my-ui-theme/
-  styles/
-    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.
-
-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.
-
-During the transition phase, style sheets targeting the `atom-text-editor` context will *also* be loaded globally. Make sure you update your selectors in a way that maintains compatibility with the shadow DOM being disabled. That means if you use a `::host` pseudo element, you should also include the same style rule matches against `atom-text-editor`.
-
-[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
@@ -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", ->
@@ -72,7 +72,7 @@ Writing Asynchronous specs can be tricky at first. Some examples.
        atom.workspace.open 'c.coffee'

    it "should be opened in an editor", ->
-      expect(atom.workspace.getActiveTextEditor().getPath()).toContain 'c.coffee'
+      expect(atom.workspace.getActiveEditor().getPath()).toContain 'c.coffee'

  ```

@@ -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:

 ```
@@ -49,18 +49,18 @@ Register the command in _lib/ascii-art.coffee_:
 ```coffeescript
 module.exports =
  activate: ->
-    atom.commands.add 'atom-workspace', "ascii-art:convert", => @convert()
+    atom.workspaceView.command "ascii-art:convert", => @convert()

  convert: ->
    # This assumes the active pane item is an editor
-    editor = atom.workspace.getActivePaneItem()
+    editor = atom.workspace.activePaneItem
    editor.insertText('Hello, World!')
 ```

-The `atom.commands.add` method takes a selector, command name, and a callback.
-The callback executes when the command is triggered on an element matching the
-selector. In this case, when the command is triggered the callback will call the
-`convert` method and insert 'Hello, World!'.
+The `atom.workspaceView.command` method takes a command name and a callback. The
+callback executes when the command is triggered. In this case, when the command
+is triggered the callback will call the `convert` method and insert 'Hello,
+World!'.

 ## Reload the Package

@@ -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,20 +88,20 @@ 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'
+'.editor':
+  '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
-`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.
+Notice `.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 `.editor` selector. If 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.

 Now reload the window and verify that the key binding works! You can also verify
 that it **doesn't** work when the Tree View is focused.
@@ -131,8 +131,8 @@ inserting 'Hello, World!' convert the selected text to ASCII art.
 ```coffeescript
 convert: ->
  # This assumes the active pane item is an editor
-  editor = atom.workspace.getActivePaneItem()
-  selection = editor.getLastSelection()
+  editor = atom.workspace.activePaneItem
+  selection = editor.getSelection()

  figlet = require 'figlet'
  figlet selection.getText(), {font: "Larry 3D 2"}, (error, asciiArt) ->
@@ -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
@@ -4,8 +4,11 @@
 # after packages are loaded/activated and after the previous editor state
 # has been restored.
 #
-# An example hack to log to the console when each text editor is saved.
+# An example hack to make opened Markdown files always be soft wrapped:
 #
-# atom.workspace.observeTextEditors (editor) ->
-#   editor.onDidSave ->
-#     console.log "Saved! #{editor.getPath()}"
+# path = require 'path'
+#
+# atom.workspaceView.eachEditorView (editorView) ->
+#   editor = editorView.getEditor()
+#   if path.extname(editor.getPath()) is '.md'
+#     editor.setSoftWrap(true)
@@ -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
@@ -9,17 +9,10 @@
 #
 # Here's an example taken from Atom's built-in keymap:
 #
-# 'atom-text-editor':
+# '.editor':
 #   'enter': 'editor:newline'
 #
-# 'atom-workspace':
-#   'ctrl-shift-p': 'core:move-up'
+# '.workspace':
+#   'ctrl-P': 'core:move-up'
 #   'ctrl-p': 'core:move-down'
 #
-# You can find more information about keymaps in these guides:
-# * https://atom.io/docs/latest/customizing-atom#customizing-key-bindings
-# * https://atom.io/docs/latest/advanced/keymaps
-#
-# This file uses CoffeeScript Object Notation (CSON).
-# If you are unfamiliar with CSON, you can read more about it here:
-# https://github.com/bevry/cson#what-is-cson
@@ -13,6 +13,3 @@
 #     'prefix': 'log'
 #     'body': 'console.log $1'
 #
-# This file uses CoffeeScript Object Notation (CSON).
-# If you are unfamiliar with CSON, you can read more about it here:
-# https://github.com/bevry/cson#what-is-cson
@@ -12,14 +12,10 @@

 }

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

 }

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

 }
@@ -1,127 +1,29 @@
 {Point, Range} = require 'text-buffer'
-{Emitter, Disposable, CompositeDisposable} = require 'event-kit'
-{deprecate} = require 'grim'

 module.exports =
  BufferedNodeProcess: require '../src/buffered-node-process'
  BufferedProcess: require '../src/buffered-process'
-  GitRepository: require '../src/git-repository'
-  Notification: require '../src/notification'
+  Git: require '../src/git'
  Point: Point
  Range: Range
-  Emitter: Emitter
-  Disposable: Disposable
-  CompositeDisposable: CompositeDisposable

 # The following classes can't be used from a Task handler and should therefore
 # only be exported when not running as a child node process
 unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE
-  module.exports.Task = require '../src/task'
-  module.exports.TextEditor = require '../src/text-editor'
-
  {$, $$, $$$, View} = require '../src/space-pen-extensions'

-  Object.defineProperty module.exports, 'Workspace', get: ->
-    deprecate """
-      Requiring `Workspace` from `atom` is no longer supported.
-      If you need this, please open an issue on
-      https://github.com/atom/atom/issues/new
-      And let us know what you are using it for.
-    """
-    require '../src/workspace'
-
-  Object.defineProperty module.exports, 'WorkspaceView', get: ->
-    deprecate """
-      Requiring `WorkspaceView` from `atom` is no longer supported.
-      Use `atom.views.getView(atom.workspace)` instead.
-    """
-    require '../src/workspace-view'
-
-  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'`
-        or
-        `$ = require 'jquery'`
-      Add `"atom-space-pen-views": "^2.0.3"` to your package dependencies.
-      Or add `"jquery": "^2"` 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.
-    """
-    $$
-
-  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.
-    """
-    $$$
-
-  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.
-    """
-    View
-
-  Object.defineProperty module.exports, 'EditorView', get: ->
-    deprecate """
-      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.
-    """
-    require '../src/text-editor-view'
-
-  Object.defineProperty module.exports, 'TextEditorView', get: ->
-    deprecate """
-      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.
-    """
-    require '../src/text-editor-view'
-
-  Object.defineProperty module.exports, 'ScrollView', get: ->
-    deprecate """
-      Requiring `ScrollView` from `atom` is no longer supported.
-      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.
-    """
-    require '../src/scroll-view'
-
-  Object.defineProperty module.exports, 'SelectListView', get: ->
-    deprecate """
-      Requiring `SelectListView` from `atom` is no longer supported.
-      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.
-    """
-    require '../src/select-list-view'
-
-  Object.defineProperty module.exports, 'React', get: ->
-    deprecate "Please require `react-atom-fork` instead: `React = require 'react-atom-fork'`. Add `\"react-atom-fork\": \"^0.11\"` to your package dependencies."
-    require 'react-atom-fork'
-
-  Object.defineProperty module.exports, 'Reactionary', get: ->
-    deprecate "Please require `reactionary-atom-fork` instead: `Reactionary = require 'reactionary-atom-fork'`. Add `\"reactionary-atom-fork\": \"^0.9\"` to your package dependencies."
-    require 'reactionary-atom-fork'
-
-Object.defineProperty module.exports, 'Git', get: ->
-  deprecate "Please require `GitRepository` instead of `Git`: `{GitRepository} = require 'atom'`"
-  module.exports.GitRepository
+  module.exports.$ = $
+  module.exports.$$ = $$
+  module.exports.$$$ = $$$
+  if atom.config.get('core.useReactMiniEditors')
+    module.exports.EditorView = require '../src/react-editor-view'
+  else
+    module.exports.EditorView = require '../src/editor-view'
+  module.exports.ScrollView = require '../src/scroll-view'
+  module.exports.SelectListView = require '../src/select-list-view'
+  module.exports.Task = require '../src/task'
+  module.exports.View = View
+  module.exports.WorkspaceView = require '../src/workspace-view'
+  module.exports.Workspace = require '../src/workspace'
+  module.exports.React = require 'react-atom-fork'
+  module.exports.Reactionary = require 'reactionary-atom-fork'
@@ -1,27 +1,25 @@
-'atom-text-editor':
+'.editor':
  # Platform Bindings
  'home': 'editor:move-to-first-character-of-line'
  'end': 'editor:move-to-end-of-screen-line'
  'shift-home': 'editor:select-to-first-character-of-line'
  'shift-end': 'editor:select-to-end-of-line'

-'atom-text-editor:not([mini])':
+'.editor:not(.mini)':
  # Atom Specific
  'ctrl-C': 'editor:copy-path'

  # Sublime Parity
  'tab': 'editor:indent'
  'enter': 'editor:newline'
+  'num-enter': 'editor:newline'
  'shift-tab': 'editor:outdent-selected-rows'
  'ctrl-K': 'editor:delete-line'

-'.select-list atom-text-editor[mini]':
-  'enter': 'core:confirm'
-
 '.tool-panel.panel-left, .tool-panel.panel-right':
  'escape': 'tool-panel:unfocus'

-'atom-text-editor !important, atom-text-editor[mini] !important':
+'.editor !important, .editor.mini !important':
  'escape': 'editor:consolidate-selections'

 # allow standard input fields to work correctly
@@ -29,6 +27,7 @@
  'tab': 'core:focus-next'
  'shift-tab': 'core:focus-previous'
  'enter': 'native!'
+  'num-enter': 'native!'
  'backspace': 'native!'
  'shift-backspace': 'native!'
  'delete': 'native!'
@@ -21,6 +21,7 @@
  'cmd-O': 'application:open-dev'
  'cmd-alt-ctrl-s': 'application:run-all-specs'
  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
  'escape': 'core:cancel'
  'up': 'core:move-up'
  'down': 'core:move-down'
@@ -29,8 +30,6 @@
  'ctrl-alt-cmd-l': 'window:reload'
  'alt-cmd-i': 'window:toggle-dev-tools'
  'cmd-alt-ctrl-p': 'window:run-package-specs'
-  'ctrl-shift-left': 'pane:move-item-left'
-  'ctrl-shift-right': 'pane:move-item-right'

  # Sublime Parity
  'cmd-,': 'application:show-settings'
@@ -102,7 +101,7 @@
  'cmd-8': 'pane:show-item-8'
  'cmd-9': 'pane:show-item-9'

-'atom-text-editor':
+'.editor':
  # Platform Bindings
  'alt-left': 'editor:move-to-beginning-of-word'
  'alt-right': 'editor:move-to-end-of-word'
@@ -112,7 +111,7 @@
  # Apple Specific
  'cmd-backspace': 'editor:delete-to-beginning-of-line'
  'cmd-shift-backspace': 'editor:delete-to-beginning-of-line'
-  'cmd-delete': 'editor:delete-to-end-of-line'
+  'cmd-delete': 'editor:delete-to-beginning-of-line'
  'ctrl-A': 'editor:select-to-first-character-of-line'
  'ctrl-E': 'editor:select-to-end-of-line'
  'cmd-left': 'editor:move-to-first-character-of-line'
@@ -121,7 +120,7 @@
  'cmd-shift-right': 'editor:select-to-end-of-line'
  'alt-backspace': 'editor:delete-to-beginning-of-word'
  'alt-delete': 'editor:delete-to-end-of-word'
-  'ctrl-a': 'editor:move-to-first-character-of-line'
+  'ctrl-a': 'editor:move-to-beginning-of-line'
  'ctrl-e': 'editor:move-to-end-of-line'
  'ctrl-k': 'editor:cut-to-end-of-line'

@@ -136,7 +135,7 @@
  'cmd-l': 'editor:select-line'
  'ctrl-t': 'editor:transpose'

-'atom-workspace atom-text-editor:not([mini])':
+'.workspace .editor:not(.mini)':
  # Atom specific
  'alt-cmd-z': 'editor:checkout-head-revision'
  'cmd-<': 'editor:scroll-to-cursor'
@@ -145,8 +144,6 @@
  # Sublime Parity
  'cmd-enter': 'editor:newline-below'
  'cmd-shift-enter': 'editor:newline-above'
-  'alt-enter': 'editor:newline'
-  'shift-enter': 'editor:newline'
  'cmd-]': 'editor:indent-selected-rows'
  'cmd-[': 'editor:outdent-selected-rows'
  'ctrl-cmd-up': 'editor:move-line-up'
@@ -1,4 +1,4 @@
-'atom-text-editor':
+'.editor':
  'alt-f': 'editor:move-to-end-of-word'
  'alt-F': 'editor:select-to-end-of-word'
  'alt-b': 'editor:move-to-beginning-of-word'
@@ -1,6 +1,7 @@
 'body':
  # Atom Specific
  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
  'escape': 'core:cancel'
  'up': 'core:move-up'
  'down': 'core:move-down'
@@ -10,14 +11,10 @@
  'ctrl-shift-i': 'window:toggle-dev-tools'
  'ctrl-alt-p': 'window:run-package-specs'
  'ctrl-alt-s': 'application:run-all-specs'
-  'ctrl-alt-o': 'application:open-dev'
-  'ctrl-shift-o': 'application:open-folder'
-  'ctrl-shift-pageup': 'pane:move-item-left'
-  'ctrl-shift-pagedown': 'pane:move-item-right'
+  'ctrl-shift-o': 'application:open-dev'
  'F11': 'window:toggle-full-screen'

  # Sublime Parity
-  'ctrl-,': 'application:show-settings'
  'ctrl-N': 'application:new-window'
  'ctrl-W': 'window:close'
  'ctrl-o': 'application:open-file'
@@ -81,7 +78,7 @@
  'alt-8': 'pane:show-item-8'
  'alt-9': 'pane:show-item-9'

-'atom-workspace atom-text-editor':
+'.workspace .editor':
  # Platform Bindings
  'ctrl-left': 'editor:move-to-beginning-of-word'
  'ctrl-right': 'editor:move-to-end-of-word'
@@ -101,7 +98,7 @@
  'ctrl-k ctrl-l': 'editor:lower-case'
  'ctrl-l': 'editor:select-line'

-'atom-workspace atom-text-editor:not([mini])':
+'.workspace .editor:not(.mini)':
  # Atom specific
  'alt-ctrl-z': 'editor:checkout-head-revision'
  'ctrl-<': 'editor:scroll-to-cursor'
@@ -5,6 +5,7 @@

  # Atom Specific
  'enter': 'core:confirm'
+  'num-enter': 'core:confirm'
  'escape': 'core:cancel'
  'up': 'core:move-up'
  'down': 'core:move-down'
@@ -14,10 +15,6 @@
  'ctrl-alt-i': 'window:toggle-dev-tools'
  'ctrl-alt-p': 'window:run-package-specs'
  'ctrl-alt-s': 'application:run-all-specs'
-  'ctrl-alt-o': 'application:open-dev'
-  'ctrl-shift-o': 'application:open-folder'
-  'ctrl-shift-left': 'pane:move-item-left'
-  'ctrl-shift-right': 'pane:move-item-right'
  'F11': 'window:toggle-full-screen'

  # Sublime Parity
@@ -29,8 +26,8 @@
  'ctrl-n': 'application:new-file'
  'ctrl-s': 'core:save'
  'ctrl-S': 'core:save-as'
-  'ctrl-f4': 'core:close'
  'ctrl-w': 'core:close'
+  'ctrl-f4': 'core:close'
  'ctrl-z': 'core:undo'
  'ctrl-shift-z': 'core:redo'
  'ctrl-y': 'core:redo'
@@ -78,7 +75,7 @@
  'ctrl-k ctrl-left':  'window:focus-pane-on-left'
  'ctrl-k ctrl-right': 'window:focus-pane-on-right'

-'atom-workspace atom-text-editor':
+'.workspace .editor':
  # Platform Bindings
  'ctrl-left': 'editor:move-to-beginning-of-word'
  'ctrl-right': 'editor:move-to-end-of-word'
@@ -98,7 +95,7 @@
  'ctrl-k ctrl-l': 'editor:lower-case'
  'ctrl-l': 'editor:select-line'

-'atom-workspace atom-text-editor:not([mini])':
+'.workspace .editor:not(.mini)':
  # Atom specific
  'alt-ctrl-z': 'editor:checkout-head-revision'
  'ctrl-<': 'editor:scroll-to-cursor'
@@ -18,8 +18,6 @@
      { type: 'separator' }
      { label: 'Install Shell Commands', command: 'window:install-shell-commands' }
      { type: 'separator' }
-      { label: 'Services', submenu: [] }
-      { type: 'separator' }
      { label: 'Hide Atom', command: 'application:hide' }
      { label: 'Hide Others', command: 'application:hide-other-applications' }
      { label: 'Show All', command: 'application:unhide-all-applications' }
@@ -190,39 +188,7 @@
    submenu: [
      { label: 'Terms of Use', command: 'application:open-terms-of-use' }
      { label: 'Documentation', command: 'application:open-documentation' }
-      { label: 'Roadmap', command: 'application:open-roadmap' }
-      { label: 'Frequently Asked Questions', command: 'application:open-faq' }
-      { type: 'separator' }
-      { label: 'Community Discussions', command: 'application:open-discussions' }
-      { label: 'Report Issue', command: 'application:report-issue' }
-      { label: 'Search Issues', command: 'application:search-issues' }
      { type: 'separator' }
    ]
  }
 ]
-
-'context-menu':
-  'atom-text-editor, .overlayer': [
-    {label: 'Undo', command: 'core:undo'}
-    {label: 'Redo', command: 'core:redo'}
-    {type: 'separator'}
-    {label: 'Cut', command: 'core:cut'}
-    {label: 'Copy', command: 'core:copy'}
-    {label: 'Paste', command: 'core:paste'}
-    {label: 'Delete', command: 'core:delete'}
-    {label: 'Select All', command: 'core:select-all'}
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
-  'atom-pane': [
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
@@ -8,6 +8,8 @@
      { label: 'Open Folder...', command: 'application:open-folder' }
      { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
      { type: 'separator' }
+      { label: '&Preferences...', command: 'application:show-settings' }
+      { type: 'separator' }
      { label: '&Save', command: 'core:save' }
      { label: 'Save &As...', command: 'core:save-as' }
      { label: 'Save A&ll', command: 'window:save-all' }
@@ -78,14 +80,6 @@
          { label: 'Fold Level 9', command: 'editor:fold-at-indent-level-9' }
        ]
      }
-      { type: 'separator' }
-      { label: '&Preferences', command: 'application:show-settings' }
-      { label: 'Open Your Config', command: 'application:open-your-config' }
-      { label: 'Open Your Init Script', command: 'application:open-your-init-script' }
-      { label: 'Open Your Keymap', command: 'application:open-your-keymap' }
-      { label: 'Open Your Snippets', command: 'application:open-your-snippets' }
-      { label: 'Open Your Stylesheet', command: 'application:open-your-stylesheet' }
-      { type: 'separator' }
    ]
  }

@@ -94,7 +88,6 @@
    submenu: [
      { label: '&Reload', command: 'window:reload' }
      { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
-      { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' }
      {
        label: 'Developer'
        submenu: [
@@ -140,6 +133,16 @@
    submenu: []
  }

+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
  {
    label: '&Help'
    submenu: [
@@ -148,39 +151,7 @@
      { label: "VERSION", enabled: false }
      { type: 'separator' }
      { label: '&Documentation', command: 'application:open-documentation' }
-      { label: 'Roadmap', command: 'application:open-roadmap' }
-      { label: 'Frequently Asked Questions', command: 'application:open-faq' }
-      { type: 'separator' }
-      { label: 'Community Discussions', command: 'application:open-discussions' }
-      { label: 'Report Issue', command: 'application:report-issue' }
-      { label: 'Search Issues', command: 'application:search-issues' }
      { type: 'separator' }
    ]
  }
 ]
-
-'context-menu':
-  'atom-text-editor, .overlayer': [
-    {label: 'Undo', command: 'core:undo'}
-    {label: 'Redo', command: 'core:redo'}
-    {type: 'separator'}
-    {label: 'Cut', command: 'core:cut'}
-    {label: 'Copy', command: 'core:copy'}
-    {label: 'Paste', command: 'core:paste'}
-    {label: 'Delete', command: 'core:delete'}
-    {label: 'Select All', command: 'core:select-all'}
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
-  'atom-pane': [
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
@@ -33,8 +33,8 @@
      { label: '&Undo', command: 'core:undo' }
      { label: '&Redo', command: 'core:redo' }
      { type: 'separator' }
-      { label: 'Cu&t', command: 'core:cut' }
-      { label: '&Copy', command: 'core:copy' }
+      { label: '&Cut', command: 'core:cut' }
+      { label: 'C&opy', command: 'core:copy' }
      { label: 'Copy Pat&h', command: 'editor:copy-path' }
      { label: '&Paste', command: 'core:paste' }
      { label: 'Select &All', command: 'core:select-all' }
@@ -93,7 +93,6 @@
    submenu: [
      { label: '&Reload', command: 'window:reload' }
      { label: 'Toggle &Full Screen', command: 'window:toggle-full-screen' }
-      { label: 'Toggle Menu Bar', command: 'window:toggle-menu-bar' }
      {
        label: 'Panes'
        submenu: [
@@ -110,7 +109,7 @@
          { label: 'Focus Pane On Left', command: 'window:focus-pane-on-left' }
          { label: 'Focus Pane On Right', command: 'window:focus-pane-on-right' }
          { type: 'separator' }
-          { label: 'Close Pane', command: 'pane:close' }
+          { label: 'Close pane', command: 'pane:close' }
        ]
      }
      {
@@ -158,50 +157,25 @@
    submenu: []
  }

+  {
+    label: '&Window'
+    submenu: [
+      { label: 'Mi&nimize', command: 'application:minimize' }
+      { label: 'Ma&ximize', command: 'application:zoom' }
+      { type: 'separator' }
+      { label: 'Bring &All to Front', command: 'application:bring-all-windows-to-front' }
+    ]
+  }
+
  {
    label: '&Help'
    submenu: [
      { label: 'View &Terms of Use', command: 'application:open-terms-of-use' }
      { label: 'View &License', command: 'application:open-license' }
-      { label: 'VERSION', enabled: false }
-      { label: 'Restart and Install Update', command: 'application:install-update', visible: false}
-      { label: 'Check for Update', command: 'application:check-for-update', visible: false}
-      { label: 'Downloading Update', enabled: false, visible: false}
+      { label: "VERSION", enabled: false }
      { type: 'separator' }
      { label: '&Documentation', command: 'application:open-documentation' }
-      { label: 'Roadmap', command: 'application:open-roadmap' }
-      { label: 'Frequently Asked Questions', command: 'application:open-faq' }
-      { type: 'separator' }
-      { label: 'Community Discussions', command: 'application:open-discussions' }
-      { label: 'Report Issue', command: 'application:report-issue' }
-      { label: 'Search Issues', command: 'application:search-issues' }
      { type: 'separator' }
    ]
  }
 ]
-
-'context-menu':
-  'atom-text-editor, .overlayer': [
-    {label: 'Undo', command: 'core:undo'}
-    {label: 'Redo', command: 'core:redo'}
-    {type: 'separator'}
-    {label: 'Cut', command: 'core:cut'}
-    {label: 'Copy', command: 'core:copy'}
-    {label: 'Paste', command: 'core:paste'}
-    {label: 'Delete', command: 'core:delete'}
-    {label: 'Select All', command: 'core:select-all'}
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
-  'atom-pane': [
-    {type: 'separator'}
-    {label: 'Split Up', command: 'pane:split-up'}
-    {label: 'Split Down', command: 'pane:split-down'}
-    {label: 'Split Left', command: 'pane:split-left'}
-    {label: 'Split Right', command: 'pane:split-right'}
-    {type: 'separator'}
-  ]
@@ -1,7 +1,7 @@
 {
  "name": "atom",
  "productName": "Atom",
-  "version": "0.178.0",
+  "version": "0.121.0",
  "description": "A hackable text editor for the 21st Century.",
  "main": "./src/browser/main.js",
  "repository": {
@@ -17,143 +17,128 @@
      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
    }
  ],
-  "atomShellVersion": "0.21.0",
+  "atomShellVersion": "0.15.2",
  "dependencies": {
-    "6to5-core": "^3.0.14",
    "async": "0.2.6",
-    "atom-keymap": "^3.1.0",
+    "atom-keymap": "^1.0.2",
    "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",
+    "emissary": "^1.2.2",
+    "first-mate": "^2.0.1",
+    "fs-plus": "^2.2.6",
    "fstream": "0.1.24",
-    "fuzzaldrin": "^2.1",
-    "git-utils": "^3.0.0",
-    "grim": "1.1.0",
+    "fuzzaldrin": "^1.1",
+    "git-utils": "^2.1.3",
+    "grim": "0.11.0",
    "guid": "0.0.10",
-    "jasmine-json": "~0.0",
+    "immutable": "^2.0.4",
    "jasmine-tagged": "^1.1.2",
-    "jquery": "^2.1.1",
-    "less-cache": "0.21",
-    "marked": "^0.3",
+    "less-cache": "0.13.0",
    "mixto": "^1",
    "mkdirp": "0.3.5",
-    "nslog": "^2.0.0",
-    "oniguruma": "^4.0.0",
+    "nslog": "^1.0.1",
+    "oniguruma": "^3.0.3",
    "optimist": "0.4.0",
-    "pathwatcher": "^3.1.0",
+    "pathwatcher": "^2.0.6",
    "property-accessors": "^1",
    "q": "^1.0.1",
    "random-words": "0.0.1",
-    "react-atom-fork": "^0.11.5",
+    "react-atom-fork": "^0.11.2",
    "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",
-    "semver": "2.2.1",
+    "runas": "1.0.1",
+    "scandal": "1.0.0",
+    "scoped-property-store": "^0.9.0",
+    "scrollbar-style": "^1.0.2",
+    "season": "^1.0.2",
+    "semver": "1.1.4",
    "serializable": "^1",
-    "service-hub": "^0.2.0",
-    "space-pen": "3.8.2",
-    "stacktrace-parser": "0.1.1",
+    "space-pen": "3.2.0",
    "temp": "0.7.0",
-    "text-buffer": "^4.0.0",
-    "theorist": "^1.0.2",
-    "underscore-plus": "^1.6.6",
+    "text-buffer": "^3.0.0",
+    "theorist": "^1",
+    "underscore-plus": "^1.5.1",
    "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",
-    "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",
-    "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",
-    "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-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-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",
+    "atom-dark-syntax": "0.19.0",
+    "atom-dark-ui": "0.33.0",
+    "atom-light-syntax": "0.20.0",
+    "atom-light-ui": "0.29.0",
+    "base16-tomorrow-dark-theme": "0.20.0",
+    "base16-tomorrow-light-theme": "0.4.0",
+    "solarized-dark-syntax": "0.22.0",
+    "solarized-light-syntax": "0.12.0",
+    "archive-view": "0.35.0",
+    "autocomplete": "0.29.0",
+    "autoflow": "0.17.0",
+    "autosave": "0.14.0",
+    "background-tips": "0.15.0",
+    "bookmarks": "0.27.0",
+    "bracket-matcher": "0.51.0",
+    "command-palette": "0.24.0",
+    "deprecation-cop": "0.7.0",
+    "dev-live-reload": "0.33.0",
+    "exception-reporting": "0.19.0",
+    "feedback": "0.33.0",
+    "find-and-replace": "0.127.0",
+    "fuzzy-finder": "0.57.0",
+    "git-diff": "0.37.0",
+    "go-to-line": "0.23.0",
+    "grammar-selector": "0.27.0",
+    "image-view": "0.36.0",
+    "incompatible-packages": "0.5.0",
+    "keybinding-resolver": "0.19.0",
+    "link": "0.25.0",
+    "markdown-preview": "0.95.0",
+    "metrics": "0.33.0",
+    "open-on-github": "0.29.0",
+    "package-generator": "0.31.0",
+    "release-notes": "0.36.0",
+    "settings-view": "0.137.0",
+    "snippets": "0.51.0",
+    "spell-check": "0.40.0",
+    "status-bar": "0.42.0",
+    "styleguide": "0.29.0",
+    "symbols-view": "0.63.0",
+    "tabs": "0.48.0",
+    "timecop": "0.22.0",
+    "tree-view": "0.112.0",
+    "update-package-dependencies": "0.6.0",
+    "welcome": "0.17.0",
+    "whitespace": "0.25.0",
+    "wrap-guide": "0.21.0",
+    "language-c": "0.26.0",
+    "language-coffee-script": "0.28.0",
+    "language-css": "0.17.0",
+    "language-gfm": "0.45.0",
+    "language-git": "0.9.0",
+    "language-go": "0.16.0",
+    "language-html": "0.22.0",
+    "language-hyperlink": "0.10.0",
+    "language-java": "0.11.0",
+    "language-javascript": "0.39.0",
+    "language-json": "0.8.0",
+    "language-less": "0.13.0",
+    "language-make": "0.10.0",
+    "language-objective-c": "0.11.0",
+    "language-perl": "0.9.0",
+    "language-php": "0.15.0",
+    "language-property-list": "0.7.0",
+    "language-python": "0.18.0",
+    "language-ruby": "0.33.0",
+    "language-ruby-on-rails": "0.15.0",
+    "language-sass": "0.14.0",
+    "language-shellscript": "0.8.0",
+    "language-source": "0.8.0",
+    "language-sql": "0.9.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.10.0",
+    "language-toml": "0.12.0",
+    "language-xml": "0.17.0",
+    "language-yaml": "0.14.0"
  },
  "private": true,
  "scripts": {
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Atom
+Comment=<%= description %>
+Exec=<%= installDir %>/share/atom/atom %U
+Icon=<%= iconName %>
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Utility;TextEditor;
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Atom
-Comment=<%= description %>
-GenericName=Text Editor
-Exec=<%= executable %> %U
-Icon=<%= iconName %>
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Utility;TextEditor;Development;
-MimeType=text/plain;
@@ -1,11 +1,8 @@
 Package: <%= name %>
 Version: <%= version %>
-Depends: git, gconf2, gconf-service, libgtk2.0-0, libudev0 | libudev1, libgcrypt11, libnotify4, libxtst6, libnss3, python, gvfs-bin, xdg-utils
-Suggests: libgnome-keyring0, gir1.2-gnomekeyring-1.0
 Section: <%= section %>
 Priority: optional
 Architecture: <%= arch %>
-Installed-Size: <%= installedSize %>
+Installed-Size: `du -ks usr|cut -f 1`
 Maintainer: <%= maintainer %>
 Description: <%= description %>
- Atom is a free and open source text editor that is modern, approachable, and hackable to the core.
@@ -1,7 +0,0 @@
-atom: arch-dependent-file-in-usr-share
-atom: changelog-file-missing-in-native-package
-atom: copyright-file-contains-full-apache-2-license
-atom: copyright-should-refer-to-common-license-file-for-apache-2
-atom: embedded-library
-atom: package-installs-python-bytecode
-atom: unstripped-binary-or-object
@@ -1,27 +0,0 @@
-Name:           <%= name %>
-Version:        <%= version %>
-Release:        0.1%{?dist}
-Summary:        <%= description %>
-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/
-
-%files
-<%= installDir %>/bin/atom
-<%= installDir %>/bin/apm
-<%= installDir %>/share/atom/
-<%= installDir %>/share/applications/atom.desktop
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$0/../../app/apm/bin/node.exe" "$0/../../app/apm/lib/cli.js" "$@"
@@ -1,22 +0,0 @@
-@echo off
-
-SET EXPECT_OUTPUT=
-
-FOR %%a IN (%*) DO (
-  IF /I "%%a"=="-f"           SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="--foreground" SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="-h"           SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="--help"       SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="-t"           SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="--test"       SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="-v"           SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="--version"    SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="-w"           SET EXPECT_OUTPUT=YES
-  IF /I "%%a"=="--wait"       SET EXPECT_OUTPUT=YES
-)
-
-IF "%EXPECT_OUTPUT%"=="YES" (
-  "%~dp0\..\..\atom.exe" %*
-) ELSE (
-  "%~dp0\..\app\apm\bin\node.exe" "%~dp0\atom.js" %*
-)
@@ -1,9 +0,0 @@
-var path  = require('path');
-var spawn = require('child_process').spawn;
-
-var atomCommandPath = path.resolve(__dirname, '..', '..', 'atom.exe');
-var arguments = process.argv.slice(2);
-arguments.unshift('--executed-from', process.cwd());
-var options = {detached: true, stdio: 'ignore'};
-spawn(atomCommandPath, arguments, options);
-process.exit(0);
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-while getopts ":fhtvw-:" opt; do
-  case "$opt" in
-    -)
-      case "${OPTARG}" in
-        foreground|help|test|version|wait)
-          EXPECT_OUTPUT=1
-        ;;
-      esac
-      ;;
-    f|h|t|v|w)
-      EXPECT_OUTPUT=1
-      ;;
-  esac
-done
-
-if [ $EXPECT_OUTPUT ]; then
-  "$0/../../../atom.exe" "$@"
-else
-  "$0/../../app/apm/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;
@@ -5,6 +5,9 @@ var path = require('path');

 process.chdir(path.dirname(__dirname));

+if (process.platform == 'linux')
+  throw new Error('cibuild can not run on linux yet!');
+
 var homeDir = process.platform == 'win32' ? process.env.USERPROFILE : process.env.HOME;

 function loadEnvironmentVariables(filePath) {
@@ -24,7 +27,7 @@ function loadEnvironmentVariables(filePath) {
 function readEnvironmentVariables() {
  if (process.platform === 'win32')
    loadEnvironmentVariables(path.resolve('/jenkins/config/atomcredentials'));
-  else if (process.platform === 'darwin') {
+  else {
    loadEnvironmentVariables('/var/lib/jenkins/config/atomcredentials');
    loadEnvironmentVariables('/var/lib/jenkins/config/xcodekeychain');
  }
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export ATOM_ACCESS_TOKEN=$BUILD_ATOM_LINUX_ACCESS_TOKEN
-
-if [ -d /usr/local/share/nodenv ]; then
-  export NODENV_ROOT=/usr/local/share/nodenv
-  export PATH=/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:$PATH
-  export NODENV_VERSION="v0.10.21"
-fi
-
-script/cibuild
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-docker build -t atom-rpm .
-docker run \
- --rm \
- --env JANKY_SHA1="$JANKY_SHA1" \
- --env JANKY_BRANCH="$JANKY_BRANCH" \
- --env ATOM_ACCESS_TOKEN="$BUILD_ATOM_RPM_ACCESS_TOKEN" \
- atom-rpm /atom/script/rpmbuild
-docker rmi atom-rpm
@@ -15,4 +15,4 @@ if [%2] == [] (
 if exist %2 rmdir %2 /s /q

 :: cp -rf %1 %2
-(robocopy %1 %2 /e) ^& IF %ERRORLEVEL% LEQ 1 exit 0
+xcopy %1 %2 /e /h /c /i /y /r
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Nathan Sobo	6e42552891	Add proper line decorations to initial state	2014-08-06 11:52:45 -06:00
Nathan Sobo	70d4af9341	Handle 'onlyNonEmpty' option for line decorations	2014-08-06 11:26:14 -06:00
Nathan Sobo	9c17e8b705	Handle 'onlyEmpty' option for line decorations	2014-08-06 11:24:16 -06:00
Nathan Sobo	7954b5c1fd	Support 'onlyHead' option in line decorations	2014-08-06 11:16:01 -06:00
Nathan Sobo	3d9b22bae4	Refactor line decoration updates	2014-08-06 11:13:21 -06:00
Nathan Sobo	ae6a3fddb2	Improve custom matcher to express omission of values	2014-08-06 11:13:05 -06:00
Nathan Sobo	f6a8a42a6d	Use line decorations to update display Basic line decorations are working, but we still need to handle special decoration options.	2014-08-05 19:37:54 -06:00
Nathan Sobo	16765138b8	Build line decorations into initial state	2014-08-05 19:36:55 -06:00
Nathan Sobo	3e656f83b8	Fix fat finger	2014-08-05 19:36:24 -06:00
Nathan Sobo	b04b025a0c	Only handle line decorations for now	2014-08-05 19:36:02 -06:00
Nathan Sobo	88743e8a71	Update the display state on when line decorations are updated or removed	2014-08-05 18:24:57 -06:00
Nathan Sobo	30d71fc37a	Add line decorations to display state when they're added	2014-08-05 17:14:54 -06:00
Nathan Sobo	09aa62fae8	Make ::updateTiles an iterator for operation-specific updates Previously, I was trying to update everything with the same method. Now I'm performing updates that are specifically tailored to each type of operation on the model.	2014-08-05 16:35:27 -06:00
Nathan Sobo	f29e50b730	Update tile states when display buffer changes	2014-08-05 14:10:18 -06:00
Nathan Sobo	dcd60a275a	WIP: Base editor updates on immutable display state	2014-08-04 21:09:17 -06:00
Nathan Sobo	5e6dff9175	Render cursors	2014-08-04 12:04:46 -06:00
Nathan Sobo	dd5bc5891c	Break lines out into manually-updated tiles	2014-08-04 12:04:46 -06:00
Nathan Sobo	79bc071353	Avoid React handling of keydown/textInput to save ~1ms on keystrokes	2014-08-04 12:04:46 -06:00
Nathan Sobo	d3c2633bb3	WIP	2014-08-04 12:04:00 -06:00