mention bats-core upgrade, fix grammar, move bug info to issue (#759)

* mention bats-core upgrade, fix grammar
* Update CHANGELOG.md
* move info about issue with ubuntu & brew to #760
* rephrase text
* more about interoperability and gnupg versions

CHANGELOG.md

@@ -5,7 +5,7 @@
 ### Features
 
 - Adds `SECRETS_GPG_ARMOR` env variable to use `gpg --armor`
-  when encrypting files, so secret files will stored
+  when encrypting files, so secret files are stored
   in text format rather than binary (#631)
 
 ### Bugfixes
@@ -18,7 +18,9 @@
 
 - Rename `killperson` command to `removeperson` (#684)
 - Moves `file_has_line` utility to tests and fixes how it is used
-- Refactors docs: new pages, new content (#675)
+- Refactor docs: new pages, new content 
+- Upgrade bats-core to v1.5.0 (#755)
+- Update docs for use with CI/CD server (#675)
 
 
 ## 0.4.0

man/man7/git-secret.7.md

@@ -111,8 +111,7 @@ You can then create your private key file with:
 echo "$GPG_PRIVATE_KEY" | tr ',' '\n' > ./private_key.gpg
 ```
 
-Also note: the `gpg` version on the CI/CD server **MUST MATCH** the one used locally. Otherwise, `gpg` decryption can fail silently, which leads to `git secret reveal` reporting `cannot find decrypted version of file` error. To be specific, `apt-get install gnupg` points to version [2.2.20](https://packages.ubuntu.com/impish/gnupg), yet `brew install gnupg` points to version [2.3.4](https://formulae.brew.sh/formula/gnupg) (as of 2022-01-17). Thus a `git-secret` encrypted file on macOS using the latest `gpg` installed from `brew` cannot be decrypted on Ubuntu (e.g. GitHub Actions' latest Ubuntu machine) using the latest `gpg` installed from `apt-get`. The work-around for this specific case is to downgrade `gpg` with `brew install gnupg@2.2.33`.
-
+Also note: the `gpg` version on the CI/CD server **MUST INTEROPERATE** with the one used locally. Otherwise, `gpg` decryption can fail, which leads to `git secret reveal` reporting `cannot find decrypted version of file` error. The best way to ensure this is to use the same version of gnupg on different systems.
 
 ## Environment Variables and Configuration