From 1e6e7fbb87b88dadf169ca87cd4031b4d9b43662 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Sat, 8 Jan 2022 12:36:15 +0000 Subject: [PATCH] Removed references to WEFT WEFT was my trading name when I was actually working. Now I'm retired, I've given up the domain, so links to WEFT no longer work. --- resources/public/content/Introduction.md | 7 ++----- resources/public/content/Phoning Home.md | 11 ----------- resources/templates/base.html | 10 +++------- src/smeagol/util.clj | 6 ------ 4 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 resources/public/content/Phoning Home.md diff --git a/resources/public/content/Introduction.md b/resources/public/content/Introduction.md index bb9a92e..2732231 100644 --- a/resources/public/content/Introduction.md +++ b/resources/public/content/Introduction.md @@ -1,4 +1,4 @@ -![One wiki to rule them all](https://www.weft.scot/images/smeagol.png) +![One wiki to rule them all](img/smeagol.png) # Welcome to Smeagol! Smeagol is a hackable, extensible Wiki engine which is reasonably user-friendly. It uses [Markdown](http://daringfireball.net/projects/markdown/) as its text format, and [Git](http://git-scm.com/) to provide versioning and backup. @@ -27,13 +27,10 @@ You can run Smeagol from the [[Docker Image]]; alternatively you can run it from Smeagol is an open source project; you're entitled to make changes yourself. Read more about [[Developing Smeagol]]. ## License -Copyright © 2014-2020 Simon Brooke. Licensed under the GNU General Public License, +Copyright © 2014-2022 [Simon Brooke](mailto:simon@journeyman.cc). Licensed under the GNU General Public License, version 2.0 or (at your option) any later version. If you wish to incorporate parts of Smeagol into another open source project which uses a less restrictive license, please contact me; I'm open to dual licensing it. -## Phoning home -Smeagol does currently fetch one image from my home site. Read more about [[Phoning Home]], and how to prevent it (if you want to). - ## Advertisement If you like what you see here, I am available for work on open source Clojure projects. diff --git a/resources/public/content/Phoning Home.md b/resources/public/content/Phoning Home.md deleted file mode 100644 index 48c4019..0000000 --- a/resources/public/content/Phoning Home.md +++ /dev/null @@ -1,11 +0,0 @@ -Smeagol currently requests the WEFT logo in the page footer from my home site. This is mainly so I can get a feel for how many people are using the product. If you object to this, edit the file - - resources/templates/base.html - -and replace the line - - The Web Engineering Factory & Toolworks Developed by WEFT - -with the line - - The Web Engineering Factory & Toolworks Developed by WEFT diff --git a/resources/templates/base.html b/resources/templates/base.html index d36cb27..dd6cf92 100644 --- a/resources/templates/base.html +++ b/resources/templates/base.html @@ -37,11 +37,7 @@

one wiki to rule them allOne Wiki to rule them all || - Smeagol wiki engine {{version}} || - The Web Engineering Factory & Toolworks - Developed by WEFT + Smeagol wiki engine {{version}}

@@ -82,13 +78,13 @@
one wiki to rule them allOne Wiki to rule them all || Smeagol wiki engine {{version}} || - The Web Engineering Factory & Toolworks Developed by WEFT + Free Software FoundationLicensed under the + GNU General Public License version 2.0
Built with LuminusWeb || Clojure Powered by Clojure || GitHubFind me/fork me on Github || - Free Software FoundationLicensed under the GNU General Public License version 2.0