Revert styling of "balena CLI" as "balenaCLI"

Change-type: patch

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 
 # About this issue tracker
 
-*balenaCLI (Command Line Interface) is a tool used to interact with the balena platform.
+*The balena CLI (Command Line Interface) is a tool used to interact with the balena platform.
 This GitHub issue tracker is used for bug reports and feature requests regarding the CLI
 tool. General and troubleshooting questions (such as setting up your project to work with a
 balenalib base image) are encouraged to be posted to the [balena
@@ -12,7 +12,7 @@ community can both contribute and benefit from the answers.*
 the same problem or feature please add comments to the existing issue.*
 
 *Thank you for your time and effort creating the issue report, and helping us improve
-balenaCLI!*
+the balena CLI!*
 
 ---
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-balenaCLI is an open source project and your contribution is welcome!
+The balena CLI is an open source project and your contribution is welcome!
 
 * Install the dependencies listed in the [NPM Installation
   section](./INSTALL-ADVANCED.md#npm-installation) section of the installation instructions. Check

INSTALL-ADVANCED.md

@@ -12,7 +12,7 @@ There are 3 options to choose from to install balena's CLI:
   executable in them: extract and run. Available for all platforms: Linux, Windows, macOS.
   Recommended also for scripted installation in CI (continuous integration) environments.
 * [NPM Installation](#npm-installation): recommended for Node.js developers who may be interested
-  in integrating balenaCLI in their existing projects or workflow.
+  in integrating the balena CLI in their existing projects or workflow.
 
 Some specific CLI commands have a few extra installation steps: see section [Additional
 Dependencies](#additional-dependencies).
@@ -74,7 +74,7 @@ as described above.
 
 ## NPM Installation
 
-If you are a Node.js developer, you may wish to install balenaCLI via [npm](https://www.npmjs.com).
+If you are a Node.js developer, you may wish to install the balena CLI via [npm](https://www.npmjs.com).
 The npm installation involves building native (platform-specific) binary modules, which require
 some additional development tools to be installed first:
 

INSTALL-LINUX.md

@@ -20,14 +20,14 @@ Selected operating system: **Linux**
 
 4. Check that the installation was successful by running the following commands on a
    command terminal:  
-   * `balena version` - should print balenaCLI's version
+   * `balena version` - should print the CLI's version
    * `balena help` - should print a list of available commands
 
-No further steps are required to run most balenaCLI commands. The `balena ssh`, `scan`, `build`,
+No further steps are required to run most CLI commands. The `balena ssh`, `scan`, `build`,
 `deploy` and `preload` commands may require additional software to be installed, as described
 below.
 
-To update balenaCLI to a new version, download a new release zip file and replace the previous
+To update the balena CLI to a new version, download a new release zip file and replace the previous
 installation folder. To uninstall, simply delete the folder and edit the PATH environment variable
 as described above.
 
@@ -39,7 +39,7 @@ These commands require [Docker](https://docs.docker.com/install/overview/) or
 [balenaEngine](https://www.balena.io/engine/) to be available (on a local or remote machine). Most
 users will simply follow [Docker's installation
 instructions](https://docs.docker.com/install/overview/) to install Docker on the same laptop (dev
-machine) where balenaCLI is installed. The [advanced installation
+machine) where the balena CLI is installed. The [advanced installation
 options](./INSTALL-ADVANCED.md) document describes other possibilities.
 
 ### balena ssh

INSTALL-MAC.md

@@ -18,10 +18,10 @@ Selected operating system: **macOS**
 
 3. Check that the installation was successful by running the following commands on a
    command terminal:  
-   * `balena version` - should print balenaCLI's version
+   * `balena version` - should print the CLI's version
    * `balena help` - should print a list of available commands
 
-No further steps are required to run most balenaCLI commands. The `balena ssh`, `build`, `deploy`
+No further steps are required to run most CLI commands. The `balena ssh`, `build`, `deploy`
 and `preload` commands may require additional software to be installed, as described below.
 
 ## Additional Dependencies
@@ -32,7 +32,7 @@ These commands require [Docker](https://docs.docker.com/install/overview/) or
 [balenaEngine](https://www.balena.io/engine/) to be available (on a local or remote machine). Most
 users will simply follow [Docker's installation
 instructions](https://docs.docker.com/install/overview/) to install Docker on the same laptop (dev
-machine) where balenaCLI is installed. The [advanced installation
+machine) where the balena CLI is installed. The [advanced installation
 options](./INSTALL-ADVANCED.md) document describes other possibilities.
 
 ### balena ssh
@@ -62,7 +62,7 @@ present workaround is to either:
 
 * Downgrade Docker Desktop to version 18.06.1. Link: [Docker CE for
   Mac](https://docs.docker.com/docker-for-mac/release-notes/#docker-community-edition-18061-ce-mac73-2018-08-29)
-* Install balenaCLI on a Linux machine (as Docker for Linux still supports AUFS). A Linux Virtual
+* Install the balena CLI on a Linux machine (as Docker for Linux still supports AUFS). A Linux
-  Machine also works, but a Docker container is _not_ recommended.
+  Virtual Machine also works, but a Docker container is _not_ recommended.
 
 Long term, we are working on replacing AUFS with overlay2 for the affected device types.

INSTALL-WINDOWS.md

@@ -18,10 +18,10 @@ Selected operating system: **Windows**
 
 3. Check that the installation was successful by running the following commands on a
    command terminal:  
-   * `balena version` - should print balenaCLI's version
+   * `balena version` - should print the CLI's version
    * `balena help` - should print a list of available commands
 
-No further steps are required to run most balenaCLI commands. The `balena ssh`, `scan`, `build`,
+No further steps are required to run most CLI commands. The `balena ssh`, `scan`, `build`,
 `deploy`, `preload` and `os configure` commands may require additional software to be installed, as
 described below.
 
@@ -33,7 +33,7 @@ These commands require [Docker](https://docs.docker.com/install/overview/) or
 [balenaEngine](https://www.balena.io/engine/) to be available (on a local or remote machine). Most
 users will simply follow [Docker's installation
 instructions](https://docs.docker.com/install/overview/) to install Docker on the same laptop (dev
-machine) where balenaCLI is installed. The [advanced installation
+machine) where the balena CLI is installed. The [advanced installation
 options](./INSTALL-ADVANCED.md) document describes other possibilities.
 
 ### balena ssh
@@ -69,8 +69,8 @@ present workaround is to either:
 
 * Downgrade Docker Desktop to version 18.06.1. Link: [Docker CE for
   Windows](https://docs.docker.com/docker-for-windows/release-notes/#docker-community-edition-18061-ce-win73-2018-08-29)
-* Install balenaCLI on a Linux machine (as Docker for Linux still supports AUFS). A Linux Virtual
+* Install the balena CLI on a Linux machine (as Docker for Linux still supports AUFS). A Linux
-  Machine also works, but a Docker container is _not_ recommended.
+  Virtual Machine also works, but a Docker container is _not_ recommended.
 
 Long term, we are working on replacing AUFS with overlay2 for the affected device types.
 
@@ -78,5 +78,5 @@ Long term, we are working on replacing AUFS with overlay2 for the affected devic
 
 * The `balena os configure` command is currently not supported on Windows natively, but works with
   the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/about) (WSL). When
-  using WSL, [install balenaCLI for
+  using WSL, [install the balena CLI for
   Linux](https://github.com/balena-io/balena-cli/blob/master/INSTALL-LINUX.md).

README.md

@@ -7,12 +7,12 @@ The official balena Command Line Interface.
 
 ## About
 
-balenaCLI is a Command Line Interface for [balenaCloud](https://www.balena.io/cloud/) or
+The balena CLI is a Command Line Interface for [balenaCloud](https://www.balena.io/cloud/) or
 [openBalena](https://www.balena.io/open/). It is a software tool available for Windows, macOS and
 Linux, used through a command prompt / terminal window. It can be used interactively or invoked in
-scripts. balenaCLI builds on the [balena API](https://www.balena.io/docs/reference/api/overview/)
+scripts. The balena CLI builds on the [balena API](https://www.balena.io/docs/reference/api/overview/)
 and the [balena SDK](https://www.balena.io/docs/reference/sdk/node-sdk/), and can also be directly
-imported in Node.js applications. balenaCLI is an [open-source project on
+imported in Node.js applications. The balena CLI is an [open-source project on
 GitHub](https://github.com/balena-io/balena-cli/), and your contribution is also welcome!
 
 ## Installation
@@ -43,8 +43,8 @@ are supported. Alternative shells include:
 * Microsoft's [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/about)
   (WSL). In this case, a Linux distribution like Ubuntu is installed via the Microsoft Store, and a
   balena CLI release **for Linux** should be selected. See
-  [FAQ](https://github.com/balena-io/balena-cli/blob/master/TROUBLESHOOTING.md) for using balenaCLI
+  [FAQ](https://github.com/balena-io/balena-cli/blob/master/TROUBLESHOOTING.md) for using the
-  with WSL and Docker Desktop for Windows.
+  balena CLI with WSL and Docker Desktop for Windows.
 
 On **macOS** and **Linux,** the standard terminal window is supported. Optionally, `bash` command
 auto completion may be enabled by copying the
@@ -106,7 +106,7 @@ server, it should be configured with the following rules in the `squid.conf` fil
 
 The `BALENARC_NO_PROXY` variable may be used to exclude specified destinations from proxying.
 
-> * This feature requires balenaCLI version 11.30.8 or later. In the case of the npm [installation
+> * This feature requires CLI version 11.30.8 or later. In the case of the npm [installation
 >   option](https://github.com/balena-io/balena-cli/blob/master/INSTALL.md), it also requires
 >   Node.js version 10.16.0 or later.
 > * To exclude a `balena ssh` target from proxying (IP address or `.local` hostname), the
@@ -148,10 +148,10 @@ If you come across any problems or would like to get in touch:
 
 ## Deprecation policy
 
-balenaCLI uses [semver versioning](https://semver.org/), with the concepts
+The balena CLI uses [semver versioning](https://semver.org/), with the concepts
 of major, minor and patch version releases.
 
-The latest release of a major version of balenaCLI will remain compatible with
+The latest release of a major version of the balena CLI will remain compatible with
 the balenaCloud backend services for at least one year from the date when the
 following major version is released. For example, balena CLI v10.17.5, as the
 latest v10 release, would remain compatible with the balenaCloud backend for one
@@ -160,7 +160,7 @@ year from the date when v11.0.0 is released.
 At the end of this period, the older major version is considered deprecated and
 some of the functionality that depends on balenaCloud services may stop working
 at any time.
-Users are encouraged to regularly update balenaCLI to the latest version.
+Users are encouraged to regularly update the balena CLI to the latest version.
 
 ## Contributing (including editing documentation files)
 

TROUBLESHOOTING.md

@@ -1,23 +1,23 @@
 # balena CLI FAQ & Troubleshooting
 
-## Where is balenaCLI's configuration file located?
+## Where is the balena CLI's configuration file located?
 
 The per-user configuration file lives in `$HOME/.balenarc.yml` or `%UserProfile%\_balenarc.yml`, in
 Unix based operating systems and Windows respectively.
 
-balenaCLI also attempts to read a `balenarc.yml` file in the current directory, which takes
+The balena CLI also attempts to read a `balenarc.yml` file in the current directory, which takes
 precedence over the per-user configuration file.
 
-## How do I point balenaCLI to the staging environment?
+## How do I point the balena CLI to the staging environment?
 
 Set the `BALENARC_BALENA_URL=balena-staging.com` environment variable, or add
-`balenaUrl: balena-staging.com` to balenaCLI's configuration file.
+`balenaUrl: balena-staging.com` to the balena CLI's configuration file.
 
-## How do I make balenaCLI persist data in another directory?
+## How do I make the balena CLI persist data in another directory?
 
-balenaCLI persists the session token, as well as cached assets, to `$HOME/.balena` or
+The balena CLI persists the session token, as well as cached assets, to `$HOME/.balena` or
 `%UserProfile%\_balena`. This directory can be changed by setting an environment variable,
-`BALENARC_DATA_DIRECTORY=/opt/balena`, or by adding `dataDirectory: /opt/balena` to balenaCLI's
+`BALENARC_DATA_DIRECTORY=/opt/balena`, or by adding `dataDirectory: /opt/balena` to the CLI's
 configuration file, replacing `/opt/balena` with the desired directory.
 
 ## After burning to an SD card, my device doesn't boot
@@ -64,9 +64,9 @@ Or in Windows:
 
 ## I get `EACCES: permission denied` when logging in
 
-balenaCLI stores the session token in `$HOME/.balena` or `C:\Users\<user>\_balena` in UNIX based
+The balena CLI stores the session token in `$HOME/.balena` or `C:\Users\<user>\_balena` in UNIX based
 operating systems and Windows respectively. This error usually indicates that the user doesn't have
-permissions over that directory, which can happen if balenaCLI was executed as the `root` user.
+permissions over that directory, which can happen if the CLI was executed as the `root` user.
 
 Try resetting the ownership by running:
 
@@ -76,7 +76,15 @@ $ sudo chown -R <user> $HOME/.balena
 
 ## Broken line wrapping / cursor behavior with `balena ssh`
 
-Users sometimes come across broken line wrapping or cursor behavior in text terminals, for example when long command lines are typed in a `balena ssh` session, or when using text editors like `vim` or `nano`. This is not something specific to balenaCLI, being also a commonly reported issue with standard remote terminal tools like `ssh` or `telnet`. It is often a remote shell configuration issue (files like `/etc/profile`, `~/.bash_profile`, `~/.bash_login`, `~/.profile` and the like), including UTF-8 misconfiguration, the use of unsupported ASCII control characters in shell prompt formatting (e.g. the `$PS1` env var) or the output of tools or log files that use colored text. The issue can sometimes be fixed by resizing the client terminal window, or by running one or more of the following commands on the shell:
+Users sometimes come across broken line wrapping or cursor behavior in text terminals, for example
+when long command lines are typed in a `balena ssh` session, or when using text editors like `vim`
+or `nano`. This is not something specific to the balena CLI, being also a commonly reported issue
+with standard remote terminal tools like `ssh` or `telnet`.  It is often a remote shell
+configuration issue (files like `/etc/profile`, `~/.bash_profile`, `~/.bash_login`, `~/.profile`
+and the like on the remote machine), including UTF-8 misconfiguration, the use of unsupported ASCII
+control characters in shell prompt formatting (e.g. the `$PS1` env var) or the output of tools or
+log files that use colored text. The issue can sometimes be fixed by simply resizing the client
+terminal window, or by running one or more of the following commands on the shell:
 
 ```sh
 export TERMINAL=linux

doc/cli.markdown

@@ -1,11 +1,11 @@
 # balena CLI Documentation
 
-balenaCLI is a Command Line Interface for [balenaCloud](https://www.balena.io/cloud/) or
+The balena CLI is a Command Line Interface for [balenaCloud](https://www.balena.io/cloud/) or
 [openBalena](https://www.balena.io/open/). It is a software tool available for Windows, macOS and
 Linux, used through a command prompt / terminal window. It can be used interactively or invoked in
-scripts. balenaCLI builds on the [balena API](https://www.balena.io/docs/reference/api/overview/)
+scripts. The balena CLI builds on the [balena API](https://www.balena.io/docs/reference/api/overview/)
 and the [balena SDK](https://www.balena.io/docs/reference/sdk/node-sdk/), and can also be directly
-imported in Node.js applications. balenaCLI is an [open-source project on
+imported in Node.js applications. The balena CLI is an [open-source project on
 GitHub](https://github.com/balena-io/balena-cli/), and your contribution is also welcome!
 
 ## Installation
@@ -36,8 +36,8 @@ are supported. Alternative shells include:
 * Microsoft's [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/about)
   (WSL). In this case, a Linux distribution like Ubuntu is installed via the Microsoft Store, and a
   balena CLI release **for Linux** should be selected. See
-  [FAQ](https://github.com/balena-io/balena-cli/blob/master/TROUBLESHOOTING.md) for using balenaCLI
+  [FAQ](https://github.com/balena-io/balena-cli/blob/master/TROUBLESHOOTING.md) for using the
-  with WSL and Docker Desktop for Windows.
+  balena CLI with WSL and Docker Desktop for Windows.
 
 On **macOS** and **Linux,** the standard terminal window is supported. Optionally, `bash` command
 auto completion may be enabled by copying the
@@ -99,7 +99,7 @@ server, it should be configured with the following rules in the `squid.conf` fil
 
 The `BALENARC_NO_PROXY` variable may be used to exclude specified destinations from proxying.
 
-> * This feature requires balenaCLI version 11.30.8 or later. In the case of the npm [installation
+> * This feature requires CLI version 11.30.8 or later. In the case of the npm [installation
 >   option](https://github.com/balena-io/balena-cli/blob/master/INSTALL.md), it also requires
 >   Node.js version 10.16.0 or later.
 > * To exclude a `balena ssh` target from proxying (IP address or `.local` hostname), the
@@ -136,10 +136,10 @@ If you come across any problems or would like to get in touch:
 
 ## Deprecation policy
 
-balenaCLI uses [semver versioning](https://semver.org/), with the concepts
+The balena CLI uses [semver versioning](https://semver.org/), with the concepts
 of major, minor and patch version releases.
 
-The latest release of a major version of balenaCLI will remain compatible with
+The latest release of a major version of the balena CLI will remain compatible with
 the balenaCloud backend services for at least one year from the date when the
 following major version is released. For example, balena CLI v10.17.5, as the
 latest v10 release, would remain compatible with the balenaCloud backend for one
@@ -148,7 +148,7 @@ year from the date when v11.0.0 is released.
 At the end of this period, the older major version is considered deprecated and
 some of the functionality that depends on balenaCloud services may stop working
 at any time.
-Users are encouraged to regularly update balenaCLI to the latest version.
+Users are encouraged to regularly update the balena CLI to the latest version.
 
 
 # CLI Command Reference
@@ -1302,7 +1302,7 @@ show additional commands
 
 ## version
 
-Display version information for balenaCLI and/or Node.js. Note that the
+Display version information for the balena CLI and/or Node.js. Note that the
 balena CLI executable installers for Windows and macOS, and the standalone
 zip packages, ship with a built-in copy of Node.js.  In this case, the
 reported version of Node.js regards this built-in copy, rather than any
@@ -1758,7 +1758,7 @@ A suitable key is automatically generated or fetched if this option is omitted.
 
 Note: This command is currently not supported on Windows natively. Windows users
 are advised to install the Windows Subsystem for Linux (WSL) with Ubuntu, and use
-the Linux release of balenaCLI:
+the Linux release of the balena CLI:
 https://docs.microsoft.com/en-us/windows/wsl/about
 
 Examples:
@@ -2177,7 +2177,7 @@ secrets.json file exists in the balena directory (usually $HOME/.balena),
 this file will be used instead.
 
 DOCKERIGNORE AND GITIGNORE FILES  
-By default, balenaCLI will use a single ".dockerignore" file (if any) at
+By default, the balena CLI will use a single ".dockerignore" file (if any) at
 the project root (--source directory) in order to decide which source files to
 exclude from the "build context" (tar stream) sent to balenaCloud, Docker
 daemon or balenaEngine. In a microservices (multicontainer) application, the
@@ -2354,7 +2354,7 @@ required until your project can be adapted.
 
 ## settings
 
-Use this command to display current balenaCLI settings.
+Use this command to display the current balena CLI settings.
 
 Examples:
 
@@ -2454,7 +2454,7 @@ secrets.json file exists in the balena directory (usually $HOME/.balena),
 this file will be used instead.
 
 DOCKERIGNORE AND GITIGNORE FILES  
-By default, balenaCLI will use a single ".dockerignore" file (if any) at
+By default, the balena CLI will use a single ".dockerignore" file (if any) at
 the project root (--source directory) in order to decide which source files to
 exclude from the "build context" (tar stream) sent to balenaCloud, Docker
 daemon or balenaEngine. In a microservices (multicontainer) application, the
@@ -2676,7 +2676,7 @@ secrets.json file exists in the balena directory (usually $HOME/.balena),
 this file will be used instead.
 
 DOCKERIGNORE AND GITIGNORE FILES  
-By default, balenaCLI will use a single ".dockerignore" file (if any) at
+By default, the balena CLI will use a single ".dockerignore" file (if any) at
 the project root (--source directory) in order to decide which source files to
 exclude from the "build context" (tar stream) sent to balenaCloud, Docker
 daemon or balenaEngine. In a microservices (multicontainer) application, the

lib/auth/index.ts

@@ -22,7 +22,7 @@ import { LoginServer } from './server';
  */
 
 /**
- * @summary Login to balenaCLI using the web dashboard
+ * @summary Login to the balena CLI using the web dashboard
  * @function
  * @public
  *

lib/commands/os/configure.ts

@@ -90,7 +90,7 @@ export default class OsConfigureCmd extends Command {
 
 		Note: This command is currently not supported on Windows natively. Windows users
 		are advised to install the Windows Subsystem for Linux (WSL) with Ubuntu, and use
-		the Linux release of balenaCLI:
+		the Linux release of the balena CLI:
 		https://docs.microsoft.com/en-us/windows/wsl/about
 	`;
 	public static examples = [

lib/commands/settings.ts

@@ -28,7 +28,7 @@ export default class SettingsCmd extends Command {
 	public static description = stripIndent`
 		Print current settings.
 
-		Use this command to display current balenaCLI settings.
+		Use this command to display the current balena CLI settings.
 `;
 	public static examples = ['$ balena settings'];
 

lib/commands/version.ts

@@ -32,9 +32,9 @@ export interface JsonVersions {
 
 export default class VersionCmd extends Command {
 	public static description = stripIndent`
-		Display version information for balenaCLI and/or Node.js.
+		Display version information for the balena CLI and/or Node.js.
 
-		Display version information for balenaCLI and/or Node.js. Note that the
+		Display version information for the balena CLI and/or Node.js. Note that the
 		balena CLI executable installers for Windows and macOS, and the standalone
 		zip packages, ship with a built-in copy of Node.js.  In this case, the
 		reported version of Node.js regards this built-in copy, rather than any

lib/events.ts

@@ -46,6 +46,9 @@ interface CachedUsername {
  * The username and command signature are also added as extra context
  * information in Sentry.io error reporting, for CLI debugging purposes
  * (mainly unexpected/unhandled exceptions -- see also `lib/errors.ts`).
+ *
+ * For more details on the data collected by balena generally, check this page:
+ * https://www.balena.io/docs/learn/more/collected-data/
  */
 export async function trackCommand(commandSignature: string) {
 	try {

lib/utils/messages.ts

@@ -69,7 +69,7 @@ this file will be used instead.`;
 
 export const dockerignoreHelp = `\
 DOCKERIGNORE AND GITIGNORE FILES  
-By default, balenaCLI will use a single ".dockerignore" file (if any) at
+By default, the balena CLI will use a single ".dockerignore" file (if any) at
 the project root (--source directory) in order to decide which source files to
 exclude from the "build context" (tar stream) sent to balenaCloud, Docker
 daemon or balenaEngine. In a microservices (multicontainer) application, the

tests/commands/help.spec.ts

@@ -87,7 +87,7 @@ ADDITIONAL COMMANDS
   tag set <tagKey> [value]               set a tag on an application, device or release
   tags                                   list all tags for an application, device or release
   util available-drives                  list available drives
-  version                                display version information for balenaCLI and/or Node.js
+  version                                display version information for the balena CLI and/or Node.js
   whoami                                 display account information for current user
 
 `;