From 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 17 Jan 2013 14:18:26 -0500 Subject: Imported Upstream version 2.1.1 --- doc/lemon.html | 2 +- doc/pager-invariants.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') 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:
  • 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. -
  • If the precedences are the same the the shift token is +
  • If the precedences are the same the shift token is left-associative, then resolve in favor of the reduce. No parsing conflict is reported.
  • 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. -- cgit v1.2.3