Skip to content

Commit

Permalink
Issue #2898947 by rajandro, jungle, ankit.singh, AkashkumarOSL, Lal_,…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
alexpott committed Jun 28, 2020
1 parent 024ef51 commit 0382a35
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions INSTALL.sqlite.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion includes/install.core.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,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',
Expand Down
2 changes: 1 addition & 1 deletion lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function load($name);
public function save($name, $code);

/**
* Whether this is a writeable storage.
* Whether this is a writable storage.
*
* @return bool
*/
Expand Down
8 changes: 4 additions & 4 deletions lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface {
const READ = 0x0004;

/**
* Wrapper is writeable.
* Wrapper is writable.
*/
const WRITE = 0x0008;

Expand All @@ -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;

Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion modules/simpletest/src/KernelTestBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function prepareConfigDirectories() {
$this->configDirectories = [];
// Assign the relative path to the global variable.
$path = $this->siteDirectory . '/config_' . CONFIG_SYNC_DIRECTORY;
// Ensure the directory can be created and is writeable.
// Ensure the directory can be created and is writable.
if (!\Drupal::service('file_system')->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS)) {
throw new \RuntimeException("Failed to create '" . CONFIG_SYNC_DIRECTORY . "' config directory $path");
}
Expand Down
2 changes: 1 addition & 1 deletion modules/system/src/Form/FileSystemForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#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);

Expand Down
4 changes: 2 additions & 2 deletions tests/Drupal/KernelTests/Core/File/DirectoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ public function testFileCheckDirectoryHandling() {

// 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.
Expand Down

0 comments on commit 0382a35

Please sign in to comment.