Skip to content

Commit

Permalink
Merge pull request #3585 from vespa-engine/vekterli/minor-grammar-fix…
Browse files Browse the repository at this point in the history
…es-and-clarifications

Minor grammar fixes and a few added clarifications
  • Loading branch information
kkraune authored Jan 20, 2025
2 parents 1bc08da + 86c26fe commit c10e775
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions en/documents.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
defined in the <a href="schemas.html">schema</a>.
</p><p>
When configuring clusters, a <a href="reference/services-content.html#documents">documents</a>
element set what document types a cluster is to store.
element sets what document types a cluster is to store.
This configuration is used to configure the garbage collector if it is enabled.
Additionally, it is used to define default routes for documents sent into the application.
By default, a document will be sent to all clusters having the document type defined.
Expand Down Expand Up @@ -259,8 +259,9 @@ <h2 id="document-expiry">Document expiry</h2>
</pre>
<p>
When <code>garbage-collection="true"</code>, Vespa iterates over the document space to purge expired documents.
Vespa will invoke the configured GC selection for each stored document at most once every
Vespa will invoke the configured GC selection for each stored document once every
<a href="reference/services-content.html#documents.selection">garbage-collection-interval</a> seconds.
It is unspecified when a particular document will be processed within the configured interval.
</p>
{% include important.html content="This is a best-effort garbage collection feature to conserve CPU and space.
Use query filters if it is important to exclude documents based on a criterion."%}
Expand Down
2 changes: 1 addition & 1 deletion en/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h2 id="vespa-operations">Vespa operations</h2>
free-text fields, structured data or <a href="nearest-neighbor-search.html">vector spaces (ANN)</a>.
Any number of such conditions can be combined freely in boolean trees to
define the full query to be executed.
Vespa will compute a query plan over the conditions which executed them
Vespa will compute a query plan over the conditions which executes them
efficiently with any number of conditions such as e.g. filters combined with ANN conditions.
Matches to a query can be passed through an inference step which can compute
any business logic or machine-learned model expressed as a
Expand Down
2 changes: 1 addition & 1 deletion en/query-api.html
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ <h3 id="matching-ranking-grouping">Matching, ranking, grouping</h3>
<li>
At this point the query enters one or more <a href="reference/services-content.html">content clusters</a>.
In a content cluster with <a href="elasticity.html#grouped-distribution">grouped distribution</a>,
the query is dispatched to one group at a time using a
the query is dispatched to all content nodes within a single group using a
<a href="reference/services-content.html#dispatch-tuning">dispatch policy</a>,
while with a flat single group content cluster the query is dispatched to all content nodes.
</li><li>
Expand Down
4 changes: 2 additions & 2 deletions en/reads-and-writes.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h2 id="operations">Operations</h2>
for test-and-set use cases.
</p><p>
A removed document is written as a tombstone, and later garbage collected -
see <a href="reference/services-content.html#removed-db-prune-age">removed-db / prune /age</a>.
see <a href="reference/services-content.html#removed-db-prune-age">removed-db / prune / age</a>.
Vespa does not retain, nor return, the document data of removed documents.
</p>
</td>
Expand All @@ -98,7 +98,7 @@ <h2 id="operations">Operations</h2>
Also referred to as <a href="partial-updates.html">partial updates</a>,
as it updates one or more fields of a document by ID - the
<a href="document-v1-api-guide.html#put">document v1 API</a> can be used to perform
<a href="reference/document-json-format.html#update">updates in the JSON Document format</a>,
<a href="reference/document-json-format.html#update">updates in the JSON Document format</a>.
If the document to update is not found, it is not considered a failure.
</p><p>
Updates support <a href="document-v1-api-guide.html#create-if-nonexistent">create if nonexistent</a> (upsert).
Expand Down
2 changes: 1 addition & 1 deletion en/schemas.html
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ <h2 id="inheritance">Inheritance</h2>
<img src="/assets/img/inheritance-overview.svg" width="600px" height="auto"
alt="Schema elements that support inheritance"/>

{% include note.html content="Inheritance is not to confuse with <a href='parent-child.html'>parent/child</a>,
{% include note.html content="Inheritance is not to be confused with <a href='parent-child.html'>parent/child</a>,
which is a feature to import field values at query time."%}


Expand Down

0 comments on commit c10e775

Please sign in to comment.