Merge from trunk.

5 files changed, 26 insertions, 227 deletions

diff --git a/admin/notes/exit-value b/admin/notes/exit-value
deleted file mode 100644
index 96337e4c8dd..00000000000
--- a/admin/notes/exit-value
+++ /dev/null
@@ -1,28 +0,0 @@
-ttn 2004-05-09
-
-The exit value of a program returning to the shell on unixoid systems
-is typically 0 for success, and non-0 (such as 1) for failure. This is
-not always the case on other systems.
-
-From the point of view of the program stdlib.h provides macros
-`EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT.  N.B. The
-numerical values of these macros DO NOT need to fulfill the exit value
-requirements outlined in the first paragraph!  That is the job of the
-`exit' function.  Thus, this kind of construct shows misunderstanding:
-
-   #ifdef WEIRD_OS
-      exit (1);
-   #else
-      exit (0);
-   #endif
-
-Values aside from EXIT_SUCCESS and EXIT_FAILURE are tricky, but can be
-used to indicate finer gradations of failure.  If this is the only
-information available to the caller, clamping such values to
-EXIT_FAILURE loses information.  If there are other ways to indicate
-the problem to the caller (such as a message to stderr) it may be ok
-to clamp.  In all cases, it is the relationship between the program
-and its caller that must be examined.
-
-[Insert ZAMM quote here.] <-- I presume this refers to ``Zen and the
-Art of Motorcycle Maintenance'' - Reuben Thomas <rrt@sc3d.org>.
diff --git a/admin/notes/iftc b/admin/notes/iftc
deleted file mode 100644
index 983b1486685..00000000000
--- a/admin/notes/iftc
+++ /dev/null
@@ -1,26 +0,0 @@
-Iso-Functional Type Contour
-
-
-This is a term coined to describe "column int->float" change approach, and can
-be used whenever low-level types need to change (hopefully not often!) but the
-meanings of the values (whose type has changed) do not.
-
-The premise is that changing a low-level type potentially means lots of code
-needs to be changed as well, and the question is how to do this incrementally,
-which is the preferred way to change things.
-
-Say LOW and HIGH are C functions:
-
-  int LOW (void) { return 1; }
-  void HIGH (void) { int value = LOW (); }
-
-We want to convert LOW to return float, so we cast HIGH usage:
-
-  float LOW (void) { return 1.0; }
-  void HIGH (void) { int value = (int) LOW (); }  /* iftc */
-
-The comment /* iftc */ is used to mark this type of casting to differentiate
-it from other casting.  We commit the changes and can now go about modifying
-LOW and HIGH separately.  When HIGH is ready to handle the type change, the
-cast can be removed.
-
diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO
deleted file mode 100644
index 4a4ccb5e6e8..00000000000
--- a/admin/notes/lel-TODO
+++ /dev/null
@@ -1,124 +0,0 @@
-Some lisp/emacs-lisp/ Features and Where They Are Documented
-
-Copyright (C) 2007-2014 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-
-* Status Key
-  -      -- as yet unknown
-  n/a    -- not applicable (internal, uninteresting, etc)
-  obsolete -- an obsolete feature, to be removed in future
-  todo   -- not documented but should be
-  NODE   -- documented in or under info node NODE
-
-
-* Features
-  advice                  (elisp) Advising Functions
-  advice-preload          n/a
-  assoc                   -
-  authors                 -
-  autoload                (elisp) Autoload
-  avl-tree                -
-  backquote               n/a
-  benchmark               n/a
-  bindat                  (elisp) Byte Packing
-  byte-compile            (elisp) Byte Compilation
-  byte-opt                -
-  bytecomp                (elisp) Compilation Functions
-  checkdoc                (elisp) Documentation Tips
-  cl                      (cl)
-  cl-compat               n/a
-  cl-specs                n/a
-  copyright               -
-  crm                     -
-  cust-print              (elisp) Printing in Edebug
-  debug                   (elisp) Debugger
-  derived                 (elisp) Derived Modes
-  disass                  (elisp) Disassembly
-  easy-mmode              (elisp) Defining Minor Modes
-  easymenu                -
-  edebug                  (elisp) Edebug
-  eldoc                   -
-  elint                   -
-  elp                     n/a
-  ewoc                    (elisp) Separated Rendering
-  find-func               -
-  find-gc                 -
-  generic                 (elisp) Generic Modes
-  gulp                    n/a
-  helper                  -
-  levents                 obsolete
-  lisp-float-type         -
-  lisp-mnt                -
-  lisp-mode               n/a
-  lmenu                   obsolete
-  lucid                   obsolete
-  macroexp                (elisp) Expansion
-  pp                      (emacs) Program Indent
-  re-builder              -
-  regexp-opt              (elisp) Regexp Functions
-  regi                    -
-  ring                    (elisp) Rings
-  rx                      -
-  shadow                  -
-  sregex                  obsolete
-  syntax                  (elisp) Position Parse
-  testcover               -
-  timer                   (elisp) Timers
-  tq                      (elisp) Transaction Queues
-  trace                   -
-  unsafep                 (elisp) Function Safety
-  warnings                (elisp) Warnings
-
-
-* Above list created using default directory lisp/emacs-lisp/ with
-  (shell-command
-    "sed '/^(provide '\\''/!d;s//  /;s/).*//' *.el | sort | uniq")
-
-
-* How to use this file to improve Emacs
-  (loop
-   (let* ((feature (choose-one Features))
-          (status (feature-status feature)))
-     (if (or (eq '- status) (not (verify status)))
-         (update feature (current-docs feature))
-       (case status
-         (todo (let (doc patch feedback)
-                 (while (not (grok feature))
-                   (or (play-with feature)
-                       (grep feature Internet)
-                       (grep feature (wisdom-maybe "emacs-devel"))))
-                 (setq doc (write-documentation feature)
-                       patch (diff (current-docs) doc))
-                 (while (not (and (correct doc)
-                                  (well-placed doc)
-                                  (well-formed patch)))
-                   (setq doc (revise doc)
-                         patch (diff (current-docs) doc))
-                         feedback (wisdom-maybe "emacs-devel" patch))
-                 (when (install patch)
-                   (when (update feature (current-docs feature))
-                     (job-well-done user-login-name)))))
-         (n/a (job-well-done user-login-name))))))
-
-
-* Etc
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-  Local variables:
-  mode: outline
-  End:
diff --git a/admin/notes/versioning b/admin/notes/versioning
new file mode 100644
index 00000000000..e422b22e432
--- /dev/null
+++ b/admin/notes/versioning
@@ -0,0 +1,26 @@
+GNU EMACS VERSIONING                                   -*- org -*-
+
+Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html
+
+Emacs version numbers have the form
+
+  major.minor[.devel].build
+
+"build" increments each time Emacs is built in the same location
+(without cleaning) and isn't really part of the version.
+
+bugfix releases increase "minor" by 1.
+non-bugfix releases increase "major" by 1, and reset "minor" to 1.
+(The division between bugfix and non-bugfix has not always been clear
+historically.)
+
+Unreleased (development) versions have an extra "devel" component.
+This is a fairly meaningless number that may be unchanged for a long time.
+It is normally 50.
+When the release process starts, it changes to 90, 91, ...
+When the actual release is made, this component is removed.
+
+The development version for a new major release has "minor" = 0.
+The development version for a new minor release has "minor" = that of
+the previous release.
+
diff --git a/admin/versioning b/admin/versioning
deleted file mode 100644
index da547ee94ca..00000000000
--- a/admin/versioning
+++ /dev/null
@@ -1,49 +0,0 @@
-GNU EMACS VERSIONING                                   -*- org -*-
-
-The version number scheme of Emacs, including how to determine when to
-bump various components of the version number, has evolved over the
-years.  This file defines the current method, explains why it was
-chosen, and lightly documents the previous schemes.  It was prompted
-by http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html.
-
-Related info:
-- [[file:FOR-RELEASE][FOR-RELEASE]]
-- [[file:make-tarball.txt][make-tarball.txt]]
-
-* what: MAJOR.MINOR
-
-This has always been the case (see [[was]], below).  MINOR is 1 or more,
-usually, the exception being for pretest releases, where there is
-an additional trailing ".ALPHA" (e.g., 24.3.95 prior to 24.4).
-
-To determine any release's version, we follow this algorithm:
-
-- If MAJOR-CHANGES, increment MAJOR and set MINOR to 1.
-- Otherwise, increment MINOR.
-
-where MAJOR-CHANGES is defined roughly as the union of:
-
-- dropped support for IMPORTANT
-  - platforms (almost never happens)
-  - Emacs Lisp features
-  - non-programming features/packages
-- IMPORTANT additions and changes
-  - Emacs Lisp features
-  - non-programming features/packages
-
-and IMPORTANT is defined through discussion on the [[http://mail.gnu.org/archive/html/emacs-devel/][emacs-devel]]
-mailing list and/or private arm-twisting (although this latter
-method is somewhat discouraged :-D).
-
-* why
-
-People expect bumps in MINOR for "minor" changes.  This typically
-includes bugfixes, doc improvements, or fully-backward-compatible
-additions and changes, only.
-
-Anything else is actually IMPORTANT, to the user.  [Actually, who
-really knows what the user thinks?  I certainly don't. --ttn]
-
-* was
-
-TODO (be sure to include "ad-hoc" :-D)