Merge a85a4c2ffd into 84c6914a9b

Removed 2 trailing spaces and rewrapped the surrounding paragraph to 100
columns, consistent with the rest of the file.

C++.gitignore

@@ -49,14 +49,14 @@ CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
 Makefile
-install_manifest.txt
+install_manifest.txt 
 compile_commands.json
 
 # Temporary files
-*.tmp
+*.tmp 
-*.log
+*.log 
-*.bak
+*.bak 
-*.swp
+*.swp 
 
 # vcpkg
 vcpkg_installed/
@@ -66,4 +66,4 @@ vcpkg_installed/
 
 # test output & cache
 Testing/
-.cache/
+.cache/

Global/macOS.gitignore

@@ -1,6 +1,5 @@
 # General
 .DS_Store
-.localized
 __MACOSX/
 .AppleDouble
 .LSOverride

Maven.gitignore

@@ -7,7 +7,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-# https://maven.apache.org/tools/wrapper/#Usage_with_or_without_Binary_JAR
+# https://maven.apache.org/wrapper/#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
 
 # Eclipse m2e generated files

Nix.gitignore

@@ -4,6 +4,3 @@ result-*
 
 # Ignore automatically generated direnv output
 .direnv
-
-# Ignore NixOS interactive test driver history
-**/.nixos-test-history

Python.gitignore

@@ -195,10 +195,10 @@ cython_debug/
 .abstra/
 
 # Visual Studio Code
-#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore 
+#   Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore that
-#   that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
+#   can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore
-#   and can be added to the global gitignore or merged into this file. However, if you prefer, 
+#   and can be added to the global gitignore or merged into this file. However, if you prefer, you
-#   you could uncomment the following to ignore the entire vscode folder
+#   could uncomment the following to ignore the entire vscode folder
 # .vscode/
 
 # Ruff stuff:

TeX.gitignore

@@ -75,11 +75,6 @@ acs-*.bib
 # comment
 *.cut
 
-# context
-*.tuc
-*.tui
-*.tuo
-
 # cprotect
 *.cpt