Skip to content

Commit

Permalink
doclint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylong committed Mar 5, 2016
1 parent a1f0cf7 commit b425411
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ public static void setIntIfNotNull(String key, Integer value) {

/**
* Merges a new properties file into the current properties. This method allows for the loading of a user provided properties
* file.<br/><br/>
* Note: even if using this method - system properties will be loaded before properties loaded from files.
* file.<br><br>
* <b>Note</b>: even if using this method - system properties will be loaded before properties loaded from files.
*
* @param filePath the path to the properties file to merge.
* @throws FileNotFoundException is thrown when the filePath points to a non-existent file
Expand All @@ -552,7 +552,7 @@ public static void mergeProperties(File filePath) throws FileNotFoundException,

/**
* Merges a new properties file into the current properties. This method allows for the loading of a user provided properties
* file.<br/><br/>
* file.<br><br>
* Note: even if using this method - system properties will be loaded before properties loaded from files.
*
* @param filePath the path to the properties file to merge.
Expand All @@ -577,8 +577,8 @@ public static void mergeProperties(String filePath) throws FileNotFoundException

/**
* Merges a new properties file into the current properties. This method allows for the loading of a user provided properties
* file.<br/><br/>
* Note: even if using this method - system properties will be loaded before properties loaded from files.
* file.<br><br>
* <b>Note</b>: even if using this method - system properties will be loaded before properties loaded from files.
*
* @param stream an Input Stream pointing at a properties file to merge
* @throws IOException is thrown when there is an exception loading/merging the properties
Expand Down

0 comments on commit b425411

Please sign in to comment.