Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Documentation: Remove references to optional BouncyCastle libraries
Change-Id: I7a0a6063b96a8655630754c4e3a62d2dd4578c66
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 110e5a5..d577470 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -4339,8 +4339,6 @@
* `diffie-hellman-group1-sha1`
By default, all supported key exchange algorithms are available.
-Without Bouncy Castle, `diffie-hellman-group1-sha1` is the only
-available algorithm.
It is strongly recommended to disable at least `diffie-hellman-group1-sha1`
as it's known to be vulnerable (logjam attack). Additionally, if your setup
diff --git a/Documentation/install.txt b/Documentation/install.txt
index c6977a4..0f121a0 100644
--- a/Documentation/install.txt
+++ b/Documentation/install.txt
@@ -175,8 +175,8 @@
[[installation_on_windows]]
== Installation on Windows
-If new site is going to be initialized with Bouncy Castle cryptography,
-ssh-keygen command must be available during the init phase. If you have
+The `ssh-keygen` command must be available during the init phase to
+generate SSH host keys. If you have
link:https://git-for-windows.github.io/[Git for Windows] installed,
start Command Prompt and temporary add directory with ssh-keygen to the
PATH environment variable just before running init command:
