Only iolog_file (not iolog_dir) supports mktemp-style suffixes.

--HG--
branch : 1.8

diff --cc configure.in
index 97b6d969c4f437c49e85c0caa64e18b9577ff393,58c281db08248d96d923337495bfa036962d36fb..b06e9def51905b0fe92d7ccdbe2b3eaafa83d080
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -3,7 -3,7 +3,7 @@@ dnl Process this file with GNU autocon
  dnl
  dnl Copyright (c) 1994-1996,1998-2011 Todd C. Miller <Todd.Miller@courtesan.com>
  dnl
- AC_INIT([sudo], [1.8.3rc1], [http://www.sudo.ws/bugs/], [sudo])
 -AC_INIT([sudo], [1.8.x], [http://www.sudo.ws/bugs/], [sudo])
++AC_INIT([sudo], [1.8.3], [http://www.sudo.ws/bugs/], [sudo])
  AC_CONFIG_HEADER([config.h pathnames.h])
  dnl
  dnl Note: this must come after AC_INIT

diff --cc doc/sudoers.cat
index 4ec196d82bbc6a3eb666dda36a8e231ac6483499,f7723529672f39b1386199a59d2ac6ca54f5207e..2459758172ab19510b3a17915ee3c2e4a2fae192
--- 1/doc/sudoers.cat
--- 2/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@@ -1065,13 -1244,22 +1065,9 @@@ S\bSU\bUD\bDO\bOE\bER\bRS\bS O\bOP\bPT\bTI\bIO\bON\b
                         In addition, any escape sequences supported by the
                         system's _\bs_\bt_\br_\bf_\bt_\bi_\bm_\be_\b(_\b) function will be expanded.
  
 -                       Path names that end in six or more Xs will have the Xs
 -                       replaced with a unique combination of digits and
 -
 -
 -
 -1.8.0rc1                February 21, 2011                      19
 -
 -
 -
 -
 -
 -SUDOERS(4)             MAINTENANCE COMMANDS            SUDOERS(4)
 -
 -
 -                       letters, similar to the _\bm_\bk_\bt_\be_\bm_\bp_\b(_\b) function.
 +                       To include a literal `%' character, the string `%%'
 +                       should be used.
  
-                        Path names that end in six or more Xs will have the Xs
-                        replaced with a unique combination of digits and
-                        letters, similar to the _\bm_\bk_\bt_\be_\bm_\bp_\b(_\b) function.
- 
         iolog_file      The path name, relative to _\bi_\bo_\bl_\bo_\bg_\b__\bd_\bi_\br, in which to store
                         input/output logs when the _\bl_\bo_\bg_\b__\bi_\bn_\bp_\bu_\bt or _\bl_\bo_\bg_\b__\bo_\bu_\bt_\bp_\bu_\bt
                         options are enabled or when the LOG_INPUT or LOG_OUTPUT
@@@ -1082,6 -1270,6 +1078,11 @@@
                         See the _\bi_\bo_\bl_\bo_\bg_\b__\bd_\bi_\br option above for a list of supported
                         percent (`%') escape sequences.
  
++                       In addition to the escape sequences, path names that
++                       end in six or more Xs will have the Xs replaced with a
++                       unique combination of digits and letters, similar to
++                       the _\bm_\bk_\bt_\be_\bm_\bp_\b(_\b) function.
++
         mailsub         Subject of the mail sent to the _\bm_\ba_\bi_\bl_\bt_\bo user. The escape
                         %h will expand to the host name of the machine.
                         Default is *** SECURITY information for %h ***.

diff --cc doc/sudoers.man.in
index c44d18c192f949cbb06488cb17ade799b4f3cc9f,f9632f05ae32c061de8de0cd21a1a0e4f6437234..59e9a31fbd98bf1fd2c8e44ebe9485220968110a
--- 1/doc/sudoers.man.in
--- 2/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@@ -1313,12 -1279,9 +1313,8 @@@ expanded to the base name of the comman
  In addition, any escape sequences supported by the system's \fIstrftime()\fR
  function will be expanded.
  .Sp
 -Path names that end in six or more \f(CW\*(C`X\*(C'\fRs will have the \f(CW\*(C`X\*(C'\fRs replaced
 -with a unique combination of digits and letters, similar to the
 -\&\fImktemp()\fR function.
 +To include a literal `\f(CW\*(C`%\*(C'\fR' character, the string `\f(CW\*(C`%%\*(C'\fR' should
 +be used.
- .Sp
- Path names that end in six or more \f(CW\*(C`X\*(C'\fRs will have the \f(CW\*(C`X\*(C'\fRs replaced
- with a unique combination of digits and letters, similar to the
- \&\fImktemp()\fR function.
  .RE
  .IP "iolog_file" 16
  .IX Item "iolog_file"
@@@ -1330,6 -1293,6 +1326,10 @@@ The default is \f(CW"%{seq}"\fR
  .Sp
  See the \fIiolog_dir\fR option above for a list of supported percent
  (`\f(CW\*(C`%\*(C'\fR') escape sequences.
++.Sp
++In addition to the escape sequences, path names that end in six or
++more \f(CW\*(C`X\*(C'\fRs will have the \f(CW\*(C`X\*(C'\fRs replaced with a unique combination
++of digits and letters, similar to the \fImktemp()\fR function.
  .IP "mailsub" 16
  .IX Item "mailsub"
  Subject of the mail sent to the \fImailto\fR user. The escape \f(CW%h\fR