From eb0ed47ef96558f77022ae2ef70e4dbec142d93f Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org> Date: Fri, 26 Feb 2016 12:51:33 +0900 Subject: [PATCH] Issue #2672442 by rakesh.gectcr, dimaro, aditya_anurag, jhodgdon: In the documentation, change all instances of "an URL" to "a URL" --- core/CHANGELOG.txt | 2 +- .../Authentication/AuthenticationProviderFilterInterface.php | 2 +- core/lib/Drupal/Core/Path/PathValidatorInterface.php | 4 ++-- core/lib/Drupal/Core/Template/TwigExtension.php | 4 ++-- core/modules/file/src/Tests/DownloadTest.php | 4 ++-- core/modules/filter/src/Tests/FilterDefaultConfigTest.php | 2 +- core/modules/link/src/LinkItemInterface.php | 2 +- .../link/src/Plugin/Field/FieldFormatter/LinkFormatter.php | 2 +- core/modules/rest/src/Tests/AuthTest.php | 2 +- core/modules/system/src/Tests/File/UrlRewritingTest.php | 4 ++-- .../views/src/Plugin/views/display/DisplayRouterInterface.php | 2 +- core/modules/views/views.module | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt index 0deaf904e2b1..c3e7c2ab6799 100644 --- a/core/CHANGELOG.txt +++ b/core/CHANGELOG.txt @@ -978,7 +978,7 @@ Drupal 4.5.0, 2004-10-18 - Syndication: * Added support for RSS ping-notifications of http://technorati.com/. * Refactored the categorization of syndicated news items. - * Added an URL alias for 'rss.xml'. + * Added a URL alias for 'rss.xml'. * Improved date parsing. - Database backend: * Added support for multiple database connections. diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php b/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php index 002d5204bc92..b71d25df87e1 100644 --- a/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php +++ b/core/lib/Drupal/Core/Authentication/AuthenticationProviderFilterInterface.php @@ -14,7 +14,7 @@ * * Some authentication methods should not be available throughout a whole site. * For instance, there are good reasons to restrict insecure methods like HTTP - * basic authentication or an URL token authentication method to API-only + * basic authentication or a URL token authentication method to API-only * routes. */ interface AuthenticationProviderFilterInterface { diff --git a/core/lib/Drupal/Core/Path/PathValidatorInterface.php b/core/lib/Drupal/Core/Path/PathValidatorInterface.php index 836b0a4c54c6..b9e09fbe5640 100644 --- a/core/lib/Drupal/Core/Path/PathValidatorInterface.php +++ b/core/lib/Drupal/Core/Path/PathValidatorInterface.php @@ -13,7 +13,7 @@ interface PathValidatorInterface { /** - * Returns an URL object, if the path is valid and accessible. + * Returns a URL object, if the path is valid and accessible. * * @param string $path * The path to check. @@ -24,7 +24,7 @@ interface PathValidatorInterface { public function getUrlIfValid($path); /** - * Returns an URL object, if the path is valid. + * Returns a URL object, if the path is valid. * * Unlike getUrlIfValid(), access check is not performed. Do not use this * method if the $path is about to be presented to a user. diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php index dd60c80c4b47..a2b29e3b73f4 100644 --- a/core/lib/Drupal/Core/Template/TwigExtension.php +++ b/core/lib/Drupal/Core/Template/TwigExtension.php @@ -253,7 +253,7 @@ public function getUrl($name, $parameters = array(), $options = array()) { } /** - * Gets a rendered link from an url object. + * Gets a rendered link from a url object. * * @param string $text * The link text for the anchor tag as a translated string. @@ -312,7 +312,7 @@ public function getActiveThemePath() { * Saves the unneeded automatic escaping for performance reasons. * * The URL generation process percent encodes non-alphanumeric characters. - * Thus, the only character within an URL that must be escaped in HTML is the + * Thus, the only character within a URL that must be escaped in HTML is the * ampersand ("&") which separates query params. Thus we cannot mark * the generated URL as always safe, but only when we are sure there won't be * multiple query params. This is the case when there are none or only one diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php index 20289e7f6600..b137e547aae7 100644 --- a/core/modules/file/src/Tests/DownloadTest.php +++ b/core/modules/file/src/Tests/DownloadTest.php @@ -23,7 +23,7 @@ protected function setUp() { * Test the public file transfer system. */ function testPublicFileTransfer() { - // Test generating an URL to a created file. + // Test generating a URL to a created file. $file = $this->createFile(); $url = file_create_url($file->getFileUri()); // URLs can't contain characters outside the ASCII set so $filename has to be @@ -33,7 +33,7 @@ function testPublicFileTransfer() { $this->drupalHead($url); $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the created file.'); - // Test generating an URL to a shipped file (i.e. a file that is part of + // Test generating a URL to a shipped file (i.e. a file that is part of // Drupal core, a module or a theme, for example a JavaScript file). $filepath = 'core/assets/vendor/jquery/jquery.min.js'; $url = file_create_url($filepath); diff --git a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php index 55fdea3ff756..0a5421d733c0 100644 --- a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php +++ b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php @@ -22,7 +22,7 @@ class FilterDefaultConfigTest extends KernelTestBase { protected function setUp() { parent::setUp(); - // Drupal\filter\FilterPermissions::permissions() builds an URL to output + // Drupal\filter\FilterPermissions::permissions() builds a URL to output // a link in the description. $this->installEntitySchema('user'); diff --git a/core/modules/link/src/LinkItemInterface.php b/core/modules/link/src/LinkItemInterface.php index f6a48f084721..921b71e87916 100644 --- a/core/modules/link/src/LinkItemInterface.php +++ b/core/modules/link/src/LinkItemInterface.php @@ -41,7 +41,7 @@ public function isExternal(); * Gets the URL object. * * @return \Drupal\Core\Url - * Returns an Url object. + * Returns a Url object. */ public function getUrl(); diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php index a7e104b1f498..96064a1a9884 100644 --- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php +++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php @@ -240,7 +240,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) { * The link field item being rendered. * * @return \Drupal\Core\Url - * An Url object. + * A Url object. */ protected function buildUrl(LinkItemInterface $item) { $url = $item->getUrl() ?: Url::fromRoute('<none>'); diff --git a/core/modules/rest/src/Tests/AuthTest.php b/core/modules/rest/src/Tests/AuthTest.php index ab0b3b1eca6a..94866ffc7ed8 100644 --- a/core/modules/rest/src/Tests/AuthTest.php +++ b/core/modules/rest/src/Tests/AuthTest.php @@ -74,7 +74,7 @@ public function testRead() { * set curl settings for basic authentication. * * @param \Drupal\Core\Url $url - * An Url object. + * A Url object. * @param string $username * The user name to authenticate with. * @param string $password diff --git a/core/modules/system/src/Tests/File/UrlRewritingTest.php b/core/modules/system/src/Tests/File/UrlRewritingTest.php index 748e86d2d02e..5239fc90ea21 100644 --- a/core/modules/system/src/Tests/File/UrlRewritingTest.php +++ b/core/modules/system/src/Tests/File/UrlRewritingTest.php @@ -27,7 +27,7 @@ class UrlRewritingTest extends FileTestBase { * Tests the rewriting of shipped file URLs by hook_file_url_alter(). */ function testShippedFileURL() { - // Test generating an URL to a shipped file (i.e. a file that is part of + // Test generating a URL to a shipped file (i.e. a file that is part of // Drupal core, a module or a theme, for example a JavaScript file). // Test alteration of file URLs to use a CDN. @@ -74,7 +74,7 @@ function testShippedFileURL() { * Tests the rewriting of public managed file URLs by hook_file_url_alter(). */ function testPublicManagedFileURL() { - // Test generating an URL to a managed file. + // Test generating a URL to a managed file. // Test alteration of file URLs to use a CDN. \Drupal::state()->set('file_test.hook_file_url_alter', 'cdn'); diff --git a/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php b/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php index 03f651b728f8..3a7fc7a07aa1 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php +++ b/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php @@ -39,7 +39,7 @@ public function collectRoutes(RouteCollection $collection); public function alterRoutes(RouteCollection $collection); /** - * Generates an URL to this display. + * Generates a URL to this display. * * @return \Drupal\Core\Url * A URL object for the display. diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 2c1ae572d445..19c2b96d48cd 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -760,7 +760,7 @@ function views_embed_view($name, $display_id = 'default') { * The display id. On the edit page for the view in question, you'll find * a list of displays at the left side of the control area. "Master" * will be at the top of that list. Hover your cursor over the name of the - * display you want to use. An URL will appear in the status bar of your + * display you want to use. A URL will appear in the status bar of your * browser. This is usually at the bottom of the window, in the chrome. * Everything after #views-tab- is the display ID, e.g. page_1. * @param ... -- GitLab