add newline

and an editorconfig to prevent future mistakes
add reviewers element
2018-06-18 08:46:31 -03:00 · 2018-06-18 08:46:00 -03:00 · 2018-06-18 08:36:39 -03:00 · 2018-06-18 08:23:53 -03:00 · 2018-06-18 07:36:15 -03:00 · 2018-06-18 06:59:22 -03:00
82 changed files with 634 additions and 459 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,10 +2,10 @@

 _TODO_

-**Links to documentation supporting these rule changes:** 
+**Links to documentation supporting these rule changes:**

 _TODO_

-If this is a new template: 
+If this is a new template:

 - **Link to application or project’s homepage**: _TODO_
--- a/Actionscript.gitignore
+++ b/Actionscript.gitignore
@@ -1,9 +1,8 @@
 # Build and Release Folders
-bin/
 bin-debug/
 bin-release/
-[Oo]bj/ # FlashDevelop obj
-[Bb]in/ # FlashDevelop bin
+[Oo]bj/
+[Bb]in/

 # Other files and folders
 .settings/
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -32,15 +32,9 @@ proguard/
 # Android Studio captures folder
 captures/

-# Intellij
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/libraries
-
 # Keystore files
-*.jks
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks

 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -48,7 +42,14 @@ captures/
 # Google Services (e.g. APIs or Firebase)
 google-services.json

-#Freeline
+# Freeline
 freeline.py
 freeline/
 freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
--- a/Android.yml
+++ b/Android.yml
@@ -0,0 +1,2 @@
+editors:
+  - Global/JetBrains.gitignore
--- a/Autotools.gitignore
+++ b/Autotools.gitignore
@@ -31,3 +31,12 @@ Makefile.in
 # http://www.gnu.org/software/texinfo

 /texinfo.tex
+
+# http://www.gnu.org/software/m4/
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+autom4te.cache
--- a/C++.yml
+++ b/C++.yml
@@ -0,0 +1,2 @@
+aliases:
+  - Fortran
--- a/C.gitignore
+++ b/C.gitignore
@@ -45,6 +45,7 @@
 # Kernel Module Compile Results
 *.mod*
 *.cmd
+.tmp_versions/
 modules.order
 Module.symvers
 Mkfile.old
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,17 +6,17 @@ high quality, we request that contributions adhere to the following guidelines.
 - **Provide a link to the application or project’s homepage**. Unless it’s
  extremely popular, there’s a chance the maintainers don’t know about or use
  the language, framework, editor, app, or project your change applies to.
-  
+
 - **Provide links to documentation** supporting the change you’re making.
  Current, canonical documentation mentioning the files being ignored is best.
  If documentation isn’t available to support your change, do the best you can
  to explain what the files being ignored are for.
-  
+
 - **Explain why you’re making a change**. Even if it seems self-evident, please
  take a sentence or two to tell us why your change or addition should happen.
  It’s especially helpful to articulate why this change applies to *everyone*
  who works with the applicable technology, rather than just you or your team.
-  
+
 - **Please consider the scope of your change**. If your change specific to a
  certain language or framework, then make sure the change is made to the
  template for that language or framework, rather than to the template for an
@@ -28,6 +28,11 @@ high quality, we request that contributions adhere to the following guidelines.
 In general, the more you can do to help us understand the change you’re making,
 the more likely we’ll be to accept your contribution quickly.

+If a template is mostly a list of files installed by a particular version of
+some software (e.g. a PHP framework) then it's brittle and probably no more
+helpful than a simple `ls`. If it's not possible to curate a small set of
+useful rules, then the template might not be a good fit for this collection.
+
 Please also understand that we can’t list every tool that ever existed.
 Our aim is to curate a collection of the *most common and helpful* templates,
 not to make sure we cover every project possible. If we choose not to
--- a/Clojure.gitignore
+++ b/Clojure.gitignore
@@ -1 +0,0 @@
-Leiningen.gitignore
--- a/CodeIgniter.gitignore
+++ b/CodeIgniter.gitignore
@@ -9,3 +9,9 @@ user_guide_src/build/*
 user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
 user_guide_src/cilexer/pycilexer.egg-info/*
+
+#codeigniter 3
+application/logs/*
+!application/logs/index.html
+!application/logs/.htaccess
+/vendor/
--- a/Composer.gitignore
+++ b/Composer.gitignore
@@ -1,6 +1,6 @@
 composer.phar
 /vendor/

-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
--- a/Dart.gitignore
+++ b/Dart.gitignore
@@ -1,33 +1,21 @@
-# See https://www.dartlang.org/tools/private-files.html
+# See https://www.dartlang.org/guides/libraries/private-files

 # Files and directories created by pub
-
-# SDK 1.20 and later (no longer creates packages directories)
+.dart_tool/
 .packages
-.pub/
 build/
-
-# Older SDK versions
-# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
-.project
-.buildlog
-**/packages/
-
-
-# Files created by dart2js
-# (Most Dart developers will use pub build to compile Dart, use/modify these 
-#  rules if you intend to use dart2js directly
-#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
-#  differentiate from explicit Javascript files)
-*.dart.js
-*.part.js
-*.js.deps
-*.js.map
-*.info.json
+# If you're building an application, you may want to check-in your pubspec.lock
+pubspec.lock

 # Directory created by dartdoc
+# If you don't generate documentation locally you can remove this line.
 doc/api/

-# Don't commit pubspec lock file 
-# (Library packages only! Remove pattern if developing an application package)
-pubspec.lock
+# Avoid committing generated Javascript files:
+*.dart.js
+*.info.json      # Produced by the --dump-info flag.
+*.js             # When generated by dart2js. Don't specify *.js if your
+                 # project includes source files written in JavaScript.
+*.js_
+*.js.deps
+*.js.map
--- a/Delphi.gitignore
+++ b/Delphi.gitignore
@@ -20,7 +20,7 @@
 # Deployment Manager configuration file for your project. Added in Delphi XE2.
 # Uncomment this if it is not mobile development and you do not use remote debug feature.
 #*.deployproj
-# 
+#
 # C++ object files produced when C/C++ Output file generation is configured.
 # Uncomment this if you are not using external objects (zlib library for example).
 #*.obj
--- a/Drupal.gitignore
+++ b/Drupal.gitignore
@@ -1,10 +1,12 @@
 # Ignore configuration files that may contain sensitive information.
 sites/*/*settings*.php
+sites/example.sites.php

 # Ignore paths that contain generated content.
 files/
 sites/*/files
 sites/*/private
+sites/*/translations

 # Ignore default text files
 robots.txt
@@ -16,6 +18,7 @@ robots.txt
 /UPGRADE.txt
 /README.txt
 sites/README.txt
+sites/all/libraries/README.txt
 sites/all/modules/README.txt
 sites/all/themes/README.txt

--- a/Eagle.gitignore
+++ b/Eagle.gitignore
@@ -4,6 +4,9 @@
 *.s#?
 *.b#?
 *.l#?
+*.b$?
+*.s$?
+*.l$?

 # Eagle project file
 # It contains a serial number and references to the file structure
@@ -31,14 +34,19 @@ eagle.epf
 *.drl
 *.gpi
 *.pls
+*.ger
+*.gpi
+*.xln

 *.drd
 *.drd.*

+*.s#*
+*.b#*
+
 *.info

 *.eps

 # file locks introduced since 7.x
 *.lck
-
--- a/Elixir.gitignore
+++ b/Elixir.gitignore
@@ -1,6 +1,9 @@
 /_build
 /cover
 /deps
+/doc
+/.fetch
 erl_crash.dump
 *.ez
 *.beam
+/config/*.secret.exs
--- a/ExtJs.gitignore
+++ b/ExtJs.gitignore
@@ -10,3 +10,5 @@ ext/
 modern.json
 modern.jsonp
 resources/sass/.sass-cache/
+resources/.arch-internal-preview.css
+.arch-internal-preview.css
--- a/Fortran.gitignore
+++ b/Fortran.gitignore
@@ -1 +0,0 @@
-C++.gitignore
--- a/Global/Archives.gitignore
+++ b/Global/Archives.gitignore
@@ -5,17 +5,18 @@
 *.rar
 *.zip
 *.gz
+*.tgz
 *.bzip
 *.bz2
 *.xz
 *.lzma
 *.cab

-#packing-only formats
+# Packing-only formats
 *.iso
 *.tar

-#package management formats
+# Package management formats
 *.dmg
 *.xpi
 *.gem
--- a/Global/Backup.gitignore
+++ b/Global/Backup.gitignore
@@ -0,0 +1,4 @@
+*.bak
+*.gho
+*.ori
+*.tmp
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -11,9 +11,6 @@ local.properties
 .loadpath
 .recommenders

-# Eclipse Core
-.project
-
 # External tool builders
 .externalToolBuilders/

@@ -26,8 +23,8 @@ local.properties
 # CDT-specific (C/C++ Development Tooling)
 .cproject

-# JDT-specific (Eclipse Java Development Tools)
-.classpath
+# CDT- autotools
+.autotools

 # Java annotation processor (APT)
 .factorypath
@@ -49,3 +46,11 @@ local.properties

 # Code Recommenders
 .recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
--- a/Global/JEnv.gitignore
+++ b/Global/JEnv.gitignore
@@ -0,0 +1,5 @@
+# JEnv local Java version configuration file
+.java-version
+
+# Used by previous versions of JEnv
+.jenv-version
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -1,33 +1,34 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf

-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml

-# Sensitive or high-churn files:
-.idea/dataSources/
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries

-# Gradle:
-.idea/gradle.xml
-.idea/libraries
+# CMake
+cmake-build-*/

-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml

-## File-based project format:
+# File-based project format
 *.iws

-## Plugin-specific files:
-
 # IntelliJ
-/out/
+out/

 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -35,8 +36,17 @@
 # JIRA plugin
 atlassian-ide-plugin.xml

