|
|
@@ -28,8 +28,8 @@ release. The release process is a single make command:
|
|
|
The release number for minor releases look like this: =7.13.01=
|
|
|
|
|
|
Minor releases are small amends to main releases. Usually they fix
|
|
|
-bugs discovered in a main release. The only yhe fix to the bug is
|
|
|
-bundled into a release, without the main development work going on on
|
|
|
+bugs discovered in a main release. Only the fix to the bug is
|
|
|
+bundled into a release, without the main development work going on in
|
|
|
the master branch. Since the big fix will also be needed in the
|
|
|
master branch, usually the fix is made in master and then
|
|
|
cherry-picked into maint. When this is done, a release is made from
|
|
|
@@ -41,7 +41,7 @@ maint with this command:
|
|
|
|
|
|
This is still a significant headache. Some hand work is needed here.
|
|
|
|
|
|
-Emacs uses bzr, I cannot bring myself to swith from git to bzr for the
|
|
|
+Emacs uses bzr, I cannot bring myself to switch from git to bzr for the
|
|
|
development version of Org-mode. So the way I have been doing things
|
|
|
is this:
|
|
|
|
|
|
@@ -56,7 +56,7 @@ is this:
|
|
|
|
|
|
2. When I have made a release (usually I wait for the minor releases
|
|
|
to stabilize), I copy org files into the Emacs repository. Yes, I
|
|
|
- do not merge, I copy. This has ben the source of some problems in
|
|
|
+ do not merge, I copy. This has been the source of some problems in
|
|
|
the past - but I have not had the patience to work out a better
|
|
|
mechanism.
|
|
|
|
Carsten Dominik