From 908975380d0e595afd6c63babc15563e78856ab4 Mon Sep 17 00:00:00 2001 From: Dirk Date: Wed, 6 May 2020 09:17:42 +0200 Subject: [PATCH] Amendment to "Relax the possible GPL license contradiction" fix it also in the man pages. See #1590 / #1593 --- doc/testssl.1 | 11 ++++++++--- doc/testssl.1.html | 16 ++++++++++++---- doc/testssl.1.md | 13 +++++++++---- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/doc/testssl.1 b/doc/testssl.1 index 05cbe3d..6aea659 100644 --- a/doc/testssl.1 +++ b/doc/testssl.1 @@ -79,7 +79,7 @@ Options are either short or long options\. Any long or short option requiring a \fB\-\-help\fR (or no arg) display command line help . .P -\fB\-b, \-\-banner\fR displays testssl\.sh banner, including license, usage conditions, version of testssl\.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture +\fB\-b, \-\-banner\fR displays testssl\.sh banner, including license, usage conditions, version of testssl\.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture\. . .P \fB\-v, \-\-version\fR same as before @@ -902,10 +902,15 @@ TLSWG Draft: The Transport Layer Security (TLS) Protocol Version 1\.3 Developed by Dirk Wetter, David Cooper and many others, see CREDITS\.md \. . .SH "COPYRIGHT" -Copyright © 2012 Dirk Wetter\. License GPLv2: Free Software Foundation, Inc\. This is free software: you are free to change and redistribute it under the terms of the license\. Usage WITHOUT ANY WARRANTY\. USE at your OWN RISK! +Copyright © 2012 Dirk Wetter\. License GPLv2: Free Software Foundation, Inc\. This is free software: you are free to change and redistribute it under the terms of the license, see LICENSE\. +.P +Attribution is important for the future of this project - also in the internet\. Thus if you\'re offering a scanner based on testssl\.sh as a public +and/or paid service in the internet you are strongly encouraged to mention to your audience that you\'re using this program and where to get this program +from\. That helps us to get bugfixes, other feedback and more contributions\. . .P -If you\'re offering testssl\.sh as a public and / or paid service in the internet you need to mention to your audience that you\'re using this program and where to get this program from\. +Usage WITHOUT ANY WARRANTY\. USE at your OWN RISK! +. . .SH "LIMITATION" All native Windows platforms emulating Linux are known to be slow\. diff --git a/doc/testssl.1.html b/doc/testssl.1.html index 2609c6f..8422223 100644 --- a/doc/testssl.1.html +++ b/doc/testssl.1.html @@ -147,7 +147,7 @@ linked OpenSSL binaries for major operating systems are supplied in ./bin/

--help (or no arg) display command line help

-

-b, --banner displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture

+

-b, --banner displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture.

-v, --version same as before

@@ -638,10 +638,18 @@ This is to prevent giving out a misleading or wrong grade.

Copyright © 2012 Dirk Wetter. License GPLv2: Free Software Foundation, Inc. - This is free software: you are free to change and redistribute it under the terms of the license. Usage WITHOUT ANY WARRANTY. USE at your OWN RISK!

+ This is free software: you are free to change and redistribute it under the terms of the license, see LICENSE.

+ +

+Attribution is important for the future of this project - also in the +internet. Thus if you're offering a scanner based on testssl.sh as a public +and/or paid service in the internet you are strongly encouraged to mention to +your audience that you're using this program and where to get this program +from. That helps us to get bugfixes, other feedback and more contributions. +

+ +

Usage WITHOUT ANY WARRANTY. USE at your OWN RISK!

-

If you're offering testssl.sh as a public and / or paid service in the internet you need to mention to your audience that you're using this program and -where to get this program from.

LIMITATION

diff --git a/doc/testssl.1.md b/doc/testssl.1.md index 536762e..a63fb26 100644 --- a/doc/testssl.1.md +++ b/doc/testssl.1.md @@ -70,7 +70,7 @@ Options are either short or long options. Any long or short option requiring a v `--help` (or no arg) display command line help -`-b, --banner` displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture +`-b, --banner` displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture. `-v, --version` same as before @@ -536,10 +536,15 @@ Developed by Dirk Wetter, David Cooper and many others, see CREDITS.md . ## COPYRIGHT Copyright © 2012 Dirk Wetter. License GPLv2: Free Software Foundation, Inc. - This is free software: you are free to change and redistribute it under the terms of the license. Usage WITHOUT ANY WARRANTY. USE at your OWN RISK! + This is free software: you are free to change and redistribute it under the terms of the license, see LICENSE. -If you're offering testssl.sh as a public and / or paid service in the internet you need to mention to your audience that you're using this program and -where to get this program from. +Attribution is important for the future of this project - also in the +internet. Thus if you're offering a scanner based on testssl.sh as a public +and/or paid service in the internet you are strongly encouraged to mention to +your audience that you're using this program and where to get this program +from. That helps us to get bugfixes, other feedback and more contributions. + +Usage WITHOUT ANY WARRANTY. USE at your OWN RISK! ## LIMITATION