Skip to content
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

Restructure the devguide for Jython #1

Merged
merged 7 commits into from
Oct 21, 2017
Merged

Conversation

jeff5
Copy link
Member

@jeff5 jeff5 commented Oct 4, 2017

Not recommended for merging until free of CPython specifics.

We'd like a Jython devguide based on CPython's, but the problem is that the CPython one is:

  • shot through with CPython specifics we must replace, and
  • likely to keep improving (which we'd like to merge).

Here I've tried to guess which files only need minor change. Two strategies have been applied, depending on how CPython specific was the original file:

  • Where content applies to Jython, with simple edits, we keep the original file. The expectation is that subsequent merges will be automatic, or at leasst manageable manually.
  • Where extensive re-writing is needed we start a new "companion" file (e.g. buildbots_jy.rst) and we keep the original as a reference, and also as a target for merge operations we don't want to modify the Jython text.

The aim is to allow changes to be merged as the CPython devguide develops.

index.rst is an exception as it is the conventional start page and cannot be renamed even though change is extensive.

Two strategies have been applied, depending on how CPython specific was
the original file. Where content applies to Jython, with simple edits,
we keep the original file. Where extensive re-writing is needed we start
a new "companion" file (e.g. grammar_jy.rst) and keep the original for
reference.

The aim is to allow changes to be merged as the CPython devguide
develops.

index.rst is an exception as it is the conventional start page and
cannot be renamed even though change is extensive.
These are words specific to Jython and Mercurial, merged by hand. We
restore some sections the CPython version has lost or never had. Much is
still in place that is CPython-specific.
Check and fix hyperlinks so the reader is not carried into material
specific to CPython while navigating. Also fix up content at the
destination sections, where reasonably easy to do.
Check and fix hyperlinks (all the :ref: and :doc: formulae) so the
reader is not carried into material specific to CPython while
navigating.
@jeff5 jeff5 mentioned this pull request Oct 12, 2017
Speak distinctly about Jython in a coherent section. Keep (and update)
the CPython story exactly as that project tells it.
Just too much divergence to remain common.
@jeff5
Copy link
Member Author

jeff5 commented Oct 20, 2017

Well, it's not free of CPython specific text by any means, but I believe I've rescued all the text from @fwierzbicki's work and structured the guide suitably for our needs. Also, I want to see if I'm right that we are able to merge changes made to the CPython devguide, and what the process is ... which should be documented in the guide, of course. :)

I'll call PR done for now and merge soon.

@jeff5 jeff5 merged commit b1451ec into jython:jython Oct 21, 2017
@jeff5 jeff5 deleted the jy_foundation branch October 22, 2017 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant