Index: ext/fts5/fts5Int.h
==================================================================
--- ext/fts5/fts5Int.h
+++ ext/fts5/fts5Int.h
@@ -299,11 +299,11 @@
 **   i64 iRowid = sqlite3Fts5IterRowid(pIter);
 ** }
 */
 
 /*
-** Open a new iterator to iterate though all docids that match the 
+** Open a new iterator to iterate though all rowids that match the 
 ** specified token or token prefix.
 */
 int sqlite3Fts5IndexQuery(
   Fts5Index *p,                   /* FTS index to query */
   const char *pToken, int nToken, /* Token (or prefix) to query for */

Index: ext/fts5/fts5_expr.c
==================================================================
--- ext/fts5/fts5_expr.c
+++ ext/fts5/fts5_expr.c
@@ -32,11 +32,11 @@
 void sqlite3Fts5Parser(void*, int, Fts5Token, Fts5Parse*);
 
 struct Fts5Expr {
   Fts5Index *pIndex;
   Fts5ExprNode *pRoot;
-  int bDesc;                      /* Iterate in descending docid order */
+  int bDesc;                      /* Iterate in descending rowid order */
   int nPhrase;                    /* Number of phrases in expression */
   Fts5ExprPhrase **apExprPhrase;  /* Pointers to phrase objects */
 };
 
 /*

Index: ext/fts5/fts5_index.c
==================================================================
--- ext/fts5/fts5_index.c
+++ ext/fts5/fts5_index.c
@@ -31,11 +31,11 @@
 **     taken to ensure it is possible to iterate in either direction through 
 **     the entries in a doclist, or to seek to a specific entry within a 
 **     doclist, without loading it into memory.
 **
 **   * large doclists that span many pages have associated "doclist index"
-**     records that contain a copy of the first docid on each page spanned by
+**     records that contain a copy of the first rowid on each page spanned by
 **     the doclist. This is used to speed up seek operations, and merges of
 **     large doclists with very small doclists.
 **
 **   * extra fields in the "structure record" record the state of ongoing
 **     incremental merge operations.
@@ -208,26 +208,26 @@
 **     * Flags byte. Bits are:
 **         0x01: Clear if leaf is also the root page, otherwise set.
 **
 **     * Page number of fts index leaf page. As a varint.
 **
-**     * First docid on page indicated by previous field. As a varint.
+**     * First rowid on page indicated by previous field. As a varint.
 **
 **     * A list of varints, one for each subsequent termless page. A 
-**       positive delta if the termless page contains at least one docid, 
+**       positive delta if the termless page contains at least one rowid, 
 **       or an 0x00 byte otherwise.
 **
 **   Internal doclist index nodes are:
 **
 **     * Flags byte. Bits are:
 **         0x01: Clear for root page, otherwise set.
 **
 **     * Page number of first child page. As a varint.
 **
-**     * Copy of first docid on page indicated by previous field. As a varint.
+**     * Copy of first rowid on page indicated by previous field. As a varint.
 **
-**     * A list of delta-encoded varints - the first docid on each subsequent
+**     * A list of delta-encoded varints - the first rowid on each subsequent
 **       child page. 
 **
 */
 
 /*
@@ -382,17 +382,17 @@
   Fts5Buffer term;                /* Buffer containing previous term on page */
 };
 struct Fts5DlidxWriter {
   int pgno;                       /* Page number for this page */
   int bPrevValid;                 /* True if iPrev is valid */
-  i64 iPrev;                      /* Previous docid value written to page */
+  i64 iPrev;                      /* Previous rowid value written to page */
   Fts5Buffer buf;                 /* Buffer containing page data */
 };
 struct Fts5SegWriter {
   int iSegid;                     /* Segid to write to */
   Fts5PageWriter writer;          /* PageWriter object */
-  i64 iPrevRowid;                 /* Previous docid written to current leaf */
+  i64 iPrevRowid;                 /* Previous rowid written to current leaf */
   u8 bFirstRowidInDoclist;        /* True if next rowid is first in doclist */
   u8 bFirstRowidInPage;           /* True if next rowid is first in page */
   u8 bFirstTermInPage;            /* True if next term will be first in leaf */
   int nLeafWritten;               /* Number of leaf pages written */
   int nEmpty;                     /* Number of contiguous term-less nodes */
@@ -405,11 +405,11 @@
   int iBtPage;                    /* Page number corresponding to btterm */
 };
 
 /*
 ** Object for iterating through the merged results of one or more segments,
-** visiting each term/docid pair in the merged data.
+** visiting each term/rowid pair in the merged data.
 **
 ** nSeg is always a power of two greater than or equal to the number of
 ** segments that this object is merging data from. Both the aSeg[] and
 ** aFirst[] arrays are sized at nSeg entries. The aSeg[] array is padded
 ** with zeroed objects - these are handled as if they were iterators opened
@@ -430,11 +430,11 @@
   u16 iFirst;                     /* aSeg[] index of firstest iterator */
   u8 bTermEq;                     /* True if the terms are equal */
 };
 
 /*
-** Object for iterating through a single segment, visiting each term/docid
+** Object for iterating through a single segment, visiting each term/rowid
 ** pair in the segment.
 **
 ** pSeg:
 **   The segment to iterate through.
 **
@@ -462,11 +462,11 @@
 **     If set, set the iterator to point to EOF after the current doclist 
 **     has been exhausted. Do not proceed to the next term in the segment.
 **
 **   FTS5_SEGITER_REVERSE:
 **     This flag is only ever set if FTS5_SEGITER_ONETERM is also set. If
-**     it is set, iterate through docids in descending order instead of the
+**     it is set, iterate through rowid in descending order instead of the
 **     default ascending order.
 **
 ** iRowidOffset/nRowidOffset/aRowidOffset:
 **     These are used if the FTS5_SEGITER_REVERSE flag is set.
 **
@@ -2237,11 +2237,11 @@
 
     /* Skip past the doclist. If the end of the page is reached, bail out. */
     while( 1 ){
       int nPos;
 
-      /* Skip past docid delta */
+      /* Skip past rowid delta */
       fts5IndexSkipVarint(a, iOff);
 
       /* Skip past position list */
       fts5IndexGetVarint32(a, iOff, nPos);
       iOff += (nPos >> 1);
@@ -3375,11 +3375,11 @@
   int nPrefix;                    /* Bytes of prefix compression for term */
   Fts5PageWriter *pPage = &pWriter->writer;
 
   assert( pPage->buf.n==0 || pPage->buf.n>4 );
   if( pPage->buf.n==0 ){
-    /* Zero the first term and first docid fields */
+    /* Zero the first term and first rowid fields */
     static const u8 zero[] = { 0x00, 0x00, 0x00, 0x00 };
     fts5BufferAppendBlob(&p->rc, &pPage->buf, 4, zero);
     assert( pWriter->bFirstTermInPage );
   }
   if( p->rc ) return;
@@ -3435,11 +3435,11 @@
     fts5WriteFlushLeaf(p, pWriter);
   }
 }
 
 /*
-** Append a docid and position-list size field to the writers output. 
+** Append a rowid and position-list size field to the writers output. 
 */
 static void fts5WriteAppendRowid(
   Fts5Index *p, 
   Fts5SegWriter *pWriter,
   i64 iRowid,
@@ -3446,19 +3446,19 @@
   int nPos
 ){
   if( p->rc==SQLITE_OK ){
     Fts5PageWriter *pPage = &pWriter->writer;
 
-    /* If this is to be the first docid written to the page, set the 
-    ** docid-pointer in the page-header. Also append a value to the dlidx
+    /* If this is to be the first rowid written to the page, set the 
+    ** rowid-pointer in the page-header. Also append a value to the dlidx
     ** buffer, in case a doclist-index is required.  */
     if( pWriter->bFirstRowidInPage ){
       fts5PutU16(pPage->buf.p, pPage->buf.n);
       fts5WriteDlidxAppend(p, pWriter, iRowid);
     }
 
-    /* Write the docid. */
+    /* Write the rowid. */
     if( pWriter->bFirstRowidInDoclist || pWriter->bFirstRowidInPage ){
       fts5BufferAppendVarint(&p->rc, &pPage->buf, iRowid);
     }else{
       assert( p->rc || iRowid>pWriter->iPrevRowid );
       fts5BufferAppendVarint(&p->rc, &pPage->buf, iRowid - pWriter->iPrevRowid);
@@ -4001,11 +4001,11 @@
           nCopy = fts5GetPoslistSize(&pDoclist[iOff], &nPos, &bDummy);
           nCopy += nPos;
           iRowid += iDelta;
           
           if( writer.bFirstRowidInPage ){
-            fts5PutU16(&pBuf->p[0], pBuf->n);   /* first docid on page */
+            fts5PutU16(&pBuf->p[0], pBuf->n);   /* first rowid on page */
             pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowid);
             writer.bFirstRowidInPage = 0;
             fts5WriteDlidxAppend(p, &writer, iRowid);
           }else{
             pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iDelta);
@@ -4607,11 +4607,11 @@
 
   return rc;
 }
 
 /*
-** Open a new iterator to iterate though all docids that match the 
+** Open a new iterator to iterate though all rowid that match the 
 ** specified token or token prefix.
 */
 int sqlite3Fts5IndexQuery(
   Fts5Index *p,                   /* FTS index to query */
   const char *pToken, int nToken, /* Token (or prefix) to query for */

Index: ext/fts5/fts5_main.c
==================================================================
--- ext/fts5/fts5_main.c
+++ ext/fts5/fts5_main.c
@@ -1171,11 +1171,11 @@
 }
 
 /* 
 ** This is the xRowid method. The SQLite core calls this routine to
 ** retrieve the rowid for the current row of the result set. fts5
-** exposes %_content.docid as the rowid for the virtual table. The
+** exposes %_content.rowid as the rowid for the virtual table. The
 ** rowid should be written to *pRowid.
 */
 static int fts5RowidMethod(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
   Fts5Cursor *pCsr = (Fts5Cursor*)pCursor;
   int ePlan = pCsr->ePlan;

Index: ext/fts5/fts5_vocab.c
==================================================================
--- ext/fts5/fts5_vocab.c
+++ ext/fts5/fts5_vocab.c
@@ -440,12 +440,11 @@
   return SQLITE_OK;
 }
 
 /* 
 ** This is the xRowid method. The SQLite core calls this routine to
-** retrieve the rowid for the current row of the result set. fts5
-** exposes %_content.docid as the rowid for the virtual table. The
+** retrieve the rowid for the current row of the result set. The
 ** rowid should be written to *pRowid.
 */
 static int fts5VocabRowidMethod(
   sqlite3_vtab_cursor *pCursor, 
   sqlite_int64 *pRowid