From fecd3725dfed275d38391ad26afeb0b13f412826 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 13 Jan 2016 14:55:02 +0000 Subject: [PATCH] Fix errors in UG platform dependent file locations Merged from ^/branches/wsjtx. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6395 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Versions.cmake | 4 ++-- doc/user_guide/platform-dependencies.adoc | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Versions.cmake b/Versions.cmake index a38582e86..0793a1d56 100644 --- a/Versions.cmake +++ b/Versions.cmake @@ -1,6 +1,6 @@ # Version number components set (WSJTX_VERSION_MAJOR 1) set (WSJTX_VERSION_MINOR 6) -set (WSJTX_VERSION_PATCH 1) +set (WSJTX_VERSION_PATCH 0) set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions -set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build +set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build diff --git a/doc/user_guide/platform-dependencies.adoc b/doc/user_guide/platform-dependencies.adoc index 2d79ac8d2..37140e841 100644 --- a/doc/user_guide/platform-dependencies.adoc +++ b/doc/user_guide/platform-dependencies.adoc @@ -14,9 +14,11 @@ Default save:: * *Windows, when using "--rig-name=xxx"* Settings:: - +%LOCALAPPDATA%\WSJT-X - xxx+ -Log files:: +%LOCALAPPDATA%\WSJT-X - xxx\WSJT-X - xxx.ini+ +Log files:: + +%LOCALAPPDATA%\WSJT-X - xxx\+ +Default save:: + +%LOCALAPPDATA%\WSJT-X - xxx\save\+ * *Linux* Settings:: @@ -27,10 +29,12 @@ Default save:: +~/.local/share/WSJT-X/save/+ * *Linux, when using "--rig-name=xxx"* +Settings:: + +~/.config/WSJT-X - xxx.ini+ Log files:: +~/.local/share/WSJT-X - xxx/+ Default save:: - +~/.config/WSJT-x - xxx.ini+ + +~/.local/share/WSJT-X - xxx/save/+ * *Macintosh* Settings:: @@ -41,8 +45,10 @@ Default save:: +~/Library/Application Support/WSJT-X/save/+ * *Macintosh, when using "--rig-name=xxx"* +Settings:: + +~/Library/Preferences/WSJT-X - xxx.ini+ Log files:: +~/Library/Application Support/WSJT-X - xxx/+ Default save:: - +~/Library/Preferences/WSJT-X - xxx.ini+ + +~/Library/Application Support/WSJT-X - xxx/save/+