Merge branch 'master' of github.com:github/gitignore into patch-1

Conflicts:
	Python.gitignore

.github/PULL_REQUEST_TEMPLATE.md

+**Reasons for making this change:**
+
+_TODO_
+
+**Links to documentation supporting these rule changes:** 
+
+_TODO_
+
+If this is a new template: 
+
+ - **Link to application or project’s homepage**: _TODO_

CakePHP.gitignore

@@ -2,8 +2,20 @@
 
 /vendor/*
 /config/app.php
-/tmp/*
+
+/tmp/cache/models/*
+!/tmp/cache/models/empty
+/tmp/cache/persistent/*
+!/tmp/cache/persistent/empty
+/tmp/cache/views/*
+!/tmp/cache/views/empty
+/tmp/sessions/*
+!/tmp/sessions/empty
+/tmp/tests/*
+!/tmp/tests/empty
+
 /logs/*
+!/logs/empty
 
 # CakePHP 2
 

Concrete5.gitignore

 config/site.php
 files/cache/*
 files/tmp/*
+.htaccess

FuelPHP.gitignore

-fuel/app/logs/*/*/*
-fuel/app/cache/*/*
+# the composer package lock file and install directory
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# /composer.lock
+/fuel/vendor
+
+# the fuelphp document
+/docs/
+
+# you may install these packages with `oil package`.
+# http://fuelphp.com/docs/packages/oil/package.html
+# /fuel/packages/auth/
+# /fuel/packages/email/
+# /fuel/packages/oil/
+# /fuel/packages/orm/
+# /fuel/packages/parser/
+
+# dynamically generated files
+/fuel/app/logs/*/*/*
+/fuel/app/cache/*/*
+/fuel/app/config/crypt.php

Global/CVS.gitignore

 /CVS/*
-*/CVS/*
+**/CVS/*
 .cvsignore
 */.cvsignore

Global/Dreamweaver.gitignore

 # DW Dreamweaver added files
 _notes
+_compareTemp
+configs/
 dwsync.xml
+dw_php_codehinting.config
+*.mno

Global/Dropbox.gitignore

+# Dropbox settings and caches
+.dropbox
+.dropbox.attr
+.dropbox.cache

Global/Eclipse.gitignore

@@ -9,6 +9,7 @@ tmp/
 local.properties
 .settings/
 .loadpath
+.recommenders
 
 # Eclipse Core
 .project

Global/Emacs.gitignore

@@ -36,3 +36,6 @@ flycheck_*.el
 
 # server auth directory
 /server/
+
+# projectiles files
+.projectile
\ No newline at end of file

Global/JetBrains.gitignore

@@ -11,6 +11,7 @@
 # Sensitive or high-churn files:
 .idea/dataSources.ids
 .idea/dataSources.xml
+.idea/dataSources.local.xml
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml

Global/Vim.gitignore

@@ -6,3 +6,5 @@ Session.vim
 # temporary
 .netrwhist
 *~
+# auto-generated tag files
+tags

KiCad.gitignore

@@ -5,9 +5,16 @@
 *.bak
 *.bck
 *.kicad_pcb-bak
+*~
+_autosave-*
+*.tmp
 
 # Netlist files (exported from Eeschema)
 *.net
 
 # Autorouter files (exported from Pcbnew)
 .dsn
+
+# Exported BOM files
+*.xml
+*.csv

Magento.gitignore

 .htaccess.sample
 .modgit/
 .modman/
-app/code/community/Phoenix/
-app/code/community/Cm/
+app/code/community/Phoenix/Moneybookers/
+app/code/community/Cm/RedisSession/
 app/code/core/
 app/design/adminhtml/default/default/
 app/design/frontend/base/
@@ -14,26 +14,7 @@ app/design/frontend/default/modern/
 app/design/frontend/enterprise/default
 app/design/install/
 app/etc/modules/Enterprise_*
-app/etc/modules/Mage_All.xml
-app/etc/modules/Mage_Api.xml
-app/etc/modules/Mage_Api2.xml
-app/etc/modules/Mage_Authorizenet.xml
-app/etc/modules/Mage_Bundle.xml
-app/etc/modules/Mage_Captcha.xml
-app/etc/modules/Mage_Centinel.xml
-app/etc/modules/Mage_Compiler.xml
-app/etc/modules/Mage_ConfigurableSwatches.xml
-app/etc/modules/Mage_Connect.xml
-app/etc/modules/Mage_CurrencySymbol.xml
-app/etc/modules/Mage_Downloadable.xml
-app/etc/modules/Mage_ImportExport.xml
-app/etc/modules/Mage_LoadTest.xml
-app/etc/modules/Mage_Oauth.xml
-app/etc/modules/Mage_PageCache.xml
-app/etc/modules/Mage_Persistent.xml
-app/etc/modules/Mage_Weee.xml
-app/etc/modules/Mage_Widget.xml
-app/etc/modules/Mage_XmlConnect.xml
+app/etc/modules/Mage_*.xml
 app/etc/modules/Phoenix_Moneybookers.xml
 app/etc/modules/Cm_RedisSession.xml
 app/etc/applied.patches.list
@@ -43,10 +24,13 @@ app/etc/local.xml.additional
 app/etc/local.xml.template
 app/etc/local.xml
 app/.htaccess
-app/locale/
+app/bootstrap.php
+app/locale/en_US/
 app/Mage.php
 /cron.php
 cron.sh
+dev/.htaccess
+dev/tests/functional/
 downloader/
 errors/
 favicon.ico
@@ -90,14 +74,7 @@ LICENSE.html
 LICENSE.txt
 LICENSE_EE*
 /mage
-media/customer/
-media/dhl/
-media/downloadable/
-media/.htaccess
-media/import/
-media/xmlconnect/
-media/catalog/product/cache/
-media/catalog/product/placeholder/default/
+media/
 /api.php
 nbproject/
 pear
@@ -105,6 +82,7 @@ pear/
 php.ini.sample
 pkginfo/
 RELEASE_NOTES.txt
+shell/.htaccess
 shell/abstract.php
 shell/compiler.php
 shell/indexer.php

Objective-C.gitignore

@@ -19,8 +19,7 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xccheckout
-*.xcscmblueprint
+*.xcuserstate
 
 ## Obj-C/Swift specific
 *.hmap

Prestashop.gitignore

@@ -7,7 +7,14 @@ config/settings.*.php
 # The following files are generated by PrestaShop.
 
 admin-dev/autoupgrade/
-/cache/*
+/cache/
+!/cache/index.php
+!/cache/cachefs/index.php
+!/cache/purifier/index.php
+!/cache/push/index.php
+!/cache/sandbox/index.php
+!/cache/smarty/index.php
+!/cache/tcpdf/index.php
 config/xml/*.xml
 /log/*
 *sitemap.xml

Python.gitignore

@@ -56,6 +56,9 @@ local_settings.py
 # Flask instance folder
 instance/
 
+# Scrapy stuff:
+.scrapy
+
 # Sphinx documentation
 docs/_build/
 
@@ -70,3 +73,9 @@ target/
 
 # celery beat schedule file
 celerybeat-schedule
+
+# dotenv
+.env
+
+# Spyder project settings
+.spyderproject

R.gitignore

@@ -8,6 +8,12 @@
 # Example code in package build process
 *-Ex.R
 
+# Output files from R CMD build
+/*.tar.gz
+
+# Output files from R CMD check
+/*.Rcheck/
+
 # RStudio files
 .Rproj.user/
 

Scheme.gitignore

+*.ss~
+*.ss#*
+.#*.ss
+
+*.scm~
+*.scm#*
+.#*.scm

Smalltalk.gitignore

+# changes file
+*.changes
+
+# system image
+*.image
+
+# Pharo Smalltalk Debug log file
+PharoDebug.log
+
+# Squeak Smalltalk Debug log file
+SqueakDebug.log
+
+# Monticello package cache
+/package-cache
+
+# Metacello-github cache
+/github-cache
+github-*.zip

Swift.gitignore

@@ -19,8 +19,7 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xccheckout
-*.xcscmblueprint
+*.xcuserstate
 
 ## Obj-C/Swift specific
 *.hmap

Symfony.gitignore

@@ -4,6 +4,9 @@
 !app/cache/.gitkeep
 !app/logs/.gitkeep
 
+# Email spool folder
+/app/spool/*
+
 # Cache and logs (Symfony3)
 /var/cache/*
 /var/logs/*

Terraform.gitignore

+# Compiled files
+*.tfstate
+*.tfstate.backup

VisualStudio.gitignore

@@ -163,9 +163,6 @@ csx/
 ecf/
 rcf/
 
-# Microsoft Azure ApplicationInsights config file
-ApplicationInsights.config
-
 # Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/

WordPress.gitignore

 *.log
-.htaccess
-sitemap.xml
-sitemap.xml.gz
 wp-config.php
 wp-content/advanced-cache.php
 wp-content/backup-db/
@@ -13,6 +10,9 @@ wp-content/uploads/
 wp-content/wp-cache-config.php
 wp-content/plugins/hello.php
 
-/readme.html
+/.htaccess
 /license.txt
+/readme.html
+/sitemap.xml
+/sitemap.xml.gz
 

ZendFramework.gitignore

@@ -15,6 +15,11 @@ data/sessions/
 data/tmp/
 temp/
 
+#Doctrine 2
+data/DoctrineORMModule/Proxy/
+data/DoctrineORMModule/cache/
+
+
 # Legacy ZF1
 demos/
 extras/documentation