Merging upstream version 20190301.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 21 insertions, 21 deletions

diff --git a/share/man/Makefile b/share/man/Makefile
index aff079f..2fe75b5 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,6 @@
-# Makefile
-
-# apache-icons - Alternative icons for Apache autoindex
-# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/share/man/apache-icons.7.txt b/share/man/service-tools.7.txt
index 4cfe6b8..01cec5f 100644
--- a/share/man/apache-icons.7.txt
+++ b/share/man/service-tools.7.txt
@@ -1,5 +1,6 @@
-// apache-icons - Alternative icons for Apache autoindex
-// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+//
+// SPDX-License-Identifier: GPL-3.0+
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@ APACHE-ICONS(7)
 ===============
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: apache-icons
+:man source: service-tools
 :man version: {revnumber}
 
 
@@ -37,10 +38,10 @@ apache-icons provides alternative icons for Apache autoindex.
 
 DOWNLOAD
 --------
-  * Upstream Releases: https://files.open-infrastructure.net/software/apache-icons/upstream
-  * Upstream Sources: https://sources.open-infrastructure.net/software/apache-icons
-  * Debian Releases: https://files.open-infrastructure.net/software/apache-icons/debian
-  * Debian Sources: https://sources.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-apache-icons
+  * Upstream Releases: https://get.open-infrastructure.net/software/service-tools/upstream
+  * Upstream Sources: https://git.open-infrastructure.net/software/service-tools
+  * Debian Releases: https://get.open-infrastructure.net/software/service-tools/debian
+  * Debian Sources: https://git.progress-linux.org/users/daniel.baumann/debian/packages/open-infrastructure-service-tools
 
 
 INSTALLATION
@@ -49,16 +50,16 @@ INSTALLATION
 SOURCE
 ~~~~~~
   1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc imagemagick librsvg2-bin
-  2. git clone https://sources.open-infrastructure.net/software/apache-icons
-  3. cd apache-icons && sudo make install
+  2. git clone https://git.open-infrastructure.net/software/service-tools
+  3. cd service-tools && sudo make install
 
 DEBIAN 9 (STRETCH) AND NEWER
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   * sudo apt install apache-icons
 
-UBUNTU 16.10 (YAKKETY) AND NEWER
---------------------------------
-  * sudo apt install apache-icons
+DEBIAN 10 (BUSTER) AND NEWER
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  * sudo apt install apache-tools
 
 
 DEVELOPMENT
@@ -93,8 +94,8 @@ icons).
 
 The following themes are available:
 
-  * awesome-png: Font Awesome based, PNG format
-  * awesome-svg: Font Awesome based, SVG format
+  * awesome-png: Fork Awesome based, PNG format
+  * awesome-svg: Fork Awesome based, SVG format
   * tango-png: Tango Icons based, PNG format
   * tango-svg: Tango Icons based, SVG format
 
@@ -102,13 +103,13 @@ The SVG themes are preferable because they are sharper and scale losless.
 They require somewhat modern browsers though.
 
 An example of the tango-svg theme can be seen on
-https://files.open-infrastructure.net.
+https://get.open-infrastructure.net.
 
 
 LINKS
 -----
-*Font Awesome:*::
-	http://fontawesome.io/
+*Fork Awesome:*::
+	https://https://forkaweso.me
 
 *Tango Desktop Project:*::
 	http://tango.freedesktop.org/