Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Components][HttpFoundation] Make a small grammatical adjustment #4276

Merged
merged 1 commit into from
Oct 15, 2014
Merged

[Components][HttpFoundation] Make a small grammatical adjustment #4276

merged 1 commit into from
Oct 15, 2014

Conversation

fabschurt
Copy link

Q A
Doc fix? yes
New docs? no
Applies to 2.3+
Fixed tickets n/a

The original form of the phrase - «The other option is to specifically
checking if a session has expired after the session is started.» - is
not entirely grammatically correct, as the infinitive form of «to check»
shall normally be used, or the gerund form, which is the form used in
this commit.

The original form of the phrase - «The other option is to specifically
checking if a session has expired after the session is started.» - is
not entirely grammatically correct, as the infinitive form of «to check»
shall normally be used, or the gerund form, which is the form used in
this commit.
@@ -181,7 +181,7 @@ which runs reasonably frequently. The ``cookie_lifetime`` would be set to a
relatively high value, and the garbage collection ``gc_maxlifetime`` would be set
to destroy sessions at whatever the desired idle period is.

The other option is to specifically checking if a session has expired after the
The other option is specifically checking if a session has expired after the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm far from native, so I can be completely wrong, but isn't "The other option is to specifically check if a session has expired after the session is started." better?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FTR, English is not my native language either.

Actually, yes, as I wrote it in the commit message and PR description, I think both the infinitive form and the gerund form are grammatically correct, and, in this context, either may be used as subject complement (but I might also be wrong).

I guess the infinitive form is a bit more literary (although this is very subjective), which is less suitable in a context of technical documentation, and that's why I chose the gerund form in my commit.

Obviously, I'd be willing to commit again with the infinitive form if it's considered a better fit.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to agree with @wouterj here. But I'm also no native speaker. So, let's wait for @weaverryan for the final decision.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, @wouterj is right. To be clear, the language is wrong as it currently is. The best is:

The other option is to specifically check if a session has expired after the session is started.

@fabschurt fabschurt changed the title Make a small grammatical adjustment [Components][HTTP Foundation] Make a small grammatical adjustment Oct 13, 2014
@fabschurt fabschurt changed the title [Components][HTTP Foundation] Make a small grammatical adjustment [Components][HttpFoundation] Make a small grammatical adjustment Oct 13, 2014
@weaverryan weaverryan merged commit 3ad13a1 into symfony:2.3 Oct 15, 2014
weaverryan added a commit that referenced this pull request Oct 15, 2014
…ustment (fabschurt)

This PR was merged into the 2.3 branch.

Discussion
----------

[Components][HttpFoundation] Make a small grammatical adjustment

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3+
| Fixed tickets | n/a

The original form of the phrase - «The other option is to specifically
checking if a session has expired after the session is started.» - is
not entirely grammatically correct, as the infinitive form of «to check»
shall normally be used, or the gerund form, which is the form used in
this commit.

Commits
-------

3ad13a1 Make a small grammatical adjustment
@weaverryan
Copy link
Member

Thanks Fabien for the report of the bad language! I've merged this in and changed the other word so that things are perfect - see sha: 4bada7c

Cheers!

@fabschurt fabschurt deleted the session-configuration-grammar-improvement branch October 15, 2014 16:11
weaverryan added a commit that referenced this pull request Oct 15, 2014
* 2.3:
  [#4276] Making language correction we agreed on
  [Cookbook][External Parameters] Enhance description of environment variables
  Make a small grammatical adjustment
weaverryan added a commit that referenced this pull request Oct 15, 2014
* 2.5:
  [#4276] Making language correction we agreed on
  Correct a typo: replace "then" by "the".
  Correct a typo: remove unnecessary "the" word.
  Remove horizontal scrollbar and change event name to follow conventions
  Remove horizontal scrollbar
  Update choice.rst
  Improve readability
  support Varnish in configuration blocks
  minor #4285 Update security.rst (placid2000)
  Update security.rst
  [Cookbook][External Parameters] Enhance description of environment variables
  Make a small grammatical adjustment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants