Launchpad itself

Merge ~jugmac00/launchpad:fix-typo-in-cannot into launchpad:master

  1. Git
  2. lp:~jugmac00/launchpad
  3. fix-typo-in-cannot
  4. Merge into master
Proposed by Jürgen Gmach
Status: Merged
Approved by: Jürgen Gmach
Approved revision: 4585251d013c9189d264c4e3252d765c6036ddcb
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~jugmac00/launchpad:fix-typo-in-cannot
Merge into: launchpad:master
Diff against target: 39 lines (+3/-3)
3 files modified
lib/lp/answers/interfaces/faq.py (+1/-1)
lib/lp/registry/browser/tests/productseries-setbranch-view.txt (+1/-1)
lib/lp/registry/interfaces/ociproject.py (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+420406@code.launchpad.net

Commit message

Fix typos

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/answers/interfaces/faq.py b/lib/lp/answers/interfaces/faq.py
2index f51a0ab..75c81f2 100644
3--- a/lib/lp/answers/interfaces/faq.py
4+++ b/lib/lp/answers/interfaces/faq.py
5@@ -39,7 +39,7 @@ from lp.services.fields import (
6
7 @error_status(http.client.BAD_REQUEST)
8 class CannotDeleteFAQ(Exception):
9- """The FAQ cannnot be deleted."""
10+ """The FAQ cannot be deleted."""
11
12
13 class IFAQPublic(IHasOwner):
14diff --git a/lib/lp/registry/browser/tests/productseries-setbranch-view.txt b/lib/lp/registry/browser/tests/productseries-setbranch-view.txt
15index 3080a22..dbe710c 100644
16--- a/lib/lp/registry/browser/tests/productseries-setbranch-view.txt
17+++ b/lib/lp/registry/browser/tests/productseries-setbranch-view.txt
18@@ -232,7 +232,7 @@ But Git branches may use git.
19 >>> print(series.branch.name)
20 chevette-branch
21
22-But Subversion branches cannnot use git.
23+But Subversion branches cannot use git.
24
25 >>> form = {
26 ... 'field.branch_type': 'import-external',
27diff --git a/lib/lp/registry/interfaces/ociproject.py b/lib/lp/registry/interfaces/ociproject.py
28index 558285c..93258f0 100644
29--- a/lib/lp/registry/interfaces/ociproject.py
30+++ b/lib/lp/registry/interfaces/ociproject.py
31@@ -75,7 +75,7 @@ OCI_PROJECT_ALLOW_CREATE = 'oci.project.create.enabled'
32
33 @error_status(http.client.BAD_REQUEST)
34 class CannotDeleteOCIProject(Exception):
35- """The OCIProject cannnot be deleted."""
36+ """The OCIProject cannot be deleted."""
37
38
39 @error_status(http.client.UNAUTHORIZED)

Subscribers

People subscribed via source and target branches

to status/vote changes: