[Scummvm-git-logs] scummvm master -> b2db1cff015a902164bafa5e08f8873daa9510a3

bluegr noreply at scummvm.org
Mon Jan 31 06:32:51 UTC 2022 

This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b8f36bd252 DOCS: Reversing Windows configuration file location list
9ff74bb672 DOCS: Changing to Windows Vista and later
8e45191e3f DOCS: Fixing formatting for Windows file lists
dc1231ea56 DOCS: Adding log paths for older Windows platforms
3b1aadd981 DOCS: Changing "Window Vista" to "Windows Vista"
ec0ae193a5 DOCS: Moving Windows to the first tab
b2db1cff01 DOCS: Combining Windows paths into one section


Commit: b8f36bd2521e54d040d0348ca8b43457443f9e58
    https://github.com/scummvm/scummvm/commit/b8f36bd2521e54d040d0348ca8b43457443f9e58
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Reversing Windows configuration file location list

Putting the most recent (the one that 99% of our users are using) first, then the less common ones after.

Changed paths:
    doc/docportal/advanced_topics/configuration_file.rst
    doc/docportal/use_scummvm/save_load_games.rst


diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index d4b4ce9be6f..5d1585e68b6 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -18,33 +18,30 @@ The configuration file saves to different default locations, depending on the pl
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		95/98/ME
-		^^^^^^^^^^
-
-		``C:\WINDOWS\scummvm.ini``
-
+		Window Vista/7/8/10
+		^^^^^^^^^^^^^^^^^^^
+		``%APPDATA%\ScummVM\scummvm.ini``
 
 		---
 		:column: col-lg-12 mb-2
 
-		Windows NT4
-		^^^^^^^^^^^^
-
-		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\scummvm.ini``
+		Windows 2000/XP
+		^^^^^^^^^^^^^^^
+		``\Documents and Settings\username\Application Data\ScummVM\scummvm.ini``
 
 		---
 		:column: col-lg-12 mb-2
 
-		Windows 2000/XP
-		^^^^^^^^^^^^^^^^^
-		``\Documents and Settings\username\Application Data\ScummVM\scummvm.ini``
+		Windows NT4
+		^^^^^^^^^^^
+		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\scummvm.ini``
 
 		---
 		:column: col-lg-12 mb-2
 
-		Window Vista/7/8/10
-		^^^^^^^^^^^^^^^^^^^^^^
-		``%APPDATA%\ScummVM\scummvm.ini``
+		95/98/ME
+		^^^^^^^^
+		``C:\WINDOWS\scummvm.ini``
 
 .. tabbed:: macOS
 
diff --git a/doc/docportal/use_scummvm/save_load_games.rst b/doc/docportal/use_scummvm/save_load_games.rst
index 5247c81e55c..5b800bfc51a 100644
--- a/doc/docportal/use_scummvm/save_load_games.rst
+++ b/doc/docportal/use_scummvm/save_load_games.rst
@@ -54,10 +54,9 @@ Default saved game paths are shown below.
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Windows NT4
-		^^^^^^^^^^^^
-
-		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Saved games\``
+		Window Vista/7/8/10
+		^^^^^^^^^^^^^^^^^^^
+		``%APPDATA%\ScummVM\Saved games``
 
 		---
 		:column: col-lg-12 mb-2
@@ -69,9 +68,9 @@ Default saved game paths are shown below.
 		---
 		:column: col-lg-12 mb-2
 
-		Window Vista/7/8/10
-		^^^^^^^^^^^^^^^^^^^^^^
-		``%APPDATA%\ScummVM\Saved games``
+		Windows NT4
+		^^^^^^^^^^^^
+		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Saved games\``
 
 
 .. tabbed:: macOS


Commit: 9ff74bb672b1e24d746d203200574d37509bcf63
    https://github.com/scummvm/scummvm/commit/9ff74bb672b1e24d746d203200574d37509bcf63
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Changing to Windows Vista and later

This is a more future-proof way than listing all the Windows versions

Changed paths:
    doc/docportal/advanced_topics/configuration_file.rst
    doc/docportal/help/report_bugs.rst
    doc/docportal/use_scummvm/save_load_games.rst


diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index 5d1585e68b6..6ee300a5195 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -18,8 +18,8 @@ The configuration file saves to different default locations, depending on the pl
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Window Vista/7/8/10
-		^^^^^^^^^^^^^^^^^^^
+		Window Vista and later
+		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\scummvm.ini``
 
 		---
diff --git a/doc/docportal/help/report_bugs.rst b/doc/docportal/help/report_bugs.rst
index 1fe6f2a3684..e90e5431b66 100644
--- a/doc/docportal/help/report_bugs.rst
+++ b/doc/docportal/help/report_bugs.rst
@@ -47,7 +47,7 @@ To help you report a bug, you can find error messages in the ScummVM log file. T
 	.. panels::
 		:column: col-lg-12 mb-2
 
-	        Window Vista/7/8/10
+		Window Vista and later
 		^^^^^^^^^^^^^^^^^^^^^^
 
                 ``%APPDATA%\ScummVM\Logs\scummvm.log``
diff --git a/doc/docportal/use_scummvm/save_load_games.rst b/doc/docportal/use_scummvm/save_load_games.rst
index 5b800bfc51a..25f96fe8ada 100644
--- a/doc/docportal/use_scummvm/save_load_games.rst
+++ b/doc/docportal/use_scummvm/save_load_games.rst
@@ -54,8 +54,8 @@ Default saved game paths are shown below.
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Window Vista/7/8/10
-		^^^^^^^^^^^^^^^^^^^
+		Window Vista and later
+		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\Saved games``
 
 		---


Commit: 8e45191e3f0733482f974e5c5f0a7037eeaf8cab
    https://github.com/scummvm/scummvm/commit/8e45191e3f0733482f974e5c5f0a7037eeaf8cab
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Fixing formatting for Windows file lists

Changed paths:
    doc/docportal/help/report_bugs.rst
    doc/docportal/use_scummvm/save_load_games.rst


diff --git a/doc/docportal/help/report_bugs.rst b/doc/docportal/help/report_bugs.rst
index e90e5431b66..633123c2cae 100644
--- a/doc/docportal/help/report_bugs.rst
+++ b/doc/docportal/help/report_bugs.rst
@@ -49,7 +49,4 @@ To help you report a bug, you can find error messages in the ScummVM log file. T
 
 		Window Vista and later
 		^^^^^^^^^^^^^^^^^^^^^^
-
-                ``%APPDATA%\ScummVM\Logs\scummvm.log``
-
-
+		``%APPDATA%\ScummVM\Logs\scummvm.log``
diff --git a/doc/docportal/use_scummvm/save_load_games.rst b/doc/docportal/use_scummvm/save_load_games.rst
index 25f96fe8ada..6f12e3917ab 100644
--- a/doc/docportal/use_scummvm/save_load_games.rst
+++ b/doc/docportal/use_scummvm/save_load_games.rst
@@ -62,14 +62,14 @@ Default saved game paths are shown below.
 		:column: col-lg-12 mb-2
 
 		Windows 2000/XP
-		^^^^^^^^^^^^^^^^^
+		^^^^^^^^^^^^^^^
 		``\Documents and Settings\username\Application Data\ScummVM\Saved games\``
 
 		---
 		:column: col-lg-12 mb-2
 
 		Windows NT4
-		^^^^^^^^^^^^
+		^^^^^^^^^^^
 		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Saved games\``
 
 


Commit: dc1231ea56109826096951eec75fe1255a931599
    https://github.com/scummvm/scummvm/commit/dc1231ea56109826096951eec75fe1255a931599
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Adding log paths for older Windows platforms

Changed paths:
    doc/docportal/help/report_bugs.rst


diff --git a/doc/docportal/help/report_bugs.rst b/doc/docportal/help/report_bugs.rst
index 633123c2cae..7692ff7b61c 100644
--- a/doc/docportal/help/report_bugs.rst
+++ b/doc/docportal/help/report_bugs.rst
@@ -50,3 +50,18 @@ To help you report a bug, you can find error messages in the ScummVM log file. T
 		Window Vista and later
 		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\Logs\scummvm.log``
+
+		---
+		:column: col-lg-12 mb-2
+
+		Windows 2000/XP
+		^^^^^^^^^^^^^^^
+		``\Documents and Settings\username\Application Data\ScummVM\Logs\scummvm.log``
+
+		---
+		:column: col-lg-12 mb-2
+
+		Windows NT4
+		^^^^^^^^^^^
+		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Logs\scummvm.log``
+


Commit: 3b1aadd981683c76f395748915389ab4ca03e282
    https://github.com/scummvm/scummvm/commit/3b1aadd981683c76f395748915389ab4ca03e282
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Changing "Window Vista" to "Windows Vista"

Changed paths:
    doc/docportal/advanced_topics/configuration_file.rst
    doc/docportal/help/report_bugs.rst
    doc/docportal/use_scummvm/save_load_games.rst


diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index 6ee300a5195..116be9fe308 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -18,7 +18,7 @@ The configuration file saves to different default locations, depending on the pl
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Window Vista and later
+		Windows Vista and later
 		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\scummvm.ini``
 
diff --git a/doc/docportal/help/report_bugs.rst b/doc/docportal/help/report_bugs.rst
index 7692ff7b61c..6f296bcc091 100644
--- a/doc/docportal/help/report_bugs.rst
+++ b/doc/docportal/help/report_bugs.rst
@@ -47,7 +47,7 @@ To help you report a bug, you can find error messages in the ScummVM log file. T
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Window Vista and later
+		Windows Vista and later
 		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\Logs\scummvm.log``
 
diff --git a/doc/docportal/use_scummvm/save_load_games.rst b/doc/docportal/use_scummvm/save_load_games.rst
index 6f12e3917ab..14867ce39af 100644
--- a/doc/docportal/use_scummvm/save_load_games.rst
+++ b/doc/docportal/use_scummvm/save_load_games.rst
@@ -54,7 +54,7 @@ Default saved game paths are shown below.
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Window Vista and later
+		Windows Vista and later
 		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\Saved games``
 


Commit: ec0ae193a5c5d32ae3fd8701a2f5710d9a227a0a
    https://github.com/scummvm/scummvm/commit/ec0ae193a5c5d32ae3fd8701a2f5710d9a227a0a
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Moving Windows to the first tab

This is consistent with other pages that reference Windows files.

Changed paths:
    doc/docportal/help/report_bugs.rst


diff --git a/doc/docportal/help/report_bugs.rst b/doc/docportal/help/report_bugs.rst
index 6f296bcc091..cc23f7e5a3c 100644
--- a/doc/docportal/help/report_bugs.rst
+++ b/doc/docportal/help/report_bugs.rst
@@ -28,20 +28,6 @@ The ScummVM log file
 To help you report a bug, you can find error messages in the ScummVM log file. The location of this file varies depending on your operating system.
 
 
-.. tabbed:: macOS
-
-	.. panels::
-		:column: col-lg-12 mb-2
-
-		``~/Library/Logs/scummvm.log``
-
-.. tabbed:: Linux
-
-	.. panels::
-		:column: col-lg-12 mb-2
-
-		We use the XDG Base Directory Specification, so by default the file will be ``~/.cache/scummvm/logs/scummvm.log`` but its location might vary depending on the value of the ``XDG_CACHE_HOME`` environment variable.
-
 .. tabbed:: Windows
 
 	.. panels::
@@ -65,3 +51,17 @@ To help you report a bug, you can find error messages in the ScummVM log file. T
 		^^^^^^^^^^^
 		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Logs\scummvm.log``
 
