From 55deb20a6338d2a7f6a25fe1bb8ad6a308a8fc8f Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Thu, 24 Apr 2025 10:28:51 -0500
Subject: [PATCH 1/8] wip

---
 source/crud/query/specify-query.txt | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/source/crud/query/specify-query.txt b/source/crud/query/specify-query.txt
index bf508679..65e12c99 100644
--- a/source/crud/query/specify-query.txt
+++ b/source/crud/query/specify-query.txt
@@ -19,12 +19,6 @@ You can narrow the set of matched documents returned by your query by creating a
 **query filter**. A query filter is an expression that specifies the documents you 
 want to match in a read, update, or delete operation.
 
-.. note:: Using LINQ
-
-   This guide shows how to specify queries using query filters. You can also
-   specify queries using LINQ. To learn more about using LINQ, see
-   :ref:`csharp-linq`.
-
 The examples in this guide use the following documents in a collection called
 ``guitars``:
 
@@ -241,12 +235,24 @@ field. The following is a list of builder methods that use array operators:
      - Description
 
    * - ``All()``
-     - Matches documents if the array field contains all elements specified in
+     - Matches documents where the array field contains all elements specified in
        the query.
 
-   * - ``Any()``
-     - Matches documents if any element in the array field matches the specified
+   * - ``AnyEq()``
+     - Matches documents where any element in the array field matches the specified
+       query filter.
+   
+   * - ``AnyGt()``
+     - Matches documents where any element in the array field is greater than the specified
        query filter.
+   
+   * - ``AnyGte()``
+     - Matches documents where any element in the array field is greater than or equal to
+       the specified query filter.
+   
+   * - ``AnyIn()``
+     - Matches documents where any element in the array field is greater than or equal to
+       the specified query filter.
 
    * - ``Size()``
      - Matches documents if the array field is a specified size.
@@ -346,24 +352,6 @@ To learn how to specify queries using LINQ, see :ref:`csharp-linq`.
 
 .. TODO: integrate into existing page
 
-Sample Class
-------------
-
-The code examples in this guide demonstrate how you can use builders to
-create types to interact with documents in the sample collection ``plants.flowers``.
-Documents in this collection are modeled by the following ``Flower`` class:
-
-.. literalinclude:: /includes/fundamentals/code-examples/builders.cs
-   :language: csharp
-   :dedent:
-   :start-after: start-model
-   :end-before: end-model
-
-Each builder class takes a generic type parameter
-``TDocument`` which represents the type of document that you are working
-with. In this guide, the ``Flower`` class is the document type used in
-each builder class example.
-
 Construct a Filter
 ------------------
 

From 7fb2249aa7b30bacaf23812a65277db3dc7b8b08 Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Thu, 24 Apr 2025 13:44:24 -0500
Subject: [PATCH 2/8] array operators

---
 source/crud/query/specify-query.txt | 114 ++++++++++++++++++++++------
 1 file changed, 90 insertions(+), 24 deletions(-)

diff --git a/source/crud/query/specify-query.txt b/source/crud/query/specify-query.txt
index 65e12c99..4f8b286e 100644
--- a/source/crud/query/specify-query.txt
+++ b/source/crud/query/specify-query.txt
@@ -228,44 +228,110 @@ Array operators match documents based on the value or quantity of elements in an
 field. The following is a list of builder methods that use array operators:
 
 .. list-table::
-   :widths: 40 60
+   :widths: 20 60 20
    :header-rows: 1
 
-   * - Operator
+   * - {+driver-short+} Method
      - Description
+     - {+mdb-server+} Operator
 
    * - ``All()``
-     - Matches documents where the array field contains all elements specified in
-       the query.
+     - Matches documents where the value of the field matches all values specified in the
+       query.
+     - :manual:`$all </reference/operator/query/all/>`
 
    * - ``AnyEq()``
-     - Matches documents where any element in the array field matches the specified
-       query filter.
+     - Matches documents where any element in the specified array field matches the specified
+       query value.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
    
    * - ``AnyGt()``
-     - Matches documents where any element in the array field is greater than the specified
-       query filter.
+     - Matches documents where any element in the specified array field is greater than the specified
+       query value.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
    
    * - ``AnyGte()``
-     - Matches documents where any element in the array field is greater than or equal to
-       the specified query filter.
+     - Matches documents where any element in the specified array field is greater than or equal to
+       the specified query value.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
    
    * - ``AnyIn()``
-     - Matches documents where any element in the array field is greater than or equal to
-       the specified query filter.
-
+     - Matches documents where any element in the specified array field matches any value in
+       the specified query array.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+
+   * - ``AnyLt()``
+     - Matches documents where any element in the specified array field is less than the specified
+       query value.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+   
+   * - ``AnyLte()``
+     - Matches documents where any element in the specified array field is less than or equal to
+       the specified query value.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+   
+   * - ``AnyNe()``
+     - Matches documents where any element in the specified array field is not equal to
+       the specified query value.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+   
+   * - ``AnyNin()``
+     - Matches documents where none of the elements in the specified array field match any of the 
+       values in the specified query array. This method also matches documents where the
+       specified field doesn't exist.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+
+   * - ``AnyStringIn()``
+     - Matches documents where any string element in the specified array field matches any
+       string value in the specified query array.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+   
+   * - ``AnyStringNin()``
+     - Matches documents where none of the string elements in the specified array field
+       matches any of the values in the specified query filter. This method also matches
+       documents where the specified field doesn't exist.
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+   
+   * - ``ElemMatch()``
+     - Matches documents where any element in the specified array field matches the
+       specified query criteria. 
+     - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
+   
+   * - ``In()``
+     - Matches documents where the value of the specified field matches any value in the
+       specified query array. 
+     - :manual:`$in </reference/operator/query/in/>`
+   
    * - ``Size()``
-     - Matches documents if the array field is a specified size.
-
-.. note:: 
-
-   The ``Any()`` builder uses the ``$elemMatch`` query operator.
-
-   To learn more about the ``$elemMatch`` query selector, see
-   :manual:`$elemMatch </reference/operator/query/elemMatch/#mongodb-query-op.-elemMatch>`.
-
-For more information on the array operators, see the :manual:`Array
-Query Operators </reference/operator/query-array/>` page.
+     - Matches documents where the specified array field is the specified size.
+     - :manual:`$size </reference/operator/query/size/>`
+   
+   * - ``SizeGt()``
+     - Matches documents where the specified array field is larger than the specified size.
+     - :manual:`$size </reference/operator/query/size/>`
+   
+   * - ``SizeGte()``
+     - Matches documents where the specified array field is larger than or equal to the specified size.
+     - :manual:`$size </reference/operator/query/size/>`
+   
+   * - ``SizeLt()``
+     - Matches documents where the specified array field is smaller than the specified size.
+     - :manual:`$size </reference/operator/query/size/>`
+   
+   * - ``SizeLte()``
+     - Matches documents where the array field is smaller than or equal to the specified size.
+     - :manual:`$size </reference/operator/query/size/>`
+
+   * - ``StringIn()``
+     - Matches documents where the string value of the specified field matches any string value in the
+       specified query array. 
+     - :manual:`$in </reference/operator/query/in/>`
+   
+   * - ``StringNin()``
+     - Matches documents where the string value of the specified field matches none of the
+       string values in the specified query array.
+       the specified query filter. 
+     - :manual:`$in </reference/operator/query/in/>`
 
 The following example uses builders to create a query filter that matches all
 documents that have 3 elements in the ``models`` field:

From bda14623dcc3e8e1f43e9f899f96b01d86839b17 Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Fri, 25 Apr 2025 16:20:52 -0500
Subject: [PATCH 3/8] wip

