Prep for new release

git-svn-id: https://nagios.svn.sourceforge.net/svnroot/nagios/nagioscore/trunk@1009 5f96b256-904b-4d8d-8c98-d829582c6739
hedenface · Aug 31, 2007 · 99caadc · 99caadc
1 parent 24594b1
commit 99caadc
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 29 deletions.
diff --git a/Changelog b/Changelog
@@ -4,9 +4,11 @@ Nagios 3.x Change Log
 
 
 
-3.0b3 - ??/??/2007
+3.0b3 - 08/30/2007
 ------------------
 * Minor bug fix for debug logging of macros
+* Version number is now printed in CGI pages
+* HTML documentation cleanup (HTML Tidy, link checking, etc.) 
 * Fixed bug where notifications would not be sent out host/service contact group members
 
 

diff --git a/base/nagios.c b/base/nagios.c
@@ -3,12 +3,12 @@
  * NAGIOS.C - Core Program Code For Nagios
  *
  * Program: Nagios
- * Version: 3.0b2
+ * Version: 3.0b3
  * License: GPL
  * Copyright (c) 1999-2007 Ethan Galstad (http://www.nagios.org)
  *
  * First Written:   01-28-1999 (start of development)
- * Last Modified:   08-29-2007
+ * Last Modified:   08-30-2007
  *
  * Description:
  *

diff --git a/base/nagiostats.c b/base/nagiostats.c
@@ -3,11 +3,11 @@
  * NAGIOSTATS.C - Displays Nagios Statistics
  *
  * Program: Nagiostats
- * Version: 3.0b2
+ * Version: 3.0b3
  * License: GPL
  * Copyright (c) 2003-2007 Ethan Galstad ([email protected])
  *
- * Last Modified:   08-29-2007
+ * Last Modified:   08-30-2007
  *
  * License:
  *

diff --git a/cgi/extinfo.c b/cgi/extinfo.c
@@ -3,7 +3,7 @@
  * EXTINFO.C -  Nagios Extended Information CGI
  *
  * Copyright (c) 1999-2007 Ethan Galstad ([email protected])
- * Last Modified: 07-28-2007
+ * Last Modified: 08-30-2007
  *
  * License:
  * 
@@ -758,6 +758,9 @@ void show_process_info(void){
 	printf("<TR><TD class='stateInfoTable1'>\n");
 	printf("<TABLE BORDER=0>\n");
 
+	/* program version */
+	printf("<TR><TD CLASS='dataVar'>Program Version:</TD><TD CLASS='dataVal'>%s</TD></TR>\n",PROGRAM_VERSION);
+
 	/* program start time */
 	get_time_string(&program_start,date_time,(int)sizeof(date_time),SHORT_DATE_TIME);
 	printf("<TR><TD CLASS='dataVar'>Program Start Time:</TD><TD CLASS='dataVal'>%s</TD></TR>\n",date_time);

diff --git a/configure b/configure
@@ -1307,9 +1307,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 PKG_NAME=nagios
-PKG_VERSION="3.0b2"
+PKG_VERSION="3.0b3"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="08-29-2007"
+PKG_REL_DATE="08-30-2007"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

diff --git a/configure.in b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cg
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 PKG_NAME=nagios
-PKG_VERSION="3.0b2"
+PKG_VERSION="3.0b3"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="08-29-2007"
+PKG_REL_DATE="08-30-2007"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

diff --git a/html/docs/quickstart-fedora.html b/html/docs/quickstart-fedora.html
@@ -127,11 +127,11 @@ <h1 class="PageTitle">Fedora Quickstart</h1>
 </pre>
 
 <p>
-Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0b2 and 1.4.7, respectively.
+Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0b3 and 1.4.7, respectively.
 </p>
 
 <pre>
-wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0b2.tar.gz
+wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0b3.tar.gz
 wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.7.tar.gz
 </pre>
 
@@ -145,8 +145,8 @@ <h1 class="PageTitle">Fedora Quickstart</h1>
 
 <pre>
 cd ~/downloads
-tar xzf nagios-3.0b2.tar.gz
-cd nagios-3.0b2
+tar xzf nagios-3.0b3.tar.gz
+cd nagios-3.0b3
 </pre>
 
 <p>

diff --git a/html/docs/quickstart-opensuse.html b/html/docs/quickstart-opensuse.html
@@ -106,11 +106,11 @@ <h1 class="PageTitle">openSUSE Quickstart</h1>
 </pre>
 
 <p>
-Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).    At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0b2 and 1.4.7, respectively.
+Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).    At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0b3 and 1.4.7, respectively.
 </p>
 
 <pre>
-wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0b2.tar.gz
+wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0b3.tar.gz
 wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.7.tar.gz
 </pre>
 
@@ -124,8 +124,8 @@ <h1 class="PageTitle">openSUSE Quickstart</h1>
 
 <pre>
 cd ~/downloads
-tar xzf nagios-3.0b2.tar.gz
-cd nagios-3.0b2
+tar xzf nagios-3.0b3.tar.gz
+cd nagios-3.0b3
 </pre>
 
 <p>

diff --git a/html/docs/quickstart-ubuntu.html b/html/docs/quickstart-ubuntu.html
@@ -131,11 +131,11 @@ <h1 class="PageTitle">Ubuntu Quickstart</h1>
 </pre>
 
 <p>
-Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0b2 and 1.4.7, respectively.
+Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0b3 and 1.4.7, respectively.
 </p>
 
 <pre>
-wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0b2.tar.gz
+wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0b3.tar.gz
 wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.7.tar.gz
 </pre>
 
@@ -149,8 +149,8 @@ <h1 class="PageTitle">Ubuntu Quickstart</h1>
 
 <pre>
 cd ~/downloads
-tar xzf nagios-3.0b2.tar.gz
-cd nagios-3.0b2
+tar xzf nagios-3.0b3.tar.gz
+cd nagios-3.0b3
 </pre>
 
 <p>

diff --git a/html/main.html b/html/main.html
@@ -35,8 +35,8 @@
 
 <P>
 <div align=center>
-<div align=center CLASS="version">Version 3.0b2</div>
-<div align=center CLASS="releaseDate">August 29, 2007</div>
+<div align=center CLASS="version">Version 3.0b3</div>
+<div align=center CLASS="releaseDate">August 30, 2007</div>
 </div>
 </P>
 

diff --git a/include/common.h b/include/common.h
@@ -21,8 +21,8 @@
  ************************************************************************/
 
 
-#define PROGRAM_VERSION "3.0b2"
-#define PROGRAM_MODIFICATION_DATE "08-29-2007"
+#define PROGRAM_VERSION "3.0b3"
+#define PROGRAM_MODIFICATION_DATE "08-30-2007"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/

diff --git a/nagios.spec b/nagios.spec
@@ -1,5 +1,5 @@
 %define name nagios
-%define version 3.0b2
+%define version 3.0b3
 %define release 1.fc4.test
 %define nsusr nagios
 %define nsgrp nagios

diff --git a/update-version b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=3.0b2
+CURRENTVERSION=3.0b3
 
 # Last date
-LASTDATE=08-29-2007
+LASTDATE=08-30-2007
 
 if [ "x$1" = "x" ]
 then