# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1098315274 -10800
# Node ID 322b580e0eb4c73ab1f945321e4a3d69078272c2
# Parent  fb7f862194b5804f64bf8d0e09046914998bbcc2
Changed %p (protocol) -> %s (service). Also changed %P (pid) -> %p.
Hopefully people weren't using these much yet :)

diff -r fb7f862194b5 -r 322b580e0eb4 doc/variables.txt
--- a/doc/variables.txt	Thu Oct 21 02:05:53 2004 +0300
+++ b/doc/variables.txt	Thu Oct 21 02:34:34 2004 +0300
@@ -11,8 +11,8 @@
  %n - user part in user@domain, same as %u if there's no domain
  %d - domain part in user@domain, empty if user there's no domain
  %h - home directory
- %p - protocol (IMAP or POP3)
- %P - PID of the current process (login or imap/pop3 process)
+ %s - service (IMAP or POP3)
+ %p - PID of the current process (login or imap/pop3 process)
  %l - local IP address
  %r - remote IP address
 
diff -r fb7f862194b5 -r 322b580e0eb4 src/auth/mech.c
--- a/src/auth/mech.c	Thu Oct 21 02:05:53 2004 +0300
+++ b/src/auth/mech.c	Thu Oct 21 02:34:34 2004 +0300
@@ -200,11 +200,11 @@
 		{ 'u', NULL },
 		{ 'n', NULL },
 		{ 'd', NULL },
-		{ 'p', NULL },
+		{ 's', NULL },
 		{ 'h', NULL },
 		{ 'l', NULL },
 		{ 'r', NULL },
-		{ 'P', NULL },
+		{ 'p', NULL },
 		{ '\0', NULL }
 	};
 	struct var_expand_table *tab;
diff -r fb7f862194b5 -r 322b580e0eb4 src/master/mail-process.c
--- a/src/master/mail-process.c	Thu Oct 21 02:05:53 2004 +0300
+++ b/src/master/mail-process.c	Thu Oct 21 02:34:34 2004 +0300
@@ -83,11 +83,11 @@
 		{ 'u', NULL },
 		{ 'n', NULL },
 		{ 'd', NULL },
-		{ 'p', NULL },
+		{ 's', NULL },
 		{ 'h', NULL },
 		{ 'l', NULL },
 		{ 'r', NULL },
-		{ 'P', NULL },
+		{ 'p', NULL },
 		{ '\0', NULL }
 	};
 	struct var_expand_table *tab;