3 files changed, 102 insertions, 6 deletions

diff --git a/web/input/doc/extra-opts.md b/web/input/doc/extra-opts.md
index 1c21575..7bf3b7f 100644
--- a/web/input/doc/extra-opts.md
+++ b/web/input/doc/extra-opts.md
@@ -4,11 +4,11 @@ parent: Documentation
 
 # Extra-Opts
 
-Starting with the 1.4.12 release, most Nagios Plugins (those written in C)
-support reading options from a configuration file.  This needs to be enabled
-at compile-time for now (`--enable-extra-opts`) and will be enabled by default
-in the future.  Perl plugins using the [Monitoring::Plugin][module] module have
-this support since version 0.16.
+Starting with the 1.4.12 release, most Monitoring Plugins (those written in C)
+support reading options from a configuration file.  Since version 2.0, this is
+enabled by default (but can be disabled at compile-time by specifying the
+`--disable-extra-opts` option).  Perl plugins using the
+[Monitoring::Plugin][module] module have this support since version 0.16.
 
 You can easily know if a plugin supports *Extra-Opts* by checking the `--help`
 output for the `--extra-opts` option.  Once compiled in, the `--extra-opts`
diff --git a/web/input/news/release-2-0.md b/web/input/news/release-2-0.md
new file mode 100644
index 0000000..c804c7d
--- /dev/null
+++ b/web/input/news/release-2-0.md
@@ -0,0 +1,96 @@
+title: Version 2.0 Released
+author: Holger Weiß
+date: 2014-07-11
+---
+
+The Monitoring Plugins Development Team is proud to announce the first release
+under the new project name: Version 2.0 of the Monitoring Plugins!  This
+release comes with various enhancements and fixes provided by more than twenty
+contributors.  Many thanks to all of you! <end-of-teaser>
+
+Let me also take the chance to welcome our newest team member, Sam
+Kottler.  He already did lots of patch review for this release, and his
+expertise will no doubt help us a lot in the future, so we're really
+happy to have him on board!
+
+One of the significant changes in the new release is that the Extra-Opts
+feature is now enabled by default.  This lets you use a configuration
+file to specify plugin options.  See [the documentation][extra-opts] for
+details.
+
+For the list of other major changes in this release, see below.  Note that a
+few of them might break certain configurations (hence the major version bump).
+Those are mentioned at [the bottom of that list][warnings], so please be sure
+to check whether they might affect you.
+
+You can get the tarball from our [download page][download].
+
+## Enhancements
+
+* `check_mailq` now supports auto detection of *qmail*, *postfix*, *exim* and
+  *nullmailer* with fallback to *sendmail*
+* `check_ide_smart` now defaults to plugin output, original output appended
+  with `-v`
+* [Extra-Opts][extra-opts] are now enabled by default
+* `check_swap` now supports a configurable state when there is no swap
+* `check_radius` now supports the [FreeRADIUS Client library][freeradius-lib]
+* New `check_mysql_query` `-f` option to specify a client options file
+* New `check_mysql_query` `-g` option to specify a client options group
+* Add performance data to `check_mysql_query`
+* New `check_file_age` `-i`/`--ignore-missing` option to return `OK` on
+  nonexistent files
+* Make `check_ping`, `check_users`, and `check_disk` work on
+  [Windows][windows]
+* New `check_ssh` `-P` option to specify the expected SSH protocol version
+* `check_dns` now emits the warning and critical thresholds with the
+  performance data
+
+## Fixes
+
+* Don't let e.g. `check_http`'s `-C` option reset SSL version if e.g. `-S` `1`
+  `-C` `5` is specified
+* Don't have `check_http`'s `-N` option expect an argument
+* `check_ide_smart` could disable offline auto-tests but could not re-enable
+  them.  For this reason all SMART command modes have been disabled
+* `check_dig`: fix wrong IPv6 arguments order (St&eacute;phane Bortzmeyer)
+* `check_dig`: make sure not to give up too early when a timeout is specified
+  with `-t`
+* `check_log`: don't stumble over log lines that include a `%` character
+* `check_nt`: add `UPTIME` to perfdata
+* Handle SNMPv3 `noAuthNoPriv` properly with `check_snmp`
+* Fix compilation with [GnuTLS][gnutls]
+
+## Warnings
+
+* New default installation prefix: `/usr/local` instead of `/usr/local/nagios`
+* `check_snmp` now evaluates negative values properly, which means it might
+  return `CRITICAL` in cases where it used to return `OK`.  If this is
+  undesired, the warning/critical threshold(s) must be fixed by specifying
+  e.g. `~:100` instead of `100`
+* `check_procs` now ignores its parent process to avoid unexpected results
+  when invoked via certain shells
+* `utils.sh` no longer defines `ECH`
+* `check_ide_smart` `-q`/`--quiet` and `-n`/`--nagios` (Nagios-compatible
+   output) are now deprecated but accepted for backward-compatibility
+* `check_ide_smart` `-0`/`--auto-off`, `-1`/`--auto-on` and
+  `-i`/`--immediate`: options have been disabled because they were broken
+* State retention: the `NAGIOS_PLUGIN_STATE_DIRECTORY` environment variablew
+  has been renamed `MP_STATE_PATH`.  The old variable will continue to work in
+  v2.0.x
+* Add the UID of the invoking user to the state retention file path.  This
+  helps solving permission issues when different users run the same plugin
+* `check_swap` used to allow returning `OK` on a system without swap when only
+  percent thresholds were used.  This is no longer the case and one must now
+  use `-n`/`--no-swap=<state>`
+* The Perl and Shell plugins now use the `PATH` specified via `./configure`'s
+  `--trusted-path` option, or
+  `/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin` by default
+
+[download]: /download.html
+[warnings]: #warnings
+[extra-opts]: /doc/extra-opts.html
+[freeradius-lib]: http://freeradius.org/freeradius-client/
+[gnutls]: http://www.gnutls.org/
+[windows]: http://windows.microsoft.com/
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/macros.py b/web/macros.py
index dbb4e93..1539093 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -2,7 +2,7 @@ import email.utils
 import os.path
 import time
 
-plugins_release = '1.5'
+plugins_release = '2.0'
 mib_release = '1.0.1'
 release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
 site_url = 'https://www.monitoring-plugins.org/'