#pyramid

[pyramid_debugtoolbar] mmerickel tagged 2.4.2 at master: http://git.io/vWbXo

am i able to put custom settings in the ini file?

[pyramid] stevepiercy pushed 2 new commits to master: http://git.io/vWNBl

pyramid/master f3d20e1 Steve Piercy: minor grammar, rewrap 79 columns, some .rst syntax fixes, add a header and index entry

pyramid/master 35c7437 Steve Piercy: Merge pull request #2051 from stevepiercy/master...

[pyramid] stevepiercy pushed 2 new commits to 1.6-branch: http://git.io/vWNB9

pyramid/1.6-branch c912eb6 Steve Piercy: minor grammar, rewrap 79 columns, some .rst syntax fixes, add a header and index entry...

pyramid/1.6-branch 25bb324 Steve Piercy: Merge pull request #2052 from stevepiercy/1.6-branch...

[pyramid] stevepiercy pushed 2 new commits to 1.6-branch: http://git.io/vWNE0

pyramid/1.6-branch 10d5d0f Tres Seaver: Restore link target used by 'whatsnew-1.3.rst'....

pyramid/1.6-branch e1150ab Steve Piercy: Merge pull request #2053 from stevepiercy/1.6-branch...

[pyramid] stevepiercy pushed 5 new commits to 1.5-branch: http://git.io/vWNaN

pyramid/1.5-branch d860ccd Steve Piercy: Restore link target used by 'whatsnew-1.3.rst'....

pyramid/1.5-branch 7db6942 Steve Piercy: Merge remote-tracking branch 'upstream/1.5-branch' into 1.5-branch

pyramid/1.5-branch c259818 Steve Piercy: Restore pre-1.6 text and index entries.

pdobrogost ping

stevepie_: Hi!

howdy!

i'm having a hard time parsing your issue #2046

and was hoping you could help me understand

Well, the problem is a) I'm not sure I correctly diagnosed the behavior as I didn't make proper test b) I'm not sure if it's intended behavior or a bug in which case maybe it should be fixed instead of changing docs?

but first, when you compared the two branches of assets.rst, https://github.com/Pylons/pyramid/blob/1.5-bran... and https://github.com/Pylons/pyramid/blob/master/d... you say you found no difference with regard to the issue, and i wanted to make sure that you made that actual comparison

ok, so maybe the problem is: defining the issue

What do you mean by actual comparison? I took a look at both.

you can compare the two files and do a diff

pycharm is wonderful for that

and if neither mentions the idea you have, then let's move on to define what the issue really is

so next, let's define the behavior you expect to see, and the behavior you actually see

Wait a second. There's difference between https://github.com/Pylons/pyramid/blob/master/d... and http://docs.pylonsproject.org/projects/pyramid/... The latter has note "As of Pyramid 1.6, it is also possible to override an asset by supplying an absolute path to a file or directory. This may be useful if the assets are not distributed as part of a Python package." which the former does not.

ding ding ding!

:D

?

And I saw this when looking at both not by diffing as you suggested.

oh dear

that's not right either

oh, no

silly you

you are not comparing the right things

do not even look at RTD stuff, that will just add to the confusion

stick to github repos

Well, rtd is nice and easy...

only when reading it as docs

it is terrible for what you are trying to do

comparison

so compare the two links I provided above using whatever editor you like, and see whether what you found missing on RTD actually appears in master

the whole thing with URL paths on RTD does not correlate well with the GitHub repo when there is no path segment of "1.x=branch"

the whole thing with URL paths on RTD does not correlate well with the GitHub repo when there is no path segment of "1.x-branch"

when mapping from RTD to GitHub:

latest -> 1.5-branch

stable -> 1.5-branch

master -> master

hope that helps explain things, and why i say "just use GitHub for diffs"

er, GitHub repos, I mean

Comparing them is hard as there's lots of changes in white space by some guy named Steve... :/

git has an option to ignore whitespace differences

git diff -w

wiggy: Hi! Well a) I'm comparing in PyCharm (it also has this feature) b) Steve rewrapped already wrapped text making sure it won't work anyways :)

stevepie_: What's the reason for rewrapping already wrapped text?

his editor might do that automatically

Nice explanation. If his editor deleted all docs does it mean we would be left with none? :)

Hmm, it would be nice to be able to compare rendered .rst ...

pdobrogost because 79 columns is the standard set for projects under Pylons Project