Merge branch 'master' into add-uVision

Author: weycen

Qt.gitignore

@@ -45,7 +45,7 @@ target_wrapper.*
 # QtCreator CMake
 CMakeLists.txt.user*
 
-# QtCreator 4.8< compilation database 
+# QtCreator 4.8< compilation database
 compile_commands.json
 
 # QtCreator local machine specific files for imported projects

README.md

@@ -20,10 +20,10 @@ the following resources are a great place to start:
 
 We support a collection of templates, organized in this way:
 
-- the root folder contains templates in common use, to help people get started
+- The root folder contains templates in common use, to help people get started
   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
+  unimportant files into your repository.
 - [`Global`](./Global) contains templates for various editors, tools and
   operating systems that can be used in different situations. It is recommended
   that you either [add these to your global template](https://help.github.com/articles/ignoring-files/#create-a-global-gitignore)

Terraform.gitignore

@@ -9,8 +9,8 @@
 crash.log
 
 # Exclude all .tfvars files, which are likely to contain sentitive data, such as
-# password, private keys, and other secrets. These should not be part of version 
-# control as they are data points which are potentially sensitive and subject 
+# password, private keys, and other secrets. These should not be part of version
+# control as they are data points which are potentially sensitive and subject
 # to change depending on the environment.
 #
 *.tfvars

Umbraco.gitignore

@@ -14,10 +14,10 @@
 # Ignore Umbraco content cache file
 **/App_Data/umbraco.config
 
-## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3` 
+## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3`
 ## you can find your Umbraco version in your Web.config. (i.e. <add key="Umbraco.Core.ConfigurationStatus" value="8.5.3" />)
 ## Uncomment this line if you think it fits the way you work on your project.
-## **/[Uu]mbraco/ 
+## **/[Uu]mbraco/
 
 # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
 # Make sure to include details from VisualStudio.gitignore BEFORE this

community/NasaSpecsIntact.gitignore

@@ -0,0 +1,40 @@
+# gitignore template for Nasa SpecsIntact (SI)
+# Website: https://specsintact.ksc.nasa.gov/
+#
+# Recommended: 
+# MicrosoftOffice.gitignore
+# 
+
+# SpecsIntact (SI) Locking file; this would lock everyone out.
+*.se$
+
+# SI Reports; auto-generated. They do not belong in the repository
+# as they will be re-created exactly when using a specific checkout point.
+*.RPT
+ADDRVER.*
+BRKTVER.*
+DUPEREF.*
+REFVER.*
+SECTVER.*
+SUBMVER.*
+TTLDIFFS.*
+
+# SpecsIntact files that change a lot and don't actually affect SI
+# PULL.TBL is an auto-generated file to help speed SI loading. 
+PULL.TBL
+pulltbl.bck
+
+# Tailoring information.
+# Keep tailor.tag; it is a list of tailoring options in SI.
+
+# JOB.OTL informs SI where a spec section came from. 
+# Keeping the old one isn't useful in git.
+JOB.OTL.OLD
+
+# OneNote TOC Files; SI Work Directories may be installed in a location co-located with OneNote
+# notebooks, and if so, OneNote will litter the SI folder with these.
+*.onetoc*
+
+# Log files, typically tagfix or other auto generated logs that aren't useful 
+# outside of the user that made them and clutter up the index.
+*.log

community/OpenSSL.gitignore

@@ -10,7 +10,7 @@
 *.csr
 
 ## Certificate
-*.der 
+*.der
 
 ## Key database file
 *.kdb

community/PHP/Magento2.gitignore

@@ -18,7 +18,7 @@
 /.php_cs.cache
 /grunt-config.json
 /dev/tools/grunt/configs/local-themes.js
- 
+
 /pub/media/*.*
 !/pub/media/.htaccess
 /pub/media/attribute/*
@@ -45,7 +45,7 @@
 !/pub/media/captcha/.htaccess
 /pub/static/*
 !/pub/static/.htaccess
- 
+
 /var/*
 !/var/.htaccess
 /vendor/*

community/embedded/IAR_EWARM.gitignore

@@ -11,7 +11,7 @@ EWARM/**/Obj
 EWARM/**/List
 EWARM/**/Exe
 
-# Autogenerated project files 
+# Autogenerated project files
 *.dep
 *.ewt