merge the two supported service criteria definitions

tsa/policy/tpa-rfc-2-support.mdwn

@@ -160,11 +160,24 @@ Example of routine tasks include:
 
 ## Supported services
 
-Debian GNU/Linux is the only supported operating system, and TPA
-supports only the "stable" and "oldstable" distributions, until the
-latter becomes EOL. TPA does *not* support Debian LTS. It is the
-responsability of service admins (see below) to upgrade their services
-to keep up with the Debian release schedule.
+Services supported by TPA must fulfill the following criteria:
+
+ 1. The software needs to have an active release cycle
+ 2. It needs to provide installation instructions, debugging
+    procedures
+ 3. It needs to maintain a bug tracker and/or some means to contact
+    upstream
+ 4. Debian GNU/Linux is the only supported operating system, and TPA
+    supports only the "stable" and "oldstable" distributions, until
+    the latter becomes EOL
+ 5. At least one extra person from the Tor community should be willing
+    to help to maintain the service in addition to one person from the
+    sysadmin team.
+
+Note that TPA does *not* support Debian LTS.
+
+Also note that it is the responsability of service admins (see below)
+to upgrade their services to keep up with the Debian release schedule.
 
 <a name="service-admins"></a>
 
@@ -211,18 +224,9 @@ responsible for a service, for a while.
 If a service is important for the Tor community the sysadmin team
 might adopt it even when there aren't designated services admins.
 
-In order for a service to be adopted by the sysadmin team:
-
- 1. The software needs to have an active release cycle,
- 2. It needs to provide installation instructions, debugging
-    procedures,
- 3. It needs to maintain a bug tracker and/or some means to contact
-    upstream,
- 4. It needs to work on a supported operating system (currently:
-    supported, non-EOL Debian GNU/Linux)
- 5. At least one extra person from the Tor community should be willing
-    to help to maintain the service in addition to one person from the
-    sysadmin team.
+In order for a service to be adopted by the sysadmin team, it needs to
+fulfill the criteria established for "Supported services" by TPA,
+above.
 
 When a service is adopted by the sysadmin team, the sysadmins will
 make an estimation of costs and resources required to maintain the