some tweaks for #3190 #3195
some tweaks for #3190 #3195
Conversation
xabbuh
commented
Nov 17, 2013
| Q | A |
|---|---|
| Doc fix? | yes |
| New docs? | no |
| Applies to | all |
| Fixed tickets | #3190 |
| @@ -349,7 +351,7 @@ The filename of the translation files is also important: each message file | |||
| must be named according to the following path: ``domain.locale.loader``: | |||
|
|
|||
| * **domain**: An optional way to organize messages into groups (e.g. ``admin``, | |||
| ``navigation`` or the default ``messages``) - see ":ref:`using-message-domains`"; | |||
| ``navigation`` or the default ``messages``) - see :ref:`using-message-domains`; | |||
There was a problem hiding this comment.
Maybe we should discuss whether we generally want to enclose references to other sections in quotes. Is there some convention we used throughout the docs?
There was a problem hiding this comment.
I prefer to always enclose them in quotes, except for the cases in which we provide the link name explicietly.
There was a problem hiding this comment.
Sometimes quotes seem necessary to me and other times they seem less necessary. I usually take it on a case-by-case basis - I don't care too much either way :).
|
@xabbuh can you rebase this? I need to patch it into the 2.2 branch, but the conflicts will mess all of that up :). You don't have to re-do it against 2.2, just rebasing against master should be good enough. Thanks! |
|
Rebased it against 2.2. Can you check again @weaverryan? Thanks! |
|
It's still causing conflicts... |
|
Did you try to merge it into 2.2 or master? |
|
Just looked at github indicating if this can be merged, so master |
|
That might be the reason. I accidentally opened the pull request against master. But since this should be merge into 2.2 I chose to rebase it on 2.2 instead of master. |
|
"You don't have to re-do it against 2.2, just rebasing against master should be good enough." 😉 |
|
Yeah, I read that. ;-) Thought it spares @weaverryan some time as it goes to 2.2 first. Let's wait What he thinks. Otherwise, I'd be happy to rebase this onto master. ;-) |
|
Rebased against 2.2? Ah, even better! I easily patched this into the 2.2 branch at sha: 0c1c2ce ;) Thanks! |
|
It was not that hard. :) Thanks! |