Skip to content

Commit fb6988e

Browse files
committed
Ensure links are appropriate to Jython (:ref: and :doc:).
Check and fix hyperlinks (all the :ref: and :doc: formulae) so the reader is not carried into material specific to CPython while navigating.
1 parent 38e606b commit fb6988e

12 files changed

+43
-33
lines changed

committing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ passes before merging any code changes.
5353
or library modules.
5454

5555
Running the entire test suite doesn't guarantee that the changes
56-
will pass the :ref:`continuous integration <buildbots>` tests, as those
56+
will pass the :ref:`continuous integration <buildbots-jy>` tests, as those
5757
will exercise more possibilities still (such as different platforms or
5858
build options). But it will at least catch non-build specific,
5959
non-platform specific errors, therefore minimizing the chance for

committing_hg_jy.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
.. Jython and Mercurial-specific companion to committing.rst,
2+
needed while we use Mercurial.
3+
14
.. _committing-hg-jy:
25

36
Committing and Pushing Changes (Mercurial)
@@ -31,7 +34,7 @@ passes before pushing any code changes.
3134
or library modules.
3235

3336
Running the entire test suite doesn't guarantee that your changes
34-
will pass the :ref:`continuous integration <buildbots>` tests, as those
37+
will pass the :ref:`continuous integration <buildbots-jy>` tests, as those
3538
will exercise more possibilities still (such as different platforms or
3639
build options). But it will at least catch non-build specific,
3740
non-platform specific errors, therefore minimizing the chance for
@@ -321,7 +324,7 @@ clone/directory, but, on the other hand, it requires you to recompile Python
321324
every time you need to switch branch. For this reason, this approach is not
322325
suggested to core developers, but it's usually suitable for contributors.
323326

324-
See :ref:`checkout` to find information about cloning and switching branches.
327+
See :ref:`checkout-jy` to find information about cloning and switching branches.
325328

326329
.. _multiple-clones:
327330

@@ -340,7 +343,7 @@ enabled by adding the following lines to your ``~/.hgrc``::
340343
[extensions]
341344
share =
342345

343-
Once you have :ref:`cloned the hg.python.org/jython repository <checkout>`
346+
Once you have :ref:`cloned the hg.python.org/jython repository <checkout-jy>`
344347
you can create the other shared clones using::
345348

346349
$ hg share jython 2.7 # create a new shared clone

coverage.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ but the strategy requires they be contributes upstream to CPython.
1919
validated in a Jython context. The section on C is not relevant to Java,
2020
and we need to write one that is.
2121

