From c392e3ce17eaa6b228a89bb440cd85b0eaee5855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20B=C3=A4ck?= Date: Tue, 27 Mar 2012 09:52:19 -0400 Subject: [PATCH] Documentation: Various typo corrections Change-Id: Ifcd40591b23ce902eb71bc8af6e490bf49a7b21b --- Documentation/dev-contributing.txt | 4 ++-- ReleaseNotes/ReleaseNotes-2.2.2.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 2ede544106..065e9d115d 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -150,7 +150,7 @@ Here are some guidelines that Gerrit uses: should be before the instance members. * Annotations should go before language keywords (final, private...) + Example: @Assisted @Nullable final type varName - * Imports should be mostly aphabetical (uppercase sorts before + * Imports should be mostly alphabetical (uppercase sorts before all lowercase, which means classes come before packages at the same level). @@ -164,7 +164,7 @@ back and consult this section when creating them. Design ------ -Here are some design level ojectives that you should keep in mind +Here are some design level objectives that you should keep in mind when coding: * ORM entity objects should match exactly one row in the database. diff --git a/ReleaseNotes/ReleaseNotes-2.2.2.txt b/ReleaseNotes/ReleaseNotes-2.2.2.txt index 3f1f76f9bd..ddfe323043 100644 --- a/ReleaseNotes/ReleaseNotes-2.2.2.txt +++ b/ReleaseNotes/ReleaseNotes-2.2.2.txt @@ -33,7 +33,7 @@ uses the default_submit predicate in common_rules.pl. + Projects now inherit the prolog rules defined in their parent project. Submit results from the child project are filtered by the -parent project using the filter predicate defined the parent's +parent project using the filter predicate defined in the parent's rules.pl. The results of the filtering are then passed up to the parent's parent and filtered, repeating this process up to the top level All-Projects. @@ -56,7 +56,7 @@ deleted afterwards. * prolog-shell: Simple command line Prolog interpreter + Define a small interactive interpreter that users or site -administartors can play around with by downloading the Gerrit WAR +administrators can play around with by downloading the Gerrit WAR file and executing: java -jar gerrit.war prolog-shell Prolog Predicates