Merge branch 'maint'

* maint:
  check_ssh: Get rid of sshd: Read from socket failed: Connection reset by peer
  fixed tests when there is no direct internet connection
  NEWS: Mention fix for check_http's -S option
  Fix for SSL Versioning when multiple options are used.
  Fix #1217 spec file fails to build due to duplicate files and unused files
  check_http: Don't let "-N" expect an argument
  README: Change GitHub URL
  README: Clarify license notice
  Update URLs and mailing list addresses
  Just using the posix conform extended regular expression grep
  check_oracle: --db +ASM bad string matching check_oracle doesn't correctly check for pmon +ASM instance from at least Oracle 11 as the pmon proces was renamed from ora_pmon_.* to asm_pmon_.*. -- Just turning attached patch of github issue #1207 into a push request. (Closes #1207)
  Update web site URLs

Conflicts:
	FAQ
	NEWS
	README
	SUPPORT
	configure.in
	monitoring-plugins.spec.in
	pkg/solaris/pkginfo.in
	plugins-root/check_dhcp.c
	plugins-root/check_icmp.c
	plugins-scripts/check_ifoperstatus.pl
	plugins-scripts/check_mssql.pl
	plugins/check_apt.c
	plugins/check_by_ssh.c
	plugins/check_cluster.c
	plugins/check_dbi.c
	plugins/check_dig.c
	plugins/check_disk.c
	plugins/check_dns.c
	plugins/check_dummy.c
	plugins/check_fping.c
	plugins/check_game.c
	plugins/check_hpjd.c
	plugins/check_http.c
	plugins/check_ide_smart.c
	plugins/check_ldap.c
	plugins/check_load.c
	plugins/check_mrtg.c
	plugins/check_mrtgtraf.c
	plugins/check_mysql.c
	plugins/check_mysql_query.c
	plugins/check_nagios.c
	plugins/check_nt.c
	plugins/check_ntp.c
	plugins/check_ntp_peer.c
	plugins/check_ntp_time.c
	plugins/check_nwstat.c
	plugins/check_overcr.c
	plugins/check_pgsql.c
	plugins/check_ping.c
	plugins/check_procs.c
	plugins/check_radius.c
	plugins/check_real.c
	plugins/check_smtp.c
	plugins/check_snmp.c
	plugins/check_ssh.c
	plugins/check_swap.c
	plugins/check_tcp.c
	plugins/check_time.c
	plugins/check_ups.c
	plugins/check_users.c
	plugins/negate.c
	plugins/urlize.c
	plugins/utils.h
	po/Makevars
	po/de.po
	po/fr.po
	po/monitoring-plugins.pot

3 files changed, 21 insertions, 21 deletions

diff --git a/po/de.po b/po/de.po
index 76e923c..73aefa6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5748,24 +5748,24 @@ msgstr ""
 #: plugins/utils.h:182
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://monitoring-plugins.org/doc/"
-"extra-opts.html\n"
+"    Read options from an ini file. See\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    for usage and examples.\n"
 msgstr ""
 
 #: plugins/utils.h:190
 msgid ""
 " See:\n"
-" http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
+" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
 #: plugins/utils.h:195
 msgid ""
 "\n"
-"Send email to help@monitoring-plugins.org if you have questions\n"
-"regarding use of this software. To submit patches or suggest improvements,\n"
-"send email to devel@monitoring-plugins.org\n"
+"Send email to help@monitoring-plugins.org if you have questions regarding\n"
+"use of this software. To submit patches or suggest improvements, send email\n"
+"to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 344769c..9893b96 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5891,24 +5891,24 @@ msgstr ""
 #, fuzzy
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://monitoring-plugins.org/doc/"
-"extra-opts.html\n"
+"    Read options from an ini file. See\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    for usage and examples.\n"
 msgstr ""
 " --extra-opts=[section][@file]\n"
-"    Lire les options d'un fichier ini. Voir http://nagiosplugins.org/extra-"
-"opts\n"
+"    Lire les options d'un fichier ini. Voir\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    pour les instructions et examples.\n"
 
 #: plugins/utils.h:190
 #, fuzzy
 msgid ""
 " See:\n"
-" http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
+" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 " Voir:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" https://www.monitoring-plugins.org/doc/guidelines.html."
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 
@@ -5916,9 +5916,9 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\n"
-"Send email to help@monitoring-plugins.org if you have questions\n"
-"regarding use of this software. To submit patches or suggest improvements,\n"
-"send email to devel@monitoring-plugins.org\n"
+"Send email to help@monitoring-plugins.org if you have questions regarding\n"
+"use of this software. To submit patches or suggest improvements, send email\n"
+"to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
 "\n"
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot
index bfb6ea8..088d8c1 100644
--- a/po/monitoring-plugins.pot
+++ b/po/monitoring-plugins.pot
@@ -5595,24 +5595,24 @@ msgstr ""
 #: plugins/utils.h:182
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://monitoring-plugins.org/doc/"
-"extra-opts.html\n"
+"    Read options from an ini file. See\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    for usage and examples.\n"
 msgstr ""
 
 #: plugins/utils.h:190
 msgid ""
 " See:\n"
-" http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
+" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
 #: plugins/utils.h:195
 msgid ""
 "\n"
-"Send email to help@monitoring-plugins.org if you have questions\n"
-"regarding use of this software. To submit patches or suggest improvements,\n"
-"send email to devel@monitoring-plugins.org\n"
+"Send email to help@monitoring-plugins.org if you have questions regarding\n"
+"use of this software. To submit patches or suggest improvements, send email\n"
+"to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""