# HG changeset patch
# User Ben Schmidt
# Date 1298330200 -39600
# Node ID 8c4064ce228ebb1bf4285e11b5a80a039a52a019
# Parent  6f8df4842d9177f5e579e4f2e52309716ec58c66
Mark a bunch of stuff as deprecated.

Replacing some generic stuff with even more generic stuff, looking forward to
the day when we will do things like http://$www$.$domain$/$list$/archive.

diff -r 6f8df4842d91 -r 8c4064ce228e README.listtexts
--- a/README.listtexts	Tue Feb 22 10:12:42 2011 +1100
+++ b/README.listtexts	Tue Feb 22 10:16:40 2011 +1100
@@ -173,6 +173,7 @@
 
 - $digestsubaddr$
   listname+subscribe-digest@domain.tld
+  DEPRECATED: use $list+$subscribe-digest@$domain$ instead
 
 - $digestthreads$
   (available only in digest)
@@ -180,29 +181,46 @@
 
 - $digestunsubaddr$
   listname+unsubscribe-digest@domain.tld
+  DEPRECATED: use $list+$unsubscribe-digest@$domain$ instead
+
+- $domain$
+  domain.tld
 
 - $faqaddr$
   listname+faq@domain.tld
+  DEPRECATED: use $list+$faq@$domain$ instead
 
 - $helpaddr$
   listname+help@domain.tld
+  DEPRECATED: use $list+$help@$domain$ instead
+
+- $list$
+  listname
+
+- $list+$
+  listname+
 
 - $listaddr$
   listname@domain.tld
+  DEPRECATED: use $list$@$domain$ instead
 
 - $listgetN$
   listname+get-N@domain.tld
   (the N here is nothing special, so this won't actually work, but is used to
   explain to users how to use the +get functionality)
+  DEPRECATED: use $list+$get-N@$domain$ instead
 
 - $listowner$
   listname+owner@domain.tld
+  DEPRECATED: use $list+$owner@$domain$ instead
 
 - $listsubaddr$
   listname+subscribe@domain.tld
+  DEPRECATED: use $list+$subscribe@$domain$ instead
 
 - $listunsubaddr$
   listname+unsubscribe@domain.tld
+  DEPRECATED: use $list+$unsubscribe@$domain$ instead
 
 - $maxmailsize$
   (available only in maxmailsize)
@@ -223,9 +241,11 @@
 
 - $nomailsubaddr$
   listname+subscribe-nomail@domain.tld
+  DEPRECATED: use $list+$subscribe-nomail@$domain$ instead
 
 - $nomailunsubaddr$
   listname+unsubscribe-nomail@domain.tld
+  DEPRECATED: use $list+$unsubscribe-nomail@$domain$ instead
 
 - $oldsub$
   (available only in notifyunsub, notifyunsub-digest and notifyunsub-nomail)
diff -r 6f8df4842d91 -r 8c4064ce228e src/prepstdreply.c
--- a/src/prepstdreply.c	Tue Feb 22 10:12:42 2011 +1100
+++ b/src/prepstdreply.c	Tue Feb 22 10:16:40 2011 +1100
@@ -100,39 +100,59 @@
 	listname = genlistname(listaddr);
 
 	if(strcmp(token, "listaddr") == 0) {
+		/* DEPRECATED: use $list$@$domain$ instead */
 		value = mystrdup(listaddr);
 		goto concatandreturn;
+	} else if(strcmp(token, "list+") == 0) {
+		value = concatstr(2, listname, listdelim);
+		goto concatandreturn;
+	} else if(strcmp(token, "list") == 0) {
+		value = mystrdup(listname);
+		goto concatandreturn;
+	} else if(strcmp(token, "domain") == 0) {
+		value = mystrdup(fqdn);
+		goto concatandreturn;
 	} else if(strcmp(token, "listowner") == 0) {
+		/* DEPRECATED: use $list+$owner@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "owner@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "helpaddr") == 0) {
+		/* DEPRECATED: use $list+$help@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "help@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "faqaddr") == 0) {
+		/* DEPRECATED: use $list+$faq@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "faq@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "listgetN") == 0) {
+		/* DEPRECATED: use $list+$get-N@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "get-N@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "listunsubaddr") == 0) {
+		/* DEPRECATED: use $list+$unsubscribe@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "unsubscribe@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "digestunsubaddr") == 0) {
+		/* DEPRECATED: use $list+$unsubscribe-digest@$domain$ instead */
 		value = concatstr(4, listname, listdelim,
 				  "unsubscribe-digest@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "nomailunsubaddr") == 0) {
+		/* DEPRECATED: use $list+$unsubscribe-nomail@$domain$ instead */
 		value = concatstr(4, listname, listdelim,
 				  "unsubscribe-nomail@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "listsubaddr") == 0) {
+		/* DEPRECATED: use $list+$subscribe@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "subscribe@", fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "digestsubaddr") == 0) {
+		/* DEPRECATED: use $list+$subscribe-digest@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "subscribe-digest@",
 				  fqdn);
 		goto concatandreturn;
 	} else if(strcmp(token, "nomailsubaddr") == 0) {
+		/* DEPRECATED: use $list+$subscribe-nomail@$domain$ instead */
 		value = concatstr(4, listname, listdelim, "subscribe-nomail@",
 				  fqdn);
 		goto concatandreturn;