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

Split Gallina, Gallina ext and most of CIC chapters into multiple pages. #12239

Merged
merged 60 commits into from May 15, 2020

Conversation

Zimmi48
Copy link
Member

@Zimmi48 Zimmi48 commented May 3, 2020

This PR is a very rough splitting of the Gallina, Gallina extensions and CIC chapters into multiple pages. This is virtually only cut and paste with no adaptation to the context (just the minimum required to make it compile).

The main point of the PR is to gather feedback on the general structure ASAP and to identify the parts that will need the more effort to make acceptable in a released version.

This is a change of strategy compared to #12172, which took one week to prepare and one more week to review and merge. Given that we are just one month away from releasing 8.12+beta1 (by which time, it would be preferable to have conducted all significant changes to the refman) and two months away from releasing 8.12.0, it would not be realistic to continue at the same pace.

cc @jfehrle @mattam82 @herbelin @JasonGross and anyone else who is interested.

Core language index: https://coq.gitlab.io/-/coq/-/jobs/554084025/artifacts/_install_ci/share/doc/coq/sphinx/html/language/core/index.html
Language extensions index: https://coq.gitlab.io/-/coq/-/jobs/554084025/artifacts/_install_ci/share/doc/coq/sphinx/html/language/extensions/index.html

Copy link
Member

@jfehrle jfehrle left a comment

Choose a reason for hiding this comment

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

AFAICT nothing was lost. Let's go with this for now--thought there may be further refinements later.

doc/sphinx/language/core/primitive.rst Show resolved Hide resolved
doc/sphinx/language/extensions/evars.rst Show resolved Hide resolved
@Zimmi48 Zimmi48 force-pushed the split-gallina-and-gallina-ext branch from 9ceec48 to 3efbd4e Compare May 4, 2020 15:36
@Zimmi48 Zimmi48 force-pushed the split-gallina-and-gallina-ext branch from 3efbd4e to 26cd7d0 Compare May 14, 2020 10:48
@coqbot coqbot added the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label May 14, 2020
@coqbot coqbot removed the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label May 14, 2020
@Zimmi48 Zimmi48 added the kind: documentation Additions or improvement to documentation. label May 14, 2020
@Zimmi48 Zimmi48 added this to the 8.12+beta1 milestone May 14, 2020
@Zimmi48 Zimmi48 marked this pull request as ready for review May 14, 2020 11:00
@Zimmi48 Zimmi48 requested a review from a team as a code owner May 14, 2020 11:00
@Zimmi48
Copy link
Member Author

Zimmi48 commented May 14, 2020

I've updated the PR to preserve the history of the sections that were moved.

Compared to the previous version, the changes are as follows:

  • less about universes in the sorts section (more in the universe polymorphism section instead: we should likely rename it into just "universes");
  • the section on impredicative set was left in CIC for now (now a section titled "Typing rules");
  • in sections on Assumptions and on Definitions, the term constructs are moved before the top-level commands;
  • type casts moved from Assumptions to Definitions (I'm unsure this will be its definite location, maybe it would be more appropriate in "Typing rules" but for now this section is very theoretical).
  • slightly different order of sections in the Core language chapter.

Note that given the size of the changes, conflicts are bound to appear very quickly, so it would be good to merge ASAP (cc @cpitclaudel). And given the number of merge commits, this is impossible to backport, so should definitely go in before the branching.

@Zimmi48
Copy link
Member Author

Zimmi48 commented May 14, 2020

Note that this PR doesn't contain any new content, just minimal fixes to make things hold together. Some new files will need a bit of rewording but this will be done as a later step, before the 8.12.0 release.

@Zimmi48
Copy link
Member Author

Zimmi48 commented May 15, 2020

ping @cpitclaudel

@cpitclaudel cpitclaudel merged commit 2111994 into coq:master May 15, 2020
@Zimmi48 Zimmi48 deleted the split-gallina-and-gallina-ext branch May 16, 2020 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind: documentation Additions or improvement to documentation.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants