Re-merge Varnish 4.0 docs after server fix

[weaverryan]

See #4280.

We're waiting on a fix that'll update the fabpot/sphinx-php submodule. Once we have that, we can re-commit the above PR.

/cc @fabpot @javiereguiluz

[fabpot]

The module has been updated a while ago but apparently that's not enough.

[weaverryan]

@fabpot Hmm, I took a screenshot of the failure when it all happened, just in case it was helpful: #4280 (comment). It is the varnish4 thing, that's about all I know.

[wouterj]

Looks like there is an issue with the extension itself...

[xabbuh]

@wouterj I don't think so. Line 51 cannot cause this error message in the current version.

[wouterj]

I think some things were missed.

@fabpot/@javiereguiluz could you please check if you updated the conf.py file the same way as #4287 did? I think something was missed because of this comment by @javiereguiluz : #4280 (comment)

Basically, the problem would be that there is no lexer set for the varnish* formats. That's why sphinx is failing to build the page

[fabpot]

ahah, of course not. doing that now.

[fabpot]

Deployed now. Can we check again?

[weaverryan]

I'll re-add the commits now!

[weaverryan]

Commits re-added to all branches at sha: 490ca6b

Assuming this works, thanks to everyone for tracking the issue down.

[xabbuh]

Shouldn't the config already have been updated with #4287 being merged?

[weaverryan]

@xabbuh I think the actual build system may use a different file. The build system pre-dates us having that conf.py file in the repo, iirc. I think we added it to help others (and Travis) build the repo.