From 42403fbf6d2fe3ea33cc05bc48e78cf15b36c3fd Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 3 Nov 2015 14:48:00 +0000 Subject: [PATCH] It was a nice idea, but the ads are kind of lame --- doc/EN/support.org | 30 ------------------------------ doc/EN/variants.org | 16 ++++++++-------- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/doc/EN/support.org b/doc/EN/support.org index 28606c0a..dab487df 100644 --- a/doc/EN/support.org +++ b/doc/EN/support.org @@ -11,33 +11,3 @@ #+BEGIN_CENTER | *IRC:* robotics.uk.to Port 6697 SSL #freedombone | *XMPP:* bob@robotics.uk.to with OTR | *Bitmessage:* BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL | #+END_CENTER - -You can support the Freedombone project with the following banner ads. Download an image and add it to your site or blog with a link to [[http://freedombone.uk.to][http://freedombone.uk.to]]. If you're using [[https://addons.mozilla.org/en-us/firefox/addon/adblock-edge/][AdBlock]] then you may need to disable it on this page to see the images below. - -#+BEGIN_CENTER -[[./ads/freedombone_ad7.jpg]] -#+END_CENTER - -#+BEGIN_CENTER -[[./ads/freedombone_ad1.jpg]] -#+END_CENTER - -#+BEGIN_CENTER -[[./ads/freedombone_ad2.jpg]] -#+END_CENTER - -#+BEGIN_CENTER -[[./ads/freedombone_ad3.jpg]] -#+END_CENTER - -#+BEGIN_CENTER -[[./ads/freedombone_ad4.jpg]] -#+END_CENTER - -#+BEGIN_CENTER -[[./ads/freedombone_ad5.jpg]] -#+END_CENTER - -#+BEGIN_CENTER -[[./ads/freedombone_ad6.jpg]] -#+END_CENTER diff --git a/doc/EN/variants.org b/doc/EN/variants.org index d18d2a7d..3b95b968 100644 --- a/doc/EN/variants.org +++ b/doc/EN/variants.org @@ -12,11 +12,11 @@ Freedombone may be installed either in its entirety or as different variants with a more specialised purpose. So for example if you just want to run a blog but don't care about any other services then you can do that. The following variants are available: -| *Mailbox* | An email server with GPG encryption and mailing list | -| *Cloud* | Share files, maintain a calendar and collaborate on document editing | -| *Social* | Social networking with Hubzilla and GNU Social | -| *Media* | Runs media services such as DLNA to play music or videos on your devices | -| *Writer* | Host your blog and wiki | -| *Chat* | Encrypted IRC and XMPP services for one-to-one and many-to-many chat | -| *Developer* | Github-like system to host your software projects | -| *Mesh* | A wireless mesh network which is like the internet, but not the internet | +| *Mailbox* | An email server with GPG encryption and mailing list | +| *Cloud* | Share files, maintain a calendar and collaborate on document editing | +| *Social* | Social networking with Hubzilla and GNU Social | +| *Media* | Runs media services such as DLNA to play music or videos on your devices | +| *Writer* | Host your blog and wiki | +| *Chat* | Encrypted IRC, XMPP, Tox and VoIP services for one-to-one and many-to-many chat | +| *Developer* | Github-like system to host your software projects | +| *Mesh* | A wireless mesh network which is like the internet, but not the internet |