22+
.. In the 2017 revision, scoring for C-specific content suggested we create a
23+
coverage_jy companion file.
24+
25+
2226
Python development follows a practice that all semantic changes and additions
2327
to the language and :abbr:`stdlib (standard library)` are accompanied by
2428
appropriate unit tests. Unfortunately Python was in existence for a long time
@@ -258,9 +262,9 @@ times.
258262
Filing the Issue
259263
""""""""""""""""
260264
Once you have increased coverage, you need to create an issue on the
261-
`Jython issue tracker`_ and submit a :doc:`pull request <pullrequest>`. On the
262-
issue set the "Components" to "Test" and "Versions" to the version of Jython you
263-
worked on (i.e., the in-development version).
265+
`Jython issue tracker`_ and submit a :doc:`pull request or patch <pullrequest>`.
266+
On the issue set the "Components" to "Test" and "Versions" to the version of
267+
Jython you worked on (i.e., the in-development version).
264268

265269
.. _Jython issue tracker: http://bugs.jython.org
266270

devcycle.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ under active development for all kinds of changes: new features, semantic
5454
changes, performance improvements, bug fixes.
5555

5656
In a process based on Mercurial, the branch is identifies as ``default``.
57-
It is the branch :ref:`checked out <checkout>` by default by Mercurial.
57+
It is the branch :ref:`checked out <checkout-jy>` by default by Mercurial.
5858

5959
At some point during the life-cycle of a release, a
6060
new :ref:`maintenance branch <maintbranch>` is created to host all bug fixing

docquality.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ Changes to the devguide are normally published within a day, on a schedule
109109
that may be different from the main documentation.
110110

111111
.. _separate repository:
112-
.. _devguide repo: https://github.com/python/devguide
113-
.. _the GitHub tracker: https://github.com/python/devguide/issues
112+
.. _devguide repo: https://github.com/jython/devguide
113+
.. _the GitHub tracker: https://github.com/jython/devguide/issues
114114
.. _Sphinx: http://www.sphinx-doc.org/

documenting.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Documenting Python
88
==================
99

1010
.. warning:: At present, this is not much modified from the CPython base.
11+
But that's probably ok, as Jython documentation is largely from CPython,
12+
and the section is predominantly a guide to ReStructuredText.
1113

1214
The Python language has a substantial body of documentation, much of it
1315
contributed by various authors. The markup used for the Python documentation is

exploring_jy.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This is a quick guide for people who are interested in learning more about
1212
Jython's internals.
1313
It provides a summary of the source code structure
1414
and contains references to resources providing a more in-depth view.
15-
Much may al;so be learned by :doc:`exploring CPython's internals <exploring>`.
15+
Much may also be learned by :doc:`exploring CPython's internals <exploring>`.
1616

1717

1818
Jython Source Code Layout

index.rst

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ GitHub
4949
^^^^^^
5050
.. highlight:: bash
5151

52-
Here are the basic steps needed to get :ref:`set up <setup>` and contribute a
52+
Here are the basic steps needed to get :ref:`set up <setup-jy>` and contribute a
5353
patch. This is meant as a checklist, once you know the basics. For complete
54-
instructions please see the :ref:`setup guide <setup>`.
54+
instructions please see the :ref:`setup guide <setup-jy>`.
5555

56-
1. Install and set up :ref:`Git <vcsetup>` and other dependencies
57-
(see the :ref:`Get Setup <setup>` page for detailed information).
56+
1. Install and set up :ref:`Git <vcsetup-jy>` and other dependencies
57+
(see the :ref:`Get Setup <setup-jy>` page for detailed information).
5858

5959
2. Fork `the Jython repository <https://github.com/jython/jython>`_
60-
to your GitHub account and :ref:`get the source code <checkout>` using::
60+
to your GitHub account and :ref:`get the source code <checkout-jy>` using::
6161

6262
git clone https://github.com/<your_username>/jython
6363

@@ -67,23 +67,21 @@ instructions please see the :ref:`setup guide <setup>`.
6767

6868
issued in the base check-out directory.
6969
The built application will be in subdirectory ``dist``.
70-
See also :ref:`more detailed instructions <compiling>`,
71-
:ref:`how to build dependencies <build-dependencies>`, and the
72-
plaform-specific pages for :ref:`UNIX <unix-compiling>`,
73-
and :ref:`Windows <windows-compiling>`.
70+
See also :ref:`more detailed instructions <compiling-jy>`,
71+
and :ref:`how to build dependencies <build-dependencies-jy>`.
7472

7573
4. :doc:`Run the tests <runtests>`::
7674

7775
dist/bin/jython -m test -e
7876

79-
With Jython 2.7, replace ``test`` with ``test.regrtest``.
77+
(for Jython 3). With Jython 2.7, replace ``test`` with ``test.regrtest``.
8078

8179
5. Create a new branch where your work for the issue will go, e.g.::
8280

8381
git checkout -b fix-issue-12345 master
8482

8583
If an issue does not already exist, please `create it
86-
<https://bugs.python.org/>`_. Trivial issues (e.g. typo fixes) do not
84+
<https://bugs.jpython.org/>`_. Trivial issues (e.g. typo fixes) do not
8785
require any issue to be created.
8886

8987
6. Once you fixed the issue, run the tests, and if
@@ -205,12 +203,12 @@ Guide for contributing to Jython:
205203
* Fixing issues found by the :doc:`buildbots <buildbots_jy>`
206204
* :doc:`fixingissues`
207205
* :ref:`tracker` and :ref:`helptriage`
208-
* :doc:`triaging`
206+
* :doc:`triaging_jy`
209207
* :doc:`experts`
210208
* :doc:`communication`
211209
* :doc:`coredev`
212-
* :doc:`committing`
213210
* :doc:`committing_hg_jy`
211+
* :doc:`committing`
214212
* :doc:`devcycle`
215213
* :doc:`buildbots_jy`
216214
* :doc:`gitbootcamp`

pullrequest.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Lifecycle of a Pull Request
77
===========================
88

99
.. warning:: At present, this is not much modified from the CPython base.
10+
This describes the PR-based process used by CPython on GitHub, which works
11+
for Jython in a limited form. (You can asubmit a PR, but we export a patch.)
12+
The traditional Jython process is based on
13+
:doc:`patches submitted to the tracker <patch_hg_jy>`.
1014

1115
Creating
1216
--------
@@ -109,14 +113,14 @@ Here is a quick overview of how you can contribute to CPython on GitHub:
109113
#. If an issue doesn't exist, `create an Issue`_ that describes your change.
110114
Trivial issues (e.g. typo fixes) do not require any issue to be created.
111115

112-
#. :ref:`Get started <setup>` and set up your system
116+
#. :ref:`Get started <setup-jy>` and set up your system
113117

114-
#. :ref:`Fork CPython <fork-cpython>` (using the Fork button in the
118+
#. :ref:`Fork Jython <fork-jython>` (using the Fork button in the
115119
upper-right on GitHub)
116120

117121
#. :ref:`Clone your GitHub fork and add an "upstream" remote <clone-your-fork>`
118122

119-
#. :ref:`Build Python <compiling>` on your system
123+
#. :ref:`Build Jython <compiling-jy>` on your system
120124

121125
#. :ref:`Run tests <runtests>` after you have built Python
122126

runtests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ be executed on that platform.
102102
Often, the cause is that an optional module hasn't been built due to missing
103103
build dependencies. In these cases, the missing module reported when the test
104104
is skipped should match one of the modules reported as failing to build when
105-
:ref:`compiling`.
105+
:ref:`compiling-jy`.
106106

107107
In other cases, the skip message should provide enough detail to help figure
108108
out and resolve the cause of the problem (for example, the default security

tracker.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Being now logged in, you can submit a bug by clicking on the "Create New" link
5050
in the sidebar.
5151

5252
The submission form has a number of fields, and they are described in detail
53-
in the :ref:`triaging` page. This is a short summary:
53+
in the :ref:`triaging-jy` page. This is a short summary:
5454

5555
* in the **Title** field, enter a *very* short description of the problem;
5656
less than ten words is good;

triaging_jy.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
33
.. _triaging-jy:
44

5-
Triaging an Issue
6-
=================
5+
Triaging a Jython Issue
6+
=======================
77

8-
.. warning:: At present, this is not much more than a copy of the CPython original
9-
with the obviously inapplicable crudely hacked out.
8+
.. warning:: At present, this is not much more than a copy of the CPython original.
109

1110
When you have the Developer role on the `issue tracker`_ you are able to triage
1211
issues directly without any assistance.

0 commit comments

Comments
 (0)