Merge 66b704afbe into f963896e65

Improve grammar and formatting in Global directory description

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

Lean.gitignore

@@ -1,2 +0,0 @@
-# cache and other artifacts produced by Lean's Lake build tool
-.lake/

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

README.md

@@ -24,11 +24,9 @@ We support a collection of templates, organized in this way:
   with popular programming languages and technologies. These define a meaningful
   set of rules to help get started, and ensure you are not committing
   unimportant files into your repository.
-- [`Global`](./Global) contains templates for various editors, tools and
+- [`Global`](./Global) contains templates for various editors, tools, and
-  operating systems that can be used in different situations. It is recommended
+  operating systems that can be used in different situations. We recommend
-  that you either [add these to your global template](https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files#configuring-ignored-files-for-all-repositories-on-your-computer)
+  adding these to your [global template](https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files#configuring-ignored-files-for-all-repositories-on-your-computer) or merging these rules into your project-specific templates if you want to use them permanently.
-  or merge these rules into your project-specific templates if you want to use
-  them permanently.
 - [`community`](./community) contains specialized templates for other popular
   languages, tools and project, which don't currently belong in the mainstream
   templates. These should be added to your project-specific templates when you

TeX.gitignore

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