---
 source/crud/query/specify-query.txt           | 468 ++++++++++++------
 .../specify-query/FindAndBuilder.cs           |   2 +-
 .../specify-query/FindAndPOCO.cs              |   2 +-
 .../specify-query/FindEqBuilder.cs            |   2 +-
 .../code-examples/specify-query/FindEqPOCO.cs |   2 +-
 .../specify-query/FindExistsBuilder.cs        |   2 +-
 .../specify-query/FindGtBuilder.cs            |   2 +-
 .../code-examples/specify-query/FindGtPOCO.cs |   4 +-
 .../specify-query/FindRegexBuilder.cs         |   2 +-
 .../specify-query/FindSizeBuilder.cs          |   2 +-
 10 files changed, 330 insertions(+), 158 deletions(-)

diff --git a/source/crud/query/specify-query.txt b/source/crud/query/specify-query.txt
index 4f8b286e..a8b8d48a 100644
--- a/source/crud/query/specify-query.txt
+++ b/source/crud/query/specify-query.txt
@@ -1,8 +1,9 @@
 .. _csharp-specify-query:
+.. _csharp-create-query-filter:
 
-===============
-Specify a Query
-===============
+=====================
+Create a Query Filter
+=====================
 
 .. contents:: On this page
    :local:
@@ -10,14 +11,26 @@ Specify a Query
    :depth: 1
    :class: singlecol
 
+.. facet::
+   :name: genre
+   :values: reference
+ 
+.. meta::
+   :keywords: search, read, update, delete
+
 Overview
 --------
 
-In this guide, you can learn how to specify a query using the {+driver-long+}.
+In this guide, you can learn how to use the {+driver-long+} to create a **query filter**.
+A query filter is an expression that specifies the documents to read, update, or delete
+in a CRUD operation. You can use builder methods, available from the
+``Builders<TDocument>.Filter`` static property, to create query filters and add
+operations to them.
+
+.. include:: /includes/method-overloads.rst
 
-You can narrow the set of matched documents returned by your query by creating a
-**query filter**. A query filter is an expression that specifies the documents you 
-want to match in a read, update, or delete operation.
+Sample Data
+~~~~~~~~~~~
 
 The examples in this guide use the following documents in a collection called
 ``guitars``:
@@ -31,13 +44,21 @@ The examples in this guide use the following documents in a collection called
    { "_id": 5, "make": "Ibanez", "models": ["RG", "AZ"], "establishedYear": 1957, "rating": 7 }
    { "_id": 6, "make": "Strandberg", "models": ["Boden", "Salen"], "establishedYear": 1982 }
 
-The following ``Guitar`` class models the documents in this collection.
+The following ``Guitar`` class models the documents in this collection:
 
 .. literalinclude:: /includes/fundamentals/code-examples/specify-query/Guitar.cs
    :language: csharp
    :copyable:
    :dedent:
 
+To run the code examples on this page, you must obtain a reference to the ``guitars``
+collection, as shown in the following example: 
+
+.. code-block:: csharp
+
+   var client = new MongoClient("localhost://27017");
+   var guitarCollection = client.GetDatabase("example").GetCollection<Guitar>("guitars");
+
 .. note::
 
    The documents in the ``guitars`` collection use the camel-case naming
@@ -45,39 +66,126 @@ The following ``Guitar`` class models the documents in this collection.
    to deserialize the fields in the collection into Pascal case and map them to
    the properties in the ``Guitar`` class.
 
-   To learn more about custom serialization, see :ref:`csharp-custom-serialization`.
+   To learn more creating and serializing custom classes, see the following pages:
+   
+   - :ref:`csharp-poco`
+   - :ref:`csharp-class-mapping`
+   - :ref:`csharp-serialization`
+   - :ref:`csharp-polymorphism`
 
-To learn more about class mapping, see :ref:`csharp-class-mapping`.
+Find All Documents
+------------------
 
-The following code instantiates the ``_guitarsCollection`` object using the 
-``Guitar`` class as a type parameter. This type parameter causes the driver to 
-automatically serialize and deserialize the documents it sends to and receives
-from MongoDB to instances of the ``Guitar`` class:
+An empty query filter matches all documents in a collection. The following example shows
+how to create an empty query filter: 
 
 .. code-block:: csharp
 
-   private static IMongoCollection<Guitar> _guitarsCollection;
+   var filter = Builders<Guitar>.Filter.Empty;
 
-Literal Values
---------------
+Comparison Operators
+--------------------
 
-Literal value queries return documents with an exact match to your query filter.
+Comparison operators compare the query value to the value in a specified field. Some of
+these methods have alternative syntax that you can use in place of the method, as shown
+in the following example:
 
-The following example specifies a query filter as a parameter to the ``Find()`` 
-method. The query matches all documents where the
-``make`` field equals "Fender".
+.. code-block:: csharp
+
+   var filter = Builders<Guitar>.Filter.Eq(g => g.Make, "Fender");
+   var results = guitarCollection.Find(filter).ToList();
+
+   // Alternative syntax
+   var results = guitarCollection.Find(g => g.Make == "Fender").ToList();;
+
+The following table lists the {+driver-short+} methods for comparison operations
+and the equivalent {+mdb-server+} operators:
+
+.. list-table::
+   :widths: 20 20 40 20
+   :header-rows: 1
+
+   * - {+driver-short+} Method
+     - Alternative Syntax
+     - Description
+     - {+mdb-server+} Operator
+
+   * - ``Eq()``
+     - ``==``
+     - Matches documents where the value of the specified field is equal to the query value.
+     - :manual:`$eq </reference/operator/query/eq/>`
+
+   * - ``Gt()``
+     - ``>``
+     - Matches documents where the value of the specified field is greater than the query value.
+     - :manual:`$gt </reference/operator/query/gt/>`
+   
+   * - ``Gte()``
+     - ``>=``
+     - Matches documents where any element in the specified array field is greater than or
+       equal to the query value.
+     - :manual:`$gte </reference/operator/query/gte/>`
+   
+   * - ``In()``
+     - N/A 
+     - Matches documents where any element in the specified array field matches any value in
+       the query array.
+     - :manual:`$in </reference/operator/query/in/>`
+
+   * - ``Lt()``
+     - ``<``
+     - Matches documents where any element in the specified array field is less than the
+       query value.
+     - :manual:`$lt </reference/operator/query/lt/>`
+   
+   * - ``Lte()``
+     - ``<=``
+     - Matches documents where any element in the specified array field is less than or equal
+       to the query value.
+     - :manual:`$lte </reference/operator/query/lte/>`
+   
+   * - ``Ne()``
+     - ``!=``
+     - Matches documents where any element in the specified array field is not equal to
+       the query value.
+     - :manual:`$ne </reference/operator/query/ne/>`
+   
+   * - ``Nin()``
+     - N/A 
+     - Matches documents where one of the following is true:
+     
+       - None of the elements in the specified array field matches any of the values in the
+         query array.
+       - The specified field doesn't exist.
+     - :manual:`$nin </reference/operator/query/nin/>`
+
+   * - ``StringIn()``
+     - N/A 
+     - Matches documents where the string value of the specified field matches any string
+       value in the query array. 
+     - :manual:`$in </reference/operator/query/in/>`
+   
+   * - ``StringNin()``
+     - N/A 
+     - Matches documents where the string value of the specified field doesn't match any
+       of the string values in the query array.
+     - :manual:`$in </reference/operator/query/in/>`
+
+The following example specifies a query filter as a parameter to the ``Find()``
+method. The query matches all documents where the ``establishedYear`` field is
+greater than ``1985``.
 
 .. io-code-block::
    :copyable:
 
-   .. input:: /includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs
+   .. input:: /includes/fundamentals/code-examples/specify-query/FindGtPOCO.cs
       :language:  csharp
 
-   .. output:: 
+   .. output::
       :language: json
       :visible:
 
