Skip to content

DOC: Linguistic edit to CONTRIBUTING.md #11469

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 1 commit into from
Nov 9, 2015
Merged

DOC: Linguistic edit to CONTRIBUTING.md #11469

merged 1 commit into from
Nov 9, 2015

Conversation

aechase
Copy link
Contributor

@aechase aechase commented Oct 29, 2015

Also fixed a dead link to the Nose testing docs.

where you could start out.

Or maybe through using *pandas* you have an idea of you own or are
looking for something in the documentation and thinking 'this can be
improved'...you can do something about it!

Feel free to ask questions on [mailing
list](https://groups.google.com/forum/?fromgroups#!forum/pydata)
Feel free to ask questions on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/pydata)
Copy link
Contributor

Choose a reason for hiding this comment

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

can you add a refernce to gitter as well, link is on the readme

@jreback jreback added the Docs label Oct 29, 2015
@jreback jreback added this to the 0.17.1 milestone Oct 29, 2015
@aechase
Copy link
Contributor Author

aechase commented Oct 29, 2015

Now added.

@jreback
Copy link
Contributor

jreback commented Oct 29, 2015

cool, pls squash and ping when ready

@jorisvandenbossche
Copy link
Member

Wait a moment, I think the CONTRIBUTING.md file is autogenerated, and the actual source is doc/source/contributing.rst (see https://github.com/pydata/pandas/wiki/Regenerating-CONTRIBUTING.md)

@aechase this is a bit inconvenient, but could you redo the changes there?

@jorisvandenbossche
Copy link
Member

Maybe we should also add a comment to CONTRIBUTING.md that it is autogenerated to prevent this

@aechase
Copy link
Contributor Author

aechase commented Oct 29, 2015

Ah no problem. Perhaps the note about CONTRIBUTING.md should go in the "Some other important things to know about the docs" section?

@jorisvandenbossche
Copy link
Member

Yes certainly OK to also mention it somewhere in contributing.rst itself

@aechase
Copy link
Contributor Author

aechase commented Nov 3, 2015

@jorisvandenbossche @jreback I notice that pandas/CONTRIBUTING.md, pandas/doc/source/contributing.rst and http://pandas.pydata.org/pandas-docs/stable/contributing.html are all different. Is the HTML file also built from the .rst file or is it separate?

EDIT: sorry, my branch wasn't synced to the master. HTML and .rst are consistent, markdown is not (for obvious reasons).

@jorisvandenbossche
Copy link
Member

For the html pages, the link you give if of the latest stable release, so there can be differences. Better look at http://pandas-docs.github.io/pandas-docs-travis/contributing.html which is built for each commit to master.

There can be a deviation between the md and rst file, but that should only be because the md was not regenerated for the last changes to the rst file (this is a manual action).

Conlcusion: you should look at the rst file (and updating the md file by autogenerating it from the latest rst file is always welcome)

@aechase
Copy link
Contributor Author

aechase commented Nov 7, 2015

@jreback I think this is ready

@jreback
Copy link
Contributor

jreback commented Nov 7, 2015

did you see the comment above?

this needs to be edited in doc/source/contributing.rst then generated.

@jorisvandenbossche
Copy link
Member

@jreback both are adapted, so I think this is good

in the Scientific Python community. This standard specifies the format of
the different sections of the docstring. See `this document
<https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt>`_
for a detailed explanation, or look at some of the existing functions to
extend it in a similar manner.

- The ``.rst`` files are used to automatically generate Markdown and HTML versions
of the docs. Therefore, please contribute to the docs only by editing the ``.rst``
files, and not the ``.md`` files.
Copy link
Member

Choose a reason for hiding this comment

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

I think this is a bit too general, as the conversion to md files is only the case for contributing.rst/CONTRIBUTING.md

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jorisvandenbossche for README.md and RELEASE.md as well though, right?

Copy link
Member

Choose a reason for hiding this comment

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

Those are separate and not linked yet (RELEASE.md is only a small note, and README.md is being maintained as it's own file for now)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gotcha. How about:

  • The .rst files are used to automatically generate Markdown and HTML versions
    of the docs. For this reason, please do not edit CONTRIBUTING.md directly, but
    instead make any changes to doc/source/contributing.rst.

We could also maybe add a sentence there mentioning pandoc?

Copy link
Contributor

Choose a reason for hiding this comment

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

even better, paste in the command to actually generate them (its on the wiki now)

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

though i think this should just be a script

doc/regenerate_markdown_docs.sh then makes this pretty easy

@jreback
Copy link
Contributor

jreback commented Nov 7, 2015

@aechase sorry, didn't see the other file. ok then! ping when you have addressed @jorisvandenbossche comment.

@aechase
Copy link
Contributor Author

aechase commented Nov 7, 2015

@jreback @jorisvandenbossche I agree, there ought to be a script for regenerating the Markdown files, but I don't have time to write it today. Happy with these changes?

Feel free to ask questions on `mailing list
<https://groups.google.com/forum/?fromgroups#!forum/pydata>`_
Feel free to ask questions on the `mailing list
<https://groups.google.com/forum/?fromgroups#!forum/pydata>`_ or on `Gitter
Copy link
Contributor

Choose a reason for hiding this comment

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

iirc these have 2 have 2 trailing underscores @jorisvandenbossche

Copy link
Member

Choose a reason for hiding this comment

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

Well, I think the 1 trailing underscore is OK in practice (it's also what sphinx says to use: http://sphinx-doc.org/rest.html#external-links), although in theory, if you don't want to reference this link again (eg with ``mailing list_), you should use two trailing underscores (http://stackoverflow.com/questions/27420317/restructured-text-rst-http-links-underscore-vs-use)

@aechase
Copy link
Contributor Author

aechase commented Nov 9, 2015

Just doing a final check. Where should the following links point?

An easy way to create a pandas development environment is as follows.

  • Install either :ref:Install Anaconda <install-anaconda> or :ref:Install miniconda <install-miniconda>

I assume that once upon a time these were links to another section of the document, because the next line refers to <contributing.forking>, which still exists. However, there's no obvious section to redirect these two to. Should they become external links to https://www.continuum.io/downloads and http://conda.pydata.org/miniconda.html respectively?

@jreback
Copy link
Contributor

jreback commented Nov 9, 2015

these should link to a subsection in install.rst

@aechase
Copy link
Contributor Author

aechase commented Nov 9, 2015

@jreback @jorisvandenbossche latest edit now up. Because I used a fresh install of pandoc on this one, the Markdown is showing up as highly edited. You might find the rich diff makes it more clear to see what's actually changed in the .rst file.

This edit also fixes the issue #11542.

@jorisvandenbossche
Copy link
Member

Looks good! @aechase this is ready to be merged on your part?

Thanks a lot for this text editing!

@aechase
Copy link
Contributor Author

aechase commented Nov 9, 2015

@jorisvandenbossche I'm happy if you're happy!

@jorisvandenbossche
Copy link
Member

And I am happy :-)

The ``.rst`` files are used to automatically generate Markdown and HTML versions
of the docs. For this reason, please do not edit ``CONTRIBUTING.md`` directly,
but instead make any changes to ``doc/source/contributing.rst``. Then, to
generate ``CONTRIBUTING.md``, use `pandoc<http://johnmacfarlane.net/pandoc/>`_
Copy link
Member

Choose a reason for hiding this comment

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

although, not yet fully :-)

There is a space missing after pandoc here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed! Didn't push a new CONTRIBUTING.md because the space gets eaten by the conversion anyway.

Thorough edit of contributing.rst, and then generated a new Markdown file.
jorisvandenbossche added a commit that referenced this pull request Nov 9, 2015
DOC: Linguistic edit to CONTRIBUTING.md
@jorisvandenbossche jorisvandenbossche merged commit 764c619 into pandas-dev:master Nov 9, 2015
@jorisvandenbossche
Copy link
Member

Merging!

@aechase
Copy link
Contributor Author

aechase commented Nov 9, 2015

Awesome, now to stop procrastinating on my PR that actually requires coding...

@aechase aechase deleted the contributing-edit branch November 10, 2015 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants