Merge branch 'master' into 6.1

_config.yml

@@ -2,5 +2,5 @@ theme: jekyll-theme-slate
 title: QtFM
 show_downloads: true
 github:
-  zip_url: https://github.com/rodlie/qtfm/archive/6.1.0-beta1.zip
-  tar_url: https://github.com/rodlie/qtfm/archive/6.1.0-beta1.tar.gz
+  zip_url: https://github.com/rodlie/qtfm/archive/6.1.0-beta2.zip
+  tar_url: https://github.com/rodlie/qtfm/archive/6.1.0-beta2.tar.gz

fm/fm.pro

@@ -60,8 +60,8 @@ desktop.files += $${TARGET}.desktop
 desktop.path += $${PREFIX}/share/applications
 docs.path += $${DOCDIR}/$${TARGET}-$${VERSION}
 docs.files += ../LICENSE ../README.md ../AUTHORS ../ChangeLog
-man.files += qtfm.8
-man.path += $${MANDIR}/man8
+man.files += qtfm.1
+man.path += $${MANDIR}/man1
 INSTALLS += target desktop docs man
 
 icon128.files = hicolor/128x128/apps/qtfm.png

fm/qtfm.8 → fm/qtfm.1

@@ -1,12 +1,12 @@
-.TH qtfm 8 "11 July 2018" "6.1" "QtFM documentation"
+.TH qtfm 1 "11 July 2018" "6.1" "QtFM documentation"
 .SH NAME
 QtFM -\ desktop independent file manager
 .SH SYNOPSIS
 qtfm [file:///]
 .SH DESCRIPTION
 Lightweight file manager using Qt.
 .SH SEE ALSO
-qtfm-tray(8)
+qtfm-tray(1)
 .SH BUGS
 See https://github.com/rodlie/qtfm/issues
 .SH AUTHOR

tray/qtfm-tray.8 → tray/qtfm-tray.1

@@ -1,12 +1,12 @@
-.TH qtfm-tray 8 "11 July 2018" "6.1" "QtFM documentation"
+.TH qtfm-tray 1 "11 July 2018" "6.1" "QtFM documentation"
 .SH NAME
 QtFM -\ desktop independent file manager
 .SH SYNOPSIS
 qtfm-tray
 .SH DESCRIPTION
 System tray daemon for QtFM.
 .SH SEE ALSO
-qtfm(8)
+qtfm(1)
 .SH BUGS
 See https://github.com/rodlie/qtfm/issues
 .SH AUTHOR

tray/tray.pro

@@ -31,8 +31,8 @@ LIBS += -L../libfm -lQtFM
 target.path = $${PREFIX}/bin
 target_desktop.path = $${XDGDIR}/autostart
 target_desktop.files = $${TARGET}.desktop
-man.files += qtfm-tray.8
-man.path += $${MANDIR}/man8
+man.files += qtfm-tray.1
+man.path += $${MANDIR}/man1
 INSTALLS += target target_desktop man
 
 lessThan(QT_MAJOR_VERSION, 5): LIBS += -lmagic