service.md

@@ -61,20 +61,15 @@ Those services have been retired.
 ## Exhaustive service list
 
 WARNING: this is an import of an old Trac wiki page, listing *all* the
-services 
+services and might be out of date.
 
-The Tor Project runs quite a lot of services for developers, researchers, relay operators, and the community at large.  Each of these services, regardless if developed by The Tor Project or by a third party, should have one or better more maintainers who look after the service if it breaks.  In particular, fixing a service is not something our system administrators can or should do.  As a consequence, unmaintained services will be shut down.
+The following table lists services run on torproject
+infrastructure. Corresponding onion services are listed on
+<https://onion.torproject.org/>.
 
- * New service will only be started if someone agrees to maintain it for at least the first six months.
- * Existing services that have a maintainer and become unmaintained will be shut down three months after discovering that they are unmaintained, unless a new maintainer shows up.
-
-The following table lists services run on torproject infrastructure.  Follow the link the _service name_ column for additional information.
-
-Corresponding onion services are listed on https://onion.torproject.org/
-
-Service admins are part of tor project sys admins team. For a rough description of what sys admin and services admin do, please have a look [here](https://help.torproject.org/tsa/doc/admins/).
-
-If you need the services admin team to maintain a new service or you would like to deploy a new service on torproject.org infrastructure please have a look [here](./org/operations/services/faq).
+Service admins are part of tor project sys admins team. For a rough
+description of what sys admin and services admin do, please have a
+look [here](policy/tpa-rfc-2-support#service-admins).
 
 The Service Admins maintain the following list of Tor Services.