Various website updates.

The main change is the removal of RT email addresses.

diff --git a/www/cms/documentation/gettingstarted.xhtml b/www/cms/documentation/gettingstarted.xhtml
index ef8db547444329562e6b4250369fe03bc20a127a..7d61dc9ec1d8eb42649d15bee675a74f76f885c4 100644 (file)
--- a/www/cms/documentation/gettingstarted.xhtml
+++ b/www/cms/documentation/gettingstarted.xhtml
@@ -228,8 +228,7 @@ ihost.pl server.domain.com port
           </p>
           <p>
             If you have any questions about any of the above, please
           </p>
           <p>
             If you have any questions about any of the above, please

-            don't hesitate to contact us at
-            <a href="mailto:support@i-scream.org">support@i-scream.org</a>.
+            don't hesitate to contact us on our mailing lists.

             If you find we've missed something out, again, please let
             us know.
           </p>
             If you find we've missed something out, again, please let
             us know.
           </p>

diff --git a/www/cvs.xhtml b/www/cvs.xhtml
index 64fd6d4924547dfac9981821bea7d070a8df4077..e86153e9549fab9bf2cc260688f4b9a20f60d3d8 100644 (file)
--- a/www/cvs.xhtml
+++ b/www/cvs.xhtml
@@ -24,7 +24,8 @@
           </p>
           <p>
             All code available in the CVS Repository is
           </p>
           <p>
             All code available in the CVS Repository is

-            <a href="/license.xhtml">licensed</a> under the GPL.
+            <a href="/license.xhtml">licensed</a> under the GPL unless
+            otherwise stated.

           </p>
           <h3>
             Web Access
           </p>
           <h3>
             Web Access

diff --git a/www/footer.inc b/www/footer.inc
index 2d3f9bd52c78623ea8ac65410b07943c06b7f5b8..ba0d9cae731cb6ccc1ad12e1e39eca4655de2531 100644 (file)
--- a/www/footer.inc
+++ b/www/footer.inc
@@ -1,7 +1,7 @@
         <div id="footer">
           <p>
         <div id="footer">
           <p>

-            &copy; 2000-2011 i-scream &#187;
-            <a href="http://www.i-scream.org/">http://www.i-scream.org/</a> &#171;
-            support@i-scream.org
+            &copy; 2000-2013 i-scream
+            &#171; &#187;
+            <a href="http://www.i-scream.org/">http://www.i-scream.org/</a>

           </p>
         </div>
\ No newline at end of file
           </p>
         </div>
\ No newline at end of file

diff --git a/www/git.xhtml b/www/git.xhtml
index c4fb7e425774e96d70b2b76652b685a638e1110e..a2227f2380a1017a85a6be18c193e185b67d9a85 100644 (file)
--- a/www/git.xhtml
+++ b/www/git.xhtml
@@ -20,7 +20,8 @@
           </p>
           <p>
             All code available in the Git repositories is
           </p>
           <p>
             All code available in the Git repositories is

-            <a href= "/license.xhtml">licensed</a> under the GPL.
+            <a href= "/license.xhtml">licensed</a> under the GPL
+            unless otherwise stated.

           </p>
           <h3>
             Web Access
           </p>
           <h3>
             Web Access

diff --git a/www/index.xhtml b/www/index.xhtml
index d0975a3eb088120893d699d82a40ba5909572e13..d03de92e94ce87e0183bf0aa79088db1d8502591 100644 (file)
--- a/www/index.xhtml
+++ b/www/index.xhtml
@@ -39,9 +39,12 @@
             Source code moved to Git
           </h4>
           <p>
             Source code moved to Git
           </h4>
           <p>

-            We've moved both libstatgrab and pystatgrab to their
-            own Git repositories. CVS will remain for everything
-            else for now.
+            We've moved both
+            <a href="http://git.i-scream.org/?p=libstatgrab.git;a=summary">libstatgrab</a>
+            and
+            <a href="http://git.i-scream.org/?p=pystatgrab.git;a=summary">pystatgrab</a>
+            to their own Git repositories. CVS will remain for
+            everything else for now.

           </p>
           <h3>
             Sunday 21 February 2010
           </p>
           <h3>
             Sunday 21 February 2010

diff --git a/www/libstatgrab/index.xhtml b/www/libstatgrab/index.xhtml
index f2c2cdf8dc00f3adb2e0ed24547757b5c113b222..f9081484c3bbec690959b003f9ee4afd7b7fce76 100644 (file)
--- a/www/libstatgrab/index.xhtml
+++ b/www/libstatgrab/index.xhtml
@@ -1,7 +1,7 @@
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>

