From 66b5df6788cf7b0a66467f87aec7277c85a054fa Mon Sep 17 00:00:00 2001
From: Daniel Naber <dnaber@apache.org>
Date: Sat, 26 Jan 2008 12:11:57 +0000
Subject: [PATCH] small typo fix in javadoc

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@615448 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/lucene/queryParser/QueryParser.java | 2 +-
 src/java/org/apache/lucene/queryParser/QueryParser.jj   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/lucene/queryParser/QueryParser.java b/src/java/org/apache/lucene/queryParser/QueryParser.java
index 70695c243c3..6c41beb0fdb 100644
--- a/src/java/org/apache/lucene/queryParser/QueryParser.java
+++ b/src/java/org/apache/lucene/queryParser/QueryParser.java
@@ -267,7 +267,7 @@ public class QueryParser implements QueryParserConstants {
    * In default mode (<code>OR_OPERATOR</code>) terms without any modifiers
    * are considered optional: for example <code>capital of Hungary</code> is equal to
    * <code>capital OR of OR Hungary</code>.<br/>
-   * In <code>AND_OPERATOR</code> mode terms are considered to be in conjuction: the
+   * In <code>AND_OPERATOR</code> mode terms are considered to be in conjunction: the
    * above mentioned query is parsed as <code>capital AND of AND Hungary</code>
    */
   public void setDefaultOperator(Operator op) {
diff --git a/src/java/org/apache/lucene/queryParser/QueryParser.jj b/src/java/org/apache/lucene/queryParser/QueryParser.jj
index 8ebad341c6f..3f3584a5f50 100644
--- a/src/java/org/apache/lucene/queryParser/QueryParser.jj
+++ b/src/java/org/apache/lucene/queryParser/QueryParser.jj
@@ -291,7 +291,7 @@ public class QueryParser {
    * In default mode (<code>OR_OPERATOR</code>) terms without any modifiers
    * are considered optional: for example <code>capital of Hungary</code> is equal to
    * <code>capital OR of OR Hungary</code>.<br/>
-   * In <code>AND_OPERATOR</code> mode terms are considered to be in conjuction: the
+   * In <code>AND_OPERATOR</code> mode terms are considered to be in conjunction: the
    * above mentioned query is parsed as <code>capital AND of AND Hungary</code>
    */
   public void setDefaultOperator(Operator op) {