Page MenuHomePhorge
Files F2683720

D25238.1734689351.diff
No OneTemporary
Actions

D25238.1734689351.diff
View Options

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -327,7 +327,7 @@
}
if ($value instanceof PhutilSafeHTML) {
- // TODO: Javelin supports implicity conversion of '__html' objects to
+ // TODO: Javelin supports implicit conversion of '__html' objects to
// JX.HTML, but only for Ajax responses, not behaviors. Just leave things
// as they are for now (where behaviors treat responses as HTML or plain
// text at their discretion).
diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
@@ -37,7 +37,7 @@
// TODO: The relationship between ConduitAPIRequest and ConduitCall is a
// little odd here and could probably be improved. Specifically, the
// APIRequest is a sub-object of the Call, which does not parallel the
- // role of AphrontRequest (which is an indepenent object).
+ // role of AphrontRequest (which is an independent object).
// In particular, the setUser() and getUser() existing independently on
// the Call and APIRequest is very awkward.
diff --git a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
--- a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
+++ b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
@@ -106,7 +106,7 @@
'The "InnoDB" engine is not available in MySQL (on host "%s"). '.
'Enable InnoDB in your MySQL configuration.'.
"\n\n".
- '(If you aleady created tables, MySQL incorrectly used some other '.
+ '(If you already created tables, MySQL incorrectly used some other '.
'engine to create them. You need to convert them or drop and '.
'reinitialize them.)',
$ref_key);
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -74,7 +74,7 @@
- If you use mailing lists, recipients may sometimes get duplicate
mail.
- Getting threading to work properly is easier, and threading settings
- can be customzied by each user.
+ can be customized by each user.
- "Reply All" will never send extra mail to other users involved in the
thread.
- Required if private reply-to addresses are configured.
diff --git a/src/applications/harbormaster/xaction/build/HarbormasterBuildMessageResumeTransaction.php b/src/applications/harbormaster/xaction/build/HarbormasterBuildMessageResumeTransaction.php
--- a/src/applications/harbormaster/xaction/build/HarbormasterBuildMessageResumeTransaction.php
+++ b/src/applications/harbormaster/xaction/build/HarbormasterBuildMessageResumeTransaction.php
@@ -99,7 +99,7 @@
throw new HarbormasterMessageException(
pht('Unable to Resume Build'),
pht(
- 'You can not resume this build beacuse it is already resuming.'));
+ 'You can not resume this build because it is already resuming.'));
}
if ($build->isRestarting()) {
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementMaintenanceWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementMaintenanceWorkflow.php
--- a/src/applications/repository/management/PhabricatorRepositoryManagementMaintenanceWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementMaintenanceWorkflow.php
@@ -23,7 +23,7 @@
'name' => 'stop',
'help' => pht(
'Take repositories out of maintenance mode, returning them '.
- 'to normal serice.'),
+ 'to normal service.'),
),
array(
'name' => 'repositories',
diff --git a/src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php b/src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php
--- a/src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php
+++ b/src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php
@@ -517,7 +517,7 @@
'/dir',
null,
null,
- // TODO: This might reasonbly be considered a bug in the parser; it
+ // TODO: This might reasonably be considered a bug in the parser; it
// should probably be COPY_AWAY.
DifferentialChangeType::TYPE_CHILD,
DifferentialChangeType::FILE_DIRECTORY,
diff --git a/src/applications/search/compiler/PhutilSearchQueryCompiler.php b/src/applications/search/compiler/PhutilSearchQueryCompiler.php
--- a/src/applications/search/compiler/PhutilSearchQueryCompiler.php
+++ b/src/applications/search/compiler/PhutilSearchQueryCompiler.php
@@ -297,7 +297,7 @@
$use_substring = true;
} else if (phutil_preg_match('/^_/', $value)) {
// See T13632. Assume users searching for any term that begins
- // with an undescore intend to perform substring search if they
+ // with an underscore intend to perform substring search if they
// don't provide an explicit search function.
$use_substring = true;
}
diff --git a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
--- a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
+++ b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
@@ -21,7 +21,7 @@
record allows you to see who edited an object, when, and how their edit changed
things.
-One common reason to call this method is that you're implmenting a webhook and
+One common reason to call this method is that you're implementing a webhook and
just received a notification that an object has changed. See the Webhooks
documentation for more detailed discussion of this use case.
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -391,7 +391,7 @@
$new = $this->getTransactionNewValue($object, $xaction);
$xaction->setNewValue($new);
- // Apply an optional transformation to convert "external" tranaction
+ // Apply an optional transformation to convert "external" transaction
// values (provided by APIs) into "internal" values.
$old = $xaction->getOldValue();
diff --git a/src/docs/contributor/database.diviner b/src/docs/contributor/database.diviner
--- a/src/docs/contributor/database.diviner
+++ b/src/docs/contributor/database.diviner
@@ -134,7 +134,7 @@
PHIDs
=====
-Each globally referencable object in Phorge has an associated PHID
+Each globally referenceable object in Phorge has an associated PHID
("Phorge ID") which serves as a global identifier, similar to a GUID.
We use PHIDs for referencing data in different databases.
diff --git a/src/docs/contributor/general_coding_standards.diviner b/src/docs/contributor/general_coding_standards.diviner
--- a/src/docs/contributor/general_coding_standards.diviner
+++ b/src/docs/contributor/general_coding_standards.diviner
@@ -142,7 +142,7 @@
= Documentation, Comments and Formatting =
- Prefer to remove code by deleting it over removing it by commenting it out.
- It shall live forever in source control, and can be retrieved therefrom if
+ It shall live forever in source control, and can be retrieved there from if
it is ever again called upon.
- In source code, use only ASCII printable characters plus space and linefeed.
Do not use UTF-8 or other multibyte encodings.
diff --git a/src/docs/user/configuration/configuring_inbound_email.diviner b/src/docs/user/configuration/configuring_inbound_email.diviner
--- a/src/docs/user/configuration/configuring_inbound_email.diviner
+++ b/src/docs/user/configuration/configuring_inbound_email.diviner
@@ -60,7 +60,7 @@
configured with `metamta.default-address`.
When a user takes an action that generates mail, Phorge sets the
-"Reply-To" addresss for the mail to that user's name and address. This means
+"Reply-To" address for the mail to that user's name and address. This means
that users can reply to email to discuss changes, but: the conversation won't
be recorded in Phorge; and users will not be able to use email commands
to take actions or make edits.
diff --git a/src/docs/user/userguide/multi_factor_auth.diviner b/src/docs/user/userguide/multi_factor_auth.diviner
--- a/src/docs/user/userguide/multi_factor_auth.diviner
+++ b/src/docs/user/userguide/multi_factor_auth.diviner
@@ -134,7 +134,7 @@
- **Active**: Users may add new factors. Users will be prompted to respond
to challenges from these providers when they take a sensitive action.
- **Deprecated**: Users may not add new factors, but they will still be
- asked to respond to challenges from exising factors.
+ asked to respond to challenges from existing factors.
- **Disabled**: Users may not add new factors, and existing factors will
not be used. If MFA is required and a user only has disabled factors,
they will be forced to add a new factor.
diff --git a/src/docs/user/userguide/webhooks.diviner b/src/docs/user/userguide/webhooks.diviner
--- a/src/docs/user/userguide/webhooks.diviner
+++ b/src/docs/user/userguide/webhooks.diviner
@@ -178,7 +178,7 @@
Test requests are never retried: they execute exactly once.
Live requests are automatically retried. If your endpoint does not return a
-HTTP 2XX response, the request will be retried regularly until it suceeds.
+HTTP 2XX response, the request will be retried regularly until it succeeds.
Retries will continue until the request succeeds or is garbage collected. By
default, this is after 7 days.
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
@@ -1679,7 +1679,7 @@
foreach ($map as $field_key => $field) {
// For now, only support overriding standard custom fields. In the
// future there's no technical or product reason we couldn't let you
- // override (some properites of) other fields like "Title", but they
+ // override (some properties of) other fields like "Title", but they
// don't usually support appropriate "setX()" methods today.
if (!($field instanceof PhabricatorStandardCustomField)) {
// For fields that are proxies on top of StandardCustomField, which
diff --git a/src/infrastructure/markup/blockrule/PhutilRemarkupLiteralBlockRule.php b/src/infrastructure/markup/blockrule/PhutilRemarkupLiteralBlockRule.php
--- a/src/infrastructure/markup/blockrule/PhutilRemarkupLiteralBlockRule.php
+++ b/src/infrastructure/markup/blockrule/PhutilRemarkupLiteralBlockRule.php
@@ -7,7 +7,7 @@
}
public function getMatchingLineCount(array $lines, $cursor) {
- // NOTE: We're consuming all continguous blocks of %%% literals, so this:
+ // NOTE: We're consuming all contiguous blocks of %%% literals, so this:
//
// %%%a%%%
// %%%b%%%
diff --git a/src/infrastructure/markup/syntax/highlighter/xhpast/PhutilXHPASTSyntaxHighlighterFuture.php b/src/infrastructure/markup/syntax/highlighter/xhpast/PhutilXHPASTSyntaxHighlighterFuture.php
--- a/src/infrastructure/markup/syntax/highlighter/xhpast/PhutilXHPASTSyntaxHighlighterFuture.php
+++ b/src/infrastructure/markup/syntax/highlighter/xhpast/PhutilXHPASTSyntaxHighlighterFuture.php
@@ -32,7 +32,7 @@
// We perform two passes here: one using the AST to find symbols we care
// about -- particularly, class names and function names. These are used
- // in the crossreference stuff to link into Diffusion. After we've done our
+ // in the cross-reference stuff to link into Diffusion. After we've done our
// AST pass, we do a followup pass on the token stream to catch all the
// simple stuff like strings and comments.
diff --git a/src/infrastructure/parser/PhutilPygmentizeParser.php b/src/infrastructure/parser/PhutilPygmentizeParser.php
--- a/src/infrastructure/parser/PhutilPygmentizeParser.php
+++ b/src/infrastructure/parser/PhutilPygmentizeParser.php
@@ -32,7 +32,7 @@
$c = $block[$ii];
switch ($mode) {
case 'text':
- // We're in general text between tags, and just passing characers
+ // We're in general text between tags, and just passing characters
// through unmodified.
if ($c == '<') {
$mode = 'tag';
diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php
--- a/src/view/control/AphrontTableView.php
+++ b/src/view/control/AphrontTableView.php
@@ -392,7 +392,7 @@
// white-space: pre to prevent wrapping. We need to append a character
// (&nbsp; -- nonbreaking space) afterward to give the bounds div height
// (alternatively, we could hard-code the line height). This is gross but
- // it's not clear that there's a better appraoch.
+ // it's not clear that there's a better approach.
return phutil_tag(
'div',

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 10:09 (21 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1017252
Default Alt Text
D25238.1734689351.diff (13 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0