-      { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
+      { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
 
 The following example uses builders to create a query filter that matches the
 same documents as the preceding example:
@@ -85,68 +193,30 @@ same documents as the preceding example:
 .. io-code-block::
    :copyable:
 
-   .. input:: /includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs
+   .. input:: /includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs
       :language:  csharp
 
    .. output:: 
       :language: json
       :visible:
 
-      { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
-
-.. tip:: Find All Documents
-
-   Use an empty query filter to match all documents in the collection. Create
-   an empty query filter with builders as follows:
-
-   .. code-block:: csharp
-
-      var result = _guitarsCollection.Find(Builders<Guitar>.Filter.Empty).ToList();
-
-Comparison Operators
---------------------
-
-Comparison operators analyze the value in a document against the specified value
-in your query filter. Common comparison operators include:
-
-.. list-table::
-   :widths: 30 30 40
-   :header-rows: 1
-
-   * - Operator
-     - Builder
-     - Description
-
-   * - ``>``
-     - ``Gt()``
-     - Greater than
-
-   * - ``<=``
-     - ``Lte()``
-     - Less than or equal to
-
-   * - ``!=``
-     - ``Ne()``
-     - Not equal to
-
-For a full list of comparison operators, see the :manual:`Comparison
-Query Operators </reference/operator/query-comparison/>` page.
+      { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
 
-The following example specifies a query filter as a parameter to the ``Find()``
-method. The query matches all documents where the ``establishedYear`` field is
-greater than ``1985``.
+The following example specifies a query filter as a parameter to the ``Find()`` 
+method. The query matches all documents where the
+``make`` field equals "Fender".
 
 .. io-code-block::
    :copyable:
 
-   .. input:: /includes/fundamentals/code-examples/specify-query/FindGtPOCO.cs
+   .. input:: /includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs
       :language:  csharp
 
-   .. output::
+   .. output:: 
       :language: json
       :visible:
 
-      { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
+      { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
 
 The following example uses builders to create a query filter that matches the
 same documents as the preceding example:
@@ -154,40 +224,59 @@ same documents as the preceding example:
 .. io-code-block::
    :copyable:
 
-   .. input:: /includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs
+   .. input:: /includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs
       :language:  csharp
 
    .. output:: 
       :language: json
       :visible:
 
-      { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
+      { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
 
 Logical Operators
 -----------------
 
-Logical operators match documents using logic applied to the results of two or more
-sets of expressions. The following is a list of some logical operators:
+Logical operators combine two or more expressions and return results based on the results
+of those expressions. These methods have alternative syntax that you can use in place of
+the method, as shown in the following example:
+
+.. code-block:: csharp
+
+   var builder = Builders<Guitar>.Filter;
+   var filter = builder.And(
+      builder.Gte(g => g.EstablishedYear, 1985),
+      builder.Ne(r => r.Make, "Kiesel"));
+   
+   var results = guitarCollection.Find(filter).ToList();
+
+   // Alternative syntax
+   var results = guitarCollection.Find(
+      g => g.EstablishedYear >= 1985
+      && g.Make != "Kiesel")
+   .ToList();
+
+The following table lists the {+driver-short+} methods for logical operations
+and the equivalent {+mdb-server+} operators:
 
 .. list-table::
-   :widths: 30 30 40
+   :widths: 20 20 40 20
    :header-rows: 1
 
-   * - Operator
-     - Builder
+   * - {+driver-short+} Method
+     - Alternative Syntax
      - Description
+     - {+mdb-server+} Operator
 
-   * - ``&&``
-     - ``And()``
-     - All expressions must evaluate to true.
-
-   * - ``||``
-     - ``Or()``
-     - At least one expression must evaluate to true.
-
-For a full list of logical operators, see the :manual:`Logical
-Query Operators </reference/operator/query-logical/>` page. 
+   * - ``And()``
+     - ``&&``
+     - Matches documents where all expressions evaluate to true.
+     - :manual:`$and </reference/operator/query/and/>`
 
+   * - ``Or()``
+     - ``||``
+     - Matches documents where one or more expressions evaluates to true.
+     - :manual:`$or </reference/operator/query/or/>`
+   
 The following example specifies a query filter as a parameter to the ``Find()`` 
 method. The query matches all documents where the
 ``establishedYear`` field is greater than or equal to ``1985``, and the ``make``
@@ -205,7 +294,6 @@ field is not equal to "Kiesel".
 
       { "_id" : 3, "make" : "PRS", "models" : ["Silver Sky", "SE", "Custom"], "establishedYear" : 1985, "rating" : 9 }
 
-
 The following example uses builders to create a query filter that matches the
 same documents as the preceding example:
 
@@ -355,8 +443,23 @@ Element Operators
 
 Element operators query data based on the presence or type of a field.
 
-For a full list of element operators, see the :manual:`Element
-Query Operators </reference/operator/query-element/>` page.
+.. list-table::
+   :widths: 20 60 20
+   :header-rows: 1
+
+   * - {+driver-short+} Method
+     - Description
+     - {+mdb-server+} Operator
+
+   * - ``Exists()``
+     - Matches documents that contain or do not contain a specified field, including
+       documents where the field value is ``null``.
+     - :manual:`$exists </reference/operator/query/exists/>`
+   
+   * - ``Type()``
+     - Matches documents where the value of the specified field is an instance of the
+       specified BSON types.
+     - :manual:`$type </reference/operator/query/type/>`
 
 The following example uses builders to create a query filter that matches all
 documents that have a ``rating`` field:
@@ -380,11 +483,34 @@ Evaluation Operators
 --------------------
 
 Evaluation operators analyze data on individual fields, or on the entire collection's
-documents. Some builder methods that use evaluation operators include ``Regex()``
-and ``Text()``.
+documents.
+
+.. list-table::
+   :widths: 20 60 20
+   :header-rows: 1
+
+   * - {+driver-short+} Method
+     - Description
+     - {+mdb-server+} Operator
 
-For a full list of evaluation operators, see the :manual:`Evaluation
-Query Operators </reference/operator/query-evaluation/>` page.
+   * - ``JsonSchema()``
+     - Matches documents that satisfy the specified JSON schema.
+     - :manual:`$jsonSchema </reference/operator/query/jsonSchema/>`
+   
+   * - ``Mod()``
+     - Matches documents where the value of the specified field divided by a divisor has the
+       specified remainder (modulo).
+     - :manual:`$mod </reference/operator/query/mod/>`
+    
+   * - ``RegEx()``
+     - Matches documents where the value of the specified field matches a specified regular
+       expression. 
+     - :manual:`$regex </reference/operator/query/regex/>`
+
+   * - ``Where()``
+     - Use to pass either a string containing a JavaScript expression or a full JavaScript
+       function to the query system.
+     - :manual:`$where </reference/operator/query/where/>`
 
 The following example uses builders to create a query filter that matches all
 documents that have a value in the ``make`` field that starts with the letter 
@@ -402,19 +528,110 @@ documents that have a value in the ``make`` field that starts with the letter
 
       { "_id" : 2, "make" : "Gibson", "models" : ["Les Paul", "SG", "Explorer"], "establishedYear" : 1902, "rating" : 8 }
 
+Geospatial Operators
+--------------------
+
+Geospatial operators return data based on geospatial expression conditions.
+
+.. list-table::
+   :widths: 20 60 20
+   :header-rows: 1
+
+   * - {+driver-short+} Method
+     - Description
+     - {+mdb-server+} Operator
+
+   * - ``GeoIntersects()``
+     - MAtches documents whose geospatial data intersects with a specified
+       `GeoJsonObject <{+new-api-root+}/MongoDB.Driver/MongoDB.Driver.GeoJsonObjectModel.GeoJsonObject-1.html>`__.
+     - :manual:`$geoIntersects </reference/operator/query/geoIntersects/>`
+   
+   * - ``GeoWithin()``
+     - Matches documents with geospatial data entirely within the specified shape.
+     - :manual:`$geoWithin </reference/operator/query/geoWithin/>`
+   
+   * - ``GeoWithinBox()``
+     - Matches documents with geospatial data entirely within the specified box.
+     - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$box </reference/operator/query/box/>`
+
+   * - ``GeoWithinCenter()``
+     - Matches documents with geospatial data entirely within the specified circle.
+     - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$center </reference/operator/query/center/>`
+
+   * - ``GeoWithinCenterSphere()``
+     - Matches documents with geospatial data entirely within the specified sphere.
+     - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$centerSphere </reference/operator/query/centerSphere/>`
+
+   * - ``GeoWithinPolygon()``
+     - Matches documents with geospatial data entirely within the specified polygon.
+     - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$polygon </reference/operator/query/polygon/>`
+
+   * - ``Near()``
+     - Specifies a point for which a geospatial query returns the documents from nearest to
+       farthest. 
+     - :manual:`$near </reference/operator/query/near/>`
+
+   * - ``NearSphere()``
+     - Specifies a point for which a geospatial query returns the documents from nearest to
+       farthest in spherical geometry. 
+     - :manual:`$nearSphere </reference/operator/query/nearSphere/>`
+
+Bitwise Operators
+-----------------
+
+Bitwise operators return data based on bit-position conditions.
+
+.. list-table::
+   :widths: 20 60 20
+   :header-rows: 1
+
+   * - {+driver-short+} Method
+     - Description
+     - {+mdb-server+} Operator
+
+   * - ``BitsAllClear()``
+     - Matches documents where all of the specified bit positions are clear (``0``) in
+       the specified field.
+     - :manual:`$bitsAllClear </reference/operator/query/bitsAllClear/>`
+   
+   * - ``bitsAllSet()``
+     - Matches documents where all of the specified bit positions are set (``1``) in
+       the specified field.
+     - :manual:`$bitsAllSet </reference/operator/query/bitsAllSet/>`
+
+   * - ``bitsAnyClear()``
+     - Matches documents where any of the specified bit positions are clear (``0``) in
+       the specified field.
+     - :manual:`$bitsAnyClear </reference/operator/query/bitsAnyClear/>`   
+
+   * - ``bitsAnySet()``
+     - Matches documents where any of the specified bit positions are set (``1``) in
+       the specified field.
+     - :manual:`$bitsAnySet </reference/operator/query/bitsAnySet/>`   
+   
+Other Operators
+---------------
+
+The {+driver-short+} also provides the following methods that create filter definitions:
+
+.. list-table::
+   :widths: 40 60
+   :header-rows: 1
+
+   * - {+driver-short+} Method
+     - Description
+
+   * - ``OfType()``
+     - Matches documents of a type derived from the specified type. You can use overloads
+       of this method to specify additional query criteria.
+
+   * - ``Text()``
+     - Matches documents with a field that contains the specified string.
+
 Additional Information
 ----------------------
 
-For more information about the operators mentioned in this guide, see the 
-following Server Manual Entries:
-
-- :manual:`Comparison Query Operators </reference/operator/query-comparison/>`
-- :manual:`Logical Query Operators </reference/operator/query-logical/>`
-- :manual:`Array Query Operators </reference/operator/query-array/>`
-- :manual:`Element Query Operators </reference/operator/query-element/>`
-- :manual:`Evaluation Query Operators </reference/operator/query-evaluation/>`
 
-To learn how to specify queries using LINQ, see :ref:`csharp-linq`.
 
 .. TODO: integrate into existing page
 
@@ -428,24 +645,7 @@ documents matching the following criteria:
 - ``Price`` field value less than 20
 - ``Category`` field value is "Perennial"
 
-Use builders to create the filter definition with the typed variant:
 
-.. code-block:: csharp
-   :copyable: true
-
-   var builder = Builders<Flower>.Filter;
-   var filter = builder.Lt(f => f.Price, 20) & builder.Eq(f => f.Category, "Perennial");
-   
-Using the typed variant form provides compile-time safety. Additionally,
-your IDE can provide refactoring support.
-
-Alternatively, you can use string-based field names to contruct the filter:
-
-.. code-block:: csharp
-   :copyable: true
-
-   var builder = Builders<Flower>.Filter;
-   var filter = builder.Lt("Price", 20) & builder.Eq("Category", "Perennial");
 
 If you are using LINQ, you can also use the ``Inject()`` method to apply the filter
 to a LINQ query:
@@ -457,34 +657,6 @@ to a LINQ query:
    var filter = builder.Lt("Price", 20) & builder.Eq("Category", "Perennial");
    var query = collection.AsQueryable().Where(f => filter.Inject());
 
-Array Operators
-~~~~~~~~~~~~~~~
-
-If your document has properties or fields that serialize to arrays,
-you can use the methods beginning with ``Any``, such as ``AnyEq()`` or
-``AnyLt()``, to compare the entire array against a single item.
-
-Use builders to check which documents in the collection have a
-``Season`` array that includes "winter":
-
-.. code-block:: csharp
-   :copyable: true
-
-   var builder = Builders<Flower>.Filter;
-   var filter = builder.AnyEq(f => f.Season, "winter");
-
-You can also call the ``ElemMatch()`` method to find documents that have an
-array field that contains at least one element that matches a specified search
-criteria. The following example returns documents that contain the value
-``"Summer"`` in their ``Season`` array:
-
-.. code-block:: csharp
-   :copyable: true
-
-   var builder = Builders<Flower>.Filter;
-   var filter = builder.ElemMatch(f => f.Season, s => s == "Summer");
 
-To learn more about array operators, see the :manual:`Array Query Operators
-</reference/operator/query-array/>` guide in the {+mdb-server+} manual.
 
 - `FilterDefinitionBuilder <{+new-api-root+}/MongoDB.Driver/MongoDB.Driver.FilterDefinitionBuilder-1.html>`__
\ No newline at end of file
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindAndBuilder.cs b/source/includes/fundamentals/code-examples/specify-query/FindAndBuilder.cs
index 01bb7a9d..55c26c5c 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindAndBuilder.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindAndBuilder.cs
@@ -4,7 +4,7 @@
 var filter = builder.And(builder.Gte(g => g.EstablishedYear, 1985), builder.Ne(r => r.Make, "Kiesel"));
 
 // Finds all documents that match the filter
-var result = _guitarsCollection.Find(filter).ToList();
+var result = guitarCollection.Find(filter).ToList();
 
 foreach (var doc in result)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindAndPOCO.cs b/source/includes/fundamentals/code-examples/specify-query/FindAndPOCO.cs
index 946a1a7e..17e2937d 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindAndPOCO.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindAndPOCO.cs
@@ -1,6 +1,6 @@
 // Finds all documents with an "establishedYear" value greater than 1985
 // and a "make" value that is not equal to "Kiesel"
-var results = _guitarsCollection.Find(g => g.EstablishedYear >= 1985 && r.Make != "Kiesel").ToList();
+var results = guitarCollection.Find(g => g.EstablishedYear >= 1985 && r.Make != "Kiesel").ToList();
 
 foreach (var doc in results)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs b/source/includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs
index 4b346502..7d23f57a 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs
@@ -2,7 +2,7 @@
 var filter = Builders<Guitar>.Filter.Eq(g => g.Make, "Fender");
 
 // Finds all documents that match the filter
-var result = _guitarsCollection.Find(filter).ToList();
+var result = guitarCollection.Find(filter).ToList();
 
 foreach (var doc in result)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs b/source/includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs
index ea031b67..a4c92c17 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs
@@ -1,5 +1,5 @@
 // Finds all documents with a "make" value of "Fender"
-var results = _guitarsCollection.Find(g => g.Make == "Fender").ToList();
+var results = guitarCollection.Find(g => g.Make == "Fender").ToList();
 
 foreach (var doc in results)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindExistsBuilder.cs b/source/includes/fundamentals/code-examples/specify-query/FindExistsBuilder.cs
index 2860354f..438e33bb 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindExistsBuilder.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindExistsBuilder.cs
@@ -2,7 +2,7 @@
 var filter = Builders<Guitar>.Filter.Exists(g => g.Rating);
 
 // Finds all documents that match the filter
-var result = _guitarsCollection.Find(filter).ToList();
+var result = guitarCollection.Find(filter).ToList();
 
 foreach (var doc in result)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs b/source/includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs
index 466b56fb..afee42b9 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs
@@ -3,7 +3,7 @@
 var filter = Builders<Guitar>.Filter.Gt(g => g.EstablishedYear, 1985);
 
 // Finds all documents that match the filter
-var result = _guitarsCollection.Find(filter).ToList();
+var result = guitarCollection.Find(filter).ToList();
 
 foreach (var doc in result)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindGtPOCO.cs b/source/includes/fundamentals/code-examples/specify-query/FindGtPOCO.cs
index d3308414..7f92dcb1 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindGtPOCO.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindGtPOCO.cs
@@ -1,5 +1,5 @@
-// Finds all documents with am "establishedYear" value greater than 1985
-var results = _guitarsCollection.Find(g => g.EstablishedYear > 1985).ToList();
+// Finds all documents with an "establishedYear" value greater than 1985
+var results = guitarCollection.Find(g => g.EstablishedYear > 1985).ToList();
 
 foreach (var doc in results)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindRegexBuilder.cs b/source/includes/fundamentals/code-examples/specify-query/FindRegexBuilder.cs
index efcc8c59..29e36a79 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindRegexBuilder.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindRegexBuilder.cs
@@ -2,7 +2,7 @@
 var filter = Builders<Guitar>.Filter.Regex(g => g.Make, "^G");
 
 // Finds all documents that match the filter
-var result = _guitarsCollection.Find(filter).ToList();
+var result = guitarCollection.Find(filter).ToList();
 
 foreach (var doc in result)
 {
diff --git a/source/includes/fundamentals/code-examples/specify-query/FindSizeBuilder.cs b/source/includes/fundamentals/code-examples/specify-query/FindSizeBuilder.cs
index 02764816..7a1272b7 100644
--- a/source/includes/fundamentals/code-examples/specify-query/FindSizeBuilder.cs
+++ b/source/includes/fundamentals/code-examples/specify-query/FindSizeBuilder.cs
@@ -2,7 +2,7 @@
 var filter = Builders<Guitar>.Filter.Size(g => g.Models, 3);
 
 // Finds all documents that match the filter
-var result = _guitarsCollection.Find(filter).ToList();
+var result = guitarCollection.Find(filter).ToList();
 
 foreach (var doc in result)
 {

From 3916380e2b94528b748bfdbc982321456fd24ed3 Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Mon, 28 Apr 2025 11:07:22 -0500
Subject: [PATCH 4/8] first draft

---
 source/crud/query/specify-query.txt | 231 ++++++++++++----------------
 1 file changed, 101 insertions(+), 130 deletions(-)

diff --git a/source/crud/query/specify-query.txt b/source/crud/query/specify-query.txt
index a8b8d48a..2e2b5363 100644
--- a/source/crud/query/specify-query.txt
+++ b/source/crud/query/specify-query.txt
@@ -14,7 +14,7 @@ Create a Query Filter
 .. facet::
    :name: genre
    :values: reference
- 
+
 .. meta::
    :keywords: search, read, update, delete
 
@@ -36,7 +36,7 @@ The examples in this guide use the following documents in a collection called
 ``guitars``:
 
 .. code-block:: json
- 
+
    { "_id": 1, "make": "Fender", "models": ["Stratocaster", "Telecaster"], "establishedYear": 1946, "rating": 9 }
    { "_id": 2, "make": "Gibson", "models": ["Les Paul", "SG", "Explorer"], "establishedYear": 1902, "rating": 8 }
    { "_id": 3, "make": "PRS", "models": ["Silver Sky", "SE", "Custom"], "establishedYear": 1985, "rating": 9 }
@@ -52,7 +52,7 @@ The following ``Guitar`` class models the documents in this collection:
    :dedent:
 
 To run the code examples on this page, you must obtain a reference to the ``guitars``
-collection, as shown in the following example: 
+collection, as shown in the following example:
 
 .. code-block:: csharp
 
@@ -67,7 +67,7 @@ collection, as shown in the following example:
    the properties in the ``Guitar`` class.
 
    To learn more creating and serializing custom classes, see the following pages:
-   
+
    - :ref:`csharp-poco`
    - :ref:`csharp-class-mapping`
    - :ref:`csharp-serialization`
@@ -77,7 +77,7 @@ Find All Documents
 ------------------
 
 An empty query filter matches all documents in a collection. The following example shows
-how to create an empty query filter: 
+how to create an empty query filter:
 
 .. code-block:: csharp
 
@@ -119,15 +119,15 @@ and the equivalent {+mdb-server+} operators:
      - ``>``
      - Matches documents where the value of the specified field is greater than the query value.
      - :manual:`$gt </reference/operator/query/gt/>`
-   
+
    * - ``Gte()``
      - ``>=``
      - Matches documents where any element in the specified array field is greater than or
        equal to the query value.
      - :manual:`$gte </reference/operator/query/gte/>`
-   
+
    * - ``In()``
-     - N/A 
+     - N/A
      - Matches documents where any element in the specified array field matches any value in
        the query array.
      - :manual:`$in </reference/operator/query/in/>`
@@ -137,36 +137,36 @@ and the equivalent {+mdb-server+} operators:
      - Matches documents where any element in the specified array field is less than the
        query value.
      - :manual:`$lt </reference/operator/query/lt/>`
-   
+
    * - ``Lte()``
      - ``<=``
      - Matches documents where any element in the specified array field is less than or equal
        to the query value.
      - :manual:`$lte </reference/operator/query/lte/>`
-   
+
    * - ``Ne()``
      - ``!=``
      - Matches documents where any element in the specified array field is not equal to
        the query value.
      - :manual:`$ne </reference/operator/query/ne/>`
-   
+
    * - ``Nin()``
-     - N/A 
+     - N/A
      - Matches documents where one of the following is true:
-     
+
        - None of the elements in the specified array field matches any of the values in the
          query array.
        - The specified field doesn't exist.
      - :manual:`$nin </reference/operator/query/nin/>`
 
    * - ``StringIn()``
-     - N/A 
+     - N/A
      - Matches documents where the string value of the specified field matches any string
-       value in the query array. 
+       value in the query array.
      - :manual:`$in </reference/operator/query/in/>`
-   
+
    * - ``StringNin()``
-     - N/A 
+     - N/A
      - Matches documents where the string value of the specified field doesn't match any
        of the string values in the query array.
      - :manual:`$in </reference/operator/query/in/>`
@@ -196,13 +196,13 @@ same documents as the preceding example:
    .. input:: /includes/fundamentals/code-examples/specify-query/FindGtBuilder.cs
       :language:  csharp
 
-   .. output:: 
+   .. output::
       :language: json
       :visible:
 
       { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
 
-The following example specifies a query filter as a parameter to the ``Find()`` 
+The following example specifies a query filter as a parameter to the ``Find()``
 method. The query matches all documents where the
 ``make`` field equals "Fender".
 
@@ -212,7 +212,7 @@ method. The query matches all documents where the
    .. input:: /includes/fundamentals/code-examples/specify-query/FindEqPOCO.cs
       :language:  csharp
 
-   .. output:: 
+   .. output::
       :language: json
       :visible:
 
@@ -227,7 +227,7 @@ same documents as the preceding example:
    .. input:: /includes/fundamentals/code-examples/specify-query/FindEqBuilder.cs
       :language:  csharp
 
-   .. output:: 
+   .. output::
       :language: json
       :visible:
 
@@ -246,7 +246,7 @@ the method, as shown in the following example:
    var filter = builder.And(
       builder.Gte(g => g.EstablishedYear, 1985),
       builder.Ne(r => r.Make, "Kiesel"));
-   
+
    var results = guitarCollection.Find(filter).ToList();
 
    // Alternative syntax
@@ -276,8 +276,8 @@ and the equivalent {+mdb-server+} operators:
      - ``||``
      - Matches documents where one or more expressions evaluates to true.
      - :manual:`$or </reference/operator/query/or/>`
-   
-The following example specifies a query filter as a parameter to the ``Find()`` 
+
+The following example specifies a query filter as a parameter to the ``Find()``
 method. The query matches all documents where the
 ``establishedYear`` field is greater than or equal to ``1985``, and the ``make``
 field is not equal to "Kiesel".
@@ -303,7 +303,7 @@ same documents as the preceding example:
    .. input:: /includes/fundamentals/code-examples/specify-query/FindAndBuilder.cs
       :language:  csharp
 
-   .. output:: 
+   .. output::
       :language: json
       :visible:
 
@@ -313,7 +313,8 @@ Array Operators
 ---------------
 
 Array operators match documents based on the value or quantity of elements in an array
-field. The following is a list of builder methods that use array operators:
+field. The following table lists the {+driver-short+} methods for array operations
+and the equivalent {+mdb-server+} operators:
 
 .. list-table::
    :widths: 20 60 20
@@ -324,105 +325,93 @@ field. The following is a list of builder methods that use array operators:
      - {+mdb-server+} Operator
 
    * - ``All()``
-     - Matches documents where the value of the field matches all values specified in the
-       query.
+     - Matches documents where the values in the specified array field match all query
+       values.
      - :manual:`$all </reference/operator/query/all/>`
 
    * - ``AnyEq()``
-     - Matches documents where any element in the specified array field matches the specified
+     - Matches documents where any element in the specified array field matches the
        query value.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyGt()``
-     - Matches documents where any element in the specified array field is greater than the specified
+     - Matches documents where any element in the specified array field is greater than the
        query value.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyGte()``
-     - Matches documents where any element in the specified array field is greater than or equal to
-       the specified query value.
+     - Matches documents where any element in the specified array field is greater than or
+       equal to the query value.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyIn()``
      - Matches documents where any element in the specified array field matches any value in
-       the specified query array.
+       the query array.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
 
    * - ``AnyLt()``
-     - Matches documents where any element in the specified array field is less than the specified
+     - Matches documents where any element in the specified array field is less than the
        query value.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyLte()``
-     - Matches documents where any element in the specified array field is less than or equal to
-       the specified query value.
+     - Matches documents where any element in the specified array field is less than or
+       equal to the query value.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyNe()``
      - Matches documents where any element in the specified array field is not equal to
-       the specified query value.
+       the query value.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyNin()``
-     - Matches documents where none of the elements in the specified array field match any of the 
-       values in the specified query array. This method also matches documents where the
-       specified field doesn't exist.
+     - Matches documents where one of the following is true:
+
+       - Any element in the specified array field isn't in the query array.
+       - The specified field doesn't exist.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
 
    * - ``AnyStringIn()``
      - Matches documents where any string element in the specified array field matches any
-       string value in the specified query array.
+       string value in the query array.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``AnyStringNin()``
-     - Matches documents where none of the string elements in the specified array field
-       matches any of the values in the specified query filter. This method also matches
-       documents where the specified field doesn't exist.
+     - Matches documents where one of the following is true:
+
+       - Any string element in the specified array field isn't in the query array.
+       - The specified field doesn't exist.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
+
    * - ``ElemMatch()``
      - Matches documents where any element in the specified array field matches the
-       specified query criteria. 
+       query criteria.
      - :manual:`$elemMatch </reference/operator/query/elemMatch/>`
-   
-   * - ``In()``
-     - Matches documents where the value of the specified field matches any value in the
-       specified query array. 
-     - :manual:`$in </reference/operator/query/in/>`
-   
+
    * - ``Size()``
      - Matches documents where the specified array field is the specified size.
      - :manual:`$size </reference/operator/query/size/>`
-   
+
    * - ``SizeGt()``
      - Matches documents where the specified array field is larger than the specified size.
      - :manual:`$size </reference/operator/query/size/>`
-   
+
    * - ``SizeGte()``
-     - Matches documents where the specified array field is larger than or equal to the specified size.
+     - Matches documents where the specified array field is larger than or equal to the
+       specified size.
      - :manual:`$size </reference/operator/query/size/>`
-   
+
    * - ``SizeLt()``
      - Matches documents where the specified array field is smaller than the specified size.
      - :manual:`$size </reference/operator/query/size/>`
-   
+
    * - ``SizeLte()``
-     - Matches documents where the array field is smaller than or equal to the specified size.
+     - Matches documents where the specified array field is smaller than or equal to the
+       specified size.
      - :manual:`$size </reference/operator/query/size/>`
 
-   * - ``StringIn()``
-     - Matches documents where the string value of the specified field matches any string value in the
-       specified query array. 
-     - :manual:`$in </reference/operator/query/in/>`
-   
-   * - ``StringNin()``
-     - Matches documents where the string value of the specified field matches none of the
-       string values in the specified query array.
-       the specified query filter. 
-     - :manual:`$in </reference/operator/query/in/>`
-
 The following example uses builders to create a query filter that matches all
-documents that have 3 elements in the ``models`` field:
+documents that have three elements in the ``models`` field:
 
 .. io-code-block::
    :copyable:
@@ -441,7 +430,9 @@ documents that have 3 elements in the ``models`` field:
 Element Operators
 -----------------
 
-Element operators query data based on the presence or type of a field.
+Element operators match document query data based on the presence or type of a field.
+The following table lists the {+driver-short+} methods for element operations
+and the equivalent {+mdb-server+} operators:
 
 .. list-table::
    :widths: 20 60 20
@@ -452,10 +443,10 @@ Element operators query data based on the presence or type of a field.
      - {+mdb-server+} Operator
 
    * - ``Exists()``
-     - Matches documents that contain or do not contain a specified field, including
+     - Matches documents that contain or don't contain a specified field, including
        documents where the field value is ``null``.
      - :manual:`$exists </reference/operator/query/exists/>`
-   
+
    * - ``Type()``
      - Matches documents where the value of the specified field is an instance of the
        specified BSON types.
@@ -482,8 +473,9 @@ documents that have a ``rating`` field:
 Evaluation Operators
 --------------------
 
-Evaluation operators analyze data on individual fields, or on the entire collection's
-documents.
+Evaluation operators analyze data in individual fields or all documents in the collection.
+The following table lists the {+driver-short+} methods for
+evaluation operations and the equivalent {+mdb-server+} operators:
 
 .. list-table::
    :widths: 20 60 20
@@ -496,15 +488,15 @@ documents.
    * - ``JsonSchema()``
      - Matches documents that satisfy the specified JSON schema.
      - :manual:`$jsonSchema </reference/operator/query/jsonSchema/>`
-   
+
    * - ``Mod()``
      - Matches documents where the value of the specified field divided by a divisor has the
        specified remainder (modulo).
      - :manual:`$mod </reference/operator/query/mod/>`
-    
+
    * - ``RegEx()``
      - Matches documents where the value of the specified field matches a specified regular
-       expression. 
+       expression.
      - :manual:`$regex </reference/operator/query/regex/>`
 
    * - ``Where()``
@@ -513,7 +505,7 @@ documents.
      - :manual:`$where </reference/operator/query/where/>`
 
 The following example uses builders to create a query filter that matches all
-documents that have a value in the ``make`` field that starts with the letter 
+documents that have a value in the ``make`` field that starts with the letter
 "G":
 
 .. io-code-block::
@@ -532,6 +524,8 @@ Geospatial Operators
 --------------------
 
 Geospatial operators return data based on geospatial expression conditions.
+The following table lists the {+driver-short+} methods for
+geospatial operations and the equivalent {+mdb-server+} operators:
 
 .. list-table::
    :widths: 20 60 20
@@ -542,44 +536,46 @@ Geospatial operators return data based on geospatial expression conditions.
      - {+mdb-server+} Operator
 
    * - ``GeoIntersects()``
-     - MAtches documents whose geospatial data intersects with a specified
+     - Matches documents whose geospatial data intersects with a specified
        `GeoJsonObject <{+new-api-root+}/MongoDB.Driver/MongoDB.Driver.GeoJsonObjectModel.GeoJsonObject-1.html>`__.
      - :manual:`$geoIntersects </reference/operator/query/geoIntersects/>`
-   
+
    * - ``GeoWithin()``
-     - Matches documents with geospatial data entirely within the specified shape.
+     - Matches documents whose geospatial data is entirely within the specified shape.
      - :manual:`$geoWithin </reference/operator/query/geoWithin/>`
-   
+
    * - ``GeoWithinBox()``
-     - Matches documents with geospatial data entirely within the specified box.
+     - Matches documents whose geospatial data is entirely within the specified box.
      - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$box </reference/operator/query/box/>`
 
    * - ``GeoWithinCenter()``
-     - Matches documents with geospatial data entirely within the specified circle.
+     - Matches documents whose geospatial data is entirely within the specified circle.
      - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$center </reference/operator/query/center/>`
 
    * - ``GeoWithinCenterSphere()``
-     - Matches documents with geospatial data entirely within the specified sphere.
+     - Matches documents whose geospatial data is entirely within the specified sphere.
      - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$centerSphere </reference/operator/query/centerSphere/>`
 
    * - ``GeoWithinPolygon()``
-     - Matches documents with geospatial data entirely within the specified polygon.
+     - Matches documents whose geospatial data is entirely within the specified polygon.
      - :manual:`$geoWithin </reference/operator/query/geoWithin/>`, :manual:`$polygon </reference/operator/query/polygon/>`
 
    * - ``Near()``
      - Specifies a point for which a geospatial query returns the documents from nearest to
-       farthest. 
+       farthest.
      - :manual:`$near </reference/operator/query/near/>`
 
    * - ``NearSphere()``
      - Specifies a point for which a geospatial query returns the documents from nearest to
-       farthest in spherical geometry. 
+       farthest in spherical geometry.
      - :manual:`$nearSphere </reference/operator/query/nearSphere/>`
 
 Bitwise Operators
 -----------------
 
-Bitwise operators return data based on bit-position conditions.
+Bitwise operators matches documents based on bit-position conditions.
+The following table lists the {+driver-short+} methods for
+bitwise operations and the equivalent {+mdb-server+} operators:
 
 .. list-table::
    :widths: 20 60 20
@@ -593,7 +589,7 @@ Bitwise operators return data based on bit-position conditions.
      - Matches documents where all of the specified bit positions are clear (``0``) in
        the specified field.
      - :manual:`$bitsAllClear </reference/operator/query/bitsAllClear/>`
-   
+
    * - ``bitsAllSet()``
      - Matches documents where all of the specified bit positions are set (``1``) in
        the specified field.
@@ -602,13 +598,13 @@ Bitwise operators return data based on bit-position conditions.
    * - ``bitsAnyClear()``
      - Matches documents where any of the specified bit positions are clear (``0``) in
        the specified field.
-     - :manual:`$bitsAnyClear </reference/operator/query/bitsAnyClear/>`   
+     - :manual:`$bitsAnyClear </reference/operator/query/bitsAnyClear/>`
 
    * - ``bitsAnySet()``
      - Matches documents where any of the specified bit positions are set (``1``) in
        the specified field.
-     - :manual:`$bitsAnySet </reference/operator/query/bitsAnySet/>`   
-   
+     - :manual:`$bitsAnySet </reference/operator/query/bitsAnySet/>`
+
 Other Operators
 ---------------
 
@@ -631,32 +627,7 @@ The {+driver-short+} also provides the following methods that create filter defi
 Additional Information
 ----------------------
 
-
-
-.. TODO: integrate into existing page
-
-Construct a Filter
-------------------
-
-The ``FilterDefinitionBuilder`` class provides a type-safe interface for
-building up queries. Suppose you want to query your collection for
-documents matching the following criteria:
-
-- ``Price`` field value less than 20
-- ``Category`` field value is "Perennial"
-
-
-
-If you are using LINQ, you can also use the ``Inject()`` method to apply the filter
-to a LINQ query:
-
-.. code-block:: csharp
-   :copyable: true
-
-   var builder = Builders<Flower>.Filter;
-   var filter = builder.Lt("Price", 20) & builder.Eq("Category", "Perennial");
-   var query = collection.AsQueryable().Where(f => filter.Inject());
-
-
-
-- `FilterDefinitionBuilder <{+new-api-root+}/MongoDB.Driver/MongoDB.Driver.FilterDefinitionBuilder-1.html>`__
\ No newline at end of file
+For more information about any of the driver methods on this page, see the
+API documentation for the
+`FilterDefinitionBuilder<TDocument> <{+new-api-root+}/MongoDB.Driver/MongoDB.Driver.FilterDefinitionBuilder-1.html>`__
+class.
\ No newline at end of file

From d7f17549657dc6ee9416cdc10e66eb9cfc517cda Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Mon, 28 Apr 2025 11:19:29 -0500
Subject: [PATCH 5/8] redirects and table fix

---
 config/redirects                                          | 3 ++-
 source/crud/query/{specify-query.txt => query-filter.txt} | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename source/crud/query/{specify-query.txt => query-filter.txt} (99%)

diff --git a/config/redirects b/config/redirects
index b593fff5..0f70d847 100644
--- a/config/redirects
+++ b/config/redirects
@@ -93,4 +93,5 @@ raw: ${prefix}/master -> ${base}/upcoming/
 [*-master]: ${prefix}/${version}/fundamentals/authentication/ldap/ -> ${base}/${version}/security/authentication/ldap/
 [*-master]: ${prefix}/${version}/fundamentals/authentication/oidc/ -> ${base}/${version}/security/authentication/oidc/
 [*-master]: ${prefix}/${version}/fundamentals/authentication/scram/ -> ${base}/${version}/security/authentication/scram/
-[*-master]: ${prefix}/${version}/fundamentals/authentication/x509/ -> ${base}/${version}/security/authentication/x509/
\ No newline at end of file
+[*-master]: ${prefix}/${version}/fundamentals/authentication/x509/ -> ${base}/${version}/security/authentication/x509/
+[*-master]: ${prefix}/${version}/crud/query/specify-query/ -> ${base}/${version}/crud/query/query-filter/
\ No newline at end of file
diff --git a/source/crud/query/specify-query.txt b/source/crud/query/query-filter.txt
similarity index 99%
rename from source/crud/query/specify-query.txt
rename to source/crud/query/query-filter.txt
index 2e2b5363..f492dc4a 100644
--- a/source/crud/query/specify-query.txt
+++ b/source/crud/query/query-filter.txt
@@ -102,7 +102,7 @@ The following table lists the {+driver-short+} methods for comparison operations
 and the equivalent {+mdb-server+} operators:
 
 .. list-table::
-   :widths: 20 20 40 20
+   :widths: 10 10 70 10
    :header-rows: 1
 
    * - {+driver-short+} Method

From 57e3bbb4025aa59fe15d28e2d3e1c23563e08c7d Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Mon, 28 Apr 2025 11:24:19 -0500
Subject: [PATCH 6/8] table fix

---
 source/crud/query/query-filter.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/crud/query/query-filter.txt b/source/crud/query/query-filter.txt
index f492dc4a..2e2b5363 100644
--- a/source/crud/query/query-filter.txt
+++ b/source/crud/query/query-filter.txt
@@ -102,7 +102,7 @@ The following table lists the {+driver-short+} methods for comparison operations
 and the equivalent {+mdb-server+} operators:
 
 .. list-table::
-   :widths: 10 10 70 10
+   :widths: 20 20 40 20
    :header-rows: 1
 
    * - {+driver-short+} Method

From 0cb0bcaf6705da2e58d2ca91b29fe7e6cbbb5e62 Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:07:45 -0500
Subject: [PATCH 7/8] mm review

---
 source/crud/query.txt              |  2 +-
 source/crud/query/query-filter.txt | 20 ++++++++++----------
 source/reference/compatibility.txt |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/source/crud/query.txt b/source/crud/query.txt
index 93468c74..e5f07bf7 100644
--- a/source/crud/query.txt
+++ b/source/crud/query.txt
@@ -12,7 +12,7 @@ Read Operations
    :titlesonly:
    :maxdepth: 1
 
-   Specify a Query </crud/query/specify-query>
+   Specify a Query </crud/query/query-filter>
    Find Documents </crud/query/find>
    Specify Documents to Return </crud/query/specify-documents-to-return>
    Specify Fields to Return </crud/query/project>
diff --git a/source/crud/query/query-filter.txt b/source/crud/query/query-filter.txt
index 2e2b5363..5812a14c 100644
--- a/source/crud/query/query-filter.txt
+++ b/source/crud/query/query-filter.txt
@@ -183,7 +183,7 @@ greater than ``1985``.
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
 
@@ -198,7 +198,7 @@ same documents as the preceding example:
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
 
@@ -214,7 +214,7 @@ method. The query matches all documents where the
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
 
@@ -229,7 +229,7 @@ same documents as the preceding example:
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
 
@@ -290,7 +290,7 @@ field is not equal to "Kiesel".
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 3, "make" : "PRS", "models" : ["Silver Sky", "SE", "Custom"], "establishedYear" : 1985, "rating" : 9 }
 
@@ -305,7 +305,7 @@ same documents as the preceding example:
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 3, "make" : "PRS", "models" : ["Silver Sky", "SE", "Custom"], "establishedYear" : 1985, "rating" : 9 }
 
@@ -411,7 +411,7 @@ and the equivalent {+mdb-server+} operators:
      - :manual:`$size </reference/operator/query/size/>`
 
 The following example uses builders to create a query filter that matches all
-documents that have three elements in the ``models`` field:
+documents that have exactly three elements in the ``models`` field:
 
 .. io-code-block::
    :copyable:
@@ -421,7 +421,7 @@ documents that have three elements in the ``models`` field:
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 2, "make" : "Gibson", "models" : ["Les Paul", "SG", "Explorer"], "establishedYear" : 1902, "rating" : 8 }
       { "_id" : 3, "make" : "PRS", "models" : ["Silver Sky", "SE", "Custom"], "establishedYear" : 1985, "rating" : 9 }
@@ -463,7 +463,7 @@ documents that have a ``rating`` field:
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 1, "make" : "Fender", "models" : ["Stratocaster", "Telecaster"], "establishedYear" : 1946, "rating" : 9 }
       { "_id" : 2, "make" : "Gibson", "models" : ["Les Paul", "SG", "Explorer"], "establishedYear" : 1902, "rating" : 8 }
@@ -516,7 +516,7 @@ documents that have a value in the ``make`` field that starts with the letter
 
    .. output::
       :language: json
-      :visible:
+      :visible: false
 
       { "_id" : 2, "make" : "Gibson", "models" : ["Les Paul", "SG", "Explorer"], "establishedYear" : 1902, "rating" : 8 }
 
diff --git a/source/reference/compatibility.txt b/source/reference/compatibility.txt
index ce124f4b..cee8ba3b 100644
--- a/source/reference/compatibility.txt
+++ b/source/reference/compatibility.txt
@@ -41,5 +41,5 @@ The first column lists the driver version.
 
 .. include:: /includes/language-compatibility-table-csharp.rst
 
-For more information on how to read the compatibility tables, see our guide on 
-:ref:`MongoDB Compatibility Tables. <about-driver-compatibility>`
+For more information about how to read the compatibility tables, see
+`MongoDB Compatibility Tables <https://www.mongodb.com/docs/drivers/about-compatibility/>`__.

From c505913c092d473a66c44ea99b5ec52d4b559bb6 Mon Sep 17 00:00:00 2001
From: Mike Woofter <108414937+mongoKart@users.noreply.github.com>
Date: Tue, 6 May 2025 11:10:28 -0500
Subject: [PATCH 8/8] rs feedback

---
 source/crud/query/query-filter.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/crud/query/query-filter.txt b/source/crud/query/query-filter.txt
index 5812a14c..d409d099 100644
--- a/source/crud/query/query-filter.txt
+++ b/source/crud/query/query-filter.txt
@@ -171,9 +171,9 @@ and the equivalent {+mdb-server+} operators:
        of the string values in the query array.
      - :manual:`$in </reference/operator/query/in/>`
 
-The following example specifies a query filter as a parameter to the ``Find()``
-method. The query matches all documents where the ``establishedYear`` field is
-greater than ``1985``.
+The following example calls the ``Find()`` method and passes a lambda filter, which
+the driver translates to a query filter. The query matches all documents where the
+``establishedYear`` field is greater than ``1985``.
 
 .. io-code-block::
    :copyable:
@@ -202,8 +202,8 @@ same documents as the preceding example:
 
       { "_id" : 4, "make" : "Kiesel", "models" : ["Ares", "Vader", "Solo"], "establishedYear" : 2015, "rating" : null }
 
-The following example specifies a query filter as a parameter to the ``Find()``
-method. The query matches all documents where the
+The following example calls the ``Find()`` method and passes a lambda expression, which
+the driver translates to a query filter. The query matches all documents where the
 ``make`` field equals "Fender".
 
 .. io-code-block::
@@ -277,8 +277,8 @@ and the equivalent {+mdb-server+} operators:
      - Matches documents where one or more expressions evaluates to true.
      - :manual:`$or </reference/operator/query/or/>`
 
-The following example specifies a query filter as a parameter to the ``Find()``
-method. The query matches all documents where the
+The following example calls the ``Find()`` method and passes a lambda expression,
+which the driver translates to a query filter. The query matches all documents where the
 ``establishedYear`` field is greater than or equal to ``1985``, and the ``make``
 field is not equal to "Kiesel".
 
@@ -590,17 +590,17 @@ bitwise operations and the equivalent {+mdb-server+} operators:
        the specified field.
      - :manual:`$bitsAllClear </reference/operator/query/bitsAllClear/>`
 
-   * - ``bitsAllSet()``
+   * - ``BitsAllSet()``
      - Matches documents where all of the specified bit positions are set (``1``) in
        the specified field.
      - :manual:`$bitsAllSet </reference/operator/query/bitsAllSet/>`
 
-   * - ``bitsAnyClear()``
+   * - ``BitsAnyClear()``
      - Matches documents where any of the specified bit positions are clear (``0``) in
        the specified field.
      - :manual:`$bitsAnyClear </reference/operator/query/bitsAnyClear/>`
 
-   * - ``bitsAnySet()``
+   * - ``BitsAnySet()``
      - Matches documents where any of the specified bit positions are set (``1``) in
        the specified field.
      - :manual:`$bitsAnySet </reference/operator/query/bitsAnySet/>`