-      i-scream libstatgrab homepage
+      libstatgrab homepage

     </title>
 <!--#include virtual="/style.inc" -->
   </head>
     </title>
 <!--#include virtual="/style.inc" -->
   </head>


@@ -11,7 +11,7 @@
 <!--#include virtual="/header.inc" -->
         <div id="contents">
           <h1 class="top">
 <!--#include virtual="/header.inc" -->
         <div id="contents">
           <h1 class="top">

-            i-scream libstatgrab homepage
+            libstatgrab homepage

           </h1>
           <div id="topnav">
             <ul>
           </h1>
           <div id="topnav">
             <ul>


@@ -74,11 +74,6 @@
           <h2>
             <a id="news">News</a>
           </h2>
           <h2>
             <a id="news">News</a>
           </h2>

-          <p>
-            To get notifications of new libstatgrab releases why not
-            subscribe to our project over on
-            <a href="http://freshmeat.net/projects/libstatgrab/">freshmeat</a>?
-          </p>

           <h3>
             Sunday 21 February 2010
           </h3>
           <h3>
             Sunday 21 February 2010
           </h3>


@@ -328,8 +323,7 @@
           <p>
             Here are links to bindings for higher level languages
             that provide access to libstatgrab. If you've written
           <p>
             Here are links to bindings for higher level languages
             that provide access to libstatgrab. If you've written

-            a binding for another language, please get
-            <a href="mailto:support@i-scream.org">in touch</a> so we
+            a binding for another language, please get in touch so we

             can add a link here.
           </p>
           <h2>
             can add a link here.
           </p>
           <h2>


@@ -373,20 +367,6 @@
             We've noticed that google throws up some RPM's relating
             to Mandrake and Suse, but no webpage for them.
           </p>
             We've noticed that google throws up some RPM's relating
             to Mandrake and Suse, but no webpage for them.
           </p>

-          <h2>
-            <a id="development">Development</a>
-          </h2>
-          <ul>
-            <li>
-              <a href="/cgi-bin/cvslog.cgi?period=thisweek&amp;module=projects/libstatgrab">Commits this week</a>
-            </li>
-          </ul>
-          <p>
-            We develop libstatgrab using the CVS revision control system.
-            Using this link you can see what changes we've made this week.
-            For more information on our CVS setup see our
-            <a href="/cvs.xhtml">CVS page</a>.
-          </p>

           <h2>
             <a id="documentation">Documentation</a>
           </h2>
           <h2>
             <a id="documentation">Documentation</a>
           </h2>

diff --git a/www/menu-static.inc b/www/menu-static.inc
index 2c46ee69838f7c2cf20d492ce08763c2fccb56e8..bf001eb3a8b94c645332ecf9c9c41f071d54d4db 100644 (file)
--- a/www/menu-static.inc
+++ b/www/menu-static.inc
@@ -35,8 +35,7 @@
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>

-          <li><a href="http://www.i-scream.org/support.xhtml">Support</a></li>
-          <li><a href="http://www.i-scream.org/support.xhtml">Bug Tracking</a></li>
+          <li><a href="http://www.i-scream.org/support.xhtml">Reporting bugs</a></li>

         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/license.xhtml">Licensing</a></li>
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/license.xhtml">Licensing</a></li>


@@ -48,12 +47,6 @@
           <li><a href="http://www.i-scream.org/who.xhtml">Who We Are</a></li>
           <li><a href="http://www.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
         </ul>
           <li><a href="http://www.i-scream.org/who.xhtml">Who We Are</a></li>
           <li><a href="http://www.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
         </ul>

-        <h3 class="heading">
-          Contact Us
-        </h3>
-        <ul>
-          <li><a href="mailto:support@i-scream.org">support@i-scream.org</a></li>
-        </ul>

         <p class="logo">
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
         <p class="logo">
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />

diff --git a/www/menu.inc b/www/menu.inc
index bb4f5e6db6f3edbab6aad67cce53c2966a9eb2e9..74658aff8fd1ac76fdb7ed3c48d87d6d97c81db6 100644 (file)
--- a/www/menu.inc
+++ b/www/menu.inc
@@ -35,8 +35,7 @@
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>

-          <li><a href="http://www.i-scream.org/support.xhtml">Support</a></li>
-          <li><a href="http://www.i-scream.org/support.xhtml">Bug Tracking</a></li>
+          <li><a href="http://www.i-scream.org/support.xhtml">Reporting bugs</a></li>

         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/license.xhtml">Licensing</a></li>
         </ul>
         <ul>
           <li><a href="http://www.i-scream.org/license.xhtml">Licensing</a></li>


@@ -48,12 +47,6 @@
           <li><a href="http://www.i-scream.org/who.xhtml">Who We Are</a></li>
           <li><a href="http://www.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
         </ul>
           <li><a href="http://www.i-scream.org/who.xhtml">Who We Are</a></li>
           <li><a href="http://www.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
         </ul>

-        <h3 class="heading">
-          Contact Us
-        </h3>
-        <ul>
-          <li><a href="mailto:support@i-scream.org">support@i-scream.org</a></li>
-        </ul>

         <p class="logo">
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
         <p class="logo">
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />

diff --git a/www/mirrors.xhtml b/www/mirrors.xhtml
index 07903a5333fbe1bfea754b51c8e5c08e458a8c52..b0dd26b9c988de7c8d407dabf16913b8f50f5042 100755 (executable)
--- a/www/mirrors.xhtml
+++ b/www/mirrors.xhtml
@@ -17,8 +17,7 @@
             This is a list of mirrors containing i-scream downloads.
             Please choose a mirror, preferably near you, rather than
             the master site. If you want to mirror i-scream please
             This is a list of mirrors containing i-scream downloads.
             Please choose a mirror, preferably near you, rather than
             the master site. If you want to mirror i-scream please

-            <a href="mailto:support@i-scream.org">contact</a> us with
-            details.
+            let us know.

           </p>
           <h2>
             FTP Mirrors
           </p>
           <h2>
             FTP Mirrors

diff --git a/www/pystatgrab/index.xhtml b/www/pystatgrab/index.xhtml
index d4c49bdc62e1ebe35e34195582e21d2d7f582d7a..5d1ef64dac5f011ed66326f8d1e6f040bc4e150c 100644 (file)
--- a/www/pystatgrab/index.xhtml
+++ b/www/pystatgrab/index.xhtml
@@ -1,7 +1,7 @@
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>

-      i-scream pystatgrab homepage
+      pystatgrab homepage

     </title>
 <!--#include virtual="/style.inc" -->
   </head>
     </title>
 <!--#include virtual="/style.inc" -->
   </head>


@@ -11,7 +11,7 @@
 <!--#include virtual="/header.inc" -->
         <div id="contents">
           <h1 class="top">
 <!--#include virtual="/header.inc" -->
         <div id="contents">
           <h1 class="top">

-            i-scream pystatgrab homepage
+            pystatgrab homepage

           </h1>
           <div id="topnav">
             <ul>
           </h1>
           <div id="topnav">
             <ul>


@@ -32,11 +32,6 @@
           <h2>
             <a id="news">News</a>
           </h2>
           <h2>
             <a id="news">News</a>
           </h2>

-          <p>
-            To get notifications of new pystatgrab releases why not
-            subscribe to our project over on
-            <a href="http://freshmeat.net/projects/pystatgrab/">freshmeat</a>?
-          </p>

           <h3>
             Saturday 14 July 2007
           </h3>
           <h3>
             Saturday 14 July 2007
           </h3>


@@ -121,8 +116,8 @@
           </p>
           <p>
             pystatgrab should work on any platform that libstatgrab
           </p>
           <p>
             pystatgrab should work on any platform that libstatgrab

-            will work on. Currently, pystatgrab requires version 0.9 of
-            libstatgrab to function.
+            will work on. Currently, pystatgrab requires version 0.9
+            or later of libstatgrab to function.

           </p>
           <h2>
             <a id="download">Downloading</a>
           </p>
           <h2>
             <a id="download">Downloading</a>


@@ -145,20 +140,6 @@
             <a href="http://software.opensuse.org/download/home:/anagappan/">
             RPMs for various Linux distributions</a>.
           </p>
             <a href="http://software.opensuse.org/download/home:/anagappan/">
             RPMs for various Linux distributions</a>.
           </p>

-          <h2>
-            <a id="development">Development</a>
-          </h2>
-          <ul>
-            <li>
-              <a href="/cgi-bin/cvslog.cgi?period=thisweek&amp;module=projects/pystatgrab">Commits this week</a>
-            </li>
-          </ul>
-          <p>
-            We develop pystatgrab using the CVS revision control system.
-            Using this link you can see what changes we've made this week.
-            For more information on our CVS setup see our
-            <a href="/cvs.xhtml">CVS page</a>.
-          </p>

         </div>
 <!--#include virtual="/footer.inc" -->
       </div>
         </div>
 <!--#include virtual="/footer.inc" -->
       </div>

diff --git a/www/styles/style.css b/www/styles/style.css
index 61fa993629e10ccea961ac560bdcd7441157e80e..aff8f21d2c3837933a5215302a7a3d4cc8f2a266 100644 (file)
--- a/www/styles/style.css
+++ b/www/styles/style.css
@@ -83,7 +83,6 @@ html,body {
        background: #eeeeff;
        border-bottom: 5px solid #000066;
        color: #000066;
        background: #eeeeff;
        border-bottom: 5px solid #000066;
        color: #000066;

-       text-align: right;

 }
 #contents h2 {
        padding: 4px;
 }
 #contents h2 {
        padding: 4px;


