aboutsummaryrefslogtreecommitdiff
path: root/sample
diff options
context:
space:
mode:
authorDavid Sommerseth2017-08-15 22:53:01 +0200
committerDavid Sommerseth2017-08-17 16:06:06 +0200
commit500854c3fc956b274790991e4d6771ad9bf6f641 (patch)
tree5a48f4b6cfabbc9bf9ec6f22c48351f8e0eefe79 /sample
parent6e4a817589de85481a5cbfe5bcae4fa872c9fb5d (diff)
downloadopenvpn-500854c3fc956b274790991e4d6771ad9bf6f641.zip
openvpn-500854c3fc956b274790991e4d6771ad9bf6f641.tar.gz
Use consistent version references
A simple clean-up where the version references have been unified all those places I could find now. The versioning scheme used is: * OpenVPN 2.x * v2.x We want to avoid: * 2.x (2.4 can be just an ordindary decimal number, OID reference, a version number or anything else) * OpenVPN v2.x (OpenVPN indicates we're talking about a version) In addition, several places where it made sense I tried to ensure the first version reference uses "OpenVPN 2.x" and the following references in the same section/paragraph uses "v2.x", to set the context for the version reference. In Changes.rst modified paragraphs exceeding 80 chars lines where reformatted as well. Signed-off-by: David Sommerseth <davids@openvpn.net> Acked-by: Steffan Karger <steffan@karger.me> Message-Id: <20170815205301.14542-1-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15260.html Signed-off-by: David Sommerseth <davids@openvpn.net>
Diffstat (limited to 'sample')
-rw-r--r--sample/sample-config-files/client.conf2
-rw-r--r--sample/sample-config-files/server.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/sample/sample-config-files/client.conf b/sample/sample-config-files/client.conf
index f5c69e3..5fd4a94 100644
--- a/sample/sample-config-files/client.conf
+++ b/sample/sample-config-files/client.conf
@@ -110,7 +110,7 @@ tls-auth ta.key 1
# Select a cryptographic cipher.
# If the cipher option is used on the server
# then you must also specify it here.
-# Note that 2.4 client/server will automatically
+# Note that v2.4 client/server will automatically
# negotiate AES-256-GCM in TLS mode.
# See also the ncp-cipher option in the manpage
cipher AES-256-CBC
diff --git a/sample/sample-config-files/server.conf b/sample/sample-config-files/server.conf
index aa7d5b3..1dd477b 100644
--- a/sample/sample-config-files/server.conf
+++ b/sample/sample-config-files/server.conf
@@ -246,13 +246,13 @@ tls-auth ta.key 0 # This file is secret
# Select a cryptographic cipher.
# This config item must be copied to
# the client config file as well.
-# Note that 2.4 client/server will automatically
+# Note that v2.4 client/server will automatically
# negotiate AES-256-GCM in TLS mode.
# See also the ncp-cipher option in the manpage
cipher AES-256-CBC
# Enable compression on the VPN link and push the
-# option to the client (2.4+ only, for earlier
+# option to the client (v2.4+ only, for earlier
# versions see below)
;compress lz4-v2
;push "compress lz4-v2"