Skip to content

Commit 7aad9ce

Browse files
committed
Session doc tweaks
1 parent 7dc5aa4 commit 7aad9ce

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/session.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ resulted in those changes.
4545
4646
* Changesets do not contain the changes in the order made
4747
48-
* Using the :class:`change set builder <ChangesetBuilder>`, you can
49-
accumulate multiple change sets, and add changes from an iterator or
50-
conflict handler.
48+
* Using :class:`ChangesetBuilder`, you can accumulate multiple change
49+
sets, and add changes from an iterator or conflict handler.
5150
5251
* Using :class:`Rebaser` you can merge conflict resolutions made when
5352
applying a changeset into a later changeset, so those conflict
@@ -65,7 +64,7 @@ resulted in those changes.
6564
painful.
6665
6766
* Most APIs produce and consume changesets as bytes (or :class:`bytes
68-
like <collections.abc.Buffer>`. That limits the changeset size to
67+
like <collections.abc.Buffer>`). That limits the changeset size to
6968
2GB - the limit is in the SQLite code and also the limit for `blobs
7069
<https://www.sqlite.org/limits.html>`__. To produce or consume
7170
larger changesets, or to not have an entire changeset in memory,
@@ -138,6 +137,8 @@ To manipulate changesets:
138137
* You can add :class:`individual changes <TableChange>` from
139138
:meth:`Changeset.iter` or from your conflict handler in
140139
:meth:`Changeset.apply`
140+
* Use :class:`Rebaser` to incorporate conflict resolutions into a
141+
changeset
141142
142143
.. tip::
143144

0 commit comments

Comments
 (0)