Fix typos

Author: jderusse

best_practices/configuration.rst

@@ -46,8 +46,8 @@ To override these variables with machine-specific or sensitive values, create a
 
 .. seealso::
 
-    You can also encrypt sensitive informations like passwords, tokens, api key,
-    secrets, etc... See :doc:`/configuration/secrets`.
+    You can also encrypt sensitive information like passwords, tokens, API key,
+    secrets, etc. See :doc:`/configuration/secrets`.
 
 .. caution::
 

configuration/secrets.rst

@@ -1,23 +1,22 @@
 .. index::
     single: Secrets
 
-How to Keep Sensitive Informations Secret
-=========================================
+How to Keep Sensitive Information Secret
+========================================
 
 In :doc:`/configuration` and :doc:`/configuration/environment_variables`, you
 learned how to manage your application configuration. In this article you'll
-learn how to easily anbd saftly configure your application with sensitive
-information such as credentials, passwords, tokens, api keys without exposing
-them.
+learn how to safely configure your application with sensitive information such
+as credentials, passwords, tokens, API keys without exposing them.
 
 .. _secrets-configuration:
 
 Configuration
 -------------
 
 In order to use secrets you have to enable the feature in the framework's
-
 configuration:
+
 .. configuration-block::
 
     .. code-block:: yaml
@@ -50,74 +49,67 @@ configuration:
             'secrets' => true,
         ]);
 
-.. tip::
-
-    the ``encryption_key`` configuration parameter accept both a path to an
-    encription key or the content of the itself. It allows you, for instance,
-    to store the content of the key in an environement variable and refer it
-    with ``%env(PRIVATE_KEY)%``.
-
 .. _secrets-generate-key:
 
 Generate an Encryption Key
 --------------------------
 
-Before creating a new ``secret``, you need to create ann ``encryption key``.
-This can be done with the provided commande ``secrets:generate-key``.
+Before creating a new **secret**, you need to create an **encryption key**.
+This can be done with the provided command ``secrets:generate-key``.
 
 .. code-block:: terminal
 
     $ APP_ENV=prod php bin/console secrets:generate-key
 
-This command will generate a new ``encryption key`` in.
+This command generates a new **encryption key** in
 ``%kernel.project_dir%/config/secrets/encryption_%kernel.environment%.key``
 
 .. note::
 
-    In order to use Symfony's built-in Secret storage, you will need the
+    In order to use Symfony's built-in secret storage, you will need the
     `libsodium`_ PHP extension or use the `sodium_compat`_ package.
 
-Symfony generates a key with a symetrics algorithm, meaning that this key could
+Symfony generates a key with a symmetric algorithm, meaning that this key could
 be used to both encrypt **and** decrypt secrets. The number of people who
 possess this key should be as small as possible.
 
 .. caution::
 
-    This file is sensitive and **must not** be commited nor publicly shared. Every
-    developpers and CI don't need that key. If the encryption key have been
-    exposed (ex-employee leaving for instance)you should consider regenerating a
-    new one.
+    This file is sensitive and **must not** be committed nor publicly shared.
+    Your team developers and Continuous Integration services don't need that
+    key. If the **encryption key** have  been exposed (ex-employee leaving for
+    instance), you need to generate a new one.
 
 .. _secrets-add:
 
 Create a Secret
 ---------------
 
-Once the ``encryption key`` generated, you can add new secret with the command
-``secrets:add``. Symfony'll ask you to enter the text to encrypt and generate
-a new file contains the ciphered text in a file stored by default in the folder
-%kernel.project_dir%/config/secrets/%kernel.environment%/. This file should be
-commited allongside the other project's files.
+Once the **encryption key** generated, you can add new secret with the command
+``secrets:add``. Symfony will ask you to enter the secret in order to encrypt
+and generate a new file containing the encrypted secret. This file is stored by
+default in the folder ``%kernel.project_dir%/config/secrets/%kernel.environment%/``.
+This file should be committed along side the other project's files.
 
 .. code-block:: terminal
 
     $ APP_ENV=prod php bin/console secrets:add DATABASE_PASSWORD
 
 .. tip::
 
-    If the ``encryption key`` is compromized, you can regenerate a new key with
-    the command ``secrets:generate-key``. Symfony will decrypt the previous
-    secret with the old key, adn re-encrypt theme with the new one.
+    If the **encryption key** is compromized, you can regenerate a new key with
+    the command ``secrets:generate-key``. Symfony will decrypt previous secrets
+    with the old key, and re-encrypt them with the new one.
 
 .. _secrets-reference:
 
 Referencing Secrets in Configuration Files
 ------------------------------------------
 
-You can reference those secrets in any configuration option enclosing their
-names using the ``secret`` :ref:`environment variable processors <env-var-processors>`.
+You can reference the secrets in any configuration option enclosing their names
+using the **secret** :ref:`environment variable processors <env-var-processors>`.
 Their actual values will be resolved at runtime (once per request), so that
-container compilation and cache warmup don't need the ``encryption key``.
+container compilation and cache warmup don't need the **encryption key**.
 
 .. configuration-block::
 
@@ -159,11 +151,11 @@ container compilation and cache warmup don't need the ``encryption key``.
             ]
         ]);
 
-This bellow configuration requires that every environment use secrets. each
-environment would have it own ``encryption key`` and encŷpted secrets.
+This configuration requires that all environments uses secrets. Each
+environment would have its own **encryption key** and encrypted secrets.
 
-You can also use parameters to configure diffrent strategy per environnement:
-By defining a default plaintext secret:
+You can also use parameters to configure different strategies per environnement:
+By defining a default plain text secret:
 
 .. configuration-block::
 
@@ -213,7 +205,7 @@ By defining a default plaintext secret:
         ]);
         $container->setParameter('database_password', 'not a secret');
 
-Then overriding it in production environement:
+Then overriding it in production environment:
 
 .. configuration-block::
 
@@ -251,27 +243,27 @@ Then overriding it in production environement:
 List existing secrets
 ---------------------
 
-Every body is allowed to list the secret's name with the command ``secrets:list``.
-If you have the ``encryption key`` you can also reveal the plain text value by
-passing the optoin ``--reveal`` to the command
+Everybody is allowed to list the secret's name with the command ``secrets:list``.
+If you have the **encryption key** you can also reveal the secret value by
+passing the option ``--reveal`` to the command
 
 .. code-block:: terminal
 
     $ APP_ENV=prod php bin/console secrets:list --reveal
 
      ------------------- ------------------
-      key                 plaintext secret
+      key                 secret
      ------------------- ------------------
       DATABASE_PASSWORD   my-secret
      ------------------- ------------------
 
 .. _secrets-deploy
 
-Deploy secret to production
----------------------------
+Deploy secrets to production
+----------------------------
 
-As the ``encryption key`` is not commited, during development, you'll have to
-manualy deploy the key (once for a will) at the path referenced in the
+As the **encryption key** is not committed, during development, you'll have to
+manualy deploy the key (once and for all) at the path referenced in the
 ``encryption_key`` configuration key. Default is ``%kernel.project_dir%/config/secrets/%kernel.environment%``.
 
 .. _secrets-custom-storage

doctrine/pdo_session_storage.rst

@@ -70,7 +70,7 @@ To use it, first register a new handler service:
 
     Configure the database credentials
     :doc:`using environment variables in the config file </configuration/environment_variables>`
-    or :doc:`using secrets in the config file </configuration/secrets>`to make
+    or :doc:`using secrets in the config file </configuration/secrets>` to make
     your application more secure.
 
 Next, tell Symfony to use your service as the session handler: