From a0a86019365840e18747bd77e7863a59c952883b Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Sun, 28 Jun 2020 13:46:45 +0100 Subject: [PATCH] Issue #2898947 by rajandro, jungle, ankit.singh, AkashkumarOSL, Lal_, shimpy, Saurabh_sgh, markdorison, gnikolovski, jordanwood, librarylasso, Swapnil_Kotwal, mrinalini9, chiranjeeb2410, codersukanta, daffie, xjm, alexpott, mmjvb, mparker17, MaskyS, larowlan, quietone: Change "writeable" to "writable" in documentation --- core/INSTALL.sqlite.txt | 4 ++-- core/INSTALL.txt | 2 +- core/includes/install.core.inc | 2 +- .../Drupal/Component/PhpStorage/PhpStorageInterface.php | 2 +- .../Drupal/Core/StreamWrapper/StreamWrapperInterface.php | 8 ++++---- core/modules/system/src/Form/FileSystemForm.php | 2 +- .../FunctionalJavascriptTests/WebDriverTestBase.php | 2 +- core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/INSTALL.sqlite.txt b/core/INSTALL.sqlite.txt index e22aaa89c3c..96092c3760c 100644 --- a/core/INSTALL.sqlite.txt +++ b/core/INSTALL.sqlite.txt @@ -20,13 +20,13 @@ SQLITE DATABASE CREATION The Drupal installer will create the SQLite database for you. The only requirement is that the installer must have write permissions to the directory where the database file resides. This directory (not just the database file) also -has to remain writeable by the web server going forward for SQLite to continue to +has to remain writable by the web server going forward for SQLite to continue to be able to operate. On the "Database configuration" form in the "Database file" field, you must supply the exact path to where you wish your database file to reside. It is strongly suggested that you choose a path that is outside of the webroot, yet -ensure that the directory is writeable by the web server. +ensure that the directory is writable by the web server. If you must place your database file in your webroot, you could try using the following in your "Database file" field: diff --git a/core/INSTALL.txt b/core/INSTALL.txt index 487e71d8ccd..910b5aaf123 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -190,7 +190,7 @@ INSTALLATION chmod a+w sites/default/files Be sure to set the permissions for the default directory back after the - installation is finished! (Leave the files directory writeable.) + installation is finished! (Leave the files directory writable.) Sample command: chmod go-w sites/default diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index d610fdd25c0..890c385a568 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1020,7 +1020,7 @@ function install_display_output($output, $install_state) { // Prevent install.php from being indexed when installed in a sub folder. // robots.txt rules are not read if the site is within domain.com/subfolder // resulting in /subfolder/install.php being found through search engines. - // When settings.php is writeable this can be used via an external database + // When settings.php is writable this can be used via an external database // leading a malicious user to gain php access to the server. $noindex_meta_tag = [ '#tag' => 'meta', diff --git a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php index fb9194c98a1..7a370d252ac 100644 --- a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php +++ b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php @@ -52,7 +52,7 @@ interface PhpStorageInterface { public function save($name, $code); /** - * Whether this is a writeable storage. + * Whether this is a writable storage. * * @return bool */ diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php index a354785affb..38a7758d0ad 100644 --- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php +++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php @@ -45,7 +45,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface { const READ = 0x0004; /** - * Wrapper is writeable. + * Wrapper is writable. */ const WRITE = 0x0008; @@ -67,12 +67,12 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface { const HIDDEN = 0x000C; /** - * Hidden, readable and writeable using local files. + * Hidden, readable and writable using local files. */ const LOCAL_HIDDEN = 0x000D; /** - * Visible, readable and writeable. + * Visible, readable and writable. */ const WRITE_VISIBLE = 0x001C; @@ -91,7 +91,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface { const NORMAL = 0x001C; /** - * Visible, readable and writeable using local files. + * Visible, readable and writable using local files. */ const LOCAL_NORMAL = 0x001D; diff --git a/core/modules/system/src/Form/FileSystemForm.php b/core/modules/system/src/Form/FileSystemForm.php index 9bc5b92ef36..6ac279a4c07 100644 --- a/core/modules/system/src/Form/FileSystemForm.php +++ b/core/modules/system/src/Form/FileSystemForm.php @@ -118,7 +118,7 @@ class FileSystemForm extends ConfigFormBase { '#markup' => $this->fileSystem->getTempDirectory(), '#description' => t('A local file system path where temporary files will be stored. This directory should not be accessible over the web. This must be changed in settings.php.'), ]; - // Any visible, writeable wrapper can potentially be used for the files + // Any visible, writable wrapper can potentially be used for the files // directory, including a remote file system that integrates with a CDN. $options = $this->streamWrapperManager->getDescriptions(StreamWrapperInterface::WRITE_VISIBLE); diff --git a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php index 503974c928e..40b0a46c494 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php @@ -138,7 +138,7 @@ abstract class WebDriverTestBase extends BrowserTestBase { * Creates a screenshot. * * @param string $filename - * The file name of the resulting screenshot including a writeable path. For + * The file name of the resulting screenshot including a writable path. For * example, /tmp/test_screenshot.jpg. * @param bool $set_background_color * (optional) By default this method will set the background color to white. diff --git a/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php index 1726cc35272..4338fe78aa0 100644 --- a/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php @@ -98,11 +98,11 @@ class DirectoryTest extends FileTestBase { // Make directory read only. @$file_system->chmod($directory, 0444); - $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writeable directory.', 'File'); + $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writable directory.', 'File'); // Test directory permission modification. $this->setSetting('file_chmod_directory', 0777); - $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writeable.', 'File'); + $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writable.', 'File'); } // Test that the directory has the correct permissions.