README* updates

bk: 4438d2f4mRPVld3CtLxvVK6xkfY0JA

diff --git a/README b/README
index f9eeabcc5486ea07a2b01e4985c9f0c8c5acebdf..186caa88212f7c5fb96a9a145700b5ae1ed663f1 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
 Submit patches, bug reports, and enhancement requests via
 
-                       http://bugzilla.ntp.org
+                       http://bugs.ntp.isc.org
 
                  The ntp Distribution Base Directory
 

diff --git a/README.bk b/README.bk
index fa92b52bf0c93d6940cb2becc39f44c8b2c76b24..dc867b52ecfa45c9cbdcceeeede9046276eacd6e 100644 (file)
--- a/README.bk
+++ b/README.bk
@@ -1,55 +1,7 @@
-In order to use the BitKeeper repository version of NTP you will have
-to have the following tools installed:
+In order to use the BitKeeper repository version of NTP you should visit
 
-       autoconf        2.58 or later
-       automake        1.8 or later
-       lynx
+ http://ntp.isc.org/Main/SoftwareDevelopment
 
-Lynx is used to generate the COPYRIGHT file.  Don't ask.
-
-You can get bitkeeper by visiting:
-
-       http://www.bitkeeper.com/ 
-
-We are using bitkeeper under their free license program.  You can use
-bitkeeper for free to access NTP, too.  If you have questions about this,
-please ask.  The license is pretty easy to read.
- 
-Once you have installed bitkeeper, you can clone any NTP repository.
-
-You can get the ntp-stable repository by either of the following commands:
-
-     bk clone bk://www.ntp.org/home/bk/ntp-stable ntp-stable
-
-     bk clone bk://ntp.bkbits.net/ntp-stable ntp-stable
-
-You can get the ntp-dev repository by either of the following commands:
-
-     bk clone bk://www.ntp.org/home/bk/ntp-dev ntp-dev
-
-     bk clone bk://ntp.bkbits.net/ntp-dev ntp-dev
-
-If you are stuck behind a firewall that blocks access to the default port
-used by bitkeeper (14690) but you can use port 80 instead, you can use
-http as a bk transport mechanism.  Just use:
-
-     bk clone http://ntp.bkbits.net/REPO REPO
-
-Finally, it's possible to use SMTP as a bk transport mechanism.  So far, we
-haven't tried this.
-
-Once you have obtained the sources, do the following:
-
-       cd REPO
-       bk -r edit              to check out the files
-       autoreconf -f -i        generates configure and Makefile.in's
-
-and you should be ready to go.  You will get some warning messages from
-autoreconf.  Ignore these messages.
-
-You can update your repository by incanting:
-
-       cd REPO
-       bk pull
+for important information.
 
 If you want to submit patches, please see the README.hackers file.

diff --git a/README.versions b/README.versions
index 550925015c259c542f9c9d1b015885b0c871dac4..0fb23e5bb7802e8e84cc4c7c7e0e131456309e54 100644 (file)
--- a/README.versions
+++ b/README.versions
@@ -1,35 +1,27 @@
 
 NTP uses A.B.C - style release numbers.
 
-The third (C) part of the version number can be:
-
- 0-69 for patches/bugfixes to the A.B.C series.
- 70-79 for alpha releases of the A.B+1.0 series.
- 80+ for beta releases of the A.B+1.0 series.
-
 At the moment:
 
  A is 4, for ntp V4.
- B is the minor release number.
- C is the patch/bugfix number, and may have extra cruft in it.
+ B is the major release number.
+ C is the minor release number.  Even numbers are 'stable' releases and
+ odd numbers are "development" releases.
 
-Any extra cruft in the C portion of the number indicates an "interim" release.
+Following the release number may be the letter 'p' followed by a number.
+This indicates a point (or patch) release.
 
-Interim releases almost always have a C portion consisting of a number
-followed by an increasing letter, optionally followed by -rcX, where X
-is an increasing number.  The -rcX indicates a "release candidate".
+Release candidates have -RC in the release number.
 
 Here are some recent versions numbers as an example:
 
- 4.1.0         A production release (from the ntp-stable repository)
- 4.1.0b-rc1    A release candidate for 4.1.1 (from the ntp-stable repo)
- 4.1.71                An alpha release of 4.2.0, from the ntp-dev repo
+ 4.2.2         A production release (from the ntp-stable repository)
+ 4.2.2p2       A production release (from the ntp-stable repository)
+ 4.2.3p12      A development release
+ 4.2.3p15-rc1  A release candidate for 4.2.2
 
 Note that after the ntp-dev repo produces a production release it will
 be copied into the ntp-stable and the cycle will repeat.
 
-The goal of this scheme is to produce version numbers that collate
-"properly" with the output of the "ls" command.
-
 Feel free to suggest improvements...