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

Rename Doc/README.txt to Doc/README.rst and add formatting #104

Merged
merged 7 commits into from Feb 15, 2017
Merged

Rename Doc/README.txt to Doc/README.rst and add formatting #104

merged 7 commits into from Feb 15, 2017

Conversation

ghost
Copy link

@ghost ghost commented Feb 15, 2017

I have simply updated the document and its references to README.rst (thanks to whoever formatted it).

@ghost
Copy link
Author

ghost commented Feb 15, 2017

CC: @zware @Haypo @methane

@ghost ghost changed the title Rename Doc/README.txt to Doc/README.rst Rename Doc/README.txt to Doc/README.rst and add formatting Feb 15, 2017
Doc/README.rst Outdated
both style and markup, is available in the "Documenting Python" chapter of the
developers guide <https://docs.python.org/devguide/documenting.html>.
both style and markup, is available in the "`Documenting Python <https://docs.python.org/devguide/documenting.html>`_" chapter of the
developers guide.
Copy link
Member

Choose a reason for hiding this comment

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

folding long line is preferred.

@ghost
Copy link
Author

ghost commented Feb 15, 2017

@methane That line is now folded.

@zware
Copy link
Member

zware commented Feb 15, 2017

Has anyone tested to make sure the docs build doesn't pick up and build README.rst? I'm not sure that it would be harmful, but would be unnecessary.

@methane
Copy link
Member

methane commented Feb 15, 2017

@zware nice catch!

@rogersachan There are two problem.

  • make check reports error. -i README.rst should be added to rstlint argument in Makefile.
  • make html reports warning README.rst:: WARNING: document isn't included in any toctree. Please add README.rst to exclude_patterns in conf.py.

(I feel markdown is better for README now. But I was too late.)

Copy link
Member

@methane methane left a comment

Choose a reason for hiding this comment

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

Please update Makefile and conf.py

@ghost
Copy link
Author

ghost commented Feb 15, 2017

@methane I have made the requested changes.

Doc/README.rst Outdated
Bugs in the toolset should be reported in the Sphinx bug tracker at
https://www.bitbucket.org/birkenfeld/sphinx/issues/.
Bugs in the toolset should be reported in the
`Sphinx bug tracker <https://www.bitbucket.org/birkenfeld/sphinx/issues/>`_.
Copy link
Member

Choose a reason for hiding this comment

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

This link is outdated, it's now https://github.com/sphinx-doc/sphinx/issues

@ghost
Copy link
Author

ghost commented Feb 15, 2017

@Haypo I have made the requested changes.

@vstinner vstinner dismissed methane’s stale review February 15, 2017 22:53

"methane: @rogersachan There are two problem." these issues have been fixed

@vstinner vstinner merged commit b3f1f59 into python:master Feb 15, 2017
@vstinner
Copy link
Member

Thanks, I merged your PR.

Right now http://sphinx-doc.org/ link displays "Diese Präsenz ist leider nicht verfügbar." error message in german, whereas http://www.sphinx-doc.org/ redirects to http://www.sphinx-doc.org/en/stable/ which is the expected website. But I hope that the error is only temporary. Otherwise, we can fix that later. I reported this issue on IRC.

@zooba
Copy link
Member

zooba commented Feb 15, 2017

The Windows installer build picks up this readme file and distributes it as readme.txt (see Tools/msi/exe/exe_files.wxs, which now needs fixing).

I vote we should keep both so that we can distribute the file without rst formatting.

(As an aside, we also read the /LICENSE file, so if someone wants to come in and "fix" that too then they'll also need to update the installer.)

@vstinner
Copy link
Member

The Windows installer build picks up this readme file and distributes it as readme.txt (see Tools/msi/exe/exe_files.wxs, which now needs fixing).

This issue is about Doc/README.txt, but Tools/msi/exe/exe_files.wxs seems to refer to README.txt (root directory).

See PR #2 which renamed README.txt to README.rst. This PR was followed by PR #70, PR #73 and #21.

Is it common to provide README as plain text on Windows?

Would it be possible to provide a README formatted as HTML? It would look nicer than plain text, no? It would also allow to keep new features like images (well, "badges"). For example, on Linux I'm running manually "rst2html README.rst README.html".

@zooba
Copy link
Member

zooba commented Feb 16, 2017

Ah, I see. This PR just modified the one at the root, which is why it showed up as the last commit for the file.

It doesn't matter whether it's common or not - it's a functional change that should have been on bpo and signed off by the RMs (who are responsible for keeping at least the header in the file up to date). This may just be Ned, depending on where the change was backported to.

@vstinner
Copy link
Member

I opened http://bugs.python.org/issue29579

Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Feb 25, 2017
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
@miss-islington
Copy link
Contributor

Thanks @rogersachan for the PR, and @Haypo for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @rogersachan and @Haypo, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.

@vstinner
Copy link
Member

I don't think that we need to backport this change to Python 2.7, so I removed the "needs backport to 2.7".

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.

7 participants