sync up for new svn site

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@909 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/website/.htaccess b/website/.htaccess
index 348dfa09320428d34ad3fdbf77695896c6470f4b..3b4503e093d8a0e467ba1fc8f6f7eaab95b60177 100644 (file)
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -1,8 +1,6 @@
 DirectoryIndex index.en.html index.html
 ErrorDocument 404 http://oss.oetiker.ch/rrdtool/404.var
 RewriteEngine On
-RewriteRule pub/(.*) http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/$1 [R=301,L]
-RewriteRule pub$ http://people.ee.ethz.ch/oetiker/webtools/rrdtool/pub/ [R=301,L]
 RewriteRule index.html http://oss.oetiker.ch/rrdtool/ [R=302,L]
 RewriteRule download.html http://oss.oetiker.ch/rrdtool/download.en.html [R=302,L]
 <FilesMatch ".htaccess">

diff --git a/website/doc/build.sh b/website/doc/build.sh
index 03c7339680265cdeacc44affd3831977941b44c9..d5b7cf91ff55364167b9e1cd9ab3cc549e4cab40 100755 (executable)
--- a/website/doc/build.sh
+++ b/website/doc/build.sh
@@ -15,7 +15,7 @@ pod2descr() {
 rm -f navbar.inc
 rm -f index.inc
 
-for pod in `cd $src/doc/;echo rrdtool.pod;ls *.pod|egrep -v 'tutorial|beginners|graph-old|bin_dec|rrdtool.pod|python|RRD|thread'`; do
+for pod in `cd $src/doc/;echo rrdtool.pod;ls *.pod|egrep -v 'tutorial|beginners|graph-old|bin_dec|rrdtool.pod|python|RRD|ruby|thread'`; do
  base=`echo $pod |sed 's,.pod,,'` 
  echo $base
  cat  $src/doc/$pod > $base.pod

diff --git a/website/download.wml b/website/download.wml
index d0d788b6bfc61ee57be0e33d5ca5400025b42e26..cd9165cdf8edd137f83f5193387a0b525b42c5ed 100644 (file)
--- a/website/download.wml
+++ b/website/download.wml
@@ -46,7 +46,7 @@ You can download RRD tool from several places:
 Or if you want todo more than look ...</p>
 
 <pre>
-svn ls -R svn://svn.ee.ethz.ch/rrdtool/
+svn ls -R svn://svn.oetiker.ch/rrdtool/
 </pre>
 
 <p>tells you what is in the repository. Normally, development will happen in
@@ -62,7 +62,7 @@ libtool installed for this to work.</p>
 
 <p>To get the latest chenges from the current 1.2 branch use this:</p>
 <pre>
-svn checkout svn://svn.ee.ethz.ch/rrdtool/branches/1.2/program
+svn checkout svn://svn.oetiker.ch/rrdtool/branches/1.2/program
 mv program rrdtool-1.2
 cd rrdtool-1.2
 ./MakeMakefile

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index e9dcef3852af8508dbf814a561d86f8581b90f34..8432961822b42c697b837d07a3597b8a68b63ea5 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -4,6 +4,7 @@
 
 <H1>RRDtool Gallery</H1>
 
+#include "load.xml"
 #include "mmh11.xml"
 #include "meteo-igf.xml"
 #include "btdmd8.xml"

diff --git a/website/gallery/load.png b/website/gallery/load.png
new file mode 100644 (file)
index 0000000..c144188
Binary files /dev/null and b/website/gallery/load.png differ

diff --git a/website/gallery/load.xml b/website/gallery/load.xml
new file mode 100644 (file)
index 0000000..5ff8881
--- /dev/null
+++ b/website/gallery/load.xml
@@ -0,0 +1,9 @@
+<gallery image="load.png" >
+    <title>Load and CPU usage</title>
+    <author>Lars Kotthoff</author> 
+    <description>Graphs the load averages on the system and the fractions of CPU
+    states under the curve.</description>
+    <year>2006</year><month>10</month>
+    <livesite>http://www.metalhead.ws/rrdtool</livesite> 
+    <email>metalhead@metalhead.ws</email>
+</gallery>

diff --git a/website/iana/RRDTOOL-SMI.txt b/website/iana/RRDTOOL-SMI.txt
index 0910605692c89a3d7b41d68bbc9423c2030228f4..7ad6db6155cf5d5f5bd2bcf27c0193b27470166a 100644 (file)
--- a/website/iana/RRDTOOL-SMI.txt
+++ b/website/iana/RRDTOOL-SMI.txt
@@ -21,7 +21,7 @@ rrdtool MODULE-IDENTITY
                 E-mail: tobi@oetiker.ch
 
                 RRD Tool Information:
-                  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+                  http://oss.oetiker.ch/rrdtool/
                "
        DESCRIPTION
                "The Structure of RRDTool fellow projects"

diff --git a/website/inc/design.css b/website/inc/design.css
index 18f2c278f1b7444a77851101d386e8191b43df88..fd8be5f068b8957bfd7c85a6ff92e46ecf393c1b 100644 (file)
--- a/website/inc/design.css
+++ b/website/inc/design.css
@@ -8,7 +8,7 @@ body {
 
 /* hide old stuff */
 .legacy {
-  display: none
+  display: none;
 }
 
 /**************************

diff --git a/website/inc/html.inc b/website/inc/html.inc
index 5a82ecce5098abaaea3b326c8401f0a04c4fa1af..afd62657ff4a02e72c5036d04c2e897c515dfd88 100644 (file)
--- a/website/inc/html.inc
+++ b/website/inc/html.inc
@@ -70,5 +70,5 @@ google_color_text = "000000";
 GOOGLEAD
 }
 </perl>
-<h2*>%body</h2*>
+<h2* %attributes>%body</h2*>
 </define-tag>

diff --git a/website/inc/template.inc b/website/inc/template.inc
index bf074671bf121e1cc054e155a2ed1ab331b392ae..e09c2ab94ff8b605eae47dd50433dd988d967f6f 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -45,7 +45,7 @@
 <br/>
 <br/>
 <br/>
-<a href="http://people.ee.ethz.ch/oetiker/wish"><img border="0" src="$(ROOT)/inc/button.png"/></a><br/>
+<a href="http://tobi.oetiker.ch/wish"><img border="0" src="$(ROOT)/inc/button.png"/></a><br/>
 <br/>
 <br/>
 <div>
@@ -133,7 +133,7 @@ foreach my $l (qw($(LANGS))){
        my $text=$1; my $url=$2; $url =~ s/<(\S+)(?:\@|_at_)(\S+)>/mailto:$1\@removethis.$2/;
        my $LANG = uc("LANG_$l");
        print <<LINE
-[$LANG:$date | <A HREF="$url">$text</A>:$LANG]
+[$LANG:$date | <A HREF="$url">$text</A> | <A HREF="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>:$LANG]
 LINE
 }
 </protect>

diff --git a/website/prog/build.sh b/website/prog/build.sh
index ec7b6004e1b76355eefc9915d2ffb45e9e162962..6ab2f7fb915e7e279601afce95a099fde17ed2a6 100755 (executable)
--- a/website/prog/build.sh
+++ b/website/prog/build.sh
@@ -14,7 +14,7 @@ pod2descr() {
 rm -f navbar.inc
 rm -f index.inc
 
-for pod in `cd $src/doc/;ls *.pod|egrep 'RRD|thread|python'`; do
+for pod in `cd $src/doc/;ls *.pod|egrep 'RRD|thread|python|ruby'`; do
  base=`echo $pod |sed 's,.pod,,'` 
  echo $base
  cat  $src/doc/$pod > $base.pod

diff --git a/website/rrdworld/smokeping.xml b/website/rrdworld/smokeping.xml
index 2f9aa28317117122e2d10f9bf4b89827e539f188..fd8d879cbbbe2df24ad48f699c3101896bdf583e 100644 (file)
--- a/website/rrdworld/smokeping.xml
+++ b/website/rrdworld/smokeping.xml
@@ -7,7 +7,7 @@
        web interface and powerful plugin system for extensibility with new
 type of latency probes and alerts.
 </description>
-   <homepage> http://people.ee.ethz.ch/oetiker/webtools/smokeping </homepage> 
+   <homepage> http://oss.oetiker.ch/smokeping </homepage> 
        <year> 2005 </year><month> 9 </month> <!-- Entry creation date -->
     <license> GPL </license>