Browse Source

Revert "Merge branch 'maint'"

This reverts commit cadb9f3603f7be0042c1ed30f7f8c3b44b81674e, reversing
changes made to f6be2b5aa3cb0586b8c9a9bdda923528a9b8f081.
Rasmus 3 years ago
parent
commit
dbf2c95774
2 changed files with 4 additions and 9 deletions
  1. 2 5
      README_maintainer
  2. 2 4
      lisp/org.el

+ 2 - 5
README_maintainer

@@ -34,8 +34,7 @@ release.
 
 When doing a /major release/, make sure all changes from the maint
 branch are merged into the the master branch, then merge the master
-branch back into maint to synchronize the two.  Further, make sure to
-update the Version and Package-Requires headers in org.el.
+branch back into maint to synchronize the two.
 
 ** Minor release
 
@@ -43,9 +42,7 @@ The release number for minor releases look like this:  =7.13.1=
 
 Minor releases are small amends to main releases.  Usually they fix
 critical bugs discovered in a main release.  Minor bugs are usually
-not fixed -- they will be addressed in the next main release.  Make
-sure to update the Version header in org.el when making a new minor
-release.
+not fixed -- they will be adressed in the next 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 bug fix

+ 2 - 4
lisp/org.el

@@ -4,11 +4,9 @@
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
-;; URL: http://orgmode.org
-;; Version: 8.3.1
+;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
-;; Package-Requires: ((emacs "23.2"))
+;; Homepage: http://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
 ;;