wording fixes [ci skip]

TryGhost · Nov 6, 2019 · b0a58c2 · b0a58c2
1 parent 6eb7e07
commit b0a58c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/commands/import.js b/lib/commands/import.js
@@ -10,7 +10,7 @@ class ImportCommand extends Command {
         const {version} = importTask.parseExport(argv.file);
 
         if (semver.major(version) === 0 && semver.major(instance.version) > 1) {
-            throw new SystemError(`Pre-1.x export files can only be imported by Ghost 1.x versions. You are running Ghost v${instance.version}.`);
+            throw new SystemError(`v0.x export files can only be imported by Ghost v1.x versions. You are running Ghost v${instance.version}.`);
         }
 
         const isRunning = await instance.isRunning();

diff --git a/lib/commands/install.js b/lib/commands/install.js
@@ -42,13 +42,11 @@ class InstallCommand extends Command {
             const parsed = parseExport(argv.fromExport);
 
             if (version) {
-                // TODO(acb): fix error message
-                this.ui.log('Warning: you specified both a specific version and an export file. The version specified in the export file will take precedence', 'yellow');
+                this.ui.log('Warning: you specified both a specific version and an export file. The version specified in the export file will be used.', 'yellow');
             }
 
             if (semver.major(parsed.version) === 0) {
-                // TODO(acb): message
-                this.ui.log('Detected a pre-1.x export file. Installing latest v1.x version.', 'green');
+                this.ui.log('Detected a v0.x export file. Installing latest v1.x version.', 'green');
                 version = null;
                 argv.v1 = true;
             } else {
@@ -160,7 +158,8 @@ InstallCommand.options = {
         default: true
     },
     'from-export': {
-        description: 'wip',
+        alias: 'f',
+        description: 'Path to a Ghost export file to import after setup',
         type: 'string'
     }
 };