Merge branch 'master' into devtoolserror

content/getting-started/sections/atom-basics.md

@@ -21,7 +21,7 @@ In that welcome screen, we are introduced to probably the most important command
 
 {{#note}}
 
-Throughout the book we will use shortcut keybindings like <kbd class="platform-mac">Cmd+Shift+P</kbd><kbd class="platform-windows platform-linux">Ctrl+Shift+P</kbd> to demonstrate how to run a command. These are the default keybindings for the platform that we detected you running.
+Throughout the book, we will use shortcut keybindings like <kbd class="platform-mac">Cmd+Shift+P</kbd><kbd class="platform-windows platform-linux">Ctrl+Shift+P</kbd> to demonstrate how to run a command. These are the default keybindings for the platform that we detected you running.
 
 If you want to see a different platform than the one we detected, you may choose a different one by using the platform selector near the top of the page:
 
@@ -77,7 +77,7 @@ The "Soft Wrap" option will wrap lines that are too long to fit in your current
 
 In [Basic Customization](/using-atom/sections/basic-customization/) we will see how to set different wrap preferences for different types of files (for example, if you want to wrap Markdown files but not other files).
 
-#### Opening, Modifying and Saving Files
+#### Opening, Modifying, and Saving Files
 
 Now that your editor is looking and acting how you want, let's start opening up and editing files. This is a text editor after all, right?
 

content/getting-started/sections/why-atom.md

@@ -21,7 +21,7 @@ Web browsers are great for browsing web pages, but writing code is a specialized
 
 For this reason, we didn't build Atom as a traditional web application. Instead, Atom is a specialized variant of Chromium designed to be a text editor rather than a web browser. Every Atom window is essentially a locally-rendered web page.
 
-All the APIs available to a typical Node.js application are also available to the code running in each window's JavaScript context. This hybrid provides an unique client-side development experience.
+All the APIs available to a typical Node.js application are also available to the code running in each window's JavaScript context. This hybrid provides a unique client-side development experience.
 
 Since everything is local, you don't have to worry about asset pipelines, script concatenation, and asynchronous module definitions. If you want to load some code, just require it at the top of your file. Node's module system makes it easy to break the system down into lots of small, focused packages.
 
@@ -33,7 +33,7 @@ In addition to the Node APIs, we also expose APIs for native dialogs, adding app
 
 ##### Web Tech: The Fun Parts
 
-Another great thing about writing code for Atom is the guarantee that it's running on the newest version of Chromium. That means we can ignore issues like browser compatibility and polyfills. We can use all the web's shiny features of tomorrow, today.
+Another great benefit, that comes with writing code for Atom, is the guarantee that it's running on the newest version of Chromium. That means we can ignore issues like browser compatibility and polyfills. We can use all the web's shiny features of tomorrow, today.
 
 For example, the layout of our workspace and panes is based on flexbox. It's an emerging standard and has gone through a lot of change since we started using it, but none of that mattered as long as it worked.
 

content/hacking-atom/sections/debugging.md

@@ -53,7 +53,7 @@ $ atom --safe
 
 This starts Atom, but does not load packages from `~/.atom/packages` or `~/.atom/dev/packages` and disables loading of your init script. If you can no longer reproduce the problem in safe mode, it's likely it was caused by one of the packages or the init script.
 
-If removing or commenting out all content from the init script and starting Atom normally still produces the error, then try figuring out which package is causing trouble. Start Atom normally again and open the Settings View with <kbd class="platform-mac">Cmd+,</kbd><kbd class="platform-windows platform-linux">Ctrl+,</kbd>. Since the Settings View allows you to disable each installed package, you can disable packages one by one until you can no longer reproduce the issue. Restart Atom or reload Atom with <kbd class="platform-mac">Alt+Cmd+Ctrl+L</kbd><kbd class="platform-windows platform-linux">Alt+Ctrl+R</kbd> after you disable each package to make sure it's completely gone.
+If removing or commenting out all content from the init script and starting Atom normally still produces the error, then try figuring out which package is causing trouble. Start Atom normally again and open the Settings View with <kbd class="platform-mac">Cmd+,</kbd><kbd class="platform-windows platform-linux">Ctrl+,</kbd>. Since the Settings View allows you to disable each installed package, you can disable packages one by one until you can no longer reproduce the issue. Restart Atom or reload Atom with <kbd class="platform-mac">Alt+Cmd+Ctrl+L</kbd><kbd class="platform-windows platform-linux">Ctrl+Shift+F5</kbd> after you disable each package to make sure it's completely gone.
 
 When you find the problematic package, you can disable or uninstall the package. We strongly recommend creating an issue on the package's GitHub repository. The [Atom FAQ](https://discuss.atom.io/c/faq) has information on [how to contact the maintainers of any Atom community package or theme](https://discuss.atom.io/t/i-have-a-question-about-a-specific-atom-community-package-where-is-the-best-place-to-ask-it/25581).
 

content/hacking-atom/sections/hacking-on-atom-core.md

@@ -26,7 +26,7 @@ $ script/bootstrap
 
 #### Running in Development Mode
 
-Once you have a local copy of Atom cloned and bootstrapped, you can then run Atom in Development Mode. But first, you have to set the `ATOM_DEV_RESOURCE_PATH` environment variable. It defaults to <span class="platform-mac platform-linux">`~/github`</span><span class="platform-windows">`%USERPROFILE%\github`</span> which then expects the `atom/atom` repository to be cloned into <span class="platform-mac platform-linux">`$ATOM_DEV_RESOURCE_PATH/atom`</span><span class="platform-windows">`%ATOM_DEV_RESOURCE_PATH%\atom`</span>. To run Atom in Dev Mode, use the `--dev` parameter from the terminal:
+Once you have a local copy of Atom cloned and bootstrapped, you can then run Atom in Development Mode. But first, you have to set the `ATOM_DEV_RESOURCE_PATH` environment variable. It defaults to <span class="platform-mac platform-linux">`~/github/atom`</span><span class="platform-windows">`%USERPROFILE%\github\atom`</span> which then expects the `atom/atom` repository to be cloned into <span class="platform-mac platform-linux">`$ATOM_DEV_RESOURCE_PATH`</span><span class="platform-windows">`%ATOM_DEV_RESOURCE_PATH%`</span>. To run Atom in Dev Mode, use the `--dev` parameter from the terminal:
 
 ``` command-line
 $ atom --dev <em>path-to-open</em>