feat(master):pull master

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+<!--
+!!! For Security Vulnerabilities, please go to https://pivotal.io/security !!!
+-->
+**Affects:** \<Spring Framework version>
+
+---
+<!--
+Thanks for taking the time to create an issue. Please read the following:
+
+- Questions should be asked on Stack Overflow.
+- For bugs, specify affected versions and explain what you are trying to do.
+- For enhancements, provide context and describe the problem.
+
+Issue or Pull Request? Create only one, not both. GitHub treats them as the same.
+If unsure, start with an issue, and if you submit a pull request later, the
+issue will be closed as superseded.
+-->

CONTRIBUTING.md

@@ -29,7 +29,7 @@ If you have a question, check StackOverflow using
 Find an existing discussion or start a new one if necessary.
 
 If you suspect an issue, perform a search in the
-[JIRA issue tracker](https://jira.spring.io/browse/SPR), using a few different keywords.
+[GitHub issue tracker](https://github.com/spring-projects/spring-framework/issues), using a few different keywords.
 When you find related issues and discussions, prior or current, it helps you to learn and
 it helps us to make a decision.
 
@@ -42,7 +42,7 @@ Before you create a ticket, please take the time to [research first](#discuss).
 
 If creating a ticket after a discussion on StackOverflow, please provide a self-sufficient description in the ticket, independent of the details on StackOverview. We understand this is extra work but the issue tracker is an important place of record for design discussions and decisions that can often be referenced long after the fix version, for example to revisit decisions, to understand the origin of a feature, and so on.
 
-When ready create a ticket in the [JIRA issue tracker](https://jira.spring.io/browse/SPR).
+When ready create a ticket in the [GitHub issue tracker](https://github.com/spring-projects/spring-framework/issues).
 
 #### Ticket Lifecycle
 
@@ -66,7 +66,7 @@ automatically when you submit a pull request.
 
 1. For all but the most trivial of contributions, please [create a ticket](#create-a-ticket).
 The purpose of the ticket is to understand and discuss the underlying issue or feature.
-We use the JIRA issue tracker as the preferred place of record for conversations and
+We use the GitHub issue tracker as the preferred place of record for conversations and
 conclusions. In that sense discussions directly under a PR are more implementation detail
 oriented and transient in nature.
 
@@ -75,21 +75,21 @@ oriented and transient in nature.
 Backports to prior versions will be considered on a case-by-case basis and reflected as
 the fix version in the issue tracker.
 
-1. Use short branch names, preferably based on the JIRA issue (e.g. `SPR-1234`), or
-otherwise using succinct, lower-case, dash (-) delimited names, such as `fix-warnings'.
+1. Use short branch names, preferably based on the GitHub issue (e.g. `22276`), or
+otherwise using succinct, lower-case, dash (-) delimited names, such as `fix-warnings`.
 
 1. Choose the granularity of your commits consciously and squash commits that represent
 multiple edits or corrections of the same logical change. See
 [Rewriting History section of Pro Git](http://git-scm.com/book/en/Git-Tools-Rewriting-History)
 for an overview of streamlining commit history.
 
 1. Format commit messages using 55 characters for the subject line, 72 lines for the
-description, followed by related issues, e.g. `Issues: SPR-1234, SPR-1235`.
+description, followed by the issue fixed, e.g. `Fixes #22276`.
 See the
 [Commit Guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)
 for best practices around commit messages and use `git log` to see some examples.
 
-1. List the JIRA issue number in the PR description.
+1. List the GitHub issue number in the PR description.
 
 If accepted, your contribution may be heavily modified as needed prior to merging.
 You will likely retain author attribution for your Git commits granted that the bulk of
@@ -116,7 +116,7 @@ defines the source file coding standards we use along with some IDEA editor sett
 
 The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) directory and, in
 [Asciidoctor](http://asciidoctor.org/) format. For trivial changes, you may be able to browse,
-edit source files, and submit directly from Github.
+edit source files, and submit directly from GitHub.
 
 When making changes locally, use `./gradlew asciidoctor` and then browse the result under
 `build/asciidoc/html5/index.html`.

README.md

@@ -1,48 +1,30 @@
 # <img src="src/docs/asciidoc/images/spring-framework.png" width="80" height="80"> Spring Framework
 
-This is the home of the Spring Framework, the foundation for all
-[Spring projects](https://spring.io/projects). Together the Spring Framework and the family of Spring projects make up what we call "Spring". 
+This is the home of the Spring Framework: the foundation for all [Spring projects](https://spring.io/projects). Collectively the Spring Framework and the family of Spring projects is often referred to simply as "Spring". 
 
-Spring provides everything you need beyond the Java language to create enterprise
-applications in a wide range of scenarios and architectures. Please read the
-[Overview](https://docs.spring.io/spring/docs/current/spring-framework-reference/overview.html#spring-introduction)
-section in the reference for a more complete introduction.
+Spring provides everything required beyond the Java programming language for creating enterprise applications for a wide range of scenarios and architectures. Please read the [Overview](https://docs.spring.io/spring/docs/current/spring-framework-reference/overview.html#spring-introduction) section as reference for a more complete introduction.
 
 ## Code of Conduct
 
-This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
-By participating you are expected to uphold this code.
-Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
 ## Access to Binaries
 
-For access to artifacts or a distribution zip, see the
-[Spring Framework Artifacts](https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Artifacts)
-wiki page.
+For access to artifacts or a distribution zip, see the [Spring Framework Artifacts](https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Artifacts) wiki page.
 
 ## Documentation
 
-The Spring Frameworks maintains reference documentation
-([published](http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and
-[source](src/docs/asciidoc)),
-Github [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
-[API reference](http://docs.spring.io/spring-framework/docs/current/javadoc-api/).
-There are also [guides and tutorials](https://spring.io/guides) across Spring projects.
+The Spring Framework maintains reference documentation ([published](http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and [source](src/docs/asciidoc)), Github [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
+[API reference](http://docs.spring.io/spring-framework/docs/current/javadoc-api/). There are also [guides and tutorials](https://spring.io/guides) across Spring projects.
 
 ## Build from Source
 
-See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source)
-wiki page and also [CONTRIBUTING.md](CONTRIBUTING.md).
+See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source) Wikipedia page and the [CONTRIBUTING.md](CONTRIBUTING.md) file.
 
 ## Stay in Touch
 
-Follow [@SpringCentral](https://twitter.com/springcentral),
-[@SpringFramework](https://twitter.com/springframework), and its
-[team members](https://twitter.com/springframework/lists/team/members) on Twitter.
-In-depth articles can be found at [The Spring Blog](http://spring.io/blog/),
-and releases are announced via our [news feed](http://spring.io/blog/category/news).
+Follow [@SpringCentral](https://twitter.com/springcentral), [@SpringFramework](https://twitter.com/springframework), and its [team members](https://twitter.com/springframework/lists/team/members) on Twitter. In-depth articles can be found at [The Spring Blog](http://spring.io/blog/), and releases are announced via our [news feed](http://spring.io/blog/category/news).
 
 ## License
 
-The Spring Framework is released under version 2.0 of the
-[Apache License](http://www.apache.org/licenses/LICENSE-2.0).
+The Spring Framework is released under version 2.0 of the [Apache License](http://www.apache.org/licenses/LICENSE-2.0).