Skip to content

Commit ea78180

Browse files
authored
Polishing
Original pull request: gh-591.
1 parent 3a80e1c commit ea78180

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

README.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ Key 5: b2898fc8130929d569c1677ee69dc5f3be57d7c4b494a6062693ce0b1c4d93d805
125125
Initial Root Token: 19aefa97-cccc-bbbb-aaaa-225940e63d76
126126
127127
Vault initialized with 5 keys and a key threshold of 3. Please
128-
securely distribute the above keys.When the Vault is re-sealed,
128+
securely distribute the above keys. When the Vault is re-sealed,
129129
restarted, or stopped, you must provide at least 3 of these keys
130130
to unseal it again.
131131
132-
Vault does not store the master key.Without at least 3 keys,
132+
Vault does not store the master key. Without at least 3 keys,
133133
your Vault will remain permanently sealed.
134134
----
135135

@@ -240,7 +240,7 @@ public class AppConfig {
240240

241241
==== Build requirements for Vault
242242

243-
Spring Vault requires SSL certificates and a running Vault instance listening on `localhost:8200`.Certificates and the Vault setup are scripted, the scripts are located in `src/test/bash`.
243+
Spring Vault requires SSL certificates and a running Vault instance listening on `localhost:8200`. Certificates and the Vault setup are scripted, the scripts are located in `src/test/bash`.
244244

245245
The following scripts need to be run prior to building the project for the tests to pass.
246246

@@ -261,11 +261,11 @@ Spring Vault uses Maven for most build-related activities, and you should be abl
261261
$ ./mvnw install
262262
----
263263

264-
NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command in place of `./mvnw` in the examples below.If you do that you also might need to add `-P spring` if your local Maven settings do not contain repository declarations for spring pre-release artifacts.
264+
NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command in place of `./mvnw` in the examples below. If you do that you also might need to add `-P spring` if your local Maven settings do not contain repository declarations for spring pre-release artifacts.
265265

266-
NOTE: Be aware that you might need to increase the amount of memory available to Maven by setting a `MAVEN_OPTS` environment variable with a value like `-Xmx512m -XX:MaxPermSize=128m`.We try to cover this in the `.mvn` configuration, so if you find you have to do it to make a build succeed, please raise a ticket to get the settings added to source control.
266+
NOTE: Be aware that you might need to increase the amount of memory available to Maven by setting a `MAVEN_OPTS` environment variable with a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in the `.mvn` configuration, so if you find you have to do it to make a build succeed, please raise a ticket to get the settings added to source control.
267267

268-
For hints on how to build the project look in `.travis.yml` if there is one.There should be a "script" and maybe "install" command.Also look at the "services" section to see if any services need to be running locally (e.g. mongo or rabbit).Ignore the git-related bits that you might find in "before_install" since they're related to setting git credentials and you already have those.
268+
For hints on how to build the project look in `.travis.yml` if there is one. There should be a "script" and maybe "install" command. Also look at the "services" section to see if any services need to be running locally (e.g. mongo or rabbit). Ignore the git-related bits that you might find in "before_install" since they're related to setting git credentials and you already have those.
269269

270270
NOTE: If all else fails, build with the command from `.travis.yml` (usually
271271
`./mvnw install`).
@@ -279,14 +279,14 @@ The module has a "distribute" profile, and if you switch that on it will try to
279279

280280
If you don't have an IDE preference we would recommend that you use
281281
https://www.springsource.com/developer/sts[Spring Tools Suite] or
282-
https://eclipse.org[Eclipse] when working with the code.We use the
283-
https://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support.Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better.
282+
https://eclipse.org[Eclipse] when working with the code. We use the
283+
https://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better.
284284

285285
==== Importing into eclipse with m2eclipse
286286

287-
We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with eclipse.If you don't already have m2eclipse installed it is available from the "eclipse marketplace".
287+
We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace".
288288

289-
NOTE: Older versions of m2e do not support Maven 3.3, so once the projects are imported into Eclipse you will also need to tell m2eclipse to use the right profile for the projects.If you see many different errors related to the POMs in the projects, check that you have an up to date installation.If you can't upgrade m2e, add the "spring" profile to your `settings.xml`.Alternatively you can copy the repository settings from the "spring" profile of the parent pom into your `settings.xml`.
289+
NOTE: Older versions of m2e do not support Maven 3.3, so once the projects are imported into Eclipse you will also need to tell m2eclipse to use the right profile for the projects.If you see many different errors related to the POMs in the projects, check that you have an up to date installation. If you can't upgrade m2e, add the "spring" profile to your `settings.xml`. Alternatively you can copy the repository settings from the "spring" profile of the parent pom into your `settings.xml`.
290290

291291
==== Importing into eclipse without m2eclipse
292292

@@ -302,13 +302,13 @@ from the `file` menu.
302302

303303
== Contributing
304304

305-
Spring Vault is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master.If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
305+
Spring Vault is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
306306

307307
=== Sign the Contributor License Agreement
308308

309309
Before we accept a non-trivial patch or pull request we will need you to sign the
310310
https://cla.pivotal.io/sign/spring[Contributor License Agreement].
311-
Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.Active contributors might be asked to join the core team, and given the ability to merge pull requests.
311+
Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
312312

313313
=== Code of Conduct
314314

0 commit comments

Comments
 (0)