From 1ff91c0d8213472aa8ff6e8db80f18043c7f86df Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 19 May 2015 15:05:26 +0900 Subject: Fix various spelling mistakes Change-Id: I5fb811eab02d48a649990c6418977915c7dd7430 --- Documentation/access-control.txt | 2 +- Documentation/config-gerrit.txt | 2 +- Documentation/dev-inspector.txt | 2 +- ReleaseNotes/ReleaseNotes-2.10.1.txt | 2 +- ReleaseNotes/ReleaseNotes-2.10.3.txt | 2 +- ReleaseNotes/ReleaseNotes-2.10.4.txt | 2 +- ReleaseNotes/ReleaseNotes-2.5.txt | 4 ++-- ReleaseNotes/ReleaseNotes-2.8.txt | 2 +- .../src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java | 2 +- .../src/main/java/com/google/gerrit/pgm/shell/JythonShell.java | 6 +++--- .../main/java/com/google/gerrit/server/project/ProjectCache.java | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt index fce3f763f0..909f972ecd 100644 --- a/Documentation/access-control.txt +++ b/Documentation/access-control.txt @@ -864,7 +864,7 @@ Suggested access rights to grant: If it's desired to have the possibility to upload temporarily hidden changes there's a specific permission for that. This enables someone to add specific reviewers for early feedback before making the change -publically visible. If you want to allow others than the owners to +publicly visible. If you want to allow others than the owners to publish a draft you also need to grant them `Publish Drafts`. Optional access rights to grant: diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index 5b1817a843..632965fd63 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -1113,7 +1113,7 @@ much more predictable behavior. Size of the buffer to store logging events for asynchronous logging. Putting a larger value can protect threads from stalling when the AsyncAppender threads are not fast enough to consume the logging events -from the buffer. It also protects from loosing log entries in this case. +from the buffer. It also protects from losing log entries in this case. + Default is 64 entries. diff --git a/Documentation/dev-inspector.txt b/Documentation/dev-inspector.txt index 2d56283c19..7c13a7defd 100644 --- a/Documentation/dev-inspector.txt +++ b/Documentation/dev-inspector.txt @@ -240,7 +240,7 @@ to the error log: ---- [2012-04-17 14:20:30,558] INFO com.google.gerrit.pgm.shell.JythonShell : Jython shell instance created. -[2012-04-17 14:20:38,005] ERROR com.google.gerrit.pgm.shell.JythonShell : Exception occured while loading file Startup.py : +[2012-04-17 14:20:38,005] ERROR com.google.gerrit.pgm.shell.JythonShell : Exception occurred while loading file Startup.py : java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) diff --git a/ReleaseNotes/ReleaseNotes-2.10.1.txt b/ReleaseNotes/ReleaseNotes-2.10.1.txt index 6ef90737c1..df70b64e43 100644 --- a/ReleaseNotes/ReleaseNotes-2.10.1.txt +++ b/ReleaseNotes/ReleaseNotes-2.10.1.txt @@ -23,7 +23,7 @@ LDAP ---- * Several performance improvements when using LDAP, both in the number of LDAP -requests and in the amount of data transfered. +requests and in the amount of data transferred. * Sites using LDAP for authentication but otherwise rely on local Gerrit groups should set the new `ldap.fetchMemberOfEagerly` option to `false`. diff --git a/ReleaseNotes/ReleaseNotes-2.10.3.txt b/ReleaseNotes/ReleaseNotes-2.10.3.txt index 578a1ae5eb..052840d6ad 100644 --- a/ReleaseNotes/ReleaseNotes-2.10.3.txt +++ b/ReleaseNotes/ReleaseNotes-2.10.3.txt @@ -33,7 +33,7 @@ New Features + OpenID auth scheme is aware of optional OAuth2 plugin-based authentication. This feature is considered to be experimental and hasn't reached full feature set yet. -Particularly, linking of user identities accross protocol boundaries and even from +Particularly, linking of user identities across protocol boundaries and even from one OAuth2 identity to another OAuth2 identity wasn't implemented yet. Configuration diff --git a/ReleaseNotes/ReleaseNotes-2.10.4.txt b/ReleaseNotes/ReleaseNotes-2.10.4.txt index 7de3f418ae..e221549c31 100644 --- a/ReleaseNotes/ReleaseNotes-2.10.4.txt +++ b/ReleaseNotes/ReleaseNotes-2.10.4.txt @@ -12,7 +12,7 @@ New Features * Support identity linking in hybrid OpenID and OAuth2 authentication. + -Linking of user identities accross protocol boundaries and from one OAuth2 +Linking of user identities across protocol boundaries and from one OAuth2 identity to another OAuth2 identity is supported. * Support identity linking in OAuth2 extension point. diff --git a/ReleaseNotes/ReleaseNotes-2.5.txt b/ReleaseNotes/ReleaseNotes-2.5.txt index cdef554dd9..4abed47f3f 100644 --- a/ReleaseNotes/ReleaseNotes-2.5.txt +++ b/ReleaseNotes/ReleaseNotes-2.5.txt @@ -923,11 +923,11 @@ Eclipse 3 writes a timestamp at the top of these files making the Git working tree dirty. Eclipse 4 (Juno) still overwrites these files but doesn't write the timestamp. This should help to keep the working tree clean. However, since the timestamp is currently present in these -files, Eclispe 4 would still make them dirty by overwriting and +files, Eclipse 4 would still make them dirty by overwriting and effectively removing the timestamp. + This change removes the timestamp from these files. This helps those -using Eclipse 4 and doesn't make it worse for those still using Eclispe +using Eclipse 4 and doesn't make it worse for those still using Eclipse 3. * Add Maven profile to skip build of plugin modules diff --git a/ReleaseNotes/ReleaseNotes-2.8.txt b/ReleaseNotes/ReleaseNotes-2.8.txt index bc854a2ba6..92cdda2a0e 100644 --- a/ReleaseNotes/ReleaseNotes-2.8.txt +++ b/ReleaseNotes/ReleaseNotes-2.8.txt @@ -625,7 +625,7 @@ Configuration * Do not persist default project state in `project.config`. -* Honor the `gerrit.cannonicalWebUrl` setting when opening the browser after init. +* Honor the `gerrit.canonicalWebUrl` setting when opening the browser after init. * Fix 'query disabled' error when Query Limit is set. diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java index a2155d4ef4..819a11ff99 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/OnEditEnabler.java @@ -87,7 +87,7 @@ public class OnEditEnabler implements KeyPressHandler, KeyDownHandler, // Resetting the "original text" on focus ensures that we are // up to date with non-user updates of the text (calls to // setText()...) and also up to date with user changes which - // occured after enabling "widget". + // occurred after enabling "widget". tb.addFocusHandler(new FocusHandler() { @Override public void onFocus(FocusEvent event) { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/shell/JythonShell.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/shell/JythonShell.java index 5b537ae297..6efda29b2d 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/shell/JythonShell.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/shell/JythonShell.java @@ -191,9 +191,9 @@ public class JythonShell { + " is not found or not executable"); } } catch (InvocationTargetException e) { - log.error("Exception occured while loading file " + p + " : ", e); + log.error("Exception occurred while loading file " + p + " : ", e); } catch (SecurityException e) { - log.error("SecurityException occured while loading file " + p + " : ", e); + log.error("SecurityException occurred while loading file " + p + " : ", e); } } @@ -204,7 +204,7 @@ public class JythonShell { new Object[] { in, p } ); } catch (InvocationTargetException e) { - log.error("Exception occured while loading " + p + " : ", e); + log.error("Exception occurred while loading " + p + " : ", e); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java index fdff1e71a3..d451b46030 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java @@ -32,7 +32,7 @@ public interface ProjectCache { * Get the cached data for a project by its unique name. * * @param projectName name of the project. - * @return the cached data; null if no such project exists or a error occured. + * @return the cached data; null if no such project exists or a error occurred. * @see #checkedGet(com.google.gerrit.reviewdb.client.Project.NameKey) */ public ProjectState get(Project.NameKey projectName); -- cgit v1.2.3