From cc0b982c5abbe8799fba2b49d15bc6761fd929a7 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 14 Jan 2019 10:49:21 -0500 Subject: [PATCH] Re-word help text --- src/main-process/parse-command-line.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main-process/parse-command-line.js b/src/main-process/parse-command-line.js index 5d7849eac..3aa019565 100644 --- a/src/main-process/parse-command-line.js +++ b/src/main-process/parse-command-line.js @@ -11,16 +11,20 @@ module.exports = function parseCommandLine (processArgs) { dedent`Atom Editor v${version} Usage: + atom atom [options] [path ...] atom file[:line[:column]] - One or more paths to files or folders may be specified. If there is an - existing Atom window that contains all of the given folders, the paths - will be opened in that window. Otherwise, they will be opened in a new - window. + If no arguments are given and no Atom windows are already open, restore all windows + from the previous editing session. Use "atom --new-window" to open a single empty + Atom window instead. - A file may be opened at the desired line (and optionally column) by - appending the numbers right after the file name, e.g. \`atom file:5:8\`. + If no arguments are given and at least one Atom window is open, open a new, empty + Atom window. + + One or more paths to files or folders may be specified. All paths will be opened + in a new Atom window. Each file may be opened at the desired line (and optionally + column) by appending the numbers after the file name, e.g. \`atom file:5:8\`. Paths that start with \`atom://\` will be interpreted as URLs. @@ -39,7 +43,7 @@ module.exports = function parseCommandLine (processArgs) { options.alias('f', 'foreground').boolean('f').describe('f', 'Keep the main process in the foreground.') options.alias('h', 'help').boolean('h').describe('h', 'Print this usage message.') options.alias('l', 'log-file').string('l').describe('l', 'Log all output to file.') - options.alias('n', 'new-window').boolean('n').describe('n', 'Open a new window.') + options.alias('n', 'new-window').boolean('n').describe('n', 'Launch an empty Atom window instead of restoring previous session.') options.boolean('profile-startup').describe('profile-startup', 'Create a profile of the startup execution time.') options.alias('r', 'resource-path').string('r').describe('r', 'Set the path to the Atom source directory and enable dev-mode.') options.boolean('safe').describe(