You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/11/28 04:19:55 UTC
svn commit: r1642260 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/memory/
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/ lucene/core/
lucene/core/src/java/org/apache/lucene/...
Author: rmuir
Date: Fri Nov 28 03:19:54 2014
New Revision: 1642260
URL: http://svn.apache.org/r1642260
Log:
backport docs fixes
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
lucene/dev/branches/branch_5x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java
lucene/dev/branches/branch_5x/solr/ (props changed)
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Fri Nov 28 03:19:54 2014
@@ -58,7 +58,7 @@ import org.apache.lucene.util.automaton.
* storage, but then at read time loads and stores all
* terms and postings directly in RAM as byte[], int[].
*
- * <p><b><font color=red>WARNING</font></b>: This is
+ * <p><b>WARNING</b>: This is
* exceptionally RAM intensive: it makes no effort to
* compress the postings data, storing terms as separate
* byte[] and postings as separate int[], but as a result it
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java Fri Nov 28 03:19:54 2014
@@ -31,7 +31,7 @@ import org.apache.lucene.codecs.TermVect
/**
* plain text index format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public final class SimpleTextCodec extends Codec {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java Fri Nov 28 03:19:54 2014
@@ -44,7 +44,7 @@ import org.apache.lucene.util.StringHelp
/**
* plain text compound format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextCompoundFormat extends CompoundFormat {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java Fri Nov 28 03:19:54 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.index.SegmentWr
/**
* plain text doc values format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* <p>
* the .dat file contains the data.
* for numbers this is a "fixed-width" file, for example a single byte range:
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java Fri Nov 28 03:19:54 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.StringHelp
/**
* plaintext field infos format
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextFieldInfosFormat extends FieldInfosFormat {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java Fri Nov 28 03:19:54 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.UnicodeUti
/**
* reads/writes plaintext live docs
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextLiveDocsFormat extends LiveDocsFormat {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Fri Nov 28 03:19:54 2014
@@ -33,7 +33,7 @@ import org.apache.lucene.util.Accountabl
/**
* plain-text norms format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
*
* @lucene.experimental
*/
@@ -53,7 +53,7 @@ public class SimpleTextNormsFormat exten
/**
* Reads plain-text norms.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
*
* @lucene.experimental
*/
@@ -100,7 +100,7 @@ public class SimpleTextNormsFormat exten
/**
* Writes plain-text norms.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
*
* @lucene.experimental
*/
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java Fri Nov 28 03:19:54 2014
@@ -43,7 +43,7 @@ import org.apache.lucene.util.Version;
/**
* plain text segments file format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextSegmentInfoFormat extends SegmentInfoFormat {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java Fri Nov 28 03:19:54 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext
/**
* plain text stored fields format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextStoredFieldsFormat extends StoredFieldsFormat {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Fri Nov 28 03:19:54 2014
@@ -49,7 +49,7 @@ import static org.apache.lucene.codecs.s
/**
* reads plaintext stored fields
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextStoredFieldsReader extends StoredFieldsReader {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java Fri Nov 28 03:19:54 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.util.IOUtils;
/**
* Writes plain-text stored fields.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextStoredFieldsWriter extends StoredFieldsWriter {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java Fri Nov 28 03:19:54 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext
/**
* plain text term vectors format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextTermVectorsFormat extends TermVectorsFormat {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Fri Nov 28 03:19:54 2014
@@ -54,7 +54,7 @@ import static org.apache.lucene.codecs.s
/**
* Reads plain-text term vectors.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextTermVectorsReader extends TermVectorsReader {
Modified: lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java Fri Nov 28 03:19:54 2014
@@ -33,7 +33,7 @@ import org.apache.lucene.util.IOUtils;
/**
* Writes plain-text term vectors.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextTermVectorsWriter extends TermVectorsWriter {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java Fri Nov 28 03:19:54 2014
@@ -80,11 +80,11 @@ import org.apache.lucene.util.BytesRef;
* of the weighted query vectors <i>V(q)</i> and <i>V(d)</i>:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="formatting only">
+ * <table cellpadding="2" cellspacing="2" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="1" cellspacing="0" border="1" align="center" summary="formatting only">
+ * <table cellpadding="1" cellspacing="0" border="1" style="margin-left:auto; margin-right:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" summary="cosine similarity formula">
+ * <table cellpadding="2" cellspacing="2" border="0" style="margin-left:auto; margin-right:auto" summary="cosine similarity formula">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* cosine-similarity(q,d) =
@@ -102,7 +102,7 @@ import org.apache.lucene.util.BytesRef;
* </table>
* </td></tr>
* <tr><td>
- * <center><font size=-1><u>VSM Score</u></font></center>
+ * <center><u>VSM Score</u></center>
* </td></tr>
* </table>
* <br> <br>
@@ -165,27 +165,27 @@ import org.apache.lucene.util.BytesRef;
* we get <i>Lucene's Conceptual scoring formula</i>:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="formatting only">
+ * <table cellpadding="2" cellspacing="2" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="1" cellspacing="0" border="1" align="center" summary="formatting only">
+ * <table cellpadding="1" cellspacing="0" border="1" style="margin-left:auto; margin-right:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" summary="formatting only">
+ * <table cellpadding="2" cellspacing="2" border="0" style="margin-left:auto; margin-right:auto" summary="formatting only">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* score(q,d) =
- * <font color="#FF9933">coord-factor(q,d)</font> ·
- * <font color="#CCCC00">query-boost(q)</font> ·
+ * <span style="color: #FF9933">coord-factor(q,d)</span> ·
+ * <span style="color: #CCCC00">query-boost(q)</span> ·
* </td>
* <td valign="middle" align="center">
* <table summary="Lucene conceptual scoring formula">
- * <tr><td align="center" style="text-align: center"><small><font color="#993399">V(q) · V(d)</font></small></td></tr>
+ * <tr><td align="center" style="text-align: center"><small><span style="color: #993399">V(q) · V(d)</span></small></td></tr>
* <tr><td align="center" style="text-align: center">–––––––––</td></tr>
- * <tr><td align="center" style="text-align: center"><small><font color="#FF33CC">|V(q)|</font></small></td></tr>
+ * <tr><td align="center" style="text-align: center"><small><span style="color: #FF33CC">|V(q)|</span></small></td></tr>
* </table>
* </td>
* <td valign="middle" align="right" rowspan="1">
- * · <font color="#3399FF">doc-len-norm(d)</font>
- * · <font color="#3399FF">doc-boost(d)</font>
+ * · <span style="color: #3399FF">doc-len-norm(d)</span>
+ * · <span style="color: #3399FF">doc-boost(d)</span>
* </td>
* </tr>
* </table>
@@ -193,7 +193,7 @@ import org.apache.lucene.util.BytesRef;
* </table>
* </td></tr>
* <tr><td>
- * <center><font size=-1><u>Lucene Conceptual Scoring Formula</u></font></center>
+ * <center><u>Lucene Conceptual Scoring Formula</u></center>
* </td></tr>
* </table>
* <br> <br>
@@ -257,26 +257,26 @@ import org.apache.lucene.util.BytesRef;
* to those of the <i>conceptual</i> formula:
*
* <P>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="formatting only">
+ * <table cellpadding="2" cellspacing="2" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="" cellspacing="2" border="2" align="center" summary="formatting only">
+ * <table cellpadding="" cellspacing="2" border="2" style="margin-left:auto; margin-right:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" summary="Lucene conceptual scoring formula">
+ * <table cellpadding="2" cellspacing="2" border="0" style="margin-left:auto; margin-right:auto" summary="Lucene conceptual scoring formula">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* score(q,d) =
- * <A HREF="#formula_coord"><font color="#FF9933">coord(q,d)</font></A> ·
- * <A HREF="#formula_queryNorm"><font color="#FF33CC">queryNorm(q)</font></A> ·
+ * <A HREF="#formula_coord"><span style="color: #FF9933">coord(q,d)</span></A> ·
+ * <A HREF="#formula_queryNorm"><span style="color: #FF33CC">queryNorm(q)</span></A> ·
* </td>
* <td valign="bottom" align="center" rowspan="1" style="text-align: center">
* <big><big><big>∑</big></big></big>
* </td>
* <td valign="middle" align="right" rowspan="1">
* <big><big>(</big></big>
- * <A HREF="#formula_tf"><font color="#993399">tf(t in d)</font></A> ·
- * <A HREF="#formula_idf"><font color="#993399">idf(t)</font></A><sup>2</sup> ·
- * <A HREF="#formula_termBoost"><font color="#CCCC00">t.getBoost()</font></A> ·
- * <A HREF="#formula_norm"><font color="#3399FF">norm(t,d)</font></A>
+ * <A HREF="#formula_tf"><span style="color: #993399">tf(t in d)</span></A> ·
+ * <A HREF="#formula_idf"><span style="color: #993399">idf(t)</span></A><sup>2</sup> ·
+ * <A HREF="#formula_termBoost"><span style="color: #CCCC00">t.getBoost()</span></A> ·
+ * <A HREF="#formula_norm"><span style="color: #3399FF">norm(t,d)</span></A>
* <big><big>)</big></big>
* </td>
* </tr>
@@ -290,7 +290,7 @@ import org.apache.lucene.util.BytesRef;
* </table>
* </td></tr>
* <tr><td>
- * <center><font size=-1><u>Lucene Practical Scoring Function</u></font></center>
+ * <center><u>Lucene Practical Scoring Function</u></center>
* </td></tr>
* </table>
*
@@ -310,7 +310,7 @@ import org.apache.lucene.util.BytesRef;
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#tf(float) DefaultSimilarity} is:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="term frequency computation">
+ * <table cellpadding="2" cellspacing="2" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="term frequency computation">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#tf(float) tf(t in d)} =
@@ -335,7 +335,7 @@ import org.apache.lucene.util.BytesRef;
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#idf(long, long) DefaultSimilarity} is:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="inverse document frequency computation">
+ * <table cellpadding="2" cellspacing="2" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="inverse document frequency computation">
* <tr>
* <td valign="middle" align="right">
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#idf(long, long) idf(t)} =
@@ -383,7 +383,7 @@ import org.apache.lucene.util.BytesRef;
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#queryNorm(float) DefaultSimilarity}
* produces a <a href="http://en.wikipedia.org/wiki/Euclidean_norm#Euclidean_norm">Euclidean norm</a>:
* <br> <br>
- * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto" summary="query normalization computation">
+ * <table cellpadding="1" cellspacing="0" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="query normalization computation">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* queryNorm(q) =
@@ -409,7 +409,7 @@ import org.apache.lucene.util.BytesRef;
* computes this value as:
*
* <br> <br>
- * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto" summary="sum of squared weights computation">
+ * <table cellpadding="1" cellspacing="0" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="sum of squared weights computation">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* {@link org.apache.lucene.search.Weight#getValueForNormalization() sumOfSquaredWeights} =
@@ -475,7 +475,7 @@ import org.apache.lucene.util.BytesRef;
* If the document has multiple fields with the same name, all their boosts are multiplied together:
*
* <br> <br>
- * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto" summary="index-time normalization">
+ * <table cellpadding="1" cellspacing="0" border="0" style="width:auto; margin-left:auto; margin-right:auto" summary="index-time normalization">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* norm(t,d) =
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java Fri Nov 28 03:19:54 2014
@@ -97,88 +97,88 @@ public abstract class DataOutput {
* <col width="64*">
* <col width="64*">
* <tr valign="top">
- * <th align="left" width="25%">Value</th>
- * <th align="left" width="25%">Byte 1</th>
- * <th align="left" width="25%">Byte 2</th>
- * <th align="left" width="25%">Byte 3</th>
+ * <th align="left">Value</th>
+ * <th align="left">Byte 1</th>
+ * <th align="left">Byte 2</th>
+ * <th align="left">Byte 3</th>
* </tr>
* <tr valign="bottom">
- * <td width="25%">0</td>
- * <td width="25%"><kbd>00000000</kbd></td>
- * <td width="25%"></td>
- * <td width="25%"></td>
+ * <td>0</td>
+ * <td><kbd>00000000</kbd></td>
+ * <td></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">1</td>
- * <td width="25%"><kbd>00000001</kbd></td>
- * <td width="25%"></td>
- * <td width="25%"></td>
+ * <td>1</td>
+ * <td><kbd>00000001</kbd></td>
+ * <td></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">2</td>
- * <td width="25%"><kbd>00000010</kbd></td>
- * <td width="25%"></td>
- * <td width="25%"></td>
+ * <td>2</td>
+ * <td><kbd>00000010</kbd></td>
+ * <td></td>
+ * <td></td>
* </tr>
* <tr>
- * <td valign="top" width="25%">...</td>
- * <td valign="bottom" width="25%"></td>
- * <td valign="bottom" width="25%"></td>
- * <td valign="bottom" width="25%"></td>
+ * <td valign="top">...</td>
+ * <td valign="bottom"></td>
+ * <td valign="bottom"></td>
+ * <td valign="bottom"></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">127</td>
- * <td width="25%"><kbd>01111111</kbd></td>
- * <td width="25%"></td>
- * <td width="25%"></td>
+ * <td>127</td>
+ * <td><kbd>01111111</kbd></td>
+ * <td></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">128</td>
- * <td width="25%"><kbd>10000000</kbd></td>
- * <td width="25%"><kbd>00000001</kbd></td>
- * <td width="25%"></td>
+ * <td>128</td>
+ * <td><kbd>10000000</kbd></td>
+ * <td><kbd>00000001</kbd></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">129</td>
- * <td width="25%"><kbd>10000001</kbd></td>
- * <td width="25%"><kbd>00000001</kbd></td>
- * <td width="25%"></td>
+ * <td>129</td>
+ * <td><kbd>10000001</kbd></td>
+ * <td><kbd>00000001</kbd></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">130</td>
- * <td width="25%"><kbd>10000010</kbd></td>
- * <td width="25%"><kbd>00000001</kbd></td>
- * <td width="25%"></td>
+ * <td>130</td>
+ * <td><kbd>10000010</kbd></td>
+ * <td><kbd>00000001</kbd></td>
+ * <td></td>
* </tr>
* <tr>
- * <td valign="top" width="25%">...</td>
- * <td width="25%"></td>
- * <td width="25%"></td>
- * <td width="25%"></td>
+ * <td valign="top">...</td>
+ * <td></td>
+ * <td></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">16,383</td>
- * <td width="25%"><kbd>11111111</kbd></td>
- * <td width="25%"><kbd>01111111</kbd></td>
- * <td width="25%"></td>
+ * <td>16,383</td>
+ * <td><kbd>11111111</kbd></td>
+ * <td><kbd>01111111</kbd></td>
+ * <td></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">16,384</td>
- * <td width="25%"><kbd>10000000</kbd></td>
- * <td width="25%"><kbd>10000000</kbd></td>
- * <td width="25%"><kbd>00000001</kbd></td>
+ * <td>16,384</td>
+ * <td><kbd>10000000</kbd></td>
+ * <td><kbd>10000000</kbd></td>
+ * <td><kbd>00000001</kbd></td>
* </tr>
* <tr valign="bottom">
- * <td width="25%">16,385</td>
- * <td width="25%"><kbd>10000001</kbd></td>
- * <td width="25%"><kbd>10000000</kbd></td>
- * <td width="25%"><kbd>00000001</kbd></td>
+ * <td>16,385</td>
+ * <td><kbd>10000001</kbd></td>
+ * <td><kbd>10000000</kbd></td>
+ * <td><kbd>00000001</kbd></td>
* </tr>
* <tr>
- * <td valign="top" width="25%">...</td>
- * <td valign="bottom" width="25%"></td>
- * <td valign="bottom" width="25%"></td>
- * <td valign="bottom" width="25%"></td>
+ * <td valign="top">...</td>
+ * <td valign="bottom"></td>
+ * <td valign="bottom"></td>
+ * <td valign="bottom"></td>
* </tr>
* </table>
* <p>This provides compression while still being efficient to decode.</p>
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java Fri Nov 28 03:19:54 2014
@@ -41,14 +41,14 @@ import java.util.concurrent.Future; // j
* for details.
* </p>
* <p>
- * <font color="red"><b>NOTE:</b> Accessing this class either directly or
+ * <b>NOTE:</b> Accessing this class either directly or
* indirectly from a thread while it's interrupted can close the
* underlying file descriptor immediately if at the same time the thread is
* blocked on IO. The file descriptor will remain closed and subsequent access
* to {@link NIOFSDirectory} will throw a {@link ClosedChannelException}. If
* your application uses either {@link Thread#interrupt()} or
* {@link Future#cancel(boolean)} you should use {@code RAFDirectory} in
- * favor of {@link NIOFSDirectory}.</font>
+ * favor of {@link NIOFSDirectory}.
* </p>
*/
public class NIOFSDirectory extends FSDirectory {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java Fri Nov 28 03:19:54 2014
@@ -173,12 +173,12 @@ public class AttributeSource {
}
/** <b>Expert:</b> Adds a custom AttributeImpl instance with one or more Attribute interfaces.
- * <p><font color="red"><b>Please note:</b> It is not guaranteed, that <code>att</code> is added to
+ * <p><b>NOTE:</b> It is not guaranteed, that <code>att</code> is added to
* the <code>AttributeSource</code>, because the provided attributes may already exist.
* You should always retrieve the wanted attributes using {@link #getAttribute} after adding
* with this method and cast to your class.
* The recommended way to use custom implementations is using an {@link AttributeFactory}.
- * </font></p>
+ * </p>
*/
public final void addAttributeImpl(final AttributeImpl att) {
final Class<? extends AttributeImpl> clazz = att.getClass();
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java?rev=1642260&r1=1642259&r2=1642260&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java Fri Nov 28 03:19:54 2014
@@ -25,7 +25,7 @@ import org.apache.lucene.util.BytesRef;
import java.util.Arrays;
-/** The base for the original two SPT's: Geohash & Quad. Don't subclass this for new SPTs.
+/** The base for the original two SPT's: Geohash and Quad. Don't subclass this for new SPTs.
* @lucene.internal */
abstract class LegacyPrefixTree extends SpatialPrefixTree {
public LegacyPrefixTree(SpatialContext ctx, int maxLevels) {