Merge branch 'master' into feature/fix-comments

2 files changed, 10 insertions, 5 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f9795575..66241f98 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-28         Bjarni Ingi Gislason  <bjarniig@rhi.hi.is>
+
+	* gawk.1: Change two-fonts macros to one-font macros for a
+	single argument.
+
 2018-05-27         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in (Extract Program): Bug fix. Keep the files open
diff --git a/doc/gawk.1 b/doc/gawk.1
index 21bcda6a..0359b9d0 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -234,7 +234,7 @@ Enable debugging of \*(AK programs.
 By default, the debugger reads commands interactively from the keyboard
 (standard input).
 The optional
-.IR file
+.I file
 argument specifies a file with a list
 of commands for the debugger to execute non-interactively.
 .TP
@@ -506,10 +506,10 @@ Disable
 default optimizations upon the internal representation of the program.
 .TP
 .PD 0
-.BI \-S
+.B \-S
 .TP
 .PD
-.BI \-\^\-sandbox
+.B \-\^\-sandbox
 Run
 .I gawk
 in sandbox mode, disabling the
@@ -1141,7 +1141,7 @@ system call.
 The value of
 .IR errno (3)
 when
-.BR ERRNO
+.B ERRNO
 is set to the associated error message.
 .TP
 \fBPROCINFO["euid"]\fP
@@ -1288,7 +1288,7 @@ and this array entry exists, then
 .B getline
 returns \-2 instead of following the default behavior of returning \-1
 and configuring
-.IR input
+.I input
 to return no further data.
 An I/O error that may be retried is one where
 .IR errno (3)