+# Cursive Clojure plugin
+.idea/replstate.xml
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Rider-specific rules
+*.sln.iml
--- a/Global/JetBrains.yml
+++ b/Global/JetBrains.yml
@@ -0,0 +1,11 @@
+aliases:
+  - IntelliJ
+  - RubyMine
+  - PhpStorm
+  - AppCode
+  - PyCharm
+  - CLion
+  - Android Studio
+  - WebStorm
+  - Rider
+reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
--- a/Global/Matlab.gitignore
+++ b/Global/Matlab.gitignore
@@ -1,8 +1,3 @@
-##---------------------------------------------------
-## Remove autosaves generated by the Matlab editor
-## We have git for backups!
-##---------------------------------------------------
-
 # Windows default autosave extension
 *.asv

@@ -12,11 +7,22 @@
 # Compiled MEX binaries (all platforms)
 *.mex*

-# Simulink Code Generation
-slprj/
+# Packaged app and toolbox files
+*.mlappinstall
+*.mltbx

-# Session info
-octave-workspace
+# Generated helpsearch folders
+helpsearch*/
+
+# Simulink code generation folders
+slprj/
+sccprj/
+
+# Matlab code generation folders
+codegen/

 # Simulink autosave extension
-.autosave
+*.autosave
+
+# Octave session info
+octave-workspace
--- a/Global/MicrosoftOffice.gitignore
+++ b/Global/MicrosoftOffice.gitignore
@@ -13,4 +13,4 @@
 ~$*.ppt*

 # Visio autosave temporary files
-*.~vsdx
+*.~vsd*
--- a/Global/SBT.gitignore
+++ b/Global/SBT.gitignore
@@ -1,9 +1,12 @@
 # Simple Build Tool
 # http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control

