There are several occurrences of the words "web site" in core documentation--namely INSTALL.txt. However, the overwhelming majority uses "website" instead. I propose we replace any and all uses of "web site" with "website".

Comments

owenpm3 created an issue. See original summary.

owenpm3’s picture

StatusFileSize
new11.14 KB
harpreet16’s picture

Assigned: Unassigned » harpreet16
harpreet16’s picture

Issue tags: +Drupal India Association
StatusFileSize
new173.4 KB
new564.29 KB

The patch works perfectly when applied by placing it in the project directory and using "patch -p1 < 3118831_2.patch" command.
See https://www.drupal.org/files/issues/2020-06-02/patch-p1-command.png.
But the patch does not apply with composer. Adding the following lines to end of "extras" in composer.json

"patches": {
            "drupal/core": {
                "3118831_2": "https://www.drupal.org/files/issues/2020-03-09/3118831_2.patch"
            }
        }

and thereafter using the command "composer install" throws the error : https://www.drupal.org/files/issues/2020-06-02/patch-via-composer.png. Although something like https://www.linkedin.com/pulse/drupal-8-patch-workflow-files-docroot-tom... might be thought as a workaround for INSTALL.txt and other file changes within core/ may be used to generate the patch.

Note: Text within js files remain as it is. This patch affects only documentation and .module files

harpreet16’s picture

Assigned: harpreet16 » Unassigned
harpreet16’s picture

Assigned: Unassigned » harpreet16
harpreet16’s picture

Assigned: harpreet16 » Unassigned
StatusFileSize
new10.9 KB

To make the patch working in a composer based setup, the patch needs to be modified as https://www.drupal.org/files/issues/2020-06-03/3118831_3.patch. Now add these lines to "extra" section of composer.json

"patches": {
            "drupal/core": {
                "3118831_3": "https://www.drupal.org/files/issues/2020-06-03/3118831_3.patch"
            }
        }

Note that this patch does not include changes to INSTALL.txt present immediately within drupal project directory. To apply documentation changes to INSTALL.txt do the following:

  1. Make a patch file with following content in patch folder with following content
    diff --git a/INSTALL.txt b/INSTALL.txt
    index 2ee9ad89b8..3714df040a 100644
    --- a/INSTALL.txt
    +++ b/INSTALL.txt
    @@ -1,3 +1,3 @@
     
     Please read core/INSTALL.txt for detailed installation instructions for your
    -Drupal web site.
    +Drupal website.
    
    
  2. Run "composer require drupal/core-composer-scaffold"
  3. Add these lines to "script" section of the composer.json file:
    "post-drupal-scaffold-cmd": [
          "patch -p1 < [path to patch file]"
      ]
    
  4. Run "composer install"
atul4drupal’s picture

Version: 8.8.x-dev » 9.1.x-dev
Status: Needs review » Needs work

Thanks for working on this standardization, updating for 9.x.

A few findings:

Still see use of this word at files that need attention

1) core/modules/help_topics/help_topics/user.security_account_settings.html.twig
2) core/modules/help_topics/help_topics/core.content_structure.html.twig

ankitsingh0188’s picture

Assigned: Unassigned » ankitsingh0188
ankitsingh0188’s picture

Assigned: ankitsingh0188 » Unassigned
Status: Needs work » Needs review
StatusFileSize
new17 KB
new6.09 KB

Updated the patch and Standardize the use of "website" instead of "web site" in the remaining files.

ankitsingh0188’s picture

StatusFileSize
new6.09 KB

Updated interdiff.

Status: Needs review » Needs work

The last submitted patch, 10: 3118831-10.patch, failed testing. View results

hardik_patel_12’s picture

Assigned: Unassigned » hardik_patel_12
hardik_patel_12’s picture

Assigned: hardik_patel_12 » Unassigned
Status: Needs work » Needs review
StatusFileSize
new17.25 KB
new14.88 KB

Kindly review a new patch.

cburschka’s picture

Status: Needs review » Needs work

That interdiff file seems pretty broken... it looks as though two patch files were diffed instead?

cburschka’s picture

Status: Needs work » Needs review
StatusFileSize
new242 bytes
atul4drupal’s picture

Status: Needs review » Reviewed & tested by the community

Thanks all for working this .. patch #14 looks good.

The last submitted patch, 7: 3118831_3.patch, failed testing. View results

longwave’s picture

Confirmed that no instances of "web site" remain after applying #14.

The last submitted patch, 7: 3118831_3.patch, failed testing. View results

The last submitted patch, 7: 3118831_3.patch, failed testing. View results

The last submitted patch, 7: 3118831_3.patch, failed testing. View results

cburschka’s picture

The testbot keeps re-testing one of the older patches. Not sure how to turn that off.

cburschka’s picture

Maybe just hiding the old patches will do it.

xjm’s picture

Status: Reviewed & tested by the community » Closed (outdated)
xjm’s picture

Status: Closed (outdated) » Closed (duplicate)