From fbe3c803f263b8b5ada5dba4f7e989dbe82b7c66 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 23 Oct 2006 20:17:04 +0000 Subject: [PATCH] r9358@Kushana: nickm | 2006-10-23 12:02:25 -0400 clarify recent spec stuff svn:r8808 --- doc/control-spec.txt | 5 ++--- doc/version-spec.txt | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/control-spec.txt b/doc/control-spec.txt index f317b368aa..04bfb42593 100644 --- a/doc/control-spec.txt +++ b/doc/control-spec.txt @@ -941,9 +941,8 @@ $Id$ Action is a string, and Arguments is a series of keyword=value pairs on the same line. - Controllers who listen to these events will be assumed to want - both EXTENDED_EVENTS and VERBOSE_NAMES; see the explanations - in the USEFEATURE section command for details. + These events are always produced with EXTENDED_EVENTS and VERBOSE_NAMES; + see the explanations in the USEFEATURE section command for details. Actions for STATUS_GENERAL severity NOTICE events can be as follows: diff --git a/doc/version-spec.txt b/doc/version-spec.txt index 5db299456e..5b9aeee01b 100644 --- a/doc/version-spec.txt +++ b/doc/version-spec.txt @@ -32,9 +32,10 @@ All versions should be distinguishable purely by those four numbers. The status tag is purely informational, and lets you know how stable we think the release is: "alpha" is pretty unstable; "rc" is a release candidate; and no tag at all means that we have a final -release. If the tag ends with "-cvs", you're looking at a development -snapshot that came after a given release. If we *do* encounter two -versions that differ only by status tag, we compare them lexically. +release. If the tag ends with "-cvs" or "-dev", you're looking at a +development snapshot that came after a given release. If we *do* +encounter two versions that differ only by status tag, we compare them +lexically. Now, we start each development branch with (say) 0.1.1.1-alpha. The patchlevel increments consistently as the status tag changes, for