Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_all

Improve description of the encrypt-all and decrypt-all command line tool

3 files changed, 5 insertions, 3 deletions

diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php
index 599cd82aa4d..d7cd422c5e9 100644
--- a/apps/encryption/lib/crypto/decryptall.php
+++ b/apps/encryption/lib/crypto/decryptall.php
@@ -90,7 +90,7 @@ class DecryptAll {
 			);
 			$useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword);
 			if ($useLoginPassword) {
-				$question = new Question('Please enter the users login password: ');
+				$question = new Question('Please enter the user\'s login password: ');
 			} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
 				$output->writeln('No recovery key available for user ' . $user);
 				return false;
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index c71ba5f04c7..a8560ce88bb 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -101,7 +101,8 @@ class DecryptAll extends Command {
 		parent::configure();
 
 		$this->setName('encryption:decrypt-all');
-		$this->setDescription(
+		$this->setDescription('Disable server-side encryption and decrypt all files');
+		$this->setHelp(
 			'This will disable server-side encryption and decrypt all files for '
 			. 'all users if it is supported by your encryption module. '
 			. 'Please make sure that no user access his files during this process!'
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 4ae6ae47836..8294264f212 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -93,7 +93,8 @@ class EncryptAll extends Command {
 		parent::configure();
 
 		$this->setName('encryption:encrypt-all');
-		$this->setDescription(
+		$this->setDescription('Encrypt all files for all users');
+		$this->setHelp(
 			'This will encrypt all files for all users. '
 			. 'Please make sure that no user access his files during this process!'
 		);