diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
| commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
| tree | 6a637dd4dde653f870346a37ec6555eb0574949a /doc | |
| parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
| parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) | |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lemon.html | 2 | ||||
| -rw-r--r-- | doc/pager-invariants.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/lemon.html b/doc/lemon.html index 2c65555..b16e359 100644 --- a/doc/lemon.html +++ b/doc/lemon.html @@ -481,7 +481,7 @@ as follows: <li> If the precedences are the same and the shift token is right-associative, then resolve in favor of the shift. No parsing conflict is reported. -<li> If the precedences are the same the the shift token is +<li> If the precedences are the same the shift token is left-associative, then resolve in favor of the reduce. No parsing conflict is reported. <li> Otherwise, resolve the conflict by doing the shift and diff --git a/doc/pager-invariants.txt b/doc/pager-invariants.txt index c6deda7..44444da 100644 --- a/doc/pager-invariants.txt +++ b/doc/pager-invariants.txt @@ -44,7 +44,7 @@ *** Definition: Two databases (or the same database at two points it time) are said to be "logically equivalent" if they give the same answer to - all queries. Note in particular the the content of freelist leaf + all queries. Note in particular the content of freelist leaf pages can be changed arbitarily without effecting the logical equivalence of the database. |