From: oetiker Date: Wed, 25 Oct 2006 15:41:44 +0000 (+0000) Subject: sync up for new svn site X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0f98c13a280011aefdd0dec1ba5e02f451d3e011;p=rrdtool-all.git 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 348dfa09..3b4503e0 100644 --- 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] diff --git a/website/doc/build.sh b/website/doc/build.sh index 03c73396..d5b7cf91 100755 --- 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 d0d788b6..cd9165cd 100644 --- 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 ...

-svn ls -R svn://svn.ee.ethz.ch/rrdtool/
+svn ls -R svn://svn.oetiker.ch/rrdtool/

tells you what is in the repository. Normally, development will happen in @@ -62,7 +62,7 @@ libtool installed for this to work.

To get the latest chenges from the current 1.2 branch use this:

-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 e9dcef38..84329618 100644
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -4,6 +4,7 @@
 
 
RRDtool Gallery

 
+#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
index 00000000..c1441883
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
index 00000000..5ff88814
--- /dev/null
+++ b/website/gallery/load.xml
@@ -0,0 +1,9 @@
+
+    Load and CPU usage
+    Lars Kotthoff 
+    Graphs the load averages on the system and the fractions of CPU
+    states under the curve.
+    200610
+    http://www.metalhead.ws/rrdtool 
+    metalhead@metalhead.ws
+
diff --git a/website/iana/RRDTOOL-SMI.txt b/website/iana/RRDTOOL-SMI.txt
index 09106056..7ad6db61 100644
--- 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 18f2c278..fd8be5f0 100644
--- 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 5a82ecce..afd62657 100644
--- a/website/inc/html.inc
+++ b/website/inc/html.inc
@@ -70,5 +70,5 @@ google_color_text = "000000";
 GOOGLEAD
 }
 
-%body
+%body
 
diff --git a/website/inc/template.inc b/website/inc/template.inc
index bf074671..e09c2ab9 100644
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -45,7 +45,7 @@
 

 

 

-

+

 

 

 

@@ -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 <$text:$LANG]
+[$LANG:$date | $text | OETIKER+PARTNER AG:$LANG]
 LINE
 }
 
diff --git a/website/prog/build.sh b/website/prog/build.sh
index ec7b6004..6ab2f7fb 100755
--- 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 2f9aa283..fd8d879c 100644
--- 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.
 
-    http://people.ee.ethz.ch/oetiker/webtools/smokeping  
+    http://oss.oetiker.ch/smokeping  
         2005  9  
      GPL