core/lib/Drupal/Core/Render/RenderCache.php | 2 +- core/modules/page_cache/page_cache.module | 2 +- core/modules/smart_cache/smart_cache.module | 2 +- .../modules/smart_cache/src/EventSubscriber/SmartCacheSubscriber.php | 5 ++--- core/modules/system/system.module | 2 +- core/profiles/standard/src/Tests/StandardTest.php | 2 -- sites/example.settings.local.php | 4 ++-- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/core/lib/Drupal/Core/Render/RenderCache.php b/core/lib/Drupal/Core/Render/RenderCache.php index 37be19d..b7fb4f6 100644 --- a/core/lib/Drupal/Core/Render/RenderCache.php +++ b/core/lib/Drupal/Core/Render/RenderCache.php @@ -18,7 +18,7 @@ * Wraps the caching logic for the render caching system. * * @todo Refactor this out into a generic service capable of cache redirects, - * let RenderCache use that. https://www.drupal.org/node/2551419 + * and let RenderCache use that. https://www.drupal.org/node/2551419 */ class RenderCache implements RenderCacheInterface { diff --git a/core/modules/page_cache/page_cache.module b/core/modules/page_cache/page_cache.module index e5f4f34..87b4be4 100644 --- a/core/modules/page_cache/page_cache.module +++ b/core/modules/page_cache/page_cache.module @@ -20,7 +20,7 @@ function page_cache_help($route_name, RouteMatchInterface $route_match) { $output .= '
'; $output .= '
' . t('Speeding up your site') . '
'; $output .= '
' . t('Pages requested by anonymous users are stored the first time they are requested and then are reused. Depending on your site configuration and the amount of your web traffic tied to anonymous visitors, the caching system may significantly increase the speed of your site.') . '
'; - $output .= '
' . t('Pages are usually identical for all anonymous users, while they can be personalized for each authenticated user. This is why pages can be cached for anonymous users, whereas they will have to be rebuilt for every authenticated user.') . '
'; + $output .= '
' . t('Pages are usually identical for all anonymous users, while they can be personalized for each authenticated user. This is why entire pages can be cached for anonymous users, whereas they will have to be rebuilt for every authenticated user.') . '
'; $output .= '
' . t('To speed up your site for authenticated users, see the Smart Cache module.', ['!smart_cache-help' => (\Drupal::moduleHandler()->moduleExists('smart_cache')) ? Url::fromRoute('help.page', ['name' => 'smart_cache'])->toString() : '#']) . '

'; $output .= '
' . t('Configuring the internal page cache') . '
'; $output .= '
' . t('On the Performance page, you can configure how long browsers and proxies may cache pages; that setting is also respected by the Internal Page Cache module. There is no other configuration.', array('!cache-settings' => \Drupal::url('system.performance_settings'))) . '
'; diff --git a/core/modules/smart_cache/smart_cache.module b/core/modules/smart_cache/smart_cache.module index 4c0a9e6..a6ca2c1 100644 --- a/core/modules/smart_cache/smart_cache.module +++ b/core/modules/smart_cache/smart_cache.module @@ -14,7 +14,7 @@ function smart_cache_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.smart_cache': $output = '

' . t('About') . '

'; - $output .= '

' . t('The Smart Cache module caches pages in the database, minus the personalized parts. For more information, see the online documentation for the Smart Cache module.', ['!smartcache-documentation' => 'https://www.drupal.org/documentation/modules/smart_cache']) . '

'; + $output .= '

' . t('The Smart Cache module caches pages for authenticated users in the database, minus the personalized parts. For more information, see the online documentation for the Smart Cache module.', ['!smartcache-documentation' => 'https://www.drupal.org/documentation/modules/smart_cache']) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Speeding up your site') . '
'; diff --git a/core/modules/smart_cache/src/EventSubscriber/SmartCacheSubscriber.php b/core/modules/smart_cache/src/EventSubscriber/SmartCacheSubscriber.php index 9bed7cb..5d7b46e 100644 --- a/core/modules/smart_cache/src/EventSubscriber/SmartCacheSubscriber.php +++ b/core/modules/smart_cache/src/EventSubscriber/SmartCacheSubscriber.php @@ -216,8 +216,7 @@ public function onResponse(FilterResponseEvent $event) { * The response whose cacheability to analyze. * * @return bool - * Whether the given render array's cacheability does not meet the - * placeholdering conditions. + * Whether the given response should be cached. * * @see \Drupal\Core\Render\Renderer::shouldAutomaticallyPlaceholder() */ @@ -245,7 +244,7 @@ protected function shouldCacheResponse(CacheableResponseInterface $response) { } /** - * Embeds a Response object in a render array to let RenderCache can cache it. + * Embeds a Response object in a render array so that RenderCache can cache it. * * @param \Drupal\Core\Cache\CacheableResponseInterface $response * A cacheable response. diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 7def4d4..9e5d3bd 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -90,7 +90,7 @@ function system_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Using maintenance mode') . '
'; $output .= '
' . t('When you are performing site maintenance, you can prevent non-administrative users (including anonymous visitors) from viewing your site by putting it in Maintenance mode. This will prevent unauthorized users from making changes to the site while you are performing maintenance, or from seeing a broken site while updates are in progress.', array('!maintenance-mode' => \Drupal::url('system.site_maintenance_mode'))) . '
'; $output .= '
' . t('Configuring for performance') . '
'; - $output .= '
' . t('On the Performance page, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the Internal Page Cache module should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the Smart Cache module should be installed so that the non-personalized parts of pages are efficiently cached (for all users).', array('!performance-page' => \Drupal::url('system.performance_settings'), '!page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? \Drupal::url('help.page', array('name' => 'page_cache')) : '#', '!smart-cache' => (\Drupal::moduleHandler()->moduleExists('smart_cache')) ? \Drupal::url('help.page', array('name' => 'smart_cache')) : '#')) . '
'; + $output .= '
' . t('On the Performance page, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the Internal Page Cache module should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the Smart Cache module should also be installed so that the non-personalized parts of pages are efficiently cached (for all users).', array('!performance-page' => \Drupal::url('system.performance_settings'), '!page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? \Drupal::url('help.page', array('name' => 'page_cache')) : '#', '!smart-cache' => (\Drupal::moduleHandler()->moduleExists('smart_cache')) ? \Drupal::url('help.page', array('name' => 'smart_cache')) : '#')) . '
'; $output .= '
' . t('Configuring cron') . '
'; $output .= '
' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as cron tasks. On the Cron page, you can configure cron to run periodically as part of normal page requests, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the Status report page. For more information, see the online documentation for configuring cron jobs.', array('!status' => \Drupal::url('system.status'), '!handbook' => 'https://www.drupal.org/cron', '!cron' => \Drupal::url('system.cron_settings'))) . '
'; $output .= '
' . t('Configuring the file system') . '
'; diff --git a/core/profiles/standard/src/Tests/StandardTest.php b/core/profiles/standard/src/Tests/StandardTest.php index f124568..2a7f4ef 100644 --- a/core/profiles/standard/src/Tests/StandardTest.php +++ b/core/profiles/standard/src/Tests/StandardTest.php @@ -9,8 +9,6 @@ use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\contact\Entity\ContactForm; -use Drupal\Core\Cache\Cache; -use Drupal\Core\Url; use Drupal\filter\Entity\FilterFormat; use Drupal\simpletest\WebTestBase; use Drupal\user\Entity\Role; diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php index 32b4f9a..134370a 100644 --- a/sites/example.settings.local.php +++ b/sites/example.settings.local.php @@ -53,8 +53,8 @@ * Disable the render cache (this includes the page cache). * * Note: you should test with the render cache enabled, to ensure the correct - * cacheability metadata is present (and hence the expected behavior). However, - * in the early stages of development, you may want to disable it. + * cacheability metadata is present. However, in the early stages of + * development, you may want to disable it. * * This setting disables the render cache by using the Null cache back-end * defined by the development.services.yml file above.