[Openvas-commits] r9560 - trunk/doc/website

[scm-commit@wald.intevation.org]

Author: jan
Date: 2010-11-29 20:55:47 +0100 (Mon, 29 Nov 2010)
New Revision: 9560

Added:
   trunk/doc/website/contact.htm4
Modified:
   trunk/doc/website/constitution.htm4
   trunk/doc/website/misc.htm4
   trunk/doc/website/template_header.m4
Log:
Removed some historic stuff from Constitution, added a link
to SPI OpenVAS project, moved the link to misc.
Replaced the Constitution link by a new page "Contacts".


Modified: trunk/doc/website/constitution.htm4
===================================================================
--- trunk/doc/website/constitution.htm4	2010-11-29 19:49:20 UTC (rev 9559)
+++ trunk/doc/website/constitution.htm4	2010-11-29 19:55:47 UTC (rev 9560)
@@ -29,11 +29,8 @@
 <h2>Constitution for OpenVAS project</h2>
 
 <p>
-This is the current (June 2007) constitution for OpenVAS
-. It was originally <a href="http://www.spi-inc.org/secretary/agenda/2005/2005-11-15.html">accepted</a> by
-<a href="http://www.spi-inc.org/">SPI</a> on the 15th November 2005. We were briefly delisted by SPI during a
-period of hosting difficulties but were reaccepted after successful discussions at
-<a href="http://www.debconf.org/">DebConf</a> 7.
+OpenVAS is officially accepted as a SPI project, see
+<a href="http://www.spi-inc.org/projects/openvas/">SPI page on OpenVAS</a>.
 </p>
 
 <h3>Project contacts</h3>

Added: trunk/doc/website/contact.htm4
===================================================================
--- trunk/doc/website/contact.htm4	2010-11-29 19:49:20 UTC (rev 9559)
+++ trunk/doc/website/contact.htm4	2010-11-29 19:55:47 UTC (rev 9560)
@@ -0,0 +1,75 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+
+m4_dnl OpenVAS
+m4_dnl $Id$
+m4_dnl Description: OpenVAS contact information.
+m4_dnl
+m4_dnl Authors:
+m4_dnl Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+m4_dnl
+m4_dnl Copyright:
+m4_dnl Copyright (C) 2010 Greenbone Networks GmbH
+m4_dnl
+m4_dnl This program is free software; you can redistribute it and/or modify
+m4_dnl it under the terms of the GNU General Public License version 2,
+m4_dnl as published by the Free Software Foundation.
+m4_dnl
+m4_dnl This program is distributed in the hope that it will be useful,
+m4_dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+m4_dnl GNU General Public License for more details.
+m4_dnl
+m4_dnl You should have received a copy of the GNU General Public License
+m4_dnl along with this program; if not, write to the Free Software
+m4_dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+PAGE_START
+<h2>Contact</h2>
+
+<h3>Contact with OpenVAS users and developers</h3>
+
+<p>
+The best way to contact the OpenVAS development team is to
+<ul>
+<li> <a href="http://lists.wald.intevation.org/mailman/listinfo/openvas-discuss">subscribe</a>
+to the discussions mailing list
+</li>
+</ul>
+
+or to
+
+<ul>
+<li> contact the team in our <a href="online-chat.html">Online Chat</a>.
+</li>
+</ul>
+</p>
+
+<h3>Contacts regarding OpenVAS infrastructure</h3>
+
+<p>
+Question/reports about the OpenVAS infrastructure:
+</p>
+
+<ul>
+<li> OpenVAS web site and development platform is operated by:
+     <a href="http://www.intevation.net">Intevation GmbH</a>
+     (<a href="mailto:intevation at intevation.de">intevation @ intevation.de</a>)
+</li>
+</ul>
+
+<h3>Project contacts</h3>
+
+<p>
+Contacts regarding the OpenVAS project as such
+and for anything that does not match one of the above
+options:
+</p>
+
+<ul>
+<li>Project initiator: <a href="mailto:timb at openvas.org">Tim Brown</a></li>
+<li>Development coordinator: <a href="mailto:neuro at well.com">William Anderson</a></li>
+<li>Administrative coordinator: <a href="mailto:robert.berkowitz at gmail.com">Robert Berkowitz</a></li>
+</ul>
+

Modified: trunk/doc/website/misc.htm4
===================================================================
--- trunk/doc/website/misc.htm4	2010-11-29 19:49:20 UTC (rev 9559)
+++ trunk/doc/website/misc.htm4	2010-11-29 19:55:47 UTC (rev 9560)
@@ -38,6 +38,13 @@
 
 </li>
 
+<li>
+<p>
+<a href="constitution.html">Constitution</a> Summary of OpenVAS constitution
+    according to SPI guidline.
+</p>
+</li>
+
 <li><a href="trusted-nvts.html">Trusted NVTs  (how to manage NVT signatures)</a>
 
 <p>

Modified: trunk/doc/website/template_header.m4
===================================================================
--- trunk/doc/website/template_header.m4	2010-11-29 19:49:20 UTC (rev 9559)
+++ trunk/doc/website/template_header.m4	2010-11-29 19:55:47 UTC (rev 9560)
@@ -63,7 +63,7 @@
        <li><a href="__TMPL_ROOT`'screenshots.html">Screenshots</a></li>
        <li><a href="__TMPL_ROOT`'openvas-nvt-feed.html">OpenVAS NVT Feed</a></li>
        <li><a href="__TMPL_ROOT`'security.html">Security</a></li>
-       <li><a href="__TMPL_ROOT`'constitution.html">Constitution</a></li>
+       <li><a href="__TMPL_ROOT`'contact.html">Contact</a></li>
        <li><a href="__TMPL_ROOT`'news_archive.html">News</a></li>
      </ul>
     </div>