Merge branch 'master' of https://github.com/JavaMoney/jsr354-api

Author: atsticks

pom.xml

@@ -5,7 +5,7 @@
 	THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE AGREEMENT. 
 	IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT 
 	THE BOTTOM OF THIS PAGE. Specification: JSR-354 Money and Currency API ("Specification") 
-	Copyright (c) 2012-2013, Credit Suisse All rights reserved. -->
+	Copyright (c) 2012-2015, Credit Suisse All rights reserved. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
@@ -190,8 +190,8 @@
     </developers>
 
     <ciManagement>
-        <system>Jenkins</system>
-        <url>https://jsr354.ci.cloudbees.com/</url>
+        <system>Travis CI</system>
+        <url>https://travis-ci.org/JavaMoney/jsr354-api</url>
     </ciManagement>
 
     <mailingLists>

src/main/asciidoc/JavaMoneySpecification.adoc

@@ -280,7 +280,7 @@ JSR 354 targets to support all general application areas, e.g.
 * etc.
 
 This specification will not discuss low latency concerns as required for example by algorithmic trading applications.
-Nevertheless the API was designed to support different implementations of monetary amounts and allows to be extended in
+Nevertheless the API was designed to support different implementations of monetary amounts and allows for extension in
 several ways. So it should be flexible enough that corresponding implementations can be used transparently to
 accommodate such applications.
 
@@ -869,8 +869,8 @@ public abstract class NumberValue extends java.lang.Number{
 
 Hereby
 
-. +getNumberType()+ provides information about the numeric representation used internally. It does explicitly not
-  constraint the type returned to be a subtype of +java.lang.Number+ to allow also alternate implementations used.
+. +getNumberType()+ provides information about the numeric representation used internally. It explicitly does not 
+ constrain the type returned to be a subtype of +java.lang.Number+ to allow alternate implementations to be used.
 . +intValueExact(), longValueExact(), doubleValueExact()+ extend the methods defined in +java.lang.Number+, with their
   exact variants. Exact means, that it is required to throw an +ArithmeticException+, if the current numeric value must
   be truncated to fit into the required target type. So in the following cases an exception must be thrown:
@@ -2690,9 +2690,9 @@ The implementation that implements the API’s SPI may use a different logging a
 == Meta-Data Contexts and Query Models ==
 === Overview ===
 
-The JSR uses a unified meta-data model to support more advanced use cases, which are not explicitly specified.
-Mostly reasons for not specifying these aspects is that these things are highly use case and organization dependent
-aspects. In general there are 2 flavors of meta-data used throughout the JSR:
+The JSR uses a unified meta-data model to support more advanced use cases, which are not explicitly specified. 
+The main reason for not specifying these aspects is that they are highly use case and organization dependent.
+In general there are two flavors of meta-data used throughout the JSR: 
 
 . _Contexts_ provide additional information on value types or services, such as currencies, amounts, conversions or
   formats. Contexts are accessible directly from the corresponding value types, by calling methods named