Minor tweaks

This commit is contained in:
Graham Nelson 2022-08-20 10:51:25 +01:00
parent 79311e5cb2
commit 765dd7609e
3 changed files with 11 additions and 1 deletions

View file

@ -3,3 +3,7 @@
This release was made in April 2022, but was only a prerelease and was marked This release was made in April 2022, but was only a prerelease and was marked
`-beta` in its semantic version number. The first proper release for major `-beta` in its semantic version number. The first proper release for major
version 7 is [v7.2.0](7-2-0.md). version 7 is [v7.2.0](7-2-0.md).
<hr>
Return to the [table of Inweb release notes here](../version_history.md).

View file

@ -7,3 +7,7 @@ The prerelease version [v7.1.0](7-1-0.md), a stopgap during the period when
Inform's open-sourcing was getting going, is substantially the same program. Inform's open-sourcing was getting going, is substantially the same program.
However, 7.2.0 corrects a few bugs, and the `foundation` library added a number However, 7.2.0 corrects a few bugs, and the `foundation` library added a number
of useful functions, notably to do with JSON file parsing and validation. of useful functions, notably to do with JSON file parsing and validation.
<hr>
Return to the [table of Inweb release notes here](../version_history.md).

View file

@ -15,10 +15,12 @@ source it was compiled from. This one is clearly unstable:
$ inweb/Tangled/inweb -version $ inweb/Tangled/inweb -version
inweb version 7.1.0-beta+1B14 'Escape to Danger' (9 August 2022) inweb version 7.1.0-beta+1B14 'Escape to Danger' (9 August 2022)
(At some point, major versions of Inweb were given code-names according to the (Since around 2011, major versions of Inweb have been given code-names according to the
episodes of the 1964 Doctor Who serial [The Web Planet](https://en.wikipedia.org/wiki/The_Web_Planet). episodes of the 1964 Doctor Who serial [The Web Planet](https://en.wikipedia.org/wiki/The_Web_Planet).
Major version 8 will be "Crater of Needles".) Major version 8 will be "Crater of Needles".)
Release notes for releases since 2022 can be found [here](version_history.md).
## Branching ## Branching
In the core Inweb repository, active development is on the `master` branch, at least for now. That will always be a version which is unstable. All releases will be made from short branches off of `master`. For example, there will soon be a branch called `r7.1`. This will contain as few commits as possible, ideally just one, which would be the actual release version of 7.1.0. But if there are then point updates with bug fixes, say 7.1.1, 7.1.2, and so on, those would be further commits to the `r7.1` branch. Later, another short branch from `master` would be `r7.2`. In the core Inweb repository, active development is on the `master` branch, at least for now. That will always be a version which is unstable. All releases will be made from short branches off of `master`. For example, there will soon be a branch called `r7.1`. This will contain as few commits as possible, ideally just one, which would be the actual release version of 7.1.0. But if there are then point updates with bug fixes, say 7.1.1, 7.1.2, and so on, those would be further commits to the `r7.1` branch. Later, another short branch from `master` would be `r7.2`.