Skip to content
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

Finalized #418 #433

Merged
merged 2 commits into from
Jun 17, 2017
Merged

Finalized #418 #433

merged 2 commits into from
Jun 17, 2017

Conversation

benjaoming
Copy link
Contributor

This finalizes comments regarding indents by @agjohnson on #418

In an ideal world where everyone knows exactly what's the most efficient thing to do, #418 would have just had PRs against @NickVolynkin branch rather than all the comments about indentation back and forth :)

(please don't regard the above as some smart-ass comment, I'm trying also to teach myself to spend less time commenting and more time PRing in other reviews, and I know it's hard because I fear getting sucked in and ending up spending half the evening with someone elses PR)

NickVolynkin and others added 2 commits June 16, 2017 18:27
* Refactor list items.
* Use autonumbering in lists to prevent errors.
* Indent code inside list items to make it belong to those items.
* Use inline-code style for filenames.
* Update link to a pull request with new repo path.
* Fix a few typos and punctuation.
* Use .. code:: bash for proper highlighting
* Use # for comments in bash
* Use ordered list for step-by-step instuctions.
@benjaoming
Copy link
Contributor Author

Oh yeah, this also fixes the merge issue in #418, that's why I didn't PR against the original PR branch :)

@Blendify Blendify merged commit 93e6fe2 into readthedocs:master Jun 17, 2017
travismiller pushed a commit to broco1974/couscous-template-readthedocs that referenced this pull request Dec 4, 2017
* commit '6c2302472fb2c61eec9b4be3a2515117fffbfac3': (253 commits)
  Add pygments_style to theme.conf
  Document new theme option
  Add option to layout.html
  Update theme.conf
  Apply clearfix on breadcrumbs
  Follow-up grunt for readthedocs#472 (readthedocs#476)
  Only change current if a matching link is found (readthedocs#472)
  Add a couple of badge icons to readme (readthedocs#471)
  Add Sphinx Framework for PyPi (readthedocs#470)
  Fix error in setup entry points (readthedocs#466)
  Added `.admonition` to the CSS (readthedocs#462)
  Use explicit UTF8 encoding (readthedocs#452)
  Add missing pygments css link
  Convert underscores to dashes.
  Reflect language in lang attribute.
  Replace master with v0.2.5 in README.rst
  Add missing dependency in dev setup: sphinxcontrib-httpdomain (readthedocs#431)
  Finalized readthedocs#418 (readthedocs#433)
  Added a link to the Sphinx documentation about setuptools entry points
  Added setuptools entry point for Sphinx
  ...
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.

4 participants