8000 Merge pull request #25132 from meeseeksmachine/auto-backport-of-pr-24… · matplotlib/matplotlib@ef37c6d · GitHub
[go: up one dir, main page]
Skip to content

Commit ef37c6d

Browse files
ksundenksunden
authored
Merge pull request #25132 from meeseeksmachine/auto-backport-of-pr-24993-on-v3.7.x
Backport PR #24993 on branch v3.7.x ([DOC] GitHub spelling and links)
2 parents d247979 + 446b145 commit ef37c6d

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

‎doc/devel/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Contributor incubator
3838
The incubator is our non-public communication channel for new contributors. It
3939
is a private gitter room moderated by core Matplotlib developers where you can
4040
get guidance and support for your first few PRs. It's a place you can ask
41-
questions about anything: how to use git, github, how our PR review process
41+
questions about anything: how to use git, GitHub, how our PR review process
4242
works, technical questions about the code, what makes for good documentation
4343
or a blog post, how to get involved in community work, or get
4444
"pre-review" on your PR.
@@ -57,7 +57,7 @@ Among our attendees are fellow new contributors, as well as maintainers, and
5757
veteran contributors, who are keen to support onboarding of new folks and
5858
share their experience. You can find our community calendar link at the
5959
`Scientific Python website <https://scientific-python.org/calendars/>`_, and
60-
you can browse previous meeting notes on `github
60+
you can browse previous meeting notes on `GitHub
6161
<https://github.com/matplotlib/ProjectManagement/tree/master/
6262
new_contributor_meeting>`_.
6363
We recommend joining the meeting to clarify any doubts, or lingering

‎doc/devel/dependencies.rst

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,13 @@ Matplotlib requires a C++ compiler that supports C++11.
215215

216216
- `gcc 4.8.1 <https://gcc.gnu.org/projects/cxx-status.html#cxx11>`_ or higher. For gcc <6.5 you will
217217
need to set ``$CFLAGS=-std=c++11`` to enable C++11 support.
218-
- `clang 3.3 <https://clang.llvm.org/cxx_status.html>`_ or higher
218+
`Installing GCC: Binaries <https://gcc.gnu.org/install/binaries.html>`_.
219+
- `clang 3.3 <https://clang.llvm.org/cxx_status.html>`_ or higher.
220+
`LLVM Download Page <https://releases.llvm.org/download.html>`_.
219221
- `Visual Studio 2015
220222
<https://docs.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance?view=msvc-140>`_
221-
(aka VS 14.0) or higher
223+
(aka VS 14.0) or higher. A free version of Build Tools for Visual Studio is available for
224+
`download <https://visualstudio.microsoft.com/downloads/?q=build+tools>`_.
222225

223226

224227
.. _test-dependencies:
@@ -304,9 +307,10 @@ Additional external dependencies
304307
--------------------------------
305308
Required:
306309

307-
* a minimal working LaTeX distribution
310+
* a minimal working LaTeX distribution, e.g., `TeX Live <https://www.tug.org/texlive/>`_ or
311+
`MikTeX <https://miktex.org/>`_
308312
* `Graphviz <http://www.graphviz.org/download>`_
309-
* the following LaTeX packages (if your OS bundles TeXLive, the
313+
* the following LaTeX packages (if your OS bundles TeX Live, the
310314
"complete" version of the installer, e.g. "texlive-full" or "texlive-all",
311315
will often automatically include these packages):
312316

‎doc/devel/development_workflow.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ why you did it, we recommend the following:
2828
.. note::
2929

3030
It may sound strange, but deleting your own ``main`` branch can help reduce
31-
confusion about which branch you are on. See `deleting main on github`_ for
31+
confusion about which branch you are on. See `deleting main on GitHub`_ for
3232
details.
3333

34-
.. _deleting main on github: https://matthew-brett.github.io/pydagogue/gh_delete_master.html
34+
.. _deleting main on GitHub: https://matthew-brett.github.io/pydagogue/gh_delete_master.html
3535

3636
.. _update-mirror-main:
3737

@@ -134,7 +134,7 @@ In more detail
134134
description in the `tangled working copy problem`_. The
135135
`git commit <https://git-scm.com/docs/git-commit>`_ manual page might also be
136136
useful.
137-
#. To push the changes up to your forked repo on github, do a ``git
137+
#. To push the changes up to your forked repo on GitHub, do a ``git
138138
push``.
139139

140140
.. _why the -a flag?: http://gitready.com/beginner/2009/01/18/the-staging-area.html

‎doc/devel/maintainer_workflow.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ If there are only a few commits, consider rebasing to upstream::
5050
git rebase upstream-rw/main
5151

5252
Remember that, if you do a rebase, and push that, you'll have to close any
53-
github pull requests manually, because github will not be able to detect the
53+
GitHub pull requests manually, because GitHub will not be able to detect the
5454
changes have already been merged.
5555

5656
A long series of commits
@@ -61,7 +61,7 @@ If there are a longer series of related commits, consider a merge instead::
6161
git fetch upstream-rw
6262
git merge --no-ff upstream-rw/main
6363

64-
The merge will be detected by github, and should close any related pull requests
64+
The merge will be detected by GitHub, and should close any related pull requests
6565
automatically.
6666

6767
Note the ``--no-ff`` above. This forces git to make a merge commit, rather than

‎doc/devel/triage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Triaging operations for members of the core and triage teams
8787
In addition to the above, members of the core team and the triage team
8888
can do the following important tasks:
8989

90-
- Update labels for issues and PRs: see the list of `available github
90+
- Update labels for issues and PRs: see the list of `available GitHub
9191
labels <https://github.com/matplotlib/matplotlib/labels>`_.
9292

9393
- Triage issues:

0 commit comments

Comments
 (0)
0