Merge branch 'utf-8-characters' into 3.x

nebhale · nebhale · commit d02edbb8fb4d · 2017-05-02T09:24:52.000-07:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-_Have something you’d like to contribute to the buildpack? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Cloud Foundry Java Experience team when evaluating your submission._
+_Have something you'd like to contribute to the buildpack? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Cloud Foundry Java Experience team when evaluating your submission._
 
 _Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!_
 
diff --git a/docs/buildpack-modes.md b/docs/buildpack-modes.md
@@ -2,7 +2,7 @@
 The Java Buildpack has three execution modes as described in the blog post, ['Packaged and Offline Buildpacks'][l].
 
 * **Easy Mode:** Uses the repository at `https://java-buildpack.cloudfoundry.org`. This does not require any cloning or downloading unless you want to modify the Cloud Foundry provided buildpack. This is the default, and what we recommend to anyone who asks.
-* **Expert Mode:**   Refers to a repository hosted at a different location, possibly on an internal network.  The [structure of the repository][r] is defined as an HTTP-accessible collection of files. The repository root must contain an `index.yml` file that is a mapping of concrete versions to absolute URIs.  This repository can be created manually or [creating a replica](#replicating-the-repository-optional) for the repository at `https://java-buildpack.cloudfoundry.org`.  This is what we would recommend to any customer that didn’t want to access the Internet. It’s easy to keep applications secure and up-to-date, but requires the expertise to run a web-server and keep it up to date.
+* **Expert Mode:**   Refers to a repository hosted at a different location, possibly on an internal network.  The [structure of the repository][r] is defined as an HTTP-accessible collection of files. The repository root must contain an `index.yml` file that is a mapping of concrete versions to absolute URIs.  This repository can be created manually or [creating a replica](#replicating-the-repository-optional) for the repository at `https://java-buildpack.cloudfoundry.org`.  This is what we would recommend to any customer that didn't want to access the Internet. It's easy to keep applications secure and up-to-date, but requires the expertise to run a web-server and keep it up to date.
 * **Offline Mode:** Uses only the packaged internal cache. This is what we recommend if you wanted a single, self-contained artifact. The downside is having to package and keep all your dependencies up to date.
 
 
diff --git a/lib/java_buildpack/buildpack.rb b/lib/java_buildpack/buildpack.rb
@@ -188,7 +188,7 @@ def names(components)
     end
 
     def no_container
-      raise 'No container can run this application. Please ensure that you’ve pushed a valid JVM artifact or ' \
+      raise 'No container can run this application. Please ensure that you\'ve pushed a valid JVM artifact or ' \
             'artifacts using the -p command line argument or path manifest entry. Information about valid JVM ' \
             'artifacts can be found at https://github.com/cloudfoundry/java-buildpack#additional-documentation. '
     end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-_Have something you’d like to contribute to the buildpack? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Cloud Foundry Java Experience team when evaluating your submission._`
	`1`	`+_Have something you'd like to contribute to the buildpack? We welcome pull requests, but ask that you carefully read this document first to understand how best to submit them; what kind of changes are likely to be accepted; and what to expect from the Cloud Foundry Java Experience team when evaluating your submission._`
`2`	`2`
`3`	`3`	`_Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!_`
`4`	`4`