From 2ba1d67a41930cb705f8ecb2219f58c2c918f848 Mon Sep 17 00:00:00 2001 From: catch <catch@35733.no-reply.drupal.org> Date: Fri, 1 Jul 2022 16:39:18 +0100 Subject: [PATCH] Issue #3248078 by uri_frazier, antojose, alisonjo315, rootwork: Update 8.x specific documentation URLs --- composer/Template/LegacyProject/composer.json | 2 +- composer/Template/RecommendedProject/composer.json | 2 +- core/lib/Drupal/Core/DrupalKernel.php | 2 +- core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php | 2 +- core/modules/system/system.install | 2 +- .../FunctionalTests/Installer/InstallerTranslationTest.php | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer/Template/LegacyProject/composer.json b/composer/Template/LegacyProject/composer.json index d6cd5108ba23..727571933300 100644 --- a/composer/Template/LegacyProject/composer.json +++ b/composer/Template/LegacyProject/composer.json @@ -66,7 +66,7 @@ "", "<bg=yellow;fg=black>Next steps</>:", - " * Install the site: https://www.drupal.org/docs/8/install", + " * Install the site: https://www.drupal.org/docs/installing-drupal", " * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html", " * Get support: https://www.drupal.org/support", " * Get involved with the Drupal community:", diff --git a/composer/Template/RecommendedProject/composer.json b/composer/Template/RecommendedProject/composer.json index 91a4871fffc4..e813253acdba 100644 --- a/composer/Template/RecommendedProject/composer.json +++ b/composer/Template/RecommendedProject/composer.json @@ -64,7 +64,7 @@ "", "<bg=yellow;fg=black>Next steps</>:", - " * Install the site: https://www.drupal.org/docs/8/install", + " * Install the site: https://www.drupal.org/docs/installing-drupal", " * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html", " * Get support: https://www.drupal.org/support", " * Get involved with the Drupal community:", diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index b3dd953030f3..e992b77bcea6 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -1498,7 +1498,7 @@ public static function validateHostname(Request $request) { * @return bool * TRUE if the Host header is trusted, FALSE otherwise. * - * @see https://www.drupal.org/docs/8/install/trusted-host-settings + * @see https://www.drupal.org/docs/installing-drupal/trusted-host-settings * @see \Drupal\Core\Http\TrustedHostsRequestFactory */ protected static function setupTrustedHosts(Request $request, $host_patterns) { diff --git a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php index 233853e4b544..dc265471222a 100644 --- a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php +++ b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php @@ -219,7 +219,7 @@ protected function getDatabaseErrors(array $database, $settings_file) { public static function getDatabaseErrorsTemplate(array $errors) { return [ '#type' => 'inline_template', - '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/8/install">installation handbook</a>, or contact your hosting provider.{% endtrans %}{{ errors }}', + '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/installing-drupal">installation handbook</a>, or contact your hosting provider.{% endtrans %}{{ errors }}', '#context' => [ 'errors' => [ '#theme' => 'item_list', diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 3c58a9787ca8..2854149748ec 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1235,7 +1235,7 @@ function system_requirements($phase) { $requirements['trusted_host_patterns'] = [ 'title' => t('Trusted Host Settings'), 'value' => t('Not enabled'), - 'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is <strong>highly recommended</strong> that you configure this. See <a href=":url">Protecting against HTTP HOST Header attacks</a> for more information.', [':url' => 'https://www.drupal.org/docs/8/install/trusted-host-settings']), + 'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is <strong>highly recommended</strong> that you configure this. See <a href=":url">Protecting against HTTP HOST Header attacks</a> for more information.', [':url' => 'https://www.drupal.org/docs/installing-drupal/trusted-host-settings']), 'severity' => REQUIREMENT_ERROR, ]; } diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php index b8c6aa378f5f..456096c62eb1 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php @@ -67,7 +67,7 @@ protected function setUpSettings() { // Ensure that the error message translation is working. // cSpell:disable - $this->assertSession()->responseContains('Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/8/install">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter.'); + $this->assertSession()->responseContains('Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/installing-drupal">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter.'); $this->assertSession()->responseContains('<strong>CREATE</strong> ein Test-Tabelle auf Ihrem Datenbankserver mit dem Befehl <em class="placeholder">CREATE TABLE {drupal_install_test} (id int NOT NULL PRIMARY KEY)</em> fehlgeschlagen.'); // cSpell:enable @@ -164,8 +164,8 @@ protected function getPo($langcode) { msgid "Anonymous" msgstr "Anonymous $langcode" -msgid "Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/8/install">installation handbook</a>, or contact your hosting provider." -msgstr "Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/8/install">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter." +msgid "Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/installing-drupal">installation handbook</a>, or contact your hosting provider." +msgstr "Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/installing-drupal">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter." msgid "Failed to <strong>CREATE</strong> a test table on your database server with the command %query. The server reports the following message: %error.<p>Are you sure the configured username has the necessary permissions to create tables in the database?</p>" msgstr "<strong>CREATE</strong> ein Test-Tabelle auf Ihrem Datenbankserver mit dem Befehl %query fehlgeschlagen." -- GitLab