Merge branch 'master' into develop

23 files changed, 42 insertions, 41 deletions

diff --git a/tools/dnsmasq.html b/tools/dnsmasq.html
index 0938cc0..a3b3ea8 100644
--- a/tools/dnsmasq.html
+++ b/tools/dnsmasq.html
@@ -68,7 +68,7 @@
         <a href="index.html">Tools Index</a>
 
         <p>
-        This is part of the c9-doc Manual.
+        This is part of the Hive System Documentation.
         Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p>
diff --git a/tools/fail2ban.html b/tools/fail2ban.html
index 0238635..46c909c 100644
--- a/tools/fail2ban.html
+++ b/tools/fail2ban.html
@@ -46,7 +46,7 @@
         <a href="index.html">Tools Index</a>
 
         <p>
-        This is part of the c9-doc Manual.
+        This is part of the Hive System Documentation.
         Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p>
diff --git a/tools/gitolite.html b/tools/gitolite.html
index 52d8cbd..cfb443b 100644
--- a/tools/gitolite.html
+++ b/tools/gitolite.html
@@ -825,7 +825,7 @@
         </pre>
 
         <a href="index.html">Tools Index</a>
-        <p>This is part of the c9-doc Manual.
+        <p>This is part of the Hive System Documentation.
         Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
diff --git a/tools/gnupg.html b/tools/gnupg.html
index 21aedcb..b009725 100644
--- a/tools/gnupg.html
+++ b/tools/gnupg.html
@@ -51,7 +51,7 @@
 
         <pre>
         $ gpg2 --full-gen-key
-        gpg (GnuPG) 2.1.11; Copyright (C) 2016 Free Software Foundation, Inc.
+        gpg (GnuPG) 2.1.11; Copyright (C) 2018 Free Software Foundation, Inc.
         This is free software: you are free to change and redistribute it.
         There is NO WARRANTY, to the extent permitted by law.
 
@@ -295,8 +295,8 @@
         <a href="index.html">Tools Index</a>
 
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p>
     </body>
diff --git a/tools/index.html b/tools/index.html
index 5ecc70b..6c608e4 100644
--- a/tools/index.html
+++ b/tools/index.html
@@ -168,8 +168,8 @@
         <a href="../index.html">Documentation Index</a>
 
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2017
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/logrotate.html b/tools/logrotate.html
index 39da406..2228c62 100644
--- a/tools/logrotate.html
+++ b/tools/logrotate.html
@@ -155,8 +155,8 @@
         # logrotate -f /etc/logrotate.conf
         </pre>
 
-        <p>This is part of the c9-doc Manual.
-Copyright (C) 2016 
+        <p>This is part of the Hive System Documentation.
+Copyright (C) 2018 
 c9 team.
 See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a>
 for copying conditions.</p>
diff --git a/tools/lvm.html b/tools/lvm.html
index b6c7678..347e502 100644
--- a/tools/lvm.html
+++ b/tools/lvm.html
@@ -158,8 +158,8 @@
 
         <a href="index.html">Tools Index</a>
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/mutt.html b/tools/mutt.html
index 5c72e0c..5597600 100644
--- a/tools/mutt.html
+++ b/tools/mutt.html
@@ -311,8 +311,8 @@
 
         <a href="index.html">Tools Index</a>
         <p>
-        This is part of the SysDoc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/network.html b/tools/network.html
index 31ca60b..ba78bac 100644
--- a/tools/network.html
+++ b/tools/network.html
@@ -66,8 +66,8 @@
         </pre>
 
         <a href="index.html">Tools Index</a>
-        <p>This is part of the c9 Manual.
-        Copyright (C) 2016
+        <p>This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/nginx.html b/tools/nginx.html
index ef78ecb..9c735ea 100644
--- a/tools/nginx.html
+++ b/tools/nginx.html
@@ -60,11 +60,11 @@
         <p>First run dryrun to test if everything is ok;</p>
 
         <pre>
-        # certbot certonly --dry-run --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d c9.root.sx
+        # certbot certonly --dry-run --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d hive.gnu.systems
         </pre>
 
         <pre>
-        # certbot certonly --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d c9.root.sx
+        # certbot certonly --email user@mail.org --webroot -w /srv/www/c9-pmwiki/pub/cert/-d hive.gnu.systems
         </pre>
 
         <h3 id="mancert">2.2. Self certificate</h2>
@@ -392,8 +392,8 @@
 
         <a href="index.html">Tools Index</a>
 
-        <p>This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        <p>This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/nmap.html b/tools/nmap.html
index c3d5316..0f0f1b4 100644
--- a/tools/nmap.html
+++ b/tools/nmap.html
@@ -24,7 +24,7 @@
         <p>Or by hostname;</p>
 
         <pre>
-        # nmap -v c9.root.sx
+        # nmap -v hive.gnu.systems
         </pre>
 
         <p>Check OS and version detection;</p>
diff --git a/tools/openssh.html b/tools/openssh.html
index c70a5f5..f257f9c 100644
--- a/tools/openssh.html
+++ b/tools/openssh.html
@@ -301,8 +301,8 @@
         </pre>
 
         <a href="index.html">Tools Index</a>
-        <p>This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        <p>This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/postgresql.html b/tools/postgresql.html
index 155f30c..c5b309c 100644
--- a/tools/postgresql.html
+++ b/tools/postgresql.html
@@ -316,8 +316,8 @@
 
         <a href="index.html">Tools Index</a>
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/qemu.html b/tools/qemu.html
index e32d03f..e180ed4 100644
--- a/tools/qemu.html
+++ b/tools/qemu.html
@@ -287,7 +287,7 @@
         memory=1024
         boot=d
         tap="tap1"
-        iso=iso/crux-3.3.iso
+        iso=iso/crux-3.4.iso
         image=img/crux-standard.qcow2
         other="-vga std -display sdl"
         </pre>
@@ -401,7 +401,7 @@
         </pre>
 
         <a href="index.html">Tools Index</a>
-        <p>This is part of the c9 Manual.
+        <p>This is part of the Hive System Documentation.
         Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
diff --git a/tools/scripts/replace.sh b/tools/scripts/replace.sh
index e925e7d..8d5d8d9 100755
--- a/tools/scripts/replace.sh
+++ b/tools/scripts/replace.sh
@@ -5,4 +5,5 @@ folder=$1
 oldstring=$2
 newstring=$3
 
-grep -rl $oldstring $folder | xargs sed -i s@$oldstring@$newstring@g
+#grep -rl $oldstring $folder | xargs sed -i s@$oldstring@$newstring@g
+grep -rl "$oldstring" $folder | xargs sed -i "s@$oldstring@$newstring@g"
diff --git a/tools/scripts/runvm/profile/crux b/tools/scripts/runvm/profile/crux
index af33e1b..672b80d 100644
--- a/tools/scripts/runvm/profile/crux
+++ b/tools/scripts/runvm/profile/crux
@@ -2,6 +2,6 @@ mac="54:60:be:ef:5c:64"
 memory=1024
 boot=$2
 tap="tap4"
-iso=iso/crux-3.3.iso
+iso=iso/crux-3.4.iso
 image=img/c14.qcow2
 other="-vga std -display sdl"
diff --git a/tools/scripts/runvm/runvm.sh b/tools/scripts/runvm/runvm.sh
index 1e56a52..21cd097 100644
--- a/tools/scripts/runvm/runvm.sh
+++ b/tools/scripts/runvm/runvm.sh
@@ -10,7 +10,7 @@ source profile/$1
 #memory=1024
 #boot=d
 #tap="tap1"
-#iso=iso/crux-3.3.iso
+#iso=iso/crux-3.4.iso
 #image=img/crux-standard.qcow2
 #other="-soundhw hda -vga std -display sdl"
 
diff --git a/tools/squid.html b/tools/squid.html
index f34c2dd..cdf28cb 100644
--- a/tools/squid.html
+++ b/tools/squid.html
@@ -65,8 +65,8 @@ ssl_bump bump all
         </pre>
 
         <a href="index.html">Tools Index</a>
-        <p>This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        <p>This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/storage.html b/tools/storage.html
index 2fc95d4..f745cc7 100644
--- a/tools/storage.html
+++ b/tools/storage.html
@@ -91,8 +91,8 @@
 
         <a href="index.html">Tools Index</a>
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/syslog-ng.html b/tools/syslog-ng.html
index f1ed95b..a799a16 100644
--- a/tools/syslog-ng.html
+++ b/tools/syslog-ng.html
@@ -144,7 +144,7 @@
 
         <a href="index.html">Tools Index</a>
 
-        <p>This is part of the c9-doc Manual.
+        <p>This is part of the Hive System Documentation.
 Copyright (C) 2018
 c9 team.
 See the file <a href="fdl-1.3-standalone.html">Gnu Free Documentation License</a>
diff --git a/tools/tar.html b/tools/tar.html
index 1cafbb6..19708be 100644
--- a/tools/tar.html
+++ b/tools/tar.html
@@ -122,8 +122,8 @@
         <a href="index.html">Tools Index</a>
 
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p>
     </body>
diff --git a/tools/vim.html b/tools/vim.html
index 8210681..15c526f 100644
--- a/tools/vim.html
+++ b/tools/vim.html
@@ -173,8 +173,8 @@
         <h2 id="plugin">6. Plugins</h2>
 
         <a href="index.html">Systools Index</a>
-        <p>This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        <p>This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>
diff --git a/tools/x.html b/tools/x.html
index 8a68c5b..cbc9d3e 100644
--- a/tools/x.html
+++ b/tools/x.html
@@ -230,8 +230,8 @@
         <a href="index.html">Tools Index</a>
 
         <p>
-        This is part of the c9-doc Manual.
-        Copyright (C) 2016
+        This is part of the Hive System Documentation.
+        Copyright (C) 2018
         c9 team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p>
     </body>