The branch master has been updated via dd28d1c4d305574e5feacb0f3fee21192b9ccf2f (commit) from f4407385f58242dcc6ae95a60c2a3dc8782bee42 (commit)
- Log ----------------------------------------------------------------- commit dd28d1c4d305574e5feacb0f3fee21192b9ccf2f Author: Hubert Kario <hka...@redhat.com> Date: Fri Apr 30 16:45:47 2021 +0200 man: s_server: fix text repetition in -alpn description Reviewed-by: Tomas Mraz <to...@openssl.org> Reviewed-by: Dmitry Belyavskiy <beld...@gmail.com> (Merged from https://github.com/openssl/openssl/pull/15099) ----------------------------------------------------------------------- Summary of changes: doc/man1/openssl-s_server.pod.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man1/openssl-s_server.pod.in b/doc/man1/openssl-s_server.pod.in index 55227d9080..243ab8b3e0 100644 --- a/doc/man1/openssl-s_server.pod.in +++ b/doc/man1/openssl-s_server.pod.in @@ -672,7 +672,7 @@ disabling the ephemeral DH cipher suites. =item B<-alpn> I<val>, B<-nextprotoneg> I<val> -These flags enable the Enable the Application-Layer Protocol Negotiation +These flags enable the Application-Layer Protocol Negotiation or Next Protocol Negotiation (NPN) extension, respectively. ALPN is the IETF standard and replaces NPN. The I<val> list is a comma-separated list of supported protocol