summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2016-07-04 18:23:52 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2016-07-04 18:23:55 -0400
commit65e3a3abf24c78c43f10f767b2c98d83ca8d7406 (patch)
tree4dc737fc870e8fa8e95d0fe2bc88cf0bf7e5cc2c /org.eclipse.jgit
parent7803c25f5412c6fe12ba26e4df0265322522d582 (diff)
parente9bed8de62840b178b2e8a301ef13f15f79342ee (diff)
downloadjgit-65e3a3abf24c78c43f10f767b2c98d83ca8d7406.tar.gz
jgit-65e3a3abf24c78c43f10f767b2c98d83ca8d7406.zip
Merge "UploadPack: Correct typo of negotiation in Javadoc"
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index e49ee87b73..ac8f5f61f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -682,7 +682,7 @@ public class UploadPack {
* Get the PackWriter's statistics if a pack was sent to the client.
*
* @return statistics about pack output, if a pack was sent. Null if no pack
- * was sent, such as during the negotation phase of a smart HTTP
+ * was sent, such as during the negotiation phase of a smart HTTP
* connection, or if the client was already up-to-date.
* @since 3.0
* @deprecated Use {@link #getStatistics()}.
@@ -697,7 +697,7 @@ public class UploadPack {
* Get the PackWriter's statistics if a pack was sent to the client.
*
* @return statistics about pack output, if a pack was sent. Null if no pack
- * was sent, such as during the negotation phase of a smart HTTP
+ * was sent, such as during the negotiation phase of a smart HTTP
* connection, or if the client was already up-to-date.
* @since 4.1
*/