@@ -106,9 +105,8 @@ html,body {
        /*font-size: larger;*/
 }
 #topnav {
        /*font-size: larger;*/
 }
 #topnav {

-       margin: -15px -10px 0px 0px;
-       padding: 0px 0px 10px 0px;
-       text-align: right;
+       margin: -10px 0px 0px -10px;
+       padding: 0px;

        background: transparent;
        color: #000000;
 }
        background: transparent;
        color: #000000;
 }

diff --git a/www/support.xhtml b/www/support.xhtml
index 12116f8b47a8570b70e4cf7903c29418a739c932..8305b7a93134db0063398b4a9efce1cfa6a695fd 100644 (file)
--- a/www/support.xhtml
+++ b/www/support.xhtml
@@ -1,7 +1,7 @@
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>
 <!--#include virtual="/doctype.inc" -->
   <head>
     <title>

-      i-scream support
+      Reporting bugs

     </title>
 <!--#include virtual="/style.inc" -->
   </head>
     </title>
 <!--#include virtual="/style.inc" -->
   </head>


@@ -11,35 +11,29 @@
 <!--#include virtual="/header.inc" -->
         <div id="contents">
           <h1 class="top">
 <!--#include virtual="/header.inc" -->
         <div id="contents">
           <h1 class="top">

-            i-scream Support
+            Reporting bugs

           </h1>
           <p>
           </h1>
           <p>

-            i-scream uses <a href="http://www.bestpractical.com/rt/">RT</a>
-            to track support requests. We've set up two addresses
-            to help seperate the two main types of requests.
+            i-scream makes uses of the GitHub issue trackers
+            associated with our projects over on
+            <a href="http://github.com/i-scream">GitHub</a>. If you've
+            found a bug with our software that's the best place to
+            report and discuss it. If you have a fix, you can make a
+            pull request there too.

           </p>
           </p>

-          <h3>
-            bugs@i-scream.org
-          </h3>

           <p>
           <p>

-            If you have found a bug or problem with an i-scream program
-            send an email to this address. Your message will be logged
-            and one of the developers will get back to you with more
-            information. Hopefully we'll be able to fix the bug.
+            If you want some help using one of the projects or which
+            to discuss any other issues the best place to go to is the
+            users mailing list. You can find out more about our mailing
+            lists <a href="mailinglists.xhtml">here</a>.

           </p>
           </p>

-          <h3>
-            support@i-scream.org
-          </h3>

           <p>
           <p>

-            If you have any other query, please email this address. We
-            prefer to use this mechanism over emailing us directly
-            because it means we can't lose your email in the rafts of
-            spam we unfortunately receive.
-          </p>
-          <p>
-            Once your email has been received you will get an
-            acknowledgement by email and details of how to view your
-            tickets over the web.
+            If there issue needs to remain private, for example a
+            security issue, please contact Tim directly. His details
+            are on the <a href="who.xhtml">Who We Are</a> page. This
+            should only be used in exceptional circumstances - we
+            prefer all discussion to happen on public mailing lists or
+            bug trackers where possible.

           </p>
         </div>
 <!--#include virtual="/footer.inc" -->
           </p>
         </div>
 <!--#include virtual="/footer.inc" -->

diff --git a/www/who.xhtml b/www/who.xhtml
index 4f68cae9d33b73876ade81bbd0ca2338629f5e71..c9914db9fa9567fd0ecbb35c4cb71f2192ac8846 100644 (file)
--- a/www/who.xhtml
+++ b/www/who.xhtml
@@ -50,6 +50,9 @@
           <p>
             <b>Adam Sampson</b> - ats@offog.org
           </p>
           <p>
             <b>Adam Sampson</b> - ats@offog.org
           </p>

+          <p>
+            <b>Jens Rehsack</b>
+          </p>

           <ul>
             <li>
               <a href="http://www.offog.org/">Homepage</a>
           <ul>
             <li>
               <a href="http://www.offog.org/">Homepage</a>


@@ -58,10 +61,6 @@
           <p>
             <b>Peter Saunders</b> - pajs@i-scream.org
           </p>
           <p>
             <b>Peter Saunders</b> - pajs@i-scream.org
           </p>

-          <p>
-            Group Contact Address -
-            <a href="mailto:support@i-scream.org">support@i-scream.org</a>
-          </p>

         </div>
 <!--#include virtual="/footer.inc" -->
       </div>
         </div>
 <!--#include virtual="/footer.inc" -->
       </div>