-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Additions to the documentation guide #9875
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -139,6 +139,54 @@ An example docstring looks like: | |
The Sphinx website also contains plenty of documentation_ concerning ReST | ||
markup and working with Sphinx in general. | ||
|
||
.. note:: | ||
|
||
Some parts of the documentation do not yet conform to the current | ||
documentation style. If in doubt, follow the rules given here and not what | ||
you may see in the source code. Pull requests updating docstrings to | ||
the current style are very welcome. | ||
|
||
Additional formatting conventions | ||
--------------------------------- | ||
|
||
There are some additional conventions, not handled by numpydoc and the Sphinx | ||
guide: | ||
|
||
* We do not have a convention whether to use single-quotes or double-quotes. | ||
There is a mixture of both in the current code. Please leave them as they are. | ||
|
||
* Long parameter lists should be wrapped using a ``\`` for continuation and | ||
starting on the new line without any indent: | ||
|
||
.. code-block:: python | ||
|
||
def add_axes(self, *args, **kwargs): | ||
""" | ||
... | ||
|
||
Parameters | ||
---------- | ||
projection : | ||
['aitoff' | 'hammer' | 'lambert' | 'mollweide' | \ | ||
'polar' | 'rectilinear'], optional | ||
The projection type of the axes. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. close the triple quotes here (possibly after an ellipsis) |
||
|
||
Alternatively, you can describe the valid parameter values in a dedicated | ||
section of the docstring. | ||
|
||
* Generally, do not add markup to types for ``Parameters`` and ``Returns``. | ||
This is usually not needed because Sphinx will link them automatically and | ||
would unnecessarily clutter the docstring. However, it does seem to fail in | ||
some situations. If you encounter such a case, you are allowed to add markup: | ||
|
||
.. code-block:: rst | ||
|
||
Returns | ||
------- | ||
lines : `~matplotlib.collections.LineCollection` | ||
|
||
|
||
|
||
Linking to other code | ||
--------------------- | ||
To link to other methods, classes, or modules in Matplotlib you can encase | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This all looks good to me. Note I knocked all this down a level in the outline, so we'll have to remember to reconcile. Actually my new outlining is somewhat incomplete the way I've done it, but I thought I'd leave it like that to at least remind myself that it needed fixing.