Merge branch 'stable-5.0'

* stable-5.0:
  Fix Javadoc typo

Change-Id: Ib864f5871f8e99d2a776b7ae9f782ec3eb312d50
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-06-11 08:09:00 +09:00
commit 0bcf88bc0d
1 changed files with 2 additions and 2 deletions

View File

@ -237,7 +237,7 @@ protected final void setPlatformChecker() {
public abstract FileBasedConfig openUserConfig(Config parent, FS fs);
/**
* Open the gitonfig configuration found in the system-wide "etc" directory
* Open the gitconfig configuration found in the system-wide "etc" directory
*
* @param parent
* a config with values not found directly in the returned
@ -245,7 +245,7 @@ protected final void setPlatformChecker() {
* @param fs
* the file system abstraction which will be necessary to perform
* certain file system operations.
* @return the gitonfig configuration found in the system-wide "etc"
* @return the gitconfig configuration found in the system-wide "etc"
* directory
*/
public abstract FileBasedConfig openSystemConfig(Config parent, FS fs);