From 2c1ce45e9d2886ea87d08a56fbd26b4625fb1b61 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 25 Apr 2019 22:02:12 +0100 Subject: [PATCH] Website update New eclipse logo Stickers no longer available due to Moo API going. Fix manpage generation. Add rr manpage Update version support on index. --- www/conf.py | 3 ++- www/files/images/eclipse_logo_colour.png | Bin 4826 -> 4700 bytes www/files/stickers/index.html | 32 +++++------------------ www/man | 1 + www/pages/index.html | 2 +- 5 files changed, 10 insertions(+), 28 deletions(-) create mode 120000 www/man diff --git a/www/conf.py b/www/conf.py index 7b5f4ded..d7f1cbfe 100644 --- a/www/conf.py +++ b/www/conf.py @@ -94,6 +94,7 @@ NAVIGATION_LINKS = { ("/man/mosquitto-conf-5.html", "mosquitto.conf"), ("/man/mosquitto_passwd-1.html", "mosquitto_passwd"), ("/man/mosquitto_pub-1.html", "mosquitto_pub"), + ("/man/mosquitto_rr-1.html", "mosquitto_rr"), ("/man/mosquitto_sub-1.html", "mosquitto_sub"), ("/man/mosquitto-tls-7.html", "mosquitto-tls"), ("/man/mqtt-7.html", "mqtt"), @@ -155,7 +156,7 @@ PAGES = ( ("pages/*.txt", "", "story.tmpl"), ("pages/*.html", "", "story.tmpl"), ("pages/*.md", "", "story.tmpl"), - ("../man/*.xml", "man", "story.tmpl"), + ("man/*.xml", "man", "story.tmpl"), ) diff --git a/www/files/images/eclipse_logo_colour.png b/www/files/images/eclipse_logo_colour.png index f6f6b903110b9dd4db992fb3c08abe02ed0f3689..4f86721bd6d483e4b7a2f10dc3af17b199e20a0e 100644 GIT binary patch literal 4700 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 A7ytkO diff --git a/www/files/stickers/index.html b/www/files/stickers/index.html index 3b2f7d34..f76b5998 100644 --- a/www/files/stickers/index.html +++ b/www/files/stickers/index.html @@ -11,39 +11,19 @@

Eclipse Mosquitto™ Sticker Generator

-

This page allows you to create a book of square stickers to buy from Moo.

+

This page used to allow you to create a book of square stickers to buy + from Moo. Unfortunately they have + discontinued their API, so if you want Mosquitto stickers you can use the + images and create your own sticker book manually.

Click the logos to choose which to include, then click submit to be taken to the Moo site with a stickerbook ready in your basket. If you choose both logos you will get 45 of each, otherwise you will get 90 of the one you choose.

- -
+ +
-
- - - -
- - diff --git a/www/man b/www/man new file mode 120000 index 00000000..973fd1a9 --- /dev/null +++ b/www/man @@ -0,0 +1 @@ +../man \ No newline at end of file diff --git a/www/pages/index.html b/www/pages/index.html index e269d72c..87b07fce 100644 --- a/www/pages/index.html +++ b/www/pages/index.html @@ -12,7 +12,7 @@

Eclipse Mosquitto is an open source (EPL/EDL licensed) message broker that - implements the MQTT protocol versions 3.1 and 3.1.1. Mosquitto + implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. Mosquitto is lightweight and is suitable for use on all devices from low power single board computers to full servers.