Skip to content

Convert docs to reST #62

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

Merged
merged 5 commits into from
Jan 3, 2016
Merged

Convert docs to reST #62

merged 5 commits into from
Jan 3, 2016

Conversation

ddeboer
Copy link
Contributor

@ddeboer ddeboer commented Jan 2, 2016

Fix #59.

@sagikazarmark
Copy link
Member

Can you make a separate build for it so we can see it? Also, we don't have to forget to change the build settings from mkdocs.

@ddeboer
Copy link
Contributor Author

ddeboer commented Jan 2, 2016

@sagikazarmark
Copy link
Member

Ah, finally a good looking navigation.

Actually message is rather a component than httplug stuff.

@ddeboer ddeboer force-pushed the sphinx-rest branch 3 times, most recently from 0218092 to a90d26b Compare January 2, 2016 17:30
@dbu
Copy link
Contributor

dbu commented Jan 2, 2016

wow, that was quick! and looks well on first glance. some random notes:

we should make http://php-http.readthedocs.org/en/sphinx-rest/httplug/introduction.html the page that is the HTTPlug main title in the navigation. should plugin be unter HTTPlug or at the same level as HTTPlug? i think we ideally would want all of those as main sections, and drop the two un-linked titles Components and Httplug.

it looks like the development section got lost.

links need to be adjusted, e.g. http://php-http.readthedocs.org/en/sphinx-rest/plugins.html#install

@dbu
Copy link
Contributor

dbu commented Jan 2, 2016

the mix between anchor links and sub pages is a bit weird on http://php-http.readthedocs.org/en/sphinx-rest/plugins.html - is that normal? or should we make the main plugins page very short and then have an introduction.html that appears on the same level as the plugins?

@ddeboer ddeboer force-pushed the sphinx-rest branch 3 times, most recently from 0359529 to 2c7384a Compare January 2, 2016 17:58
@sagikazarmark
Copy link
Member

FOS HTTP cache also have this mixed navigation.

@sagikazarmark
Copy link
Member

sudo:false is missing from travis config to run on the newer, faster infrastructure

@ddeboer ddeboer force-pushed the sphinx-rest branch 9 times, most recently from 534b292 to 7649359 Compare January 2, 2016 18:20
@ddeboer
Copy link
Contributor Author

ddeboer commented Jan 2, 2016

This is somewhat inconvenient without the diff views. 😢

Anyway, I fixed most of the issues mentioned above. And the build is finally green. 😉

@sagikazarmark
Copy link
Member

The development section seems to be a bit weird. If it has a top level nav, then the subpages are not necessary to be grouped yet another Development nav I think.

@sagikazarmark
Copy link
Member

Is it possible to make the syntax highlighting similar to what you have on the HTTP Cache docs? Is it configuration or custom style?

@ddeboer
Copy link
Contributor Author

ddeboer commented Jan 2, 2016

Yeah that’s because I needed to differentiate the development group from the components one.

I did the syntax highlighting with some custom CSS. Let’s hold off on that for later.

@sagikazarmark
Copy link
Member

👍

@sagikazarmark
Copy link
Member

Is there something we can do about the development section?

@dbu
Copy link
Contributor

dbu commented Jan 3, 2016

@sagikazarmark can you please look at the last section of code-of-conduct.rst? there are "things" there that i think do not look like correct markdown, nor rst. not sure what exactly the idea there was?

@dbu
Copy link
Contributor

dbu commented Jan 3, 2016

@ddeboer is the file docs/css/extra.css relevant? i have the impression its a leftover. we should probably remove it and add a new css when we tweak syntax highlighting. favicon.ico seems also unused, but would make sense to be used.

@@ -1,53 +0,0 @@
site_name: PHP-HTTP Documentation
Copy link
Contributor

Choose a reason for hiding this comment

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

deleted as i think this is obsolete

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
html_favicon = 'favicon.ico'
Copy link
Contributor

Choose a reason for hiding this comment

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

yay, favicon!

@dbu
Copy link
Contributor

dbu commented Jan 3, 2016

okay, i think this should be ready:

  • changed toc layout for development section (using --- to separate)
  • some little tweaks and fixes

i suggest we merge as is and continue tweaking whats online. switching readthedocs to rst killed the markdown documentation that is/was currently live...

@ddeboer
Copy link
Contributor Author

ddeboer commented Jan 3, 2016

Thanks for helping @dbu! Please wait with merging as I'd like to go over everything one more time: I still see some broken Markdown links and other leftovers.

By the way, GH support has fixed the diff view. 😉

@dbu
Copy link
Contributor

dbu commented Jan 3, 2016

yeah, though with this PR its so many moving parts its hard to see.

i scanned for the links and fixed what i found. but sure, go over it. but we should merge today, as right now there is no documentation online anymore :-O


.. toctree::
:hidden:
:maxdepth: 3
Copy link
Contributor

Choose a reason for hiding this comment

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

changed this to 3 in the hope that the anchor links would come back when opening a doc page, but they don't. @ddeboer any idea why? otherwise we can switch this back to 2 to avoid surprises.

@sagikazarmark
Copy link
Member

@dbu fixed CoC links.

As I can see, the Message Factory became part of the Message section. I have no problem with it, but technically, the message factory contract is not part of the message package.

@sagikazarmark
Copy link
Member

Agree, we should merge this today.

params
rebase
Semver
sexualized
Copy link
Member

Choose a reason for hiding this comment

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

LOL? 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, because of the code of conduct.

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense, but without a context, it's a bit funny. 😄

@dbu
Copy link
Contributor

dbu commented Jan 3, 2016

lets merge and discuss the TOC structure in a new issue (what goes under components, message factory and message, ...)

ddeboer added a commit that referenced this pull request Jan 3, 2016
@ddeboer ddeboer merged commit d072b0a into master Jan 3, 2016
@ddeboer ddeboer deleted the sphinx-rest branch January 3, 2016 12:07
@ddeboer
Copy link
Contributor Author

ddeboer commented Jan 3, 2016

Yay, docs are back up. 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants