From: oetiker Date: Wed, 9 Dec 2015 07:40:40 +0000 (+0000) Subject: gwos sponsors X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ec7b01df225670ec8412b5ce2218a29f607efea;p=rrdtool-all.git gwos sponsors git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4@2318 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/website/build.sh b/website/build.sh index c6a3bc53..d5001501 100755 --- a/website/build.sh +++ b/website/build.sh @@ -1,8 +1,9 @@ #!/bin/sh PERL5LIB=/home/oetiker/lib/fake-perl/ SITEROOT=`pwd` +LANG=C PODPATH=`ls */build.sh | sed -e 's|/.*||g' | perl -0777 -e 'print join ":", map {"$_"} split /\n/, <>'` -export PERL5LIB SITEROOT PODPATH +export PERL5LIB SITEROOT PODPATH LANG rm */pod*tmp for x in `ls */build.sh | sed 's|/.*||g'`; do echo '****' $x '****' diff --git a/website/doc/build.sh b/website/doc/build.sh index 7f015cf2..4d692011 100755 --- a/website/doc/build.sh +++ b/website/doc/build.sh @@ -1,7 +1,7 @@ #!/bin/sh sect=doc -src=/home/oetiker/checkouts/rrdtool-1.x -(cd $src; git checkout 1.5) +src=/scratch/rrdtool-1.5 +git clone -b 1.5 git@github.com:oetiker/rrdtool-1.x.git $src . ../bin/pod2wml.sh pod2descr() { diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html index 234f05d7..2c0444c6 100644 --- a/website/gallery/index.en.html +++ b/website/gallery/index.en.html @@ -109,20 +109,11 @@ RRDtool
-

RRDtool Gallery

@@ -133,6 +124,71 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> actual volume of transactions for MMS submitions, from 3 differents devices, such as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella <alessio.r-delme-@XYZ-tiscalinet.it>, 2006/3
+ + + + + + + + + + + + + + + + + + @@ -169,24 +225,6 @@ These graphs shows the active VPN tunnels and the VPN network traffic generated @@ -738,7 +775,7 @@ than 600 pixels.

-06/27/14 | Tobias Oetiker | OETIKER+PARTNER AG +10/30/15 | Tobias Oetiker | OETIKER+PARTNER AG
diff --git a/website/gallery/index.wml b/website/gallery/index.wml index da0d4e05..193c5147 100644 --- a/website/gallery/index.wml +++ b/website/gallery/index.wml @@ -5,6 +5,11 @@

RRDtool Gallery

#include "mmh11.xml" +#include "sunny.xml" +#include "iteisa.xml" +#include "VMware_cluster_memory_quickstats.xml" +#include "ZFS_zpool_usage.xml" +#include "cafelizardo.xml" #include "leucht.xml" #include "PTFDV_cpu.xml" #include "vpnttg.xml" diff --git a/website/iana/RRDTOOL-SMI.txt b/website/iana/RRDTOOL-SMI.txt index 0d70ea55..8b6441cd 100644 --- a/website/iana/RRDTOOL-SMI.txt +++ b/website/iana/RRDTOOL-SMI.txt @@ -39,7 +39,6 @@ mobilerrd OBJECT-IDENTITY STATUS current DESCRIPTION "RRDtool within KPN Mobile. - Contact mobilerrd{at}12move.nl " ::= { rrdtool 2 } diff --git a/website/inc/html.inc b/website/inc/html.inc index c628cf95..d4b689d0 100644 --- a/website/inc/html.inc +++ b/website/inc/html.inc @@ -11,16 +11,8 @@ $x =~ s/\\n/ /g; print $x; :>:#H1_FLAT#} /> @@ -42,26 +34,8 @@ if ($addcount == 7){ print <<'GOOGLEAD';

- +amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--> +

GOOGLEAD } @@ -76,21 +50,8 @@ if ($addcount == 7){ print <<'GOOGLEAD';

- +amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--> +

GOOGLEAD } diff --git a/website/inc/pub_contrib_header.html b/website/inc/pub_contrib_header.html index f3d2513a..79e7e509 100644 --- a/website/inc/pub_contrib_header.html +++ b/website/inc/pub_contrib_header.html @@ -103,23 +103,13 @@ -
+

RRDtool Crontrib Area

-
+
+ + +
diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html index 2b95a293..5558c0d3 100644 --- a/website/inc/pub_header.html +++ b/website/inc/pub_header.html @@ -101,18 +101,15 @@ -
+

RRDtool Download Area

- - - - + +
diff --git a/website/inc/template.inc b/website/inc/template.inc index e4d07d08..b16ea3b0 100644 --- a/website/inc/template.inc +++ b/website/inc/template.inc @@ -127,9 +127,7 @@ RRDtool
- {#Body#} -
@@ -144,21 +142,8 @@ if ( -s "$(WML_SRC_BASENAME).wml" > 4000 ){ print <<'GOOGLEAD';
- +amazon_ad_tag = "tobistools-20"; amazon_ad_width = "300"; amazon_ad_height = "250"; amazon_ad_logo = "hide"; amazon_ad_price = "retail"; amazon_ad_border = "hide";//--> +
GOOGLEAD } diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml index e4f1a362..5f2ceeea 100644 --- a/website/rrdworld/index.wml +++ b/website/rrdworld/index.wml @@ -10,6 +10,7 @@ add-ons to big applications or even replacements for rrdtool itself.

RRDtool Companions

#include "rrd-editor.xml" +#include "dokuwiki_rrdgraph.xml" #include "drraw.xml" #include "dsreport.xml" #include "nhawk_description.xml" @@ -69,6 +70,7 @@ add-ons to big applications or even replacements for rrdtool itself.

#include "tstat.xml" #include "unnoc.xml" #include "webminstats.xml" +#include "xymon.xml" #include "yacketystats.xml" #include "zenoss.xml" #include "zerod.xml" diff --git a/website/sponsor.wml b/website/sponsor.wml index f039d364..d9f0caba 100644 --- a/website/sponsor.wml +++ b/website/sponsor.wml @@ -11,8 +11,9 @@ If you profit from RRDtool and want to support the project as a whole, you could become a sponsor!

-#

2014 Gold Sponsors

-# +

2016 Gold Sponsors

+# heather.gray@foxt.com +GroundWork Inc 

2015 Silver Sponsors

@@ -33,8 +34,16 @@ globally recognised quality seal enabling you to prove trust and attract more cu #op5  # stuart@irisns.com IRIS  -Laura Horstmanshof +#Laura Horstmanshof beslist.nl  +#Jonas Krummenacher +keycdm.ch  +# Oscar Travis oscar@chameleonjohn.com +chameleonjohn.com  +# pavel.hampl@xorux.com +xorux.com  +# markbarsno@gmail.com +online coupons from discountrue 

#

2013 Gold Sponsors

diff --git a/website/tut/build.sh b/website/tut/build.sh index 8e0677a9..06f1d11c 100755 --- a/website/tut/build.sh +++ b/website/tut/build.sh @@ -1,7 +1,7 @@ #!/bin/sh sect=tut -src=/home/oetiker/checkouts/rrdtool-1.x -(cd $src; git checkout 1.4) +src=/scratch/rrdtool-1.5 +git clone -b 1.5 git@github.com:oetiker/rrdtool-1.x.git $src . ../bin/pod2wml.sh pod2descr() {