At the bottom of default.settings.php it says:

/**
* Load local development override configuration, if available.
*
* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. Typically used to disable
* caching, JavaScript/CSS compression, re-routing of outgoing emails, and
* other things that should not happen on development and testing sites.
*
* Keep this code block at the end of this file to take full effect.
*/

Should it instead say:

/**
* Load local development override configuration, if available.
*
* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. Typically used to disable
* caching, JavaScript/CSS compression, re-routing of outgoing emails, and
* other things that should not happen on production.
*
* Keep this code block at the end of this file to take full effect.
*/

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

TomSherlock created an issue. See original summary.

cilefen’s picture

Issue tags: +Novice
bhushan.nagaonkar’s picture

cilefen’s picture

Status: Active » Needs review

I suppose we could have a follow-up that both the old and proposed "Typically used to disable caching, JavaScript/CSS compression, re-routing of outgoing emails..." is not an English sentence, because it lacks a subject.

Status: Needs review » Needs work

The last submitted patch, 3: 3158589.patch, failed testing. View results

Kristen Pol’s picture

Issue tags: +Global2020

Tagging this issue for new contributors to work on during the Friday DrupalCon Global sprint.

bhushan.nagaonkar’s picture

I am working on it, as part of Global2020

bhushan.nagaonkar’s picture

FileSize
655 bytes

Here is updated patch.

cilefen’s picture

@bhushan.nagaonkar If you look at the test results for the first patch, it is evident there is another file you must edit.

git grep 'to override variables on secondary'
core/assets/scaffold/files/default.settings.php: * Use settings.local.php to override variables on secondary (staging,
sites/default/default.settings.php: * Use settings.local.php to override variables on secondary (staging,
bhushan.nagaonkar’s picture

FileSize
1.33 KB

Thanks @cilefen

Updated my patch.

bhushan.nagaonkar’s picture

Assigned: Unassigned » bhushan.nagaonkar
cilefen’s picture

Status: Needs work » Needs review
bhushan.nagaonkar’s picture

Assigned: bhushan.nagaonkar » Unassigned
brittany.huntzberry’s picture

Assigned: Unassigned » brittany.huntzberry

Going to review this patch shortly!

brittany.huntzberry’s picture

Assigned: brittany.huntzberry » Unassigned
Status: Needs review » Reviewed & tested by the community

I have reviewed and tested the patch on 9.1-x-dev. Patch applied cleanly and the two files showed the updated comments without issue.

I'm updating the status to "Reviewed & tested by the community" and welcome any additional feedback or comments. Thank you!

hedrickbt’s picture

I have also reviewed and tested the patch on 9.1-x-dev. Patch applied cleanly and the two files showed the updated comments without issue.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 10: 3158589_3.patch, failed testing. View results

brittany.huntzberry’s picture

Status: Needs work » Reviewed & tested by the community

Re-tested patch from #10 and passed: https://www.drupal.org/pift-ci-job/1762586

Not sure why the automated test failed, it doesn't seem related to this change?

binnythomas’s picture

Seems to be working for me.

alexpott’s picture

Status: Reviewed & tested by the community » Needs work
+++ b/core/assets/scaffold/files/default.settings.php
@@ -754,7 +754,7 @@
  * development, etc) installations of this site. Typically used to disable
  * caching, JavaScript/CSS compression, re-routing of outgoing emails, and
- * other things that should not happen on development and testing sites.
+ * other things that should not happen on production.

I think this comment is confusing. I think we're in double negative territory. I.e use to disable caching... and other things that should not happen on production?!!? - Caching definitely should happen on production :)

I think the original is "correct" but I think this can be clearer. Not sure how atm.

brittany.huntzberry’s picture

* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. Typically used to disable
* caching, JavaScript/CSS compression, re-routing of outgoing emails, and
* other things that should happen on development and testing sites.

Or

* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. 
* Typically used on development on testing sites to disable caching and 
* JavaScript/CSS compression, set re-routing of outgoing emails, and 
* other things.

Open to other suggestions too!

alexpott’s picture

I think making a list would be good because the problem is the work disable and what it is applying to.

So something like:

 * Use settings.local.php to override variables on secondary (staging,
 * development, etc) installations of this site. Typically used to:
 * - Disable caching.
 * - Disable JavaScript/CSS compression.
 * - Reroute outgoing emails.

Another problem with original test is that we say "Typically used to..." and the follow this up with the hand-wavy "and other things that should not happen on development and testing sites" - there's nothing typical about that part.

brittany.huntzberry’s picture

Oh yeah, that is easier to read -- clear, concise and to the point w/o making assumptions. I can get a patch up or someone else can if they want. :D

cilefen’s picture

I like the idea! There is just one adjustment I would prefer. "Typically used to..." is not the beginning of an English sentence.

nijolawrence’s picture

@cliefen How about making it

 * Use settings.local.php to override variables on secondary (staging,
 * development, etc) installations of this site. They are typically used to:
 * - Disable caching.
 * - Disable JavaScript/CSS compression.
 * - Reroute outgoing emails.
alexpott’s picture

settings.local.php is a singular thing ... It is typically...

brittany.huntzberry’s picture

This file is often used to: or This file is typically used to:
Is there any issue with being specific about the subject e.g. file?

cilefen’s picture

There is ambiguity about the subject of the second sentence. May I suggest "Create a settings.local.php file to override variables on secondary (staging, development, etc) installations of this site. Typical uses of settings.local.php include: ..."?

brittany.huntzberry’s picture

Assigned: Unassigned » brittany.huntzberry
Status: Needs work » Needs review
FileSize
1.8 KB
1.91 KB

Thank you cilefen! That flows much better, I'm not great with proper sentence structure and grammar. :)

I've rolled up a new patch with your suggestion. Hopefully I did this correctly!

brittany.huntzberry’s picture

Assigned: brittany.huntzberry » Unassigned
cilefen’s picture

Status: Needs review » Needs work

In order to complete the sentence we need the gerund form of each verb in the bullet points, which means "Disable caching" should be "Disabling caching", and so on.

brittany.huntzberry’s picture

Status: Needs work » Needs review
FileSize
1.3 KB
1.92 KB

Thank you, I've updated the comments in a new patch.

tripurari’s picture

Assigning to myself and will be updating very shortly.

tripurari’s picture

Assigned: Unassigned » tripurari
tripurari’s picture

FileSize
127.65 KB
128.66 KB

@brittany.huntzberry changes looks good to me as per latest patch #32. I would suggest it is good to go for RTBC.

tripurari’s picture

Assigned: tripurari » Unassigned
brittany.huntzberry’s picture

Status: Needs review » Reviewed & tested by the community

Thank you for reviewing tripurari! I'll set this as RTBC for now, but anyone can provide feedback or additional testing still.

alexpott’s picture

Title: Typo in comment in default.settings.php » Improve comment in default.settings.php
Status: Reviewed & tested by the community » Needs work

@brittany.huntzberry I know how frustrating it is for someone to say

I would suggest it is good to go for RTBC.

But effectively #37 is rtbc'ing your own patch. It's important for community processes that we minimise rtbc-ing of our own patches. Maybe @tripurari can follow up their comments with a real rtbc?

@tripurari please do not post screenshots of patches. Posting screenshots of your codebase or CLI does not advance the issue, since the automated testing infrastructure tells us whether the patch applies correctly. So, I've removed the issue credit for that screenshot. In the future, you can get credit for issues by reading the issue to understand its purpose, and posting your review or testing of that purpose. On a patch like this which is quite small a credit worthy comment is one that results in a change to the patch. For example see #31. Thank you!

brittany.huntzberry’s picture

@alexpott ++ Thank you, I appreciate your guidance since I'm still very new to contributing to Drupal and open source in general! Do you have any resources or references I could use for determining when moving to RTBC is appropriate? I know it is case-by-case basis, so it's probably difficult to determine without a lot of experience. Is there a certain number of people needed for review -- or any standards needed to be met (more specific to documentation)?

davidhernandez’s picture

* development, etc) installations of this site.

"etc" is an abbreviation and should have a trailing period.

* development, etc) installations of this site.
 * Typical uses of settings.local.php include:

"Typical uses ..." is starting a new paragraph, so there should be a blank line before.

Otherwise, the change looks fine.

@brittany.huntzberry I'm not sure if there are specific docs that would help you in determining RTBC status, but basically, don't RTBC if you have submitted any patches. You are considered a contributor to the actual fix. The reviewer needs to be an independent person. There doesn't need to be a certain number of people reviewing. One can do it. They are just checking that the fix is correct. If they feel it is and there is no further work needed, it gets set to RTBC. For some special cases, core committers may request more than one person review an issue. Like for a large or complex change that they want help double-checking.

tripurari’s picture

Please Ignore the comments by mistake comment was added.

ankithashetty’s picture

Status: Needs work » Needs review
FileSize
1.93 KB
1.14 KB

The patch provided in #32 is great! But I agree with the changes suggested in #40, so included an updated patch with an intediff. Kindly review the same.

Thank You.

longwave’s picture

Status: Needs review » Reviewed & tested by the community

The new wording is clearer to me, so this looks good to go.

alexpott’s picture

Version: 9.1.x-dev » 8.9.x-dev
Status: Reviewed & tested by the community » Fixed

Committed and pushed 6cac5d7f21 to 9.1.x and 92da9f80d8 to 9.0.x and e43f7306ee to 8.9.x. Thanks!

Backported the docs fix to 8.9.x

  • alexpott committed 6cac5d7 on 9.1.x
    Issue #3158589 by bhushan.nagaonkar, brittany.huntzberry, ankithashetty...

  • alexpott committed 92da9f8 on 9.0.x
    Issue #3158589 by bhushan.nagaonkar, brittany.huntzberry, ankithashetty...

  • alexpott committed e43f730 on 8.9.x
    Issue #3158589 by bhushan.nagaonkar, brittany.huntzberry, ankithashetty...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.