+.. tabbed:: macOS
+
+	.. panels::
+		:column: col-lg-12 mb-2
+
+		``~/Library/Logs/scummvm.log``
+
+.. tabbed:: Linux
+
+	.. panels::
+		:column: col-lg-12 mb-2
+
+		We use the XDG Base Directory Specification, so by default the file will be ``~/.cache/scummvm/logs/scummvm.log`` but its location might vary depending on the value of the ``XDG_CACHE_HOME`` environment variable.
+


Commit: b2db1cff015a902164bafa5e08f8873daa9510a3
    https://github.com/scummvm/scummvm/commit/b2db1cff015a902164bafa5e08f8873daa9510a3
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-01-31T08:32:46+02:00

Commit Message:
DOCS: Combining Windows paths into one section

It was discovered that %APPDATA% works in Windows NT/2000/XP. Therefore, we do not need different sections for each version.

Changed paths:
    doc/docportal/advanced_topics/configuration_file.rst
    doc/docportal/help/report_bugs.rst
    doc/docportal/use_scummvm/save_load_games.rst


diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index 116be9fe308..a2e06b79c7f 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -18,30 +18,10 @@ The configuration file saves to different default locations, depending on the pl
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Windows Vista and later
-		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\scummvm.ini``
 
-		---
-		:column: col-lg-12 mb-2
-
-		Windows 2000/XP
-		^^^^^^^^^^^^^^^
-		``\Documents and Settings\username\Application Data\ScummVM\scummvm.ini``
-
-		---
-		:column: col-lg-12 mb-2
-
-		Windows NT4
-		^^^^^^^^^^^
-		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\scummvm.ini``
-
-		---
-		:column: col-lg-12 mb-2
+		For Windows 95/98/ME, the file is at ``C:\WINDOWS\scummvm.ini``
 
-		95/98/ME
-		^^^^^^^^
-		``C:\WINDOWS\scummvm.ini``
 
 .. tabbed:: macOS
 
diff --git a/doc/docportal/help/report_bugs.rst b/doc/docportal/help/report_bugs.rst
index cc23f7e5a3c..be750821318 100644
--- a/doc/docportal/help/report_bugs.rst
+++ b/doc/docportal/help/report_bugs.rst
@@ -33,24 +33,8 @@ To help you report a bug, you can find error messages in the ScummVM log file. T
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Windows Vista and later
-		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\Logs\scummvm.log``
 
-		---
-		:column: col-lg-12 mb-2
-
-		Windows 2000/XP
-		^^^^^^^^^^^^^^^
-		``\Documents and Settings\username\Application Data\ScummVM\Logs\scummvm.log``
-
-		---
-		:column: col-lg-12 mb-2
-
-		Windows NT4
-		^^^^^^^^^^^
-		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Logs\scummvm.log``
-
 .. tabbed:: macOS
 
 	.. panels::
diff --git a/doc/docportal/use_scummvm/save_load_games.rst b/doc/docportal/use_scummvm/save_load_games.rst
index 14867ce39af..fb8ff900e29 100644
--- a/doc/docportal/use_scummvm/save_load_games.rst
+++ b/doc/docportal/use_scummvm/save_load_games.rst
@@ -54,24 +54,8 @@ Default saved game paths are shown below.
 	.. panels::
 		:column: col-lg-12 mb-2
 
-		Windows Vista and later
-		^^^^^^^^^^^^^^^^^^^^^^
 		``%APPDATA%\ScummVM\Saved games``
 
-		---
-		:column: col-lg-12 mb-2
-
-		Windows 2000/XP
-		^^^^^^^^^^^^^^^
-		``\Documents and Settings\username\Application Data\ScummVM\Saved games\``
-
-		---
-		:column: col-lg-12 mb-2
-
-		Windows NT4
-		^^^^^^^^^^^
-		``C:\WINDOWS\Profiles\username\Application Data\ScummVM\Saved games\``
-
 
 .. tabbed:: macOS

More information about the Scummvm-git-logs mailing list