Merge branch 'master' into patch-3

Android.gitignore

@@ -35,7 +35,20 @@ captures/
 # Intellij
 *.iml
 .idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
 .idea/libraries
 
 # Keystore files
 *.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+#Freeline
+freeline.py
+freeline/
+freeline_project_description.json

Autotools.gitignore

@@ -1,6 +1,11 @@
 # http://www.gnu.org/software/automake
 
 Makefile.in
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
 
 # http://www.gnu.org/software/autoconf
 
@@ -9,10 +14,20 @@ Makefile.in
 /autoscan-*.log
 /aclocal.m4
 /compile
+/config.guess
 /config.h.in
+/config.sub
 /configure
 /configure.scan
 /depcomp
 /install-sh
 /missing
 /stamp-h1
+
+# https://www.gnu.org/software/libtool/
+
+/ltmain.sh
+
+# http://www.gnu.org/software/texinfo
+
+/texinfo.tex

C.gitignore

@@ -7,6 +7,11 @@
 *.obj
 *.elf
 
+# Linker output
+*.ilk
+*.map
+*.exp
+
 # Precompiled Headers
 *.gch
 *.pch
@@ -34,3 +39,13 @@
 # Debug files
 *.dSYM/
 *.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf

CMake.gitignore

@@ -1,7 +1,9 @@
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
+Testing
 Makefile
 cmake_install.cmake
 install_manifest.txt
+compile_commands.json
 CTestTestfile.cmake

CONTRIBUTING.md

@@ -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

CodeIgniter.gitignore

@@ -4,3 +4,8 @@
 */cache/*
 !*/cache/index.html
 !*/cache/.htaccess
+
+user_guide_src/build/*
+user_guide_src/cilexer/build/*
+user_guide_src/cilexer/dist/*
+user_guide_src/cilexer/pycilexer.egg-info/*

CommonLisp.gitignore

@@ -1,3 +1,17 @@
 *.FASL
 *.fasl
 *.lisp-temp
+*.dfsl
+*.pfsl
+*.d64fsl
+*.p64fsl
+*.lx64fsl
+*.lx32fsl
+*.dx64fsl
+*.dx32fsl
+*.fx64fsl
+*.fx32fsl
+*.sx64fsl
+*.sx32fsl
+*.wx64fsl
+*.wx32fsl

Coq.gitignore

@@ -1,3 +1,30 @@
-*.vo
+.*.aux
+*.a
+*.cma
+*.cmi
+*.cmo
+*.cmx
+*.cmxa
+*.cmxs
 *.glob
+*.ml.d
+*.ml4.d
+*.mli.d
+*.mllib.d
+*.mlpack.d
+*.native
+*.o
 *.v.d
+*.vio
+*.vo
+.coq-native/
+.csdp.cache
+.lia.cache
+.nia.cache
+.nlia.cache
+.nra.cache
+csdp.cache
+lia.cache
+nia.cache
+nlia.cache
+nra.cache

Dart.gitignore

@@ -1,13 +1,19 @@
 # See https://www.dartlang.org/tools/private-files.html
 
 # Files and directories created by pub
-.buildlog
+
+# SDK 1.20 and later (no longer creates packages directories)
 .packages
-.project
 .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

Elisp.gitignore

@@ -3,3 +3,9 @@
 
 # Packaging
 .cask
+
+# Backup files
+*~
+
+# Undo-tree save-files
+*.~undo-tree

Elixir.gitignore

@@ -3,3 +3,4 @@
 /deps
 erl_crash.dump
 *.ez
+*.beam

ExtJs.gitignore

@@ -1,4 +1,12 @@
 .architect
+bootstrap.css
+bootstrap.js
 bootstrap.json
+bootstrap.jsonp
 build/
+classic.json
+classic.jsonp
 ext/
+modern.json
+modern.jsonp
+resources/sass/.sass-cache/

Global/Emacs.gitignore

@@ -39,4 +39,7 @@ flycheck_*.el
 /server/
 
 # projectiles files
-.projectile
+.projectile
+
+# directory configuration
+.dir-locals.el

Global/IPythonNotebook.gitignore

@@ -1,2 +0,0 @@
-# Temporary data
-.ipynb_checkpoints/

Global/JetBrains.gitignore

@@ -2,26 +2,24 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-.idea/workspace.xml
+.idea/**/workspace.xml
-.idea/tasks.xml
+.idea/**/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
 
 # Sensitive or high-churn files:
