diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index ec12e15..7b7e3d8 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -55,16 +55,38 @@ function image_help($path, $arg) {
case 'admin/help#image':
$output = '';
$output .= '
' . t('About') . '
';
- $output .= '' . t('The Image module allows you to manipulate images on your website. It exposes a setting for using the Image toolkit, allows you to configure Image styles that can be used for resizing or adjusting images on display, and provides an Image field for attaching images to content. For more information, see the online handbook entry for Image module.', array('@image' => 'http://drupal.org/documentation/modules/image')) . '
';
+ $output .= '' . t('The File module allows you to create fields that contain images files, and to configure Image styles that can be used to manipulate the display of images. See the Field module help and the Field UI help pages for general information on fields and how to create and manage them. For more information, see the online documentation for the Image module.', array('!image_styles' => \Drupal::url('image.style_list'), '!field' => \Drupal::url('help.page', array('name' => 'field')), '!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')), '!image_documentation' => 'https://drupal.org/documentation/modules/image')) . '
';
$output .= '' . t('Uses') . '
';
$output .= '';
- $output .= '- ' . t('Manipulating images') . '
';
- $output .= '- ' . t('With the Image module you can scale, crop, resize, rotate and desaturate images without affecting the original image using image styles. When you change an image style, the module automatically refreshes all created images. Every image style must have a name, which will be used in the URL of the generated images. There are two common approaches to naming image styles (which you use will depend on how the image style is being applied):',array('@image' => url('admin/config/media/image-styles')));
- $output .= '
- ' . t('Based on where it will be used: eg. profile-picture') . '
';
- $output .= '- ' . t('Describing its appearance: eg. square-85x85') . '
';
- $output .= t('After you create an image style, you can add effects: crop, scale, resize, rotate, and desaturate (other contributed modules provide additional effects). For example, by combining effects as crop, scale, and desaturate, you can create square, grayscale thumbnails.') . '- ';
- $output .= '
- ' . t('Attaching images to content as fields') . '
';
- $output .= '- ' . t("Image module also allows you to attach images to content as fields. To add an image field to a content type, go to the content type's manage fields page, and add a new field of type Image. Attaching images to content this way allows image styles to be applied and maintained, and also allows you more flexibility when theming.", array('@content-type' => url('admin/structure/types'))) . '
';
+ $output .= '- ' . t('Managing and displaying file fields') . '
';
+ $output .= '- ' . t('The settings and the display of the file field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array('!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')))) . '
';
+ $output .= '- ' . t('Allowing file extensions') . '
';
+ $output .= '- ' . t('In the field settings, you can define the allowed file extensions (for example png gif jpg jpeg) for the files that will be uploaded with the file field.') . '
';
+ $output .= '- ' . t('Storing files ') . '
';
+ $output .= '- ' . t('You can define a subdirectory of your files directory in which the images files uploaded with this specific field are stored. Uploaded files can either be stored as public or private, depending on the File system settings. For more information, see the System module help page.', array('!file-system' => \Drupal::url('system.file_system_settings'), '!system-help' => \Drupal::url('help.page', array('name' => 'system')))) . '
';
+ $output .= '- ' . t('Restricting the maximum file size') . '
';
+ $output .= '- ' . t('The maximum file size that users can upload is limited by PHP settings of the server, but you can restrict by entering the desired value as the Maximum upload size setting. The maximum file size is automatically displayed to users in the help text of the image field.') . '
';
+ $output .= '- ' . t('Setting minimum and maximum resolutions') . '
';
+ $output .= '- ' . t('You can define a minimum and/or maximum size for uploaded images by entering the desired size in pixels. Images that are too small will be rejected. Images that are to large will be resized. During the resizing the EXIF datain the image will get lost.', array('!exif' => 'http://en.wikipedia.org/wiki/Exchangeable_image_file_format')) . '
';
+ $output .= '- ' . t('Using Alt and Title text') . '
';
+ $output .= '- ' . t('You can attach Alt and Title text to each image. Alt text may be used by search engines, screen readers or if the image file is not loaded. Title text can be displayed by browsers as tooltip. Alt and Title texts are also available as tokens that can be used by other modules.') . '
';
+ $output .= '- ' . t('Providing a default image') . '
';
+ $output .= '- ' . t('You can define a default image that will be displayed unless the user uploads a different one. However, this image is not displayed to the user on the edit form. ') . '
';
+ // @TODO Change this if the functionality gets changed.
+ $output .= '- ' . t('Configuring the image display') . '
';
+ $output .= '- ' . t('On the Manage Display page, you can configure the image style used to display the image and to what the image links. You can also configure the preview of the image on edit forms on the Manage Form Display page.') . '
';
+
+ $output .= '- ' . t(' ') . '
';
+ $output .= '- ' . t(' ') . '
';
+ $output .= '- ' . t(' ') . '
';
+ $output .= '- ' . t(' ') . '
';
+ $output .= '- ' . t(' ') . '
';
+ $output .= '- ' . t(' ') . '
';
+
+ $output .= '- ' . t('Defining and using Image styles') . '
';
+ $output .= '- ' . t('The Image module allows you to manipulate the display of images without affecting the original image file. On the Image styles page you can add and edit the image styles by adding effects such as cropping, scaling, rotating or desaturating. A new version of the original image file is created and stored, if an image is displayed in that style. If you change an image style, all images displayed in that style are automically refreshed, but you can also manually flush all images created in a specific style.', array('!image' => \Drupal::url('image.style_list')));
+ $output .= '
- ' . t('Naming Image styles') . '
';
+ $output .= '- ' . t('Every image style requires a name which is used throughout your site where image styles can be choosen, as well as in the URL of the generated images. There are two common approaches to naming image styles, either based on the apperance of the image (for example Square 85x85), or based on its use (for example Profile picture).') . '
';
$output .= '
';
return $output;
case 'admin/config/media/image-styles':