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

Author: atsticks

src/main/java/javax/money/spi/Bootstrap.java

@@ -4,7 +4,7 @@
  * AGREEMENT CAREFULLY. BY DOWNLOADING 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.
+ * (c) 2012-2015, Credit Suisse All rights reserved.
  */
 package javax.money.spi;
 
@@ -123,4 +123,4 @@ public static <T> T getService(Class<T> serviceType) {
                 .orElse(null);
     }
 
-}
+}

src/main/java/javax/money/spi/MonetaryConversionsSingletonSpi.java

@@ -1,11 +1,10 @@
 /*
- * Copyright (c) 2012, 2013, Credit Suisse (Anatole Tresch), Werner Keil. Licensed under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * CREDIT SUISSE IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU
+ * ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT. PLEASE READ THE TERMS AND CONDITIONS OF THIS
+ * AGREEMENT CAREFULLY. BY DOWNLOADING 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-2015, Credit Suisse All rights reserved.
  */
 package javax.money.spi;
 
@@ -37,6 +36,7 @@
  * not work.
  *
  * @author Anatole Tresch
+ * @author Werner Keil
  */
 public interface MonetaryConversionsSingletonSpi {
 
@@ -176,7 +176,7 @@ default ExchangeRateProvider getExchangeRateProvider(String... providers) {
      *
      * @param conversionQuery the {@link javax.money.convert.ConversionQuery} determining the tpye of conversion
      *                        required, not null.
-     * @return the correspöonding conversion, not null.
+     * @return the corresponding conversion, not null.
      * @throws javax.money.MonetaryException if no matching conversion could be found.
      * @see #isConversionAvailable(javax.money.convert.ConversionQuery)
      */
@@ -202,4 +202,4 @@ default CurrencyConversion getConversion(CurrencyUnit termCurrency, String... pr
         return getConversion(ConversionQueryBuilder.of().setTermCurrency(termCurrency).setProviderNames(providers).build());
     }
 
-}
+}