-.idea/dataSources.ids
+.idea/**/dataSources/
-.idea/dataSources.xml
+.idea/**/dataSources.ids
-.idea/dataSources.local.xml
+.idea/**/dataSources.xml
-.idea/sqlDataSources.xml
+.idea/**/dataSources.local.xml
-.idea/dynamic.xml
+.idea/**/sqlDataSources.xml
-.idea/uiDesigner.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
 
 # Gradle:
-.idea/gradle.xml
+.idea/**/gradle.xml
-.idea/libraries
+.idea/**/libraries
 
 # Mongo Explorer plugin:
-.idea/mongoSettings.xml
+.idea/**/mongoSettings.xml
 
 ## File-based project format:
 *.iws

Global/Linux.gitignore

@@ -8,3 +8,6 @@
 
 # Linux trash folder which might appear on any partition or disk
 .Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*

Global/Matlab.gitignore

@@ -17,3 +17,6 @@ slprj/
 
 # Session info
 octave-workspace
+
+# Simulink autosave extension
+.autosave

Global/Stata.gitignore

@@ -0,0 +1,24 @@
+# .gitignore file for git projects containing Stata files
+# Commercial statistical software: http://www.stata.com
+
+# Stata dataset and output files
+*.dta
+*.gph
+*.log
+*.smcl
+*.stpr
+*.stsem
+
+# Graphic export files from Stata
+# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf
+#
+# You may add graphic export files to your .gitignore. However you should be
+# aware that this will exclude all image files from this main directory
+# and subdirectories.
+# *.ps
+# *.eps
+# *.wmf
+# *.emf
+# *.pdf
+# *.png
+# *.tif

Global/SublimeText.gitignore

@@ -20,6 +20,9 @@ Package Control.ca-bundle
 Package Control.system-ca-bundle
 Package Control.cache/
 Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
 bh_unicode_properties.cache
 
 # Sublime-github package stores a github token in this file

Global/Vim.gitignore

@@ -1,6 +1,8 @@
 # swap
-[._]*.s[a-w][a-z]
+[._]*.s[a-v][a-z]
-[._]s[a-w][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
 # session
 Session.vim
 # temporary

Global/VisualStudioCode.gitignore

@@ -2,3 +2,4 @@
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
+!.vscode/extensions.json

Global/Windows.gitignore

@@ -1,6 +1,7 @@
-# Windows image file caches
+# Windows thumbnail cache files
 Thumbs.db
 ehthumbs.db
+ehthumbs_vista.db
 
 # Folder config file
 Desktop.ini

Go.gitignore

@@ -1,27 +1,14 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
+# Binaries for programs and plugins
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
 *.exe
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
 *.test
-*.prof
 
 # 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/

Java.gitignore

@@ -1,5 +1,8 @@
 *.class
 
+# BlueJ files
+*.ctxt
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 

Joomla.gitignore

@@ -29,8 +29,6 @@
 /administrator/components/com_search/*
 /administrator/components/com_templates/*
 /administrator/components/com_users/*
-/administrator/components/com_weblinks/*
-/administrator/components/index.html
 /administrator/help/*
 /administrator/includes/*
 /administrator/language/en-GB/en-GB.com_ajax.ini
@@ -41,7 +39,6 @@
 /administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
 /administrator/language/en-GB/en-GB.com_postinstall.ini
 /administrator/language/en-GB/en-GB.com_postinstall.sys.ini
-/administrator/language/en-GB/en-GB.com_sitemapjen.sys.ini
 /administrator/language/en-GB/en-GB.com_tags.ini
 /administrator/language/en-GB/en-GB.com_tags.sys.ini
 /administrator/language/en-GB/en-GB.mod_stats_admin.ini
@@ -250,15 +247,10 @@
 /administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
 /administrator/language/en-GB/en-GB.plg_user_profile.ini
 /administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
-/administrator/language/en-GB/en-GB.tpl_bluestork.ini
-/administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini
 /administrator/language/en-GB/en-GB.tpl_hathor.ini
 /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 /administrator/language/en-GB/en-GB.xml
-/administrator/language/en-GB/index.html
-/administrator/language/ru-RU/index.html
 /administrator/language/overrides/*
-/administrator/language/index.html
 /administrator/logs/index.html
 /administrator/manifests/*
 /administrator/modules/mod_custom/*
@@ -278,12 +270,9 @@
 /administrator/modules/mod_unread/*
 /administrator/modules/mod_version/*
 /administrator/modules/mod_stats_admin/*
-/administrator/modules/index.html
-/administrator/templates/bluestork/*
 /administrator/templates/isis/*
 /administrator/templates/hathor/*
 /administrator/templates/system/*
-/administrator/templates/index.html
 /administrator/index.php
 /cache/*
 /bin/*
@@ -302,7 +291,6 @@
 /components/com_newsfeeds/*
 /components/com_search/*
 /components/com_users/*
-/components/com_weblinks/*
 /components/com_wrapper/*
 /components/index.html
 /images/banners/*
@@ -403,7 +391,6 @@
 /language/en-GB/en-GB.tpl_beez5.ini
 /language/en-GB/en-GB.tpl_beez5.sys.ini
 /language/en-GB/en-GB.xml
-/language/en-GB/index.html
 /language/en-GB/install.xml
 /language/overrides/*
 /language/index.html
@@ -428,8 +415,6 @@
 /libraries/index.html
 /libraries/import.php
 /libraries/loader.php
-/libraries/platform.php
-/logs/*
 /media/cms/*
 /media/com_contenthistory/*
 /media/com_finder/*
@@ -472,7 +457,6 @@
 /modules/mod_tags_popular/*
 /modules/mod_tags_similar/*
 /modules/mod_users_latest/*
-/modules/mod_weblinks/*
 /modules/mod_whosonline/*
 /modules/mod_wrapper/*
 /modules/index.html
@@ -481,9 +465,7 @@
 /plugins/authentication/joomla/*
 /plugins/authentication/ldap/*
 /plugins/authentication/cookie/*
-/plugins/authentication/index.html
 /plugins/captcha/recaptcha/*
-/plugins/captcha/index.html
 /plugins/content/emailcloak/*
 /plugins/content/example/*
 /plugins/content/finder/*
@@ -494,27 +476,21 @@
 /plugins/content/pagenavigation/*
 /plugins/content/vote/*
 /plugins/content/contact/*
-/plugins/content/index.html
 /plugins/editors/codemirror/*
 /plugins/editors/none/*
 /plugins/editors/tinymce/*
-/plugins/editors/index.html
 /plugins/editors-xtd/module/*
 /plugins/editors-xtd/article/*
 /plugins/editors-xtd/image/*
 /plugins/editors-xtd/pagebreak/*
 /plugins/editors-xtd/readmore/*
-/plugins/editors-xtd/index.html
 /plugins/extension/example/*
 /plugins/extension/joomla/*
-/plugins/extension/index.html
-/plugins/finder/index.html
 /plugins/finder/categories/*
 /plugins/finder/contacts/*
 /plugins/finder/content/*
 /plugins/finder/newsfeeds/*
 /plugins/finder/tags/*
-/plugins/finder/weblinks/*
 /plugins/installer/*
 /plugins/quickicon/extensionupdate/*
 /plugins/quickicon/joomlaupdate/*
@@ -547,10 +523,7 @@
 /plugins/user/profile/*
 /plugins/user/index.html
 /plugins/index.html
-/templates/atomic/*
 /templates/beez3/*
-/templates/beez_20/*
-/templates/beez5/*
 /templates/protostar/*
 /templates/system/*
 /templates/index.html

KiCad.gitignore

@@ -13,7 +13,8 @@ _autosave-*
 *.net
 
 # Autorouter files (exported from Pcbnew)
-.dsn
+*.dsn
+*.ses
 
 # Exported BOM files
 *.xml

LICENSE

@@ -1,121 +1,116 @@
-Creative Commons Legal Code
-
 CC0 1.0 Universal
 
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
 Statement of Purpose
 
 The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
+exclusive Copyright and Related Rights (defined below) upon the creator and
-and subsequent owner(s) (each and all, an "owner") of an original work of
+subsequent owner(s) (each and all, an "owner") of an original work of
 authorship and/or a database (each, a "Work").
 
-Certain owners wish to permanently relinquish those rights to a Work for
+Certain owners wish to permanently relinquish those rights to a Work for the
-the purpose of contributing to a commons of creative, cultural and
+purpose of contributing to a commons of creative, cultural and scientific
-scientific works ("Commons") that the public can reliably and without fear
+works ("Commons") that the public can reliably and without fear of later
-of later claims of infringement build upon, modify, incorporate in other
+claims of infringement build upon, modify, incorporate in other works, reuse
-works, reuse and redistribute as freely as possible in any form whatsoever
+and redistribute as freely as possible in any form whatsoever and for any
-and for any purposes, including without limitation commercial purposes.
+purposes, including without limitation commercial purposes. These owners may
-These owners may contribute to the Commons to promote the ideal of a free
+contribute to the Commons to promote the ideal of a free culture and the
-culture and the further production of creative, cultural and scientific
+further production of creative, cultural and scientific works, or to gain
-works, or to gain reputation or greater distribution for their Work in
+reputation or greater distribution for their Work in part through the use and
-part through the use and efforts of others.
+efforts of others.
 
-For these and/or other purposes and motivations, and without any
+For these and/or other purposes and motivations, and without any expectation
-expectation of additional consideration or compensation, the person
+of additional consideration or compensation, the person associating CC0 with a
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-is an owner of Copyright and Related Rights in the Work, voluntarily
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-elects to apply CC0 to the Work and publicly distribute the Work under its
+and publicly distribute the Work under its terms, with knowledge of his or her
-terms, with knowledge of his or her Copyright and Related Rights in the
+Copyright and Related Rights in the Work and the meaning and intended legal
-Work and the meaning and intended legal effect of CC0 on those rights.
+effect of CC0 on those rights.
 
 1. Copyright and Related Rights. A Work made available under CC0 may be
 protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
+Related Rights"). Copyright and Related Rights include, but are not limited
-limited to, the following:
+to, the following:
 
-  i. the right to reproduce, adapt, distribute, perform, display,
+  i. the right to reproduce, adapt, distribute, perform, display, communicate,
-     communicate, and translate a Work;
+  and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
 
-2. Waiver. To the greatest extent permitted by, but not in contravention
+  ii. moral rights retained by the original author(s) and/or performer(s);
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
 
-3. Public License Fallback. Should any part of the Waiver for any reason
+  iii. publicity and privacy rights pertaining to a person's image or likeness
-be judged legally invalid or ineffective under applicable law, then the
+  depicted in a Work;
-Waiver shall be preserved to the maximum extent permitted taking into
+
-account Affirmer's express Statement of Purpose. In addition, to the
+  iv. rights protecting against unfair competition in regards to a Work,
-extent the Waiver is so judged Affirmer hereby grants to each affected
+  subject to the limitations in paragraph 4(a), below;
-person a royalty-free, non transferable, non sublicensable, non exclusive,
+
-irrevocable and unconditional license to exercise Affirmer's Copyright and
+  v. rights protecting the extraction, dissemination, use and reuse of data in
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
+  a Work;
-maximum duration provided by applicable law or treaty (including future
+
-time extensions), (iii) in any current or future medium and for any number
+  vi. database rights (such as those arising under Directive 96/9/EC of the
-of copies, and (iv) for any purpose whatsoever, including without
+  European Parliament and of the Council of 11 March 1996 on the legal
-limitation commercial, advertising or promotional purposes (the
+  protection of databases, and under any national implementation thereof,
-"License"). The License shall be deemed effective as of the date CC0 was
+  including any amended or successor version of such directive); and
-applied by Affirmer to the Work. Should any part of the License for any
+
-reason be judged legally invalid or ineffective under applicable law, such
+  vii. other similar, equivalent or corresponding rights throughout the world
-partial invalidity or ineffectiveness shall not invalidate the remainder
+  based on applicable law or treaty, and any national implementations thereof.
-of the License, and in such case Affirmer hereby affirms that he or she
+
-will not (i) exercise any of his or her remaining Copyright and Related
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
-Rights in the Work or (ii) assert any associated claims and causes of
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-action with respect to the Work, in either case contrary to Affirmer's
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-express Statement of Purpose.
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
 
 4. Limitations and Disclaimers.
 
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
+  a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
+  surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
+
-    warranties of any kind concerning the Work, express, implied,
+  b. Affirmer offers the Work as-is and makes no representations or warranties
-    statutory or otherwise, including without limitation warranties of
+  of any kind concerning the Work, express, implied, statutory or otherwise,
-    title, merchantability, fitness for a particular purpose, non
+  including without limitation warranties of title, merchantability, fitness
-    infringement, or the absence of latent or other defects, accuracy, or
+  for a particular purpose, non infringement, or the absence of latent or
-    the present or absence of errors, whether or not discoverable, all to
+  other defects, accuracy, or the present or absence of errors, whether or not
-    the greatest extent permissible under applicable law.
+  discoverable, all to the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
+
-    that may apply to the Work or any use thereof, including without
+  c. Affirmer disclaims responsibility for clearing rights of other persons
-    limitation any person's Copyright and Related Rights in the Work.
+  that may apply to the Work or any use thereof, including without limitation
-    Further, Affirmer disclaims responsibility for obtaining any necessary
+  any person's Copyright and Related Rights in the Work. Further, Affirmer
-    consents, permissions or other rights required for any use of the
+  disclaims responsibility for obtaining any necessary consents, permissions
-    Work.
+  or other rights required for any use of the Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
+
-    party to this document and has no duty or obligation with respect to
+  d. Affirmer understands and acknowledges that Creative Commons is not a
-    this CC0 or use of the Work.
+  party to this document and has no duty or obligation with respect to this
+  CC0 or use of the Work.
+
+For more information, please see
+<http://creativecommons.org/publicdomain/zero/1.0/>

Laravel.gitignore

@@ -1,15 +1,20 @@
 vendor/
 node_modules/
+npm-debug.log
 
 # Laravel 4 specific
 bootstrap/compiled.php
 app/storage/
 
 # Laravel 5 & Lumen specific
-bootstrap/cache/
+public/storage
+public/hot
+storage/*.key
 .env.*.php
 .env.php
 .env
+Homestead.yaml
+Homestead.json
 
 # Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
 .rocketeer/

Magento.gitignore

@@ -1,104 +1,16 @@
-.htaccess.sample
+#--------------------------#
-.modgit/
+# Magento Default Files    #
-.modman/
+#--------------------------#
-app/code/community/Phoenix/Moneybookers/
+
-app/code/community/Cm/RedisSession/
+/app/etc/local.xml
-app/code/core/
+/media/*
-app/design/adminhtml/default/default/
+!/media/.htaccess
-app/design/frontend/base/
+!/media/customer/.htaccess
-app/design/frontend/rwd/
+!/media/dhl/logo.jpg
-app/design/frontend/default/blank/
+!/media/downloadable/.htaccess
-app/design/frontend/default/default/
+!/media/xmlconnect/custom/ok.gif
-app/design/frontend/default/iphone/
+!/media/xmlconnect/original/ok.gif
-app/design/frontend/default/modern/
+!/media/xmlconnect/system/ok.gif
-app/design/frontend/enterprise/default
+/var/*
-app/design/install/
+!/var/.htaccess
-app/etc/modules/Enterprise_*
+!/var/package/*.xml
-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/

Maven.gitignore

@@ -7,3 +7,6 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
+
+# Exclude maven wrapper
+!/.mvn/wrapper/maven-wrapper.jar

Nanoc.gitignore

@@ -1,6 +1,6 @@
-# For projects using nanoc (http://nanoc.ws/)
+# For projects using Nanoc (http://nanoc.ws/)
 
-# Default location for output, needs to match output_dir's value found in config.yaml
+# Default location for output (needs to match output_dir's value found in nanoc.yaml)
 output/
 
 # Temporary file directory

Node.gitignore

@@ -21,6 +21,9 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
+# Bower dependency directory (https://bower.io/)
+bower_components
+
 # node-waf configuration
 .lock-wscript
 
@@ -28,9 +31,9 @@ coverage
 build/Release
 
 # Dependency directories
-node_modules
+node_modules/
-jspm_packages
+jspm_packages/
-typings
+typings/
 
 # Optional npm cache directory
 .npm
@@ -40,3 +43,13 @@ typings
 
 # Optional REPL history
 .node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+

Objective-C.gitignore

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

OpenCart.gitignore

@@ -11,3 +11,10 @@ system/cache/
 system/logs/
 
 system/storage/
+
+# vQmod log files
+vqmod/logs/*
+# vQmod cache files
+vqmod/vqcache/*
+vqmod/checked.cache
+vqmod/mods.cache

Perl.gitignore

@@ -1,20 +1,35 @@
-/blib/
-/.build/
-_build/
-cover_db/
-inc/
-Build
 !Build/
-Build.bat
 .last_cover_stats
-/Makefile
-/Makefile.old
-/MANIFEST.bak
 /META.yml
 /META.json
 /MYMETA.*
-nytprof.out
-/pm_to_blib
 *.o
+*.pm.tdy
 *.bs
+
+# Devel::Cover
+cover_db/
+
+# Devel::NYTProf
+nytprof.out
+
+# Dizt::Zilla
+/.build/
+
+# Module::Build
+_build/
+Build
+Build.bat
+
+# Module::Install
+inc/
+
+# ExtUitls::MakeMaker
+/blib/
 /_eumm/
+/*.gz
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/pm_to_blib
+/*.zip

PureScript.gitignore

@@ -0,0 +1,8 @@
+# Dependencies
+.psci_modules
+bower_components
+node_modules
+
+# Generated files
+.psci
+output

Python.gitignore

@@ -20,6 +20,7 @@ lib64/
 parts/
 sdist/
 var/
+wheels/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -66,7 +67,7 @@ docs/_build/
 # PyBuilder
 target/
 
-# IPython Notebook
+# Jupyter Notebook
 .ipynb_checkpoints
 
 # pyenv
@@ -79,7 +80,7 @@ celerybeat-schedule
 .env
 
 # virtualenv
-.venv/
+.venv
 venv/
 ENV/
 

README.md

@@ -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

Rust.gitignore

@@ -5,3 +5,6 @@
 # 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
 Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk

Scala.gitignore

@@ -13,6 +13,8 @@ project/boot/
 project/plugins/project/
 
 # Scala-IDE specific
+.ensime
+.ensime_cache/
 .scala_dependencies
 .worksheet
 

Swift.gitignore

@@ -19,7 +19,8 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
@@ -35,6 +36,7 @@ playground.xcworkspace
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
 .build/
 
 # CocoaPods

Symfony.gitignore

@@ -31,9 +31,6 @@
 /web/bundles/
 /web/uploads/
 
-# Assets managed by Bower
-/web/assets/vendor/
-
 # PHPUnit
 /app/phpunit.xml
 /phpunit.xml
@@ -45,4 +42,4 @@
 /composer.phar
 
 # Backup entities generated with doctrine:generate:entities command
-*/Entity/*~
+**/Entity/*~

TeX.gitignore

@@ -52,15 +52,34 @@ acs-*.bib
 
 # beamer
 *.nav
+*.pre
 *.snm
 *.vrb
 
+# changes
+*.soc
+
 # cprotect
 *.cpt
 
+# elsarticle (documentclass of Elsevier journals)
+*.spl
+
+# endnotes
+*.ent
+
 # fixme
 *.lox
 
+# feynmf/feynmp
+*.mf
+*.mp
+*.t[1-9]
+*.t[1-9][0-9]
+*.tfm
+*.[1-9]
+*.[1-9][0-9]
+
 #(r)(e)ledmac/(r)(e)ledpar
 *.end
 *.?end
@@ -114,9 +133,7 @@ acs-*.bib
 *.maf
 *.mlf
 *.mlt
-*.mtc
+*.mtc[0-9]*
-*.mtc[0-9]
-*.mtc[1-9][0-9]
 
 # minted
 _minted*
@@ -131,6 +148,9 @@ _minted*
 # nomencl
 *.nlo
 
+# pax
+*.pax
+
 # sagetex
 *.sagetex.sage
 *.sagetex.py
@@ -193,5 +213,8 @@ TSWLatexianTemp*
 # KBibTeX
 *~[0-9]*
 
-# auto folder when using emacs and auctex 
+# auto folder when using emacs and auctex
 /auto/*
+
+# expex forward references with \gathertags
+*-tags.tex

Unity.gitignore

@@ -5,6 +5,9 @@
 /[Bb]uilds/
 /Assets/AssetStoreTools*
 
+# Visual Studio 2015 cache directory
+/.vs/
+
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/
@@ -18,6 +21,7 @@ ExportedObj/
 *.pidb
 *.booproj
 *.svd
+*.pdb
 
 
 # Unity3D generated meta files

UnrealEngine.gitignore

@@ -1,6 +1,9 @@
 # Visual Studio 2015 user specific files
 .vs/
 
+# Visual Studio 2015 database file
+*.VC.db
+
 # Compiled Object files
 *.slo
 *.lo
@@ -33,6 +36,7 @@
 
 # These project files can be generated by the engine
 *.xcodeproj
+*.xcworkspace
 *.sln
 *.suo
 *.opensdf
@@ -53,6 +57,9 @@ Build/*
 # Don't ignore icon files in Build
 !Build/**/*.ico
 
+# Built data for maps
+*_BuiltData.uasset
+
 # Configuration files generated by the Editor
 Saved/*
 

VisualStudio.gitignore

@@ -1,5 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -40,10 +42,11 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# .NET Core
 project.lock.json
 project.fragment.lock.json
 artifacts/
+**/Properties/launchSettings.json
 
 *_i.c
 *_p.c
@@ -239,6 +242,9 @@ typings/
 # Visual Studio 6 workspace options file
 *.opt
 
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -264,3 +270,7 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config

Waf.gitignore

@@ -1,4 +1,9 @@
-# for projects that use Waf for building: http://code.google.com/p/waf/
+# For projects that use the Waf build system: https://waf.io/
-.waf-*
+# Dot-hidden on Unix-like systems
-.waf3-*
+.waf-*-*/
-.lock-*
+.waf3-*-*/
+# Hidden directory on Windows (no dot)
+waf-*-*/
+waf3-*-*/
+# Lockfile
+.lock-waf_*_build