+dist/*
 target/
 lib_managed/
 src_managed/
 project/boot/
+project/plugins/project/
 .history
 .cache
+.lib/
--- a/Global/SublimeText.gitignore
+++ b/Global/SublimeText.gitignore
@@ -1,16 +1,16 @@
-# cache files for sublime text
+# Cache files for Sublime Text
 *.tmlanguage.cache
 *.tmPreferences.cache
 *.stTheme.cache

-# workspace files are user-specific
+# Workspace files are user-specific
 *.sublime-workspace

-# project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using SublimeText
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
 # *.sublime-project

-# sftp configuration file
+# SFTP configuration file
 sftp-config.json

 # Package control specific files
--- a/Global/SynopsysVCS.gitignore
+++ b/Global/SynopsysVCS.gitignore
@@ -4,8 +4,8 @@
 *.evcd
 *.fsdb

-# Default name of the simulation executable.  A different name can be 
-# specified with this switch (the associated daidir database name is 
+# Default name of the simulation executable.  A different name can be
+# specified with this switch (the associated daidir database name is
 # also taken from here):  -o <path>/<filename>
 simv

@@ -13,7 +13,7 @@ simv
 simv.daidir/
 simv.db.dir/

-# Infrastructure necessary to co-simulate SystemC models with 
+# Infrastructure necessary to co-simulate SystemC models with
 # Verilog/VHDL models.  An alternate directory may be specified with this
 # switch:  -Mdir=<directory_path>
 csrc/
@@ -22,7 +22,7 @@ csrc/
 # used to write all messages from simulation:  -l <filename>
 *.log

-# Coverage results (generated with urg) and database location.  The 
+# Coverage results (generated with urg) and database location.  The
 # following switch can also be used:  urg -dir <coverage_directory>.vdb
 simv.vdb/
 urgReport/
--- a/Global/Vagrant.gitignore
+++ b/Global/Vagrant.gitignore
@@ -1 +1,5 @@
+# General
 .vagrant/
+
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.logs
--- a/Global/Vim.gitignore
+++ b/Global/Vim.gitignore
@@ -1,12 +1,17 @@
-# swap
+# Swap
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
-[._]s[a-v][a-z]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
 [._]sw[a-p]
-# session
+
+# Session
 Session.vim
-# temporary
+
+# Temporary
 .netrwhist
 *~
-# auto-generated tag files
+# Auto-generated tag files
 tags
+# Persistent undo
+[._]*.un~
--- a/Global/Windows.gitignore
+++ b/Global/Windows.gitignore
@@ -3,8 +3,11 @@ Thumbs.db
 ehthumbs.db
 ehthumbs_vista.db

+# Dump file
+*.stackdump
+
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini

 # Recycle Bin used on file shares
 $RECYCLE.BIN/
@@ -12,6 +15,7 @@ $RECYCLE.BIN/
 # Windows Installer files
 *.cab
 *.msi
+*.msix
 *.msm
 *.msp

--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -1,12 +1,14 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+## User settings
+xcuserdata/

-## Build generated
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
 DerivedData/
-
-## Various settings
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -15,9 +17,3 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
--- a/Global/Xcode.yml
+++ b/Global/Xcode.yml
@@ -0,0 +1,3 @@
+aliases:
+  - Objective-C
+  - Swift
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@@ -1,26 +1,26 @@
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
--- a/Go.gitignore
+++ b/Go.gitignore
@@ -1,5 +1,6 @@
 # Binaries for programs and plugins
 *.exe
+*.exe~
 *.dll
 *.so
 *.dylib
@@ -9,6 +10,3 @@

 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
-
-# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
-.glide/
--- a/Godot.gitignore
+++ b/Godot.gitignore
@@ -0,0 +1,8 @@
+
+# Godot-specific ignores
+.import/
+export.cfg
+export_presets.cfg
+
+# Mono-specific ignores
+.mono/
--- a/Haskell.gitignore
+++ b/Haskell.gitignore
@@ -17,4 +17,6 @@ cabal.sandbox.config
 *.eventlog
 .stack-work/
 cabal.project.local
+cabal.project.local~
 .HTF/
+.ghc.environment.*
--- a/Java.gitignore
+++ b/Java.gitignore
@@ -1,5 +1,9 @@
+# Compiled class file
 *.class

+# Log file
+*.log
+
 # BlueJ files
 *.ctxt

@@ -9,7 +13,11 @@
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
+*.zip
+*.tar.gz
+*.rar

 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
--- a/Java.yml
+++ b/Java.yml
@@ -0,0 +1,2 @@
+aliases:
+  - Kotlin
--- a/Jekyll.gitignore
+++ b/Jekyll.gitignore
@@ -1,3 +1,4 @@
 _site/
 .sass-cache/
+.jekyll-cache/
 .jekyll-metadata
--- a/Joomla.gitignore
+++ b/Joomla.gitignore
@@ -1,4 +1,3 @@
-/.gitignore
 /.htaccess
 /administrator/cache/*
 /administrator/components/com_admin/*
@@ -251,7 +250,7 @@
 /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 /administrator/language/en-GB/en-GB.xml
 /administrator/language/overrides/*
-/administrator/logs/index.html
+/administrator/logs/*
 /administrator/manifests/*
 /administrator/modules/mod_custom/*
 /administrator/modules/mod_feed/*
--- a/KiCad.gitignore
+++ b/KiCad.gitignore
@@ -1,4 +1,5 @@
 # For PCBs designed using KiCad: http://www.kicad-pcb.org/
+# Format documentation: http://kicad-pcb.org/help/file-formats/

 # Temporary files
 *.000
@@ -8,6 +9,10 @@
 *~
 _autosave-*
 *.tmp
+*-cache.lib
+*-rescue.lib
+*-save.pro
+*-save.kicad_pcb

 # Netlist files (exported from Eeschema)
 *.net
--- a/LabVIEW.gitignore
+++ b/LabVIEW.gitignore
@@ -14,3 +14,4 @@
 # Metadata
 *.aliases
 *.lvlps
+.cache/
--- a/Leiningen.gitignore
+++ b/Leiningen.gitignore
@@ -11,3 +11,4 @@ pom.xml.asc
 .lein-plugins/
 .lein-failures
 .nrepl-port
+.cpcache/
--- a/Leiningen.yml
+++ b/Leiningen.yml
@@ -0,0 +1,2 @@
+aliases:
+  - Clojure
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,104 +1,43 @@
-.htaccess.sample
-.modgit/
-.modman/
-app/code/community/Phoenix/Moneybookers/
-app/code/community/Cm/RedisSession/
-app/code/core/
-app/design/adminhtml/default/default/
-app/design/frontend/base/
-app/design/frontend/rwd/
-app/design/frontend/default/blank/
-app/design/frontend/default/default/
-app/design/frontend/default/iphone/
-app/design/frontend/default/modern/
-app/design/frontend/enterprise/default
-app/design/install/
-app/etc/modules/Enterprise_*
-app/etc/modules/Mage_*.xml
-app/etc/modules/Phoenix_Moneybookers.xml
-app/etc/modules/Cm_RedisSession.xml
-app/etc/applied.patches.list
-app/etc/config.xml
-app/etc/enterprise.xml
-app/etc/local.xml.additional
-app/etc/local.xml.template
-app/etc/local.xml
-app/.htaccess
-app/bootstrap.php
-app/locale/en_US/
-app/Mage.php
-/cron.php
-cron.sh
-dev/.htaccess
-dev/tests/functional/
-downloader/
-errors/
-favicon.ico
-/get.php
-includes/
-/index.php
-index.php.sample
-/install.php
-js/blank.html
-js/calendar/
-js/enterprise/
-js/extjs/
-js/firebug/
-js/flash/
-js/index.php
-js/jscolor/
-js/lib/
-js/mage/
-js/prototype/
-js/scriptaculous/
-js/spacer.gif
-js/tiny_mce/
-js/varien/
-lib/3Dsecure/
-lib/Apache/
-lib/flex/
-lib/googlecheckout/
-lib/.htaccess
-lib/LinLibertineFont/
-lib/Mage/
-lib/PEAR/
-lib/Pelago/
-lib/phpseclib/
-lib/Varien/
-lib/Zend/
-lib/Cm/
-lib/Credis/
-lib/Magento/
-LICENSE_AFL.txt
-LICENSE.html
-LICENSE.txt
-LICENSE_EE*
-/mage
-media/
-/api.php
-nbproject/
-pear
-pear/
-php.ini.sample
-pkginfo/
-RELEASE_NOTES.txt
-shell/.htaccess
-shell/abstract.php
-shell/compiler.php
-shell/indexer.php
-shell/log.php
-sitemap.xml
-skin/adminhtml/default/default/
-skin/adminhtml/default/enterprise
-skin/frontend/base/
-skin/frontend/rwd/
-skin/frontend/default/blank/
-skin/frontend/default/blue/
-skin/frontend/default/default/
-skin/frontend/default/french/
-skin/frontend/default/german/
-skin/frontend/default/iphone/
-skin/frontend/default/modern/
-skin/frontend/enterprise
-skin/install/
-var/
+#--------------------------#
+# Magento Default Files    #
+#--------------------------#
+
+/app/etc/local.xml
+
+/media/*
+!/media/.htaccess
+
+!/media/customer
+/media/customer/*
+!/media/customer/.htaccess
+
+!/media/dhl
+/media/dhl/*
+!/media/dhl/logo.jpg
+
+!/media/downloadable
+/media/downloadable/*
+!/media/downloadable/.htaccess
+
+!/media/xmlconnect
+/media/xmlconnect/*
+
+!/media/xmlconnect/custom
+/media/xmlconnect/custom/*
+!/media/xmlconnect/custom/ok.gif
+
+!/media/xmlconnect/original
+/media/xmlconnect/original/*
+!/media/xmlconnect/original/ok.gif
+
+!/media/xmlconnect/system
+/media/xmlconnect/system/*
+!/media/xmlconnect/system/ok.gif
+
+/var/*
+!/var/.htaccess
+
+!/var/package
+/var/package/*
+!/var/package/*.xml
+
--- a/Maven.gitignore
+++ b/Maven.gitignore
@@ -8,5 +8,5 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties

-# Exclude maven wrapper
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar
--- a/Nanoc.gitignore
+++ b/Nanoc.gitignore
@@ -4,7 +4,7 @@
 output/

 # Temporary file directory
-tmp/
+tmp/nanoc/

 # Crash Log
 crash.log
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -2,6 +2,8 @@
 logs
 *.log
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

 # Runtime data
 pids
@@ -27,13 +29,16 @@ bower_components
 # node-waf configuration
 .lock-wscript

-# Compiled binary addons (http://nodejs.org/api/addons.html)
+# Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release

 # Dependency directories
 node_modules/
 jspm_packages/

+# TypeScript v1 declaration files
+typings/
+
 # Optional npm cache directory
 .npm

@@ -52,3 +57,17 @@ jspm_packages/
 # dotenv environment variables file
 .env

+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
--- a/OCaml.gitignore
+++ b/OCaml.gitignore
@@ -18,3 +18,6 @@ _build/
 # oasis generated files
 setup.data
 setup.log
+
+# Merlin configuring file for Vim and Emacs
+.merlin
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -1,63 +0,0 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## Build generated
-build/
-DerivedData/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
--- a/Perl.gitignore
+++ b/Perl.gitignore
@@ -24,7 +24,7 @@ Build.bat
 # Module::Install
 inc/

-# ExtUitls::MakeMaker
+# ExtUtils::MakeMaker
 /blib/
 /_eumm/
 /*.gz
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@@ -5,6 +5,7 @@ bin/
 /lib/
 /logs/
 /modules
+/project/project
 /project/target
 /target
 tmp/
--- a/Prestashop.gitignore
+++ b/Prestashop.gitignore
@@ -7,8 +7,10 @@ config/settings.*.php
 # The following files are generated by PrestaShop.

 admin-dev/autoupgrade/
-/cache/
+/cache/*
 !/cache/index.php
+!/cache/*/
+/cache/*/*
 !/cache/cachefs/index.php
 !/cache/purifier/index.php
 !/cache/push/index.php
--- a/PureScript.gitignore
+++ b/PureScript.gitignore
@@ -0,0 +1,8 @@
+# Dependencies
+.psci_modules
+bower_components
+node_modules
+
+# Generated files
+.psci
+output
--- a/Python.gitignore
+++ b/Python.gitignore
@@ -8,7 +8,6 @@ __pycache__/

 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -24,6 +23,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST

 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -43,8 +43,9 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
 .hypothesis/
+.pytest_cache/

 # Translations
 *.mo
@@ -53,6 +54,7 @@ coverage.xml
 # Django stuff:
 *.log
 local_settings.py
+db.sqlite3

 # Flask stuff:
 instance/
@@ -76,16 +78,27 @@ target/
 # celery beat schedule file
 celerybeat-schedule

-# dotenv
-.env
+# SageMath parsed files
+*.sage.py

-# virtualenv
+# Environments
+.env
 .venv
+env/
 venv/
 ENV/
+env.bak/
+venv.bak/

 # Spyder project settings
 .spyderproject
+.spyproject

 # Rope project settings
 .ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
--- a/Python.yml
+++ b/Python.yml
@@ -0,0 +1,3 @@
+editors:
+  - Global/JetBrains.gitignore
+  - Global/VisualStudioCode.gitignore
--- a/Qt.gitignore
+++ b/Qt.gitignore
@@ -1,5 +1,4 @@
 # C++ objects and libs
-
 *.slo
 *.lo
 *.o
@@ -11,7 +10,9 @@
 *.dylib

 # Qt-es
-
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
 /.qmake.cache
 /.qmake.stash
 *.pro.user
@@ -20,19 +21,23 @@
 *.qbs.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
+*.qmlc
+*.jsc
 Makefile*
 *build-*

-# QtCreator
+# Qt unit tests
+target_wrapper.*

+# QtCreator
 *.autosave

-# QtCtreator Qml
+# QtCreator Qml
 *.qmlproject.user
 *.qmlproject.user.*

-# QtCtreator CMake
+# QtCreator CMake
 CMakeLists.txt.user*
-
--- a/R.gitignore
+++ b/R.gitignore
@@ -31,3 +31,6 @@ vignettes/*.pdf
 # Temporary files created by R markdown
 *.utf8.md
 *.knit.md
+
+# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
+rsconnect/
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ the following resources are a great place to start:

 [man]: http://git-scm.com/docs/gitignore
 [help]: https://help.github.com/articles/ignoring-files
-[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
+[chapter]: https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#_ignoring
 [progit]: http://git-scm.com/book

 ## Folder structure
@@ -25,7 +25,7 @@ Global (operating system or editor specific) templates should go into the

 ## Contributing guidelines

-We’d love you to help us improve this project. To help us keep this collection
+We’d love for you to help us improve this project. To help us keep this collection
 high quality, we request that contributions adhere to the following guidelines.

 - **Provide a link to the application or project’s homepage**. Unless it’s
@@ -42,7 +42,7 @@ high quality, we request that contributions adhere to the following guidelines.
  It’s especially helpful to articulate why this change applies to *everyone*
  who works with the applicable technology, rather than just you or your team.

- **Please consider the scope of your change**. If your change specific to a
+- **Please consider the scope of your change**. If your change is specific to a
  certain language or framework, then make sure the change is made to the
  template for that language or framework, rather than to the template for an
  editor, tool, or operating system.
@@ -53,6 +53,11 @@ high quality, we request that contributions adhere to the following guidelines.
 In general, the more you can do to help us understand the change you’re making,
 the more likely we’ll be to accept your contribution quickly.

+If a template is mostly a list of files installed by a particular version of
+some software (e.g. a PHP framework) then it's brittle and probably no more
+helpful than a simple `ls`. If it's not possible to curate a small set of
+useful rules, then the template might not be a good fit for this collection.
+
 Please also understand that we can’t list every tool that ever existed.
 Our aim is to curate a collection of the *most common and helpful* templates,
 not to make sure we cover every project possible. If we choose not to
--- a/ROS.gitignore
+++ b/ROS.gitignore
@@ -1,3 +1,5 @@
+devel/
+logs/
 build/
 bin/
 lib/
@@ -11,6 +13,8 @@ msg/*Feedback.msg
 msg/*Goal.msg
 msg/*Result.msg
 msg/_*.py
+build_isolated/
+devel_isolated/

 # Generated by dynamic reconfigure
 *.cfgc
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -8,12 +8,13 @@ capybara-*.html
 /public/system
 /coverage/
 /spec/tmp
-**.orig
+*.orig
 rerun.txt
 pickle-email-*.html

 # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
+config/master.key

 # Only include if you have production secrets in this file, which is no longer a Rails default
 # config/secrets.yml
@@ -42,3 +43,7 @@ bower.json

 # Ignore Byebug command history file.
 .byebug_history
+
+# Ignore node_modules
+node_modules/
+
--- a/Rust.gitignore
+++ b/Rust.gitignore
@@ -3,7 +3,7 @@
 /target/

 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock

 # These are backup files generated by rustfmt
--- a/Sass.gitignore
+++ b/Sass.gitignore
@@ -1,2 +1,4 @@
 .sass-cache/
 *.css.map
+*.sass.map
+*.scss.map
--- a/Scala.gitignore
+++ b/Scala.gitignore
@@ -1,21 +1,2 @@
 *.class
 *.log
-
-# sbt specific
-.cache
-.history
-.lib/
-dist/*
-target/
-lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
-
-# Scala-IDE specific
-.scala_dependencies
-.worksheet
-
-# ENSIME specific
-.ensime_cache/
-.ensime
--- a/Smalltalk.gitignore
+++ b/Smalltalk.gitignore
@@ -13,6 +13,10 @@ SqueakDebug.log
 # Monticello package cache
 /package-cache

+# playground cache
+/play-cache
+/play-stash
+
 # Metacello-github cache
 /github-cache
 github-*.zip
--- a/SugarCRM.gitignore
+++ b/SugarCRM.gitignore
@@ -6,7 +6,7 @@
 # the misuse of the repository as backup replacement.
 # For development the cache directory can be safely ignored and
 # therefore it is ignored.
-/cache/
+/cache/*
 !/cache/index.html
 # Ignore some files and directories from the custom directory.
 /custom/history/
@@ -22,6 +22,6 @@
 # Logs files can safely be ignored.
 *.log
 # Ignore the new upload directories.
-/upload/
+/upload/*
 !/upload/index.html
 /upload_backup/
--- a/Swift.gitignore
+++ b/Swift.gitignore
@@ -1,67 +0,0 @@
-# Xcode
-#
-# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
-
-## Build generated
-build/
-DerivedData/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
--- a/Symfony.gitignore
+++ b/Symfony.gitignore
@@ -43,3 +43,6 @@

 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
+
+# Embedded web-server pid file
+/.web-server-pid
--- a/TeX.gitignore
+++ b/TeX.gitignore
@@ -10,9 +10,11 @@
 *.fot
 *.cb
 *.cb2
+.*.lb

 ## Intermediate documents:
 *.dvi
+*.xdv
 *-converted-to.*
 # these rules might exclude image files for figures etc.
 # *.ps
@@ -28,7 +30,6 @@
 *.blg
 *-blx.aux
 *-blx.bib
-*.brf
 *.run.xml

 ## Build tool auxiliary files:
@@ -39,6 +40,10 @@
 *.synctex.gz(busy)
 *.pdfsync

+## Build tool directories for auxiliary files
+# latexrun
+latex.out/
+
 ## Auxiliary and intermediate files from other packages:
 # algorithms
 *.alg
@@ -77,8 +82,6 @@ acs-*.bib
 *.t[1-9]
 *.t[1-9][0-9]
 *.tfm
-*.[1-9]
-*.[1-9][0-9]

 #(r)(e)ledmac/(r)(e)ledpar
 *.end
@@ -111,6 +114,14 @@ acs-*.bib
 *.gaux
 *.gtex

+# htlatex
+*.4ct
+*.4tc
+*.idv
+*.lg
+*.trc
+*.xref
+
 # hyperref
 *.brf

@@ -134,6 +145,9 @@ acs-*.bib
 *.mlf
 *.mlt
 *.mtc[0-9]*
+*.slf[0-9]*
+*.slt[0-9]*
+*.stc[0-9]*

 # minted
 _minted*
@@ -142,15 +156,17 @@ _minted*
 # morewrites
 *.mw

-# mylatexformat
-*.fmt
-
 # nomencl
+*.nlg
 *.nlo
+*.nls

 # pax
 *.pax

+# pdfpcnotes
+*.pdfpc
+
 # sagetex
 *.sagetex.sage
 *.sagetex.py
@@ -186,6 +202,9 @@ pythontex-files-*/
 # easy-todo
 *.lod

+# xmpincl
+*.xmpi
+
 # xindy
 *.xdy

@@ -214,7 +233,14 @@ TSWLatexianTemp*
 *~[0-9]*

 # auto folder when using emacs and auctex
-/auto/*
+./auto/*
+*.el

 # expex forward references with \gathertags
 *-tags.tex
+
+# standalone packages
+*.sta
+
+# generated if using elsarticle.cls
+*.spl
--- a/Terraform.gitignore
+++ b/Terraform.gitignore
@@ -1,6 +1,15 @@
-# Compiled files
-*.tfstate
-*.tfstate.backup
+# Local .terraform directories
+**/.terraform/*

-# Module directory
-.terraform/
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
--- a/Typo3.gitignore
+++ b/Typo3.gitignore
@@ -8,12 +8,15 @@
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
 /typo3conf/deprecation_*.log
-/typo3conf/AdditionalConfiguration.php
+/typo3conf/ENABLE_INSTALL_TOOL
+/typo3conf/realurl_autoconf.php
+/FIRST_INSTALL
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following entries.
 /typo3
 /typo3_src
 /typo3_src-*
+/Packages
 /.htaccess
 /index.php
 # Ignore temp directory.
--- a/Umbraco.gitignore
+++ b/Umbraco.gitignore
@@ -1,3 +1,7 @@
+## Ignore Umbraco files/folders generated for each instance
+##
+## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore
+
 # Note: VisualStudio gitignore rules may also be relevant

 # Umbraco
@@ -12,8 +16,11 @@

 # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
 # Make sure to include details from VisualStudio.gitignore BEFORE this
-!**/App_Data/[Pp]ackages/
-!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+!**/App_Data/[Pp]ackages/*
+!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*

-# ImageProcessor DiskCache 
+# ImageProcessor DiskCache
 **/App_Data/cache/
+
+# Ignore the Models Builder models out of date flag
+**/App_Data/Models/ood.flag
--- a/Unity.gitignore
+++ b/Unity.gitignore
@@ -1,12 +1,12 @@
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/Assets/AssetStoreTools*
+[Ll]ibrary/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+[Bb]uilds/
+Assets/AssetStoreTools*

-# Visual Studio 2015 cache directory
-/.vs/
+# Visual Studio cache directory
+.vs/

 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
@@ -22,10 +22,11 @@ ExportedObj/
 *.booproj
 *.svd
 *.pdb
-
+*.opendb

 # Unity3D generated meta files
 *.pidb.meta
+*.pdb.meta

 # Unity3D Generated File On Crash Reports
 sysinfo.txt
--- a/UnrealEngine.gitignore
+++ b/UnrealEngine.gitignore
@@ -50,10 +50,16 @@ SourceArt/**/*.tga

 # Binary Files
 Binaries/*
+Plugins/*/Binaries/*

 # Builds
 Build/*

+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
 # Don't ignore icon files in Build
 !Build/**/*.ico

@@ -65,6 +71,7 @@ Saved/*

 # Compiled source files for the engine to use
 Intermediate/*
+Plugins/*/Intermediate/*

 # Cache files for the editor to use
 DerivedDataCache/*
--- a/VisualStudio.gitignore
+++ b/VisualStudio.gitignore
@@ -24,11 +24,14 @@ bld/
 [Oo]bj/
 [Ll]og/

-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/

+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -42,20 +45,28 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c

+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
 # .NET Core
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json

+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
 *_i.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -93,6 +104,9 @@ ipch/
 *.vspx
 *.sap

+# Visual Studio Trace Files
+*.e2e
+
 # TFS 2012 Local Workspace
 $tf/

@@ -113,6 +127,10 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover

+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -148,7 +166,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
+# Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -161,12 +179,12 @@ PublishScripts/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets

@@ -183,6 +201,7 @@ AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
+*.appx

 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -199,9 +218,12 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs

+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
@@ -216,15 +238,19 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak

 # SQL Server files
 *.mdf
 *.ldf
+*.ndf

 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser

 # Microsoft Fakes
 FakesAssemblies/
@@ -234,6 +260,7 @@ FakesAssemblies/

 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/

 # Visual Studio 6 build log
 *.plg
@@ -259,10 +286,6 @@ paket-files/
 # FAKE - F# Make
 .fake/

-# JetBrains Rider
-.idea/
-*.sln.iml
-
 # CodeRush
 .cr/

@@ -273,3 +296,30 @@ __pycache__/
 # Cake - Uncomment if you are using it
 # tools/**
 # !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
--- a/VisualStudio.yml
+++ b/VisualStudio.yml
@@ -0,0 +1,14 @@
+aliases:
+  - CSharp
+  - C#
+  - FSharp
+  - F#
+  - VisualBasic
+  - VB
+
+editors:
+  - Global/JetBrains.gitignore
+  - Global/VisualStudioCode.gitignore
+
+reviewers:
+  - Brendan Forster (@shiftkey)
--- a/WordPress.gitignore
+++ b/WordPress.gitignore
@@ -7,6 +7,7 @@ wp-content/blogs.dir/
 wp-content/cache/
 wp-content/upgrade/
 wp-content/uploads/
+wp-content/mu-plugins/
 wp-content/wp-cache-config.php
 wp-content/plugins/hello.php

--- a/ZendFramework.gitignore
+++ b/ZendFramework.gitignore
@@ -19,7 +19,6 @@ temp/
 data/DoctrineORMModule/Proxy/
 data/DoctrineORMModule/cache/

-
 # Legacy ZF1
 demos/
 extras/documentation
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -0,0 +1,74 @@
+# Gitignore Metadata
+
+This document outlines the additional metadata that can be associated with a gitignore template, and how tools can consume this metadata.
+
+## Metadata Location
+
+To add additional metadata to a gitignore template, add a new file to the same directory, with the matching name but ending in `yml`.
+
+For example:
+ - for `C.gitignore` the associated metadata will be stored in `C.yml`
+ - for `Global/JetBrains.gitignore` the metadata file will be `Global/JetBrains.gitignore`
+
+## Supported Fields
+
+The structure of these files is still being settled upon, but for the moment these are some proposed entries.
+
+#### `aliases`
+
+Some templates can be used to represent a number of different situations, and rather than duplicating files on disk and needing to keep these in sync, we can store a list of these entries as metadata.
+
+For example, JetBrains has a unified gitignore template that can be applied to all of their IDEs. Previously these were stored as comments in the header:
+
+```
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+```
+
+These values can be represented as metadata, so that tools consuming this repository can use these entries as matches if the user is searching for a specific product:
+
+```yaml
+aliases:
+  - IntelliJ
+  - RubyMine
+  - PhpStorm
+  - AppCode
+  - PyCharm
+  - CLion
+  - Android Studio
+  - WebStorm
+  - Rider
+```
+
+#### `editors`
+
+There are a number of editors out there that support working with different languages. Rather than baking every editor's rules in every language that is supported, a list of additional templates that might be of interest
+
+```yaml
+editors:
+  - Global/JetBrains.gitignore
+  - Global/VisualStudioCode.gitignore
+```
+
+#### `reference`
+
+Some ecosystems have up-to-date documentation about things that are necessary to exclude from version control. To associate this with a template, this could be stored as a key-value pair in metadata:
+
+```yaml
+reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+```
+
+### `reviewers`
+
+This element is inspired by the [`DefinitelyTyped`](https://github.com/DefinitelyTyped/DefinitelyTyped) project, allowing community members to opt-in to reviewing templates when a pull request is opened. This helps to share the review load and credit people who have been helpful with reviews.
+
+```yaml
+reviewers:
+  - @shiftkey
+```
+
+A friendly name can be provided alongside the GitHub account name.
+
+```yaml
+reviewers:
+  - Brendan Forster (@shiftkey)
+```