Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
vstinner merged 7 commits intopython:masterfromunknown repositoryFeb 15, 2017
Merged

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

vstinner merged 7 commits intopython:masterfromunknown repositoryFeb 15, 2017

Conversation

@ghost
Copy link

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

@ghost
Copy link
Author

CC:@zware@Haypo@methane

@ghostghost changed the titleRename Doc/README.txt to Doc/README.rstRename Doc/README.txt to Doc/README.rst and add formattingFeb 15, 2017
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

@methane That line is now folded.

@zware
Copy link
Member

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

@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 warningREADME.rst:: WARNING: document isn't included in any toctree. Please addREADME.rst toexclude_patterns in conf.py.

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

methane
methane previously requested changesFeb 15, 2017
Copy link
Member

@methanemethane 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

@methane I have made the requested changes.

Bugs in the toolset should be reported in theSphinx 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 nowhttps://github.com/sphinx-doc/sphinx/issues

@ghost
Copy link
Author

@Haypo I have made the requested changes.

@vstinnervstinner dismissedmethane’sstale reviewFebruary 15, 2017 22:53

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

@vstinnervstinner merged commitb3f1f59 intopython:masterFeb 15, 2017
@vstinner
Copy link
Member

Thanks, I merged your PR.

Right nowhttp://sphinx-doc.org/ link displays "Diese Präsenz ist leider nicht verfügbar." error message in german, whereashttp://www.sphinx-doc.org/ redirects tohttp://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

The Windows installer build picks up this readme file and distributes it asreadme.txt (seeTools/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

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

Mariatta pushed a commit to Mariatta/cpython that referenced this pull requestFeb 25, 2017
akruis pushed a commit to akruis/cpython that referenced this pull requestSep 9, 2017
akruis pushed a commit to akruis/cpython that referenced this pull requestSep 9, 2017
akruis pushed a commit to akruis/cpython that referenced this pull requestSep 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 to2.7 due to a conflict.
Please backport usingcherry_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".

Mr3x33 added a commit to Mr3x33/cpython that referenced this pull requestSep 17, 2021
jaraco pushed a commit that referenced this pull requestDec 2, 2022
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@zware@methane@vstinner@zooba@miss-islington@Mariatta@the-knights-who-say-ni

[8]ページ先頭

©2009-2025 Movatter.jp