Skip to content

[WIP] Cookbook grammar and style fixes #4694

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

Closed
wants to merge 12 commits into from

Conversation

frne
Copy link
Contributor

@frne frne commented Dec 28, 2014

This is a follow-up for #4679

It Fixes some general issues in grammar, style and readability.

(replaces #4693 which was the wrong target branch)

Q A
Doc fix? yes
New docs? no
Applies to >= 2.3
Fixed tickets

correct port number.

This port depends on your setup. Lets say that external connections come in
This port depends on your setup. Let's say that external connections come in
Copy link
Member

Choose a reason for hiding this comment

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

To reply to:

@wouterj Agreed. Do you have a concrete idea?

Hmm, I'm not really sure what we are trying to say in this chapter. But maybe something like "For instance, if external connections come in on the default HTTP port 80" or "Imagine that external connections [...]"

@dbu I think you wrote this, can you please explain a bit more?

Copy link
Contributor

Choose a reason for hiding this comment

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

yep, i rewrote that section a few days ago. not sure what exactly is unclear. the X-Forwarded-Port needs to be set to whatever port your setup is using to receive external connections. if that would be 1234 then links will be http://example.com:1234/...

the tricky bit is that varnish may be the outmost system, or there could be something else like a load balancer or firewall that re-routes to a different port. most of the time, the external port will be 80. if you are using https, varnish does not support ssl and thus needs a proxy in front of it that terminates ssl, and then the port will almost always be 443.

does that help? happy to help more if i can, but would need a question or a proposal to comment on.

@@ -91,7 +91,7 @@ To include JavaScript files, use the ``javascripts`` tag in any template:

You can also include CSS Stylesheets: see :ref:`cookbook-assetic-including-css`.

In this example, all of the files in the ``Resources/public/js/`` directory
In this example, all the files in the ``Resources/public/js/`` directory
Copy link
Member

Choose a reason for hiding this comment

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

`all files``would be even better

@wouterj
Copy link
Member

wouterj commented Feb 22, 2015

@frne can you please fix the 2 outstanding comments?

@frne
Copy link
Contributor Author

frne commented Feb 26, 2015

@wouterj Sorry. Will do it next week. I'm on holidays w/o a notebook ;)

@wouterj
Copy link
Member

wouterj commented May 21, 2015

Hi @frne. do you have some time in the coming weeks/days? There will be a doc sprint day this Saturday were others can finish this PR if you want (if you want, please tell me so I can put it on the list).

@frne
Copy link
Contributor Author

frne commented May 22, 2015

Sry. Much work these days. Will fix it next week.

@javiereguiluz
Copy link
Member

I'm finishing this PR in #5427.

@frne don't worry about not having finished your PR. This happens sometimes. I've taken your work and finished in another PR. I've also reused all your original commits so you get the credit for your work. Thanks.

@xabbuh
Copy link
Member

xabbuh commented Jun 23, 2015

Thank you for starting this @frne.

@xabbuh xabbuh closed this Jun 23, 2015
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.

6 participants