| 12
 3
 4
 5
 6
 7
 8
 9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 208
 209
 210
 211
 212
 213
 214
 215
 216
 217
 218
 219
 220
 221
 222
 223
 224
 225
 226
 227
 228
 229
 230
 231
 232
 233
 234
 235
 236
 237
 238
 239
 240
 241
 242
 243
 244
 245
 246
 247
 248
 249
 250
 251
 252
 253
 254
 255
 256
 257
 258
 259
 260
 261
 262
 263
 264
 265
 266
 267
 268
 269
 270
 271
 272
 273
 274
 275
 276
 277
 278
 279
 280
 281
 282
 283
 284
 285
 286
 287
 288
 289
 290
 291
 292
 293
 294
 295
 296
 297
 298
 299
 300
 301
 302
 303
 304
 305
 306
 307
 308
 309
 310
 311
 312
 313
 314
 315
 316
 317
 318
 319
 320
 321
 322
 323
 324
 325
 326
 327
 328
 329
 330
 331
 332
 333
 334
 335
 336
 337
 338
 339
 340
 341
 342
 343
 344
 345
 346
 347
 348
 349
 350
 351
 352
 353
 354
 355
 356
 357
 358
 359
 360
 361
 362
 363
 364
 365
 366
 367
 368
 369
 370
 371
 372
 373
 374
 375
 376
 377
 378
 379
 380
 381
 382
 383
 384
 385
 386
 387
 388
 389
 390
 391
 392
 393
 394
 395
 396
 397
 398
 399
 400
 401
 402
 403
 404
 405
 406
 407
 408
 409
 410
 411
 412
 413
 414
 415
 416
 417
 418
 419
 420
 421
 422
 423
 424
 425
 426
 427
 428
 429
 430
 431
 432
 433
 434
 435
 436
 437
 438
 439
 440
 441
 442
 443
 444
 445
 446
 447
 448
 449
 450
 451
 452
 453
 454
 455
 456
 457
 458
 459
 460
 461
 462
 463
 464
 465
 466
 467
 468
 469
 470
 471
 472
 473
 474
 475
 476
 477
 478
 479
 480
 481
 482
 483
 484
 485
 486
 487
 488
 489
 490
 491
 492
 493
 494
 495
 496
 497
 498
 499
 500
 501
 502
 503
 504
 505
 506
 507
 508
 509
 510
 511
 512
 513
 514
 515
 516
 517
 518
 519
 520
 521
 522
 523
 524
 525
 526
 527
 528
 529
 530
 531
 532
 533
 534
 535
 536
 537
 538
 539
 540
 541
 542
 543
 544
 545
 546
 547
 548
 549
 550
 551
 552
 553
 554
 555
 556
 557
 558
 559
 560
 561
 562
 563
 564
 565
 566
 567
 568
 569
 570
 571
 572
 573
 574
 575
 576
 577
 578
 579
 580
 581
 582
 583
 584
 585
 586
 587
 588
 589
 590
 591
 592
 593
 594
 595
 596
 597
 598
 599
 600
 601
 602
 603
 604
 605
 606
 607
 608
 609
 610
 611
 612
 613
 614
 615
 616
 617
 618
 619
 620
 621
 622
 623
 624
 625
 626
 627
 628
 629
 630
 631
 632
 633
 634
 635
 636
 637
 638
 639
 640
 641
 642
 643
 644
 645
 646
 647
 648
 649
 650
 651
 652
 653
 654
 655
 656
 657
 658
 659
 660
 661
 662
 663
 664
 665
 666
 667
 668
 669
 670
 671
 672
 673
 674
 675
 676
 677
 678
 679
 680
 681
 682
 683
 684
 685
 686
 687
 688
 689
 690
 691
 692
 693
 694
 695
 696
 697
 698
 699
 700
 701
 702
 703
 704
 705
 706
 707
 708
 709
 710
 711
 712
 713
 714
 715
 716
 717
 718
 719
 720
 721
 722
 723
 724
 725
 726
 727
 728
 729
 730
 731
 732
 733
 734
 735
 736
 737
 738
 739
 740
 741
 742
 743
 744
 745
 746
 747
 748
 749
 750
 751
 752
 753
 754
 755
 756
 757
 758
 759
 760
 761
 762
 763
 764
 765
 766
 767
 768
 769
 770
 771
 772
 773
 774
 775
 776
 777
 778
 779
 780
 781
 782
 783
 784
 785
 786
 787
 788
 789
 790
 791
 792
 793
 794
 795
 796
 797
 798
 799
 800
 801
 802
 803
 804
 805
 806
 807
 808
 809
 810
 811
 812
 813
 814
 815
 816
 817
 818
 819
 820
 821
 822
 823
 824
 825
 826
 827
 828
 829
 830
 831
 832
 833
 834
 835
 836
 837
 838
 839
 840
 841
 842
 843
 844
 845
 846
 847
 848
 849
 850
 851
 852
 853
 854
 855
 856
 857
 858
 859
 860
 861
 862
 863
 864
 865
 866
 867
 868
 869
 870
 871
 872
 873
 874
 875
 876
 877
 878
 879
 880
 881
 882
 883
 884
 885
 886
 887
 888
 889
 890
 891
 892
 893
 894
 895
 896
 897
 898
 899
 900
 901
 902
 903
 904
 905
 906
 907
 908
 909
 910
 911
 912
 913
 914
 915
 916
 917
 918
 919
 920
 921
 922
 923
 924
 925
 926
 927
 928
 929
 930
 931
 932
 933
 934
 935
 936
 937
 938
 939
 940
 941
 942
 943
 944
 945
 946
 947
 948
 949
 950
 951
 952
 953
 954
 955
 956
 957
 958
 959
 960
 961
 962
 963
 964
 965
 966
 967
 968
 969
 970
 971
 972
 973
 974
 975
 976
 977
 978
 979
 980
 981
 982
 983
 984
 985
 986
 987
 988
 989
 990
 991
 992
 993
 994
 995
 996
 997
 998
 999
 1000
 1001
 1002
 1003
 1004
 1005
 1006
 1007
 1008
 1009
 1010
 1011
 1012
 1013
 1014
 1015
 1016
 1017
 1018
 1019
 1020
 1021
 1022
 1023
 1024
 1025
 1026
 1027
 1028
 1029
 1030
 1031
 1032
 1033
 1034
 1035
 1036
 1037
 1038
 1039
 1040
 1041
 1042
 1043
 1044
 1045
 1046
 1047
 1048
 1049
 1050
 1051
 1052
 1053
 1054
 1055
 1056
 1057
 1058
 1059
 1060
 1061
 1062
 1063
 1064
 1065
 1066
 1067
 1068
 1069
 1070
 1071
 1072
 1073
 1074
 1075
 1076
 1077
 1078
 1079
 1080
 1081
 1082
 1083
 1084
 1085
 1086
 1087
 1088
 1089
 1090
 1091
 1092
 1093
 1094
 1095
 1096
 1097
 1098
 1099
 1100
 1101
 1102
 1103
 1104
 1105
 1106
 1107
 1108
 1109
 1110
 1111
 1112
 1113
 1114
 1115
 1116
 1117
 1118
 1119
 1120
 1121
 1122
 1123
 1124
 1125
 1126
 1127
 1128
 1129
 1130
 1131
 1132
 1133
 1134
 1135
 1136
 1137
 1138
 1139
 1140
 1141
 1142
 1143
 1144
 1145
 1146
 1147
 1148
 1149
 1150
 1151
 1152
 1153
 1154
 1155
 1156
 1157
 1158
 1159
 1160
 1161
 1162
 1163
 1164
 1165
 1166
 1167
 1168
 1169
 1170
 1171
 1172
 1173
 1174
 1175
 1176
 1177
 1178
 1179
 1180
 1181
 1182
 1183
 1184
 1185
 1186
 1187
 1188
 1189
 1190
 1191
 1192
 1193
 1194
 1195
 1196
 1197
 1198
 1199
 1200
 1201
 1202
 1203
 1204
 1205
 1206
 1207
 1208
 1209
 1210
 1211
 1212
 1213
 1214
 1215
 1216
 1217
 1218
 1219
 1220
 1221
 1222
 1223
 1224
 1225
 1226
 1227
 1228
 1229
 1230
 1231
 1232
 1233
 1234
 1235
 1236
 1237
 1238
 1239
 1240
 1241
 1242
 1243
 1244
 1245
 1246
 1247
 1248
 1249
 1250
 1251
 1252
 1253
 1254
 1255
 1256
 1257
 1258
 1259
 1260
 1261
 1262
 1263
 1264
 1265
 1266
 1267
 1268
 1269
 1270
 1271
 1272
 1273
 1274
 1275
 1276
 1277
 1278
 1279
 1280
 1281
 1282
 1283
 1284
 1285
 1286
 1287
 1288
 1289
 1290
 1291
 1292
 1293
 1294
 1295
 1296
 1297
 1298
 1299
 1300
 1301
 1302
 1303
 1304
 1305
 1306
 1307
 1308
 1309
 1310
 1311
 1312
 1313
 1314
 1315
 1316
 1317
 1318
 1319
 1320
 1321
 1322
 1323
 1324
 1325
 1326
 1327
 1328
 1329
 1330
 1331
 1332
 1333
 1334
 1335
 1336
 1337
 1338
 1339
 1340
 1341
 1342
 1343
 1344
 1345
 1346
 1347
 1348
 1349
 1350
 1351
 1352
 1353
 1354
 1355
 1356
 1357
 1358
 1359
 1360
 1361
 1362
 1363
 1364
 1365
 1366
 1367
 1368
 1369
 1370
 1371
 1372
 1373
 1374
 1375
 1376
 1377
 1378
 1379
 1380
 1381
 1382
 1383
 1384
 1385
 1386
 1387
 1388
 1389
 1390
 1391
 1392
 1393
 1394
 1395
 1396
 1397
 1398
 1399
 1400
 1401
 1402
 1403
 1404
 1405
 1406
 1407
 1408
 1409
 1410
 1411
 1412
 1413
 1414
 1415
 1416
 1417
 1418
 1419
 1420
 1421
 1422
 1423
 1424
 1425
 1426
 1427
 1428
 1429
 1430
 1431
 1432
 1433
 1434
 1435
 1436
 1437
 1438
 1439
 1440
 1441
 1442
 1443
 1444
 1445
 1446
 1447
 1448
 1449
 1450
 1451
 1452
 1453
 1454
 1455
 1456
 1457
 1458
 1459
 1460
 1461
 1462
 1463
 1464
 1465
 1466
 1467
 1468
 1469
 1470
 1471
 1472
 1473
 1474
 1475
 1476
 1477
 1478
 1479
 1480
 1481
 1482
 1483
 1484
 1485
 1486
 1487
 1488
 1489
 1490
 1491
 1492
 1493
 1494
 1495
 1496
 1497
 
 | From: Carlos Henrique Lima Melara <charlesmelara@riseup.net>
Date: Sat, 28 Dec 2024 12:52:49 -0300
Subject: docs: use roff's CR font instead of C (non-portable) for monospace
 fonts
C is a non-portable font. Use CR instead which is a "Regular constant
width font".
Forwarded: https://github.com/neomutt/neomutt/pull/4489
Last-Update: 2024-12-28
---
 docs/config.c           | 418 ++++++++++++++++++++++++------------------------
 docs/makedoc.c          |   6 +-
 docs/neomuttrc.man.head |  14 +-
 3 files changed, 219 insertions(+), 219 deletions(-)
diff --git a/docs/config.c b/docs/config.c
index de75ef8..e6aa1ce 100644
--- a/docs/config.c
+++ b/docs/config.c
@@ -97,7 +97,7 @@
 /*
 ** .pp
 ** The default file in which to save aliases created by the
-** \fC$<create-alias>\fP function. Entries added to this file are
+** \f[CR]$<create-alias>\fP function. Entries added to this file are
 ** encoded in the character set specified by $$config_charset if it
 ** is \fIset\fP or the current character set otherwise.
 ** .pp
@@ -113,7 +113,7 @@
 /*
 ** .pp
 ** Specifies the format of the data displayed for the "$alias" menu.  The
-** following \fCprintf(3)\fP-style sequences are available:
+** following \f[CR]printf(3)\fP-style sequences are available:
 ** .dl
 ** .dt %a  .dd Alias name
 ** .dt %A  .dd Full Address (Name and Email)
@@ -270,7 +270,7 @@
 /*
 ** .pp
 ** This variable describes the format of the "attachment" menu.  The
-** following \fCprintf(3)\fP-style sequences are understood:
+** following \f[CR]printf(3)\fP-style sequences are understood:
 ** .dl
 ** .dt %C  .dd Charset
 ** .dt %c  .dd Requires charset conversion ("n" or "c")
@@ -336,16 +336,16 @@
 ** quoted in the main body of the reply (this is the case when $$include is
 ** set).
 ** .pp
-** For a full listing of defined \fCprintf(3)\fP-like sequences see the section
+** For a full listing of defined \f[CR]printf(3)\fP-like sequences see the section
 ** on $$index_format.  See also $$attribution_locale.
 */
 
 { "attribution_locale", DT_STRING, 0 },
 /*
 ** .pp
-** The locale used by \fCstrftime(3)\fP to format dates in the
+** The locale used by \f[CR]strftime(3)\fP to format dates in the
 ** attribution strings.  Legal values are the strings your system
-** accepts for the locale environment variable \fC$$$LC_TIME\fP.
+** accepts for the locale environment variable \f[CR]$$$LC_TIME\fP.
 ** .pp
 ** This variable is to allow the attribution date format to be
 ** customized by recipient or folder using hooks.  By default, NeoMutt
@@ -363,7 +363,7 @@
 ** come after a replied-to message which is quoted in the main body of the reply
 ** (this is the case when $$include is set).
 ** .pp
-** For a full listing of defined \fCprintf(3)\fP-like sequences see the section
+** For a full listing of defined \f[CR]printf(3)\fP-like sequences see the section
 ** on $$index_format.  See also $$attribution_locale.
 */
 
@@ -398,7 +398,7 @@
 ** .pp
 ** When \fIset\fP, functions in the \fIindex\fP menu which affect a message
 ** will be applied to all tagged messages (if there are any).  When
-** unset, you must first use the \fC<tag-prefix>\fP function (bound to ";"
+** unset, you must first use the \f[CR]<tag-prefix>\fP function (bound to ";"
 ** by default) to make the next function apply to all tagged messages.
 */
 
@@ -416,7 +416,7 @@
 /*
 ** .pp
 ** This variable describes the format of the "autocrypt account" menu.
-** The following \fCprintf(3)\fP-style sequences are understood
+** The following \f[CR]printf(3)\fP-style sequences are understood
 ** .dl
 ** .dt %a  .dd email address
 ** .dt %k  .dd gpg keyid
@@ -500,8 +500,8 @@
 ** names in the browser mailbox list, using '~' and '='
 ** shortcuts.
 ** .pp
-** The default \fC"alpha"\fP setting of $$browser_sort uses
-** locale-based sorting (using \fCstrcoll(3)\fP), which ignores some
+** The default \f[CR]"alpha"\fP setting of $$browser_sort uses
+** locale-based sorting (using \f[CR]strcoll(3)\fP), which ignores some
 ** punctuation.  This can lead to some situations where the order
 ** doesn't make intuitive sense.  In those cases, it may be
 ** desirable to \fIunset\fP this variable.
@@ -523,7 +523,7 @@
 ** .ie
 ** .pp
 ** You may optionally use the "reverse-" prefix to specify reverse sorting
-** order (example: "\fCset browser_sort=reverse-date\fP").
+** order (example: "\f[CR]set browser_sort=reverse-date\fP").
 ** .pp
 ** The "unread" value is a synonym for "new".
 */
@@ -568,7 +568,7 @@
 { "change_folder_next", DT_BOOL, false },
 /*
 ** .pp
-** When this variable is \fIset\fP, the \fC<change-folder>\fP function
+** When this variable is \fIset\fP, the \f[CR]<change-folder>\fP function
 ** mailbox suggestion will start at the next folder in your "$mailboxes"
 ** list, instead of starting at the first folder in the list.
 */
@@ -580,7 +580,7 @@
 ** It is also the fallback for $$send_charset.
 ** .pp
 ** Upon startup NeoMutt tries to derive this value from environment variables
-** such as \fC$$$LC_CTYPE\fP or \fC$$$LANG\fP.
+** such as \f[CR]$$$LC_CTYPE\fP or \f[CR]$$$LANG\fP.
 ** .pp
 ** \fBNote:\fP It should only be set in case NeoMutt isn't able to determine the
 ** character set used correctly.
@@ -662,7 +662,7 @@
 /*
 ** .pp
 ** When \fIset\fP, NeoMutt will prompt for confirmation when trying to use
-** \fC<detach-file>\fP on the first entry in the compose menu. This is to help
+** \f[CR]<detach-file>\fP on the first entry in the compose menu. This is to help
 ** prevent irreversible loss of the typed message by accidentally hitting 'D' in
 ** the menu.
 ** .pp
@@ -676,7 +676,7 @@
 ** .pp
 ** Controls the format of the status line displayed in the "compose"
 ** menu.  This string is similar to $$status_format, but has its own
-** set of \fCprintf(3)\fP-like sequences:
+** set of \f[CR]printf(3)\fP-like sequences:
 ** .dl
 ** .dt %a  .dd Total number of attachments
 ** .dt %h  .dd Local hostname
@@ -765,7 +765,7 @@
 /*
 ** .pp
 ** Controls whether NeoMutt will weed headers when invoking the
-** \fC<decode-copy>\fP or \fC<decode-save>\fP functions.
+** \f[CR]<decode-copy>\fP or \f[CR]<decode-save>\fP functions.
 */
 
 { "count_alternatives", DT_BOOL, false },
@@ -900,7 +900,7 @@
 ** Encrypted messages using protected headers often substitute the exposed
 ** Subject header with a dummy value (see $$crypt_protected_headers_subject).
 ** NeoMutt will update its concept of the correct subject \fBafter\fP the
-** message is opened, i.e. via the \fC<display-message>\fP function.
+** message is opened, i.e. via the \f[CR]<display-message>\fP function.
 ** If you reply to a message before opening it, NeoMutt will end up using
 ** the dummy Subject header, so be sure to open such a message first.
 ** (Crypto only)
@@ -1055,7 +1055,7 @@
 ** of the different menu needs.
 ** .pp
 ** This variable controls the format of the date printed by the "%d"
-** sequence in $$index_format.  This is passed to the \fCstrftime(3)\fP
+** sequence in $$index_format.  This is passed to the \f[CR]strftime(3)\fP
 ** function to process the date, see the man page for the proper syntax.
 ** .pp
 ** Unless the first character in the string is a bang ("!"), the month
@@ -1078,20 +1078,20 @@
 { "debug_file", DT_PATH, "~/.neomuttdebug" },
 /*
 ** .pp
-** Debug logging is controlled by the variables \fC$$debug_file\fP and \fC$$debug_level\fP.
-** \fC$$debug_file\fP specifies the root of the filename.  NeoMutt will add "0" to the end.
+** Debug logging is controlled by the variables \f[CR]$$debug_file\fP and \f[CR]$$debug_level\fP.
+** \f[CR]$$debug_file\fP specifies the root of the filename.  NeoMutt will add "0" to the end.
 ** Each time NeoMutt is run with logging enabled, the log files are rotated.
 ** A maximum of five log files are kept, numbered 0 (most recent) to 4 (oldest).
 ** .pp
 ** This option can be enabled on the command line, "neomutt -l mylog"
 ** .pp
-** See also: \fC$$debug_level\fP
+** See also: \f[CR]$$debug_level\fP
 */
 
 { "debug_level", DT_NUMBER, 0 },
 /*
 ** .pp
-** Debug logging is controlled by the variables \fC$$debug_file\fP and \fC$$debug_level\fP.
+** Debug logging is controlled by the variables \f[CR]$$debug_file\fP and \f[CR]$$debug_level\fP.
 ** .pp
 ** The debug level controls how much information is saved to the log file.
 ** If you have a problem with NeoMutt, then enabling logging may help find the cause.
@@ -1102,14 +1102,14 @@
 ** .pp
 ** This option can be enabled on the command line, "neomutt -d 2"
 ** .pp
-** See also: \fC$$debug_file\fP
+** See also: \f[CR]$$debug_file\fP
 */
 
 { "default_hook", DT_STRING, "~f %s !~P | (~P ~C %s)" },
 /*
 ** .pp
 ** This variable controls how some hooks are interpreted if their pattern is a
-** plain string or a regex. i.e. they don't contain a pattern, like \fC~f\fP
+** plain string or a regex. i.e. they don't contain a pattern, like \f[CR]~f\fP
 ** .pp
 ** The hooks are: $fcc-hook, $fcc-save-hook, $index-format-hook, $message-hook,
 ** $reply-hook, $save-hook, $send-hook and $send2-hook.
@@ -1162,15 +1162,15 @@
 ** filtered message is read from the standard output.
 ** .pp
 ** When preparing the message, NeoMutt inserts some escape sequences into the
-** text.  They are of the form: \fC<esc>]9;XXX<bel>\fP where "XXX" is a random
+** text.  They are of the form: \f[CR]<esc>]9;XXX<bel>\fP where "XXX" is a random
 ** 64-bit number.
 ** .pp
 ** If these escape sequences interfere with your filter, they can be removed
-** using a tool like \fCansifilter\fP or \fCsed 's/^\x1b]9;[0-9]\+\x7//'\fP
+** using a tool like \f[CR]ansifilter\fP or \f[CR]sed 's/^\x1b]9;[0-9]\+\x7//'\fP
 ** .pp
 ** If they are removed, then PGP and MIME headers will no longer be coloured.
 ** This can be fixed by adding this to your config:
-** \fCcolor body magenta default '^\[-- .* --\]$$$'\fP.
+** \f[CR]color body magenta default '^\[-- .* --\]$$$'\fP.
 */
 
 { "dsn_notify", DT_STRING, 0 },
@@ -1190,7 +1190,7 @@
 ** .pp
 ** \fBNote:\fP when using $$sendmail for delivery, you should not enable
 ** this unless you are either using Sendmail 8.8.x or greater or a MTA
-** providing a \fCsendmail(1)\fP-compatible interface supporting the \fC-N\fP option
+** providing a \f[CR]sendmail(1)\fP-compatible interface supporting the \f[CR]-N\fP option
 ** for DSN. For SMTP delivery, DSN support is auto-detected so that it
 ** depends on the server whether DSN will be used or not.
 */
@@ -1209,7 +1209,7 @@
 ** .pp
 ** \fBNote:\fP when using $$sendmail for delivery, you should not enable
 ** this unless you are either using Sendmail 8.8.x or greater or a MTA
-** providing a \fCsendmail(1)\fP-compatible interface supporting the \fC-R\fP option
+** providing a \f[CR]sendmail(1)\fP-compatible interface supporting the \f[CR]-R\fP option
 ** for DSN. For SMTP delivery, DSN support is auto-detected so that it
 ** depends on the server whether DSN will be used or not.
 */
@@ -1244,11 +1244,11 @@
 /*
 ** .pp
 ** This variable specifies which editor is used by NeoMutt.
-** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
+** It defaults to the value of the \f[CR]$$$VISUAL\fP, or \f[CR]$$$EDITOR\fP, environment
 ** variable, or to the string "/usr/bin/editor" if neither of those are set.
 ** .pp
-** The \fC$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
-** of the file to be edited.  If the \fI%s\fP escape does not appear in \fC$$editor\fP, a
+** The \f[CR]$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
+** of the file to be edited.  If the \fI%s\fP escape does not appear in \f[CR]$$editor\fP, a
 ** space and the name to be edited are appended.
 ** .pp
 ** The resulting string is then executed by running
@@ -1256,7 +1256,7 @@
 ** sh -c 'string'
 ** .te
 ** .pp
-** where \fIstring\fP is the expansion of \fC$$editor\fP described above.
+** where \fIstring\fP is the expansion of \f[CR]$$editor\fP described above.
 */
 
 { "empty_subject", DT_STRING, "Re: your mail" },
@@ -1421,7 +1421,7 @@
 ** .pp
 ** This variable allows you to customize the file browser display to your
 ** personal taste.  This string is similar to $$index_format, but has
-** its own set of \fCprintf(3)\fP-like sequences:
+** its own set of \f[CR]printf(3)\fP-like sequences:
 ** .dl
 ** .dt %a  .dd   .dd Alert: 1 if user is notified of new mail
 ** .dt %C  .dd   .dd Current file number
@@ -1442,7 +1442,7 @@
 ** .dt %s  .dd   .dd Size in bytes (see $formatstrings-size)
 ** .dt %t  .dd   .dd "*" if the file is tagged, blank otherwise
 ** .dt %u  .dd   .dd Owner name (or numeric uid, if missing)
-** .dt %[fmt] .dd   .dd Date/time folder was last modified using an \fCstrftime(3)\fP expression
+** .dt %[fmt] .dd   .dd Date/time folder was last modified using an \f[CR]strftime(3)\fP expression
 ** .dt %>X .dd   .dd Right justify the rest of the string and pad with character "X"
 ** .dt %|X .dd   .dd Pad to the end of the line with character "X"
 ** .dt %*X .dd   .dd Soft-fill with character "X" as pad
@@ -1513,7 +1513,7 @@
 ** .pp
 ** This is the string that will precede a message which has been forwarded
 ** in the main body of a message (when $$mime_forward is unset).
-** For a full listing of defined \fCprintf(3)\fP-like sequences see
+** For a full listing of defined \f[CR]printf(3)\fP-like sequences see
 ** the section on $$index_format.  See also $$attribution_locale.
 */
 
@@ -1522,14 +1522,14 @@
 ** .pp
 ** This is the string that will follow a message which has been forwarded
 ** in the main body of a message (when $$mime_forward is unset).
-** For a full listing of defined \fCprintf(3)\fP-like sequences see
+** For a full listing of defined \f[CR]printf(3)\fP-like sequences see
 ** the section on $$index_format.  See also $$attribution_locale.
 */
 
 { "forward_decode", DT_BOOL, true },
 /*
 ** .pp
-** Controls the decoding of complex MIME messages into \fCtext/plain\fP when
+** Controls the decoding of complex MIME messages into \f[CR]text/plain\fP when
 ** forwarding a message.  The message header is also RFC2047 decoded.
 ** This variable is only used, if $$mime_forward is \fIunset\fP,
 ** otherwise $$mime_forward_decode is used instead.
@@ -1583,7 +1583,7 @@
 ** can be overridden using "$my_hdr" (including from a "$send-hook") and
 ** $$reverse_name.  This variable is ignored if $$use_from is \fIunset\fP.
 ** .pp
-** If not specified, then it may be read from the environment variable \fC$$$EMAIL\fP.
+** If not specified, then it may be read from the environment variable \f[CR]$$$EMAIL\fP.
 */
 
 { "from_chars", DT_MBTABLE, 0 },
@@ -1618,7 +1618,7 @@
 ** entry when expanding the alias.  The default value
 ** will return the string up to the first "," encountered.
 ** If the GECOS field contains a string like "lastname, firstname" then you
-** should set it to "\fC.*\fP".
+** should set it to "\f[CR].*\fP".
 ** .pp
 ** This can be useful if you see the following behavior: you address an e-mail
 ** to user ID "stevef" whose full name is "Steve Franklin".  If NeoMutt expands
@@ -1831,7 +1831,7 @@
 ** .pp
 ** Controls the format of the entries of the history list.
 ** This string is similar to $$index_format, but has its own
-** set of \fCprintf(3)\fP-like sequences:
+** set of \f[CR]printf(3)\fP-like sequences:
 ** .dl
 ** .dt %C  .dd Line number
 ** .dt %s  .dd History match
@@ -1906,14 +1906,14 @@
 { "ignore_list_reply_to", DT_BOOL, false },
 /*
 ** .pp
-** Affects the behavior of the \fC<reply>\fP function when replying to
+** Affects the behavior of the \f[CR]<reply>\fP function when replying to
 ** messages from mailing lists (as defined by the "$subscribe" or
 ** "$lists" commands).  When \fIset\fP, if the "Reply-To:" field is
 ** set to the same value as the "To:" field, NeoMutt assumes that the
 ** "Reply-To:" field was set by the mailing list to automate responses
 ** to the list, and will ignore this field.  To direct a response to the
-** mailing list when this option is \fIset\fP, use the \fC$<list-reply>\fP
-** function; \fC<group-reply>\fP will reply to both the sender and the
+** mailing list when this option is \fIset\fP, use the \f[CR]$<list-reply>\fP
+** function; \f[CR]<group-reply>\fP will reply to both the sender and the
 ** list.
 */
 
@@ -2033,7 +2033,7 @@
 ** .pp
 ** This variable configures whether IMAP folder browsing will look for
 ** only subscribed folders or all folders.  This can be toggled in the
-** IMAP browser with the \fC<toggle-subscribed>\fP function.
+** IMAP browser with the \f[CR]<toggle-subscribed>\fP function.
 */
 
 { "imap_login", DT_STRING, 0 },
@@ -2057,7 +2057,7 @@
 /*
 ** .pp
 ** Specifies the password for your IMAP account.  If \fIunset\fP, NeoMutt will
-** prompt you for your password when you invoke the \fC<imap-fetch-mail>\fP function
+** prompt you for your password when you invoke the \f[CR]<imap-fetch-mail>\fP function
 ** or try to open an IMAP folder.
 ** .pp
 ** \fBWarning\fP: you should only use this option when you are on a
@@ -2158,7 +2158,7 @@
 /*
 ** .pp
 ** If set to "yes", NeoMutt will look for a mailcap entry with the
-** "\fCcopiousoutput\fP" flag set for \fIevery\fP MIME attachment it doesn't have
+** "\f[CR]copiousoutput\fP" flag set for \fIevery\fP MIME attachment it doesn't have
 ** an internal viewer defined for.  If such an entry is found, NeoMutt will
 ** use the viewer defined in that entry to convert the body part to text
 ** form.
@@ -2201,7 +2201,7 @@
 ** the quoting mechanism is strictly defined for format=flowed.
 ** .pp
 ** This option is a format string, please see the description of
-** $$index_format for supported \fCprintf(3)\fP-style sequences.
+** $$index_format for supported \f[CR]printf(3)\fP-style sequences.
 */
 
 { "index_format", DT_STRING, "%4C %Z %{%b %d} %-15.15L (%<l?%4l&%4c>) %s" },
@@ -2211,7 +2211,7 @@
 ** your personal taste.
 ** .pp
 ** "Format strings" are similar to the strings used in the C
-** function \fCprintf(3)\fP to format output (see the man page for more details).
+** function \f[CR]printf(3)\fP to format output (see the man page for more details).
 ** For an explanation of the %<...> construct, see the $status_format description.
 ** The following sequences are defined in NeoMutt:
 ** .dl
@@ -2280,7 +2280,7 @@
 **                 "$index-format-hook" command
 ** .dt %{fmt} .dd the date and time of the message is converted to sender's
 **                time zone, and "fmt" is expanded by the library function
-**                \fCstrftime(3)\fP; if the first character inside the braces
+**                \f[CR]strftime(3)\fP; if the first character inside the braces
 **                is a bang ("!"), the date is formatted ignoring any locale
 **                settings.  Note that the sender's time zone might only be
 **                available as a numerical offset, so "%Z" behaves like "%z".
@@ -2288,10 +2288,10 @@
 **                doesn't have a tm_gmtoff member.
 ** .dt %[fmt] .dd the date and time of the message is converted to the local
 **                time zone, and "fmt" is expanded by the library function
-**                \fCstrftime(3)\fP; if the first character inside the brackets
+**                \f[CR]strftime(3)\fP; if the first character inside the brackets
 **                is a bang ("!"), the date is formatted ignoring any locale settings.
 ** .dt %(fmt) .dd the local date and time when the message was received, and
-**                "fmt" is expanded by the library function \fCstrftime(3)\fP;
+**                "fmt" is expanded by the library function \f[CR]strftime(3)\fP;
 **                if the first character inside the parentheses is a bang ("!"),
 **                the date is formatted ignoring any locale settings.
 ** .dt %>X    .dd right justify the rest of the string and pad with character "X"
@@ -2397,7 +2397,7 @@
 ** counts.
 ** .pp
 ** Message statistics can also be explicitly calculated by invoking the
-** \fC<check-stats>\fP function.
+** \f[CR]<check-stats>\fP function.
 */
 
 { "mail_check_stats_interval", DT_NUMBER, 60 },
@@ -2424,7 +2424,7 @@
 ** default value is generated during startup: see the "$mailcap" section of the
 ** manual.
 ** .pp
-** $$mailcap_path is overridden by the environment variable \fC$$$MAILCAPS\fP.
+** $$mailcap_path is overridden by the environment variable \f[CR]$$$MAILCAPS\fP.
 ** .pp
 ** The default search path is from RFC1524.
 */
@@ -2467,7 +2467,7 @@
 /*
 ** .pp
 ** Check for Maildir unaware programs other than NeoMutt having modified maildir
-** files when the header cache is in use.  This incurs one \fCstat(2)\fP per
+** files when the header cache is in use.  This incurs one \f[CR]stat(2)\fP per
 ** message every time the folder is opened (which can be very slow for NFS
 ** folders).
 */
@@ -2532,7 +2532,7 @@
 ** The default mailbox type used when creating new folders. May be any of
 ** "mbox", "MMDF", "MH" or "Maildir".
 ** .pp
-** This can also be set using the \fC-m\fP command-line option.
+** This can also be set using the \f[CR]-m\fP command-line option.
 */
 
 { "me_too", DT_BOOL, false },
@@ -2593,8 +2593,8 @@
 /*
 ** .pp
 ** This is the string displayed in the "attachment" menu for
-** attachments of type \fCmessage/rfc822\fP.  For a full listing of defined
-** \fCprintf(3)\fP-like sequences see the section on $$index_format.
+** attachments of type \f[CR]message/rfc822\fP.  For a full listing of defined
+** \f[CR]printf(3)\fP-like sequences see the section on $$index_format.
 */
 
 { "meta_key", DT_BOOL, false },
@@ -2603,9 +2603,9 @@
 ** If \fIset\fP, forces NeoMutt to interpret keystrokes with the high bit (bit 8)
 ** set as if the user had pressed the Esc key and whatever key remains
 ** after having the high bit removed.  For example, if the key pressed
-** has an ASCII value of \fC0xf8\fP, then this is treated as if the user had
+** has an ASCII value of \f[CR]0xf8\fP, then this is treated as if the user had
 ** pressed Esc then "x".  This is because the result of removing the
-** high bit from \fC0xf8\fP is \fC0x78\fP, which is the ASCII character
+** high bit from \f[CR]0xf8\fP is \f[CR]0x78\fP, which is the ASCII character
 ** "x".
 */
 
@@ -2643,7 +2643,7 @@
 /*
 ** .pp
 ** When \fIset\fP, the message you are forwarding will be attached as a
-** separate \fCmessage/rfc822\fP MIME part instead of included in the main body of the
+** separate \f[CR]message/rfc822\fP MIME part instead of included in the main body of the
 ** message.  This is useful for forwarding MIME messages so the receiver
 ** can properly view the message as it was delivered to you. If you like
 ** to switch between MIME and not MIME from mail to mail, set this
@@ -2655,7 +2655,7 @@
 { "mime_forward_decode", DT_BOOL, false },
 /*
 ** .pp
-** Controls the decoding of complex MIME messages into \fCtext/plain\fP when
+** Controls the decoding of complex MIME messages into \f[CR]text/plain\fP when
 ** forwarding a message while $$mime_forward is \fIset\fP. Otherwise
 ** $$forward_decode is used instead.
 */
@@ -2745,10 +2745,10 @@
 ** This variable specifies domain name or address of NNTP server.
 ** .pp
 ** You can also specify username and an alternative port for each news server,
-** e.g. \fC[[s]news://][username[:password]@]server[:port]\fP
+** e.g. \f[CR][[s]news://][username[:password]@]server[:port]\fP
 ** .pp
 ** This option can also be set using the command line option "-g", the
-** environment variable \fC$$$NNTPSERVER\fP, or putting the server name in the
+** environment variable \f[CR]$$$NNTPSERVER\fP, or putting the server name in the
 ** file "/etc/nntpserver".
 */
 
@@ -2766,12 +2766,12 @@
 ** is understood:
 ** .dl
 ** .dt \fBExpando\fP .dd \fBDescription\fP .dd \fBExample\fP
-** .dt %a .dd Account url       .dd \fCnews:news.gmane.org\fP
-** .dt %p .dd Port              .dd \fC119\fP
-** .dt %P .dd Port if specified .dd \fC10119\fP
-** .dt %s .dd News server name  .dd \fCnews.gmane.org\fP
-** .dt %S .dd Url schema        .dd \fCnews\fP
-** .dt %u .dd Username          .dd \fCusername\fP
+** .dt %a .dd Account url       .dd \f[CR]news:news.gmane.org\fP
+** .dt %p .dd Port              .dd \f[CR]119\fP
+** .dt %P .dd Port if specified .dd \f[CR]10119\fP
+** .dt %s .dd News server name  .dd \f[CR]news.gmane.org\fP
+** .dt %S .dd Url schema        .dd \f[CR]news\fP
+** .dt %u .dd Username          .dd \f[CR]username\fP
 ** .de
 */
 
@@ -2889,7 +2889,7 @@
 ** .pp
 ** This variable specifies the notmuch tag modifications (addition, removal,
 ** toggling) applied to messages added to the Neomutt record when $$nm_record is
-** true. See the description of the \fC<modify-labels>\fP function for the
+** true. See the description of the \f[CR]<modify-labels>\fP function for the
 ** syntax.
 */
 
@@ -3041,7 +3041,7 @@
 /*
 ** .pp
 ** Determines the number of lines of context to show before the
-** unquoted text when using the \fC<skip-quoted>\fP function. When set
+** unquoted text when using the \f[CR]<skip-quoted>\fP function. When set
 ** to a positive number at most that many lines of the previous quote
 ** are displayed. If the previous quote is shorter the whole quote is
 ** displayed.
@@ -3054,7 +3054,7 @@
 /*
 ** .pp
 ** When \fIset\fP, the internal-pager will \fBnot\fP move to the next message
-** when you are at the end of a message and invoke the \fC<next-page>\fP
+** when you are at the end of a message and invoke the \f[CR]<next-page>\fP
 ** function.
 */
 
@@ -3062,7 +3062,7 @@
 /*
 ** .pp
 ** This variable describes the format of the "pattern completion" menu. The
-** following \fCprintf(3)\fP-style sequences are understood:
+** following \f[CR]printf(3)\fP-style sequences are understood:
 ** .dl
 ** .dt %d  .dd pattern description
 ** .dt %e  .dd pattern expression
@@ -3081,7 +3081,7 @@
 ** messages whenever the user performs an operation which ordinarily would
 ** result in the contents of the message being operated on.  For example,
 ** if the user displays a pgp-traditional message which has not been manually
-** checked with the \fC$<check-traditional-pgp>\fP function, NeoMutt will automatically
+** checked with the \f[CR]$<check-traditional-pgp>\fP function, NeoMutt will automatically
 ** check the message for traditional pgp.
 */
 
@@ -3139,7 +3139,7 @@
 ** \fBdeprecated\fP.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** Note that in this case, %r expands to the search string, which is a list of
 ** one or more quoted values such as email address, name, or keyid.
 ** (PGP only)
@@ -3151,7 +3151,7 @@
 ** This format strings specifies a command which is used to decode
 ** application/pgp attachments.
 ** .pp
-** The PGP command formats have their own set of \fCprintf(3)\fP-like sequences:
+** The PGP command formats have their own set of \f[CR]printf(3)\fP-like sequences:
 ** .dl
 ** .dt %a .dd The value of $$pgp_sign_as if set, otherwise the value
 **            of $$pgp_default_key.
@@ -3160,7 +3160,7 @@
 **            string otherwise. Note: This may be used with a %<...> construct.
 ** .dt %r .dd One or more key IDs (or fingerprints if available).
 ** .dt %s .dd Expands to the name of a file containing the signature part
-**            of a \fCmultipart/signed\fP attachment when verifying it.
+**            of a \f[CR]multipart/signed\fP attachment when verifying it.
 ** .de
 ** .pp
 ** (PGP only)
@@ -3172,13 +3172,13 @@
 ** This command is used to decrypt a PGP encrypted message.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 ** .pp
-** Note: When decrypting messages using \fCgpg\fP, a pinentry program needs to
-** be invoked unless the password is cached within \fCgpg-agent\fP.
-** Currently, the \fCpinentry-tty\fP program (usually distributed with
-** \fCgpg\fP) isn't suitable for being invoked by NeoMutt.  You are encouraged
+** Note: When decrypting messages using \f[CR]gpg\fP, a pinentry program needs to
+** be invoked unless the password is cached within \f[CR]gpg-agent\fP.
+** Currently, the \f[CR]pinentry-tty\fP program (usually distributed with
+** \f[CR]gpg\fP) isn't suitable for being invoked by NeoMutt.  You are encouraged
 ** to use a different pinentry-program when running NeoMutt in order to avoid
 ** problems.
 ** .pp
@@ -3221,7 +3221,7 @@
 ** This command is used to encrypt a body part without signing it.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** Note that in this case, %r expands to the search string, which is a list of
 ** one or more quoted values such as email address, name, or keyid.
 ** (PGP only)
@@ -3233,7 +3233,7 @@
 ** This command is used to both sign and encrypt a body part.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 #endif
@@ -3244,7 +3244,7 @@
 ** This variable allows you to customize the PGP key selection menu to
 ** your personal taste. If $$crypt_use_gpgme is \fIset\fP, then it applies
 ** to S/MIME key selection menu also. This string is similar to $$index_format,
-** but has its own set of \fCprintf(3)\fP-like sequences:
+** but has its own set of \f[CR]printf(3)\fP-like sequences:
 ** .dl
 ** .dt %a     .dd Algorithm
 ** .dt %c     .dd Capabilities
@@ -3256,7 +3256,7 @@
 ** .dt %p     .dd Protocol
 ** .dt %t     .dd Trust/validity of the key-uid association
 ** .dt %u     .dd User id
-** .dt %[<s>] .dd Date of the key where <s> is an \fCstrftime(3)\fP expression
+** .dt %[<s>] .dd Date of the key where <s> is an \f[CR]strftime(3)\fP expression
 ** .dt %>X    .dd Right justify the rest of the string and pad with character "X"
 ** .dt %|X    .dd Pad to the end of the line with character "X"
 ** .dt %*X    .dd Soft-fill with character "X" as pad
@@ -3277,7 +3277,7 @@
 ** key ring.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 
@@ -3286,7 +3286,7 @@
 ** .pp
 ** This command is invoked whenever NeoMutt needs to fetch the public key associated with
 ** an email address.  Of the sequences supported by $$pgp_decode_command, %r is
-** the only \fCprintf(3)\fP-like sequence used with this format.  Note that
+** the only \f[CR]printf(3)\fP-like sequence used with this format.  Note that
 ** in this case, %r expands to the email address, not the public key ID (the key ID is
 ** unknown, which is why NeoMutt is invoking this command).
 ** (PGP only)
@@ -3320,7 +3320,7 @@
 ** the user's public key ring.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 
@@ -3333,12 +3333,12 @@
 ** gpg --list-keys --with-colons --with-fingerprint
 ** .te
 ** .pp
-** Note: gpg's \fCfixed-list-mode\fP option should not be used.  It
+** Note: gpg's \f[CR]fixed-list-mode\fP option should not be used.  It
 ** produces a different date format which may result in NeoMutt showing
 ** incorrect key generation dates.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 
@@ -3351,12 +3351,12 @@
 ** gpg --list-keys --with-colons --with-fingerprint
 ** .te
 ** .pp
-** Note: gpg's \fCfixed-list-mode\fP option should not be used.  It
+** Note: gpg's \f[CR]fixed-list-mode\fP option should not be used.  It
 ** produces a different date format which may result in NeoMutt showing
 ** incorrect key generation dates.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 #endif
@@ -3427,11 +3427,11 @@
 /*
 ** .pp
 ** If \fIset\fP, signed and encrypted messages will consist of nested
-** \fCmultipart/signed\fP and \fCmultipart/encrypted\fP body parts.
+** \f[CR]multipart/signed\fP and \f[CR]multipart/encrypted\fP body parts.
 ** .pp
 ** This is useful for applications like encrypted and signed mailing
-** lists, where the outer layer (\fCmultipart/encrypted\fP) can be easily
-** removed, while the inner \fCmultipart/signed\fP part is retained.
+** lists, where the outer layer (\f[CR]multipart/encrypted\fP) can be easily
+** removed, while the inner \f[CR]multipart/signed\fP part is retained.
 ** (PGP only)
 */
 
@@ -3458,7 +3458,7 @@
 ** If you have a different key pair to use for signing, you should
 ** set this to the signing key.  Most people will only need to set
 ** $$pgp_default_key.  It is recommended that you use the keyid form
-** to specify your key (e.g. \fC0x00112233\fP).
+** to specify your key (e.g. \f[CR]0x00112233\fP).
 ** (PGP only)
 */
 
@@ -3467,10 +3467,10 @@
 /*
 ** .pp
 ** This command is used to create the detached PGP signature for a
-** \fCmultipart/signed\fP PGP/MIME body part.
+** \f[CR]multipart/signed\fP PGP/MIME body part.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 #endif
@@ -3497,7 +3497,7 @@
 { "pgp_use_gpg_agent", DT_BOOL, true },
 /*
 ** .pp
-** If \fIset\fP, NeoMutt expects a \fCgpg-agent(1)\fP process will handle
+** If \fIset\fP, NeoMutt expects a \f[CR]gpg-agent(1)\fP process will handle
 ** private key passphrase prompts.  If \fIunset\fP, NeoMutt will prompt
 ** for the passphrase and pass it via stdin to the pgp command.
 ** .pp
@@ -3521,7 +3521,7 @@
 ** This command is used to verify PGP signatures.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 
@@ -3532,7 +3532,7 @@
 ** menu.
 ** .pp
 ** This is a format string, see the $$pgp_decode_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (PGP only)
 */
 #endif
@@ -3540,7 +3540,7 @@
 { "pipe_decode", DT_BOOL, false },
 /*
 ** .pp
-** Used in connection with the \fC<pipe-message>\fP function.  When \fIunset\fP,
+** Used in connection with the \f[CR]<pipe-message>\fP function.  When \fIunset\fP,
 ** NeoMutt will pipe the messages without any preprocessing. When \fIset\fP, NeoMutt
 ** will attempt to decode the messages first.
 ** .pp
@@ -3551,7 +3551,7 @@
 { "pipe_decode_weed", DT_BOOL, true },
 /*
 ** .pp
-** For \fC<pipe-message>\fP, when $$pipe_decode is set, this further
+** For \f[CR]<pipe-message>\fP, when $$pipe_decode is set, this further
 ** controls whether NeoMutt will weed headers.
 */
 
@@ -3565,8 +3565,8 @@
 { "pipe_split", DT_BOOL, false },
 /*
 ** .pp
-** Used in connection with the \fC<pipe-message>\fP function following
-** \fC<tag-prefix>\fP.  If this variable is \fIunset\fP, when piping a list of
+** Used in connection with the \f[CR]<pipe-message>\fP function following
+** \f[CR]<tag-prefix>\fP.  If this variable is \fIunset\fP, when piping a list of
 ** tagged messages NeoMutt will concatenate the messages and will pipe them
 ** all concatenated.  When \fIset\fP, NeoMutt will pipe the messages one by one.
 ** In both cases the messages are piped in the current sorted order,
@@ -3610,14 +3610,14 @@
 /*
 ** .pp
 ** If \fIset\fP, NeoMutt will delete successfully downloaded messages from the POP
-** server when using the \fC$<fetch-mail>\fP function.  When \fIunset\fP, NeoMutt will
+** server when using the \f[CR]$<fetch-mail>\fP function.  When \fIunset\fP, NeoMutt will
 ** download messages but also leave them on the POP server.
 */
 
 { "pop_host", DT_STRING, 0 },
 /*
 ** .pp
-** The name of your POP server for the \fC$<fetch-mail>\fP function.  You
+** The name of your POP server for the \f[CR]$<fetch-mail>\fP function.  You
 ** can also specify an alternative port, username and password, i.e.:
 ** .ts
 ** [pop[s]://][username[:password]@]popserver[:port]
@@ -3629,9 +3629,9 @@
 { "pop_last", DT_BOOL, false },
 /*
 ** .pp
-** If this variable is \fIset\fP, NeoMutt will try to use the "\fCLAST\fP" POP command
+** If this variable is \fIset\fP, NeoMutt will try to use the "\f[CR]LAST\fP" POP command
 ** for retrieving only unread messages from the POP server when using
-** the \fC$<fetch-mail>\fP function.
+** the \f[CR]$<fetch-mail>\fP function.
 */
 
 { "pop_oauth_refresh_command", D_STRING_COMMAND, 0 },
@@ -3723,7 +3723,7 @@
 ** .pp
 ** If \fIset\fP, a shell command to be executed if NeoMutt fails to establish
 ** a connection to the server. This is useful for setting up secure
-** connections, e.g. with \fCssh(1)\fP. If the command returns a  nonzero
+** connections, e.g. with \f[CR]ssh(1)\fP. If the command returns a  nonzero
 ** status, NeoMutt gives up opening the server. Example:
 ** .ts
 ** set preconnect="ssh -f -q -L 1234:mailhost.net:143 mailhost.net \(rs
@@ -3765,7 +3765,7 @@
 { "print_decode", DT_BOOL, true },
 /*
 ** .pp
-** Used in connection with the \fC<print-message>\fP function.  If this
+** Used in connection with the \f[CR]<print-message>\fP function.  If this
 ** option is \fIset\fP, the message is decoded before it is passed to the
 ** external command specified by $$print_command.  If this option
 ** is \fIunset\fP, no processing will be applied to the message when
@@ -3780,21 +3780,21 @@
 { "print_decode_weed", DT_BOOL, true },
 /*
 ** .pp
-** For \fC<print-message>\fP, when $$print_decode is set, this
+** For \f[CR]<print-message>\fP, when $$print_decode is set, this
 ** further controls whether NeoMutt will weed headers.
 */
 
 { "print_split", DT_BOOL, false },
 /*
 ** .pp
-** Used in connection with the \fC<print-message>\fP function.  If this option
+** Used in connection with the \f[CR]<print-message>\fP function.  If this option
 ** is \fIset\fP, the command specified by $$print_command is executed once for
 ** each message which is to be printed.  If this option is \fIunset\fP,
 ** the command specified by $$print_command is executed only once, and
 ** all the messages are concatenated, with a form feed as the message
 ** separator.
 ** .pp
-** Those who use the \fCenscript\fP(1) program's mail-printing mode will
+** Those who use the \f[CR]enscript\fP(1) program's mail-printing mode will
 ** most likely want to \fIset\fP this option.
 */
 
@@ -3824,7 +3824,7 @@
 /*
 ** .pp
 ** This variable describes the format of the "query" menu. The
-** following \fCprintf(3)\fP-style sequences are understood:
+** following \f[CR]printf(3)\fP-style sequences are understood:
 ** .dl
 ** .dt %A  .dd Full Address (Name and Email)
 ** .dt %C  .dd Comment
@@ -3867,7 +3867,7 @@
 ** .pp
 ** A regular expression used in the internal pager to determine quoted
 ** sections of text in the body of a message. Quoted text may be filtered
-** out using the \fC<toggle-quoted>\fP command, or colored according to the
+** out using the \f[CR]<toggle-quoted>\fP command, or colored according to the
 ** "color quoted" family of directives.
 ** .pp
 ** Higher levels of quoting may be colored differently ("color quoted1",
@@ -3907,7 +3907,7 @@
 ** This variable specifies what "real" or "personal" name should be used
 ** when sending messages.
 ** .pp
-** If not specified, then the user's "real name" will be read from \fC/etc/passwd\fP.
+** If not specified, then the user's "real name" will be read from \f[CR]/etc/passwd\fP.
 ** This option will not be used, if "$$from" is set.
 */
 
@@ -3918,7 +3918,7 @@
 ** when composing a new message.
 ** .pp
 ** Setting this variable to \fIyes\fP is not generally useful, and thus not
-** recommended.  Note that the \fC<recall-message>\fP function can be used
+** recommended.  Note that the \f[CR]<recall-message>\fP function can be used
 ** to manually recall postponed messages.
 ** .pp
 ** Also see $$postponed variable.
@@ -3987,20 +3987,20 @@
 ** .pp
 ** This value may have been localized by the translator for your
 ** locale, adding other prefixes that are common in the locale. You
-** can add your own prefixes by appending inside \fC"^(re)"\fP.  For
-** example: \fC"^(re|sv)"\fP or \fC"^(re|aw|sv)"\fP.
+** can add your own prefixes by appending inside \f[CR]"^(re)"\fP.  For
+** example: \f[CR]"^(re|sv)"\fP or \f[CR]"^(re|aw|sv)"\fP.
 ** .pp
 ** The second parenthesized expression matches zero or more
-** bracketed numbers following the prefix, such as \fC"Re[1]: "\fP.
-** The initial \fC"\\["\fP means a literal left-bracket character.
+** bracketed numbers following the prefix, such as \f[CR]"Re[1]: "\fP.
+** The initial \f[CR]"\\["\fP means a literal left-bracket character.
 ** Note the backslash must be doubled when used inside a double
-** quoted string in the neomuttrc.  \fC"[0-9]+"\fP means one or more
-** numbers.  \fC"\\]"\fP means a literal right-bracket.  Finally the
-** whole parenthesized expression has a \fC"*"\fP suffix, meaning it
+** quoted string in the neomuttrc.  \f[CR]"[0-9]+"\fP means one or more
+** numbers.  \f[CR]"\\]"\fP means a literal right-bracket.  Finally the
+** whole parenthesized expression has a \f[CR]"*"\fP suffix, meaning it
 ** can occur zero or more times.
 ** .pp
 ** The last part matches a colon followed by an optional space or
-** tab.  Note \fC"\t"\fP is converted to a literal tab inside a
+** tab.  Note \f[CR]"\t"\fP is converted to a literal tab inside a
 ** double quoted string.  If you use a single quoted string, you
 ** would have to type an actual tab character, and would need to
 ** convert the double-backslashes to single backslashes.
@@ -4060,7 +4060,7 @@
 { "resume_draft_files", DT_BOOL, false },
 /*
 ** .pp
-** If \fIset\fP, draft files (specified by \fC-H\fP on the command
+** If \fIset\fP, draft files (specified by \f[CR]-H\fP on the command
 ** line) are processed similarly to when resuming a postponed
 ** message.  Recipients are not prompted for; send-hooks are not
 ** evaluated; no alias expansion takes place; user-defined headers
@@ -4070,7 +4070,7 @@
 { "resume_edited_draft_files", DT_BOOL, true },
 /*
 ** .pp
-** If \fIset\fP, draft files previously edited (via \fC-E -H\fP on
+** If \fIset\fP, draft files previously edited (via \f[CR]-E -H\fP on
 ** the command line) will have $$resume_draft_files automatically
 ** set when they are used as a draft file again.
 ** .pp
@@ -4271,13 +4271,13 @@
 ** Specifies the program and arguments used to deliver mail sent by NeoMutt.
 ** NeoMutt expects that the specified program interprets additional
 ** arguments as recipient addresses.  NeoMutt appends all recipients after
-** adding a \fC--\fP delimiter (if not already present).  Additional
+** adding a \f[CR]--\fP delimiter (if not already present).  Additional
 ** flags, such as for $$use_8bit_mime, $$use_envelope_from,
 ** $$dsn_notify, or $$dsn_return will be added before the delimiter.
 ** .pp
 ** \fBNote:\fP This command is invoked differently from most other
 ** commands in NeoMutt.  It is tokenized by space, and invoked directly
-** via \fCexecvp(3)\fP with an array of arguments - so commands or
+** via \f[CR]execvp(3)\fP with an array of arguments - so commands or
 ** arguments with spaces in them are not supported.  The shell is
 ** not used to run the command, so shell quoting is also not
 ** supported.
@@ -4307,14 +4307,14 @@
 /*
 ** .pp
 ** Command to use when spawning a subshell.
-** If not specified, then the user's login shell from \fC/etc/passwd\fP is used.
+** If not specified, then the user's login shell from \f[CR]/etc/passwd\fP is used.
 */
 
 { "show_multipart_alternative", DT_STRING, 0 },
 /*
 ** .pp
-** When \fIset\fP to \fCinfo\fP, the multipart/alternative information is shown.
-** When \fIset\fP to \fCinline\fP, all of the alternatives are displayed.
+** When \fIset\fP to \f[CR]info\fP, the multipart/alternative information is shown.
+** When \fIset\fP to \f[CR]inline\fP, all of the alternatives are displayed.
 ** When not set, the default behavior is to show only the chosen alternative.
 */
 
@@ -4341,7 +4341,7 @@
 ** $$folder variable. This specifies the number of parent directories to hide
 ** from display in the sidebar. For example: If a maildir is normally
 ** displayed in the sidebar as dir1/dir2/dir3/maildir, setting
-** \fCsidebar_component_depth=2\fP will display it as dir3/maildir, having
+** \f[CR]sidebar_component_depth=2\fP will display it as dir3/maildir, having
 ** truncated the 2 highest directories.
 ** .pp
 ** \fBSee also:\fP $$sidebar_short_path
@@ -4392,7 +4392,7 @@
 /*
 ** .pp
 ** This variable allows you to customize the sidebar display. This string is
-** similar to $$index_format, but has its own set of \fCprintf(3)\fP-like
+** similar to $$index_format, but has its own set of \f[CR]printf(3)\fP-like
 ** sequences:
 ** .dl
 ** .dt %a .dd     .dd Alert: 1 if user is notified of new mail
@@ -4448,9 +4448,9 @@
 { "sidebar_next_new_wrap", DT_BOOL, false },
 /*
 ** .pp
-** When set, the \fC<sidebar-next-new>\fP command will not stop at the end of
+** When set, the \f[CR]<sidebar-next-new>\fP command will not stop at the end of
 ** the list of mailboxes, but wrap around to the beginning. The
-** \fC<sidebar-prev-new>\fP command is similarly affected, wrapping around to
+** \f[CR]<sidebar-prev-new>\fP command is similarly affected, wrapping around to
 ** the end of the list.
 */
 
@@ -4472,14 +4472,14 @@
 /*
 ** .pp
 ** By default the sidebar will show the mailbox's path, relative to the
-** $$folder variable. Setting \fCsidebar_shortpath=yes\fP will shorten the
+** $$folder variable. Setting \f[CR]sidebar_shortpath=yes\fP will shorten the
 ** names relative to the previous name. Here's an example:
 ** .dl
 ** .dt \fBshortpath=no\fP .dd \fBshortpath=yes\fP .dd \fBshortpath=yes, folderindent=yes, indentstr=".."\fP
-** .dt \fCfruit\fP        .dd \fCfruit\fP         .dd \fCfruit\fP
-** .dt \fCfruit.apple\fP  .dd \fCapple\fP         .dd \fC..apple\fP
-** .dt \fCfruit.banana\fP .dd \fCbanana\fP        .dd \fC..banana\fP
-** .dt \fCfruit.cherry\fP .dd \fCcherry\fP        .dd \fC..cherry\fP
+** .dt \f[CR]fruit\fP        .dd \f[CR]fruit\fP         .dd \f[CR]fruit\fP
+** .dt \f[CR]fruit.apple\fP  .dd \f[CR]apple\fP         .dd \f[CR]..apple\fP
+** .dt \f[CR]fruit.banana\fP .dd \f[CR]banana\fP        .dd \f[CR]..banana\fP
+** .dt \f[CR]fruit.cherry\fP .dd \f[CR]cherry\fP        .dd \f[CR]..cherry\fP
 ** .de
 ** .pp
 ** \fBSee also:\fP $$sidebar_delim_chars, $$sidebar_folder_indent,
@@ -4501,7 +4501,7 @@
 ** .ie
 ** .pp
 ** You may optionally use the "reverse-" prefix to specify reverse sorting
-** order (example: "\fCset sidebar_sort=reverse-path\fP").
+** order (example: "\f[CR]set sidebar_sort=reverse-path\fP").
 ** .pp
 ** The \fBalpha\fP and \fBname\fP values are synonyms for \fBpath\fP. The
 ** \fBnew\fP value is a synonym for \fBunread\fP.
@@ -4560,8 +4560,8 @@
 ** pattern.  A simple search is one that does not contain any of the "~" pattern
 ** operators.  See "$patterns" for more information on search patterns.
 ** .pp
-** simple_search applies to several functions, e.g. \fC<delete-pattern>\fP,
-** \fC<limit>\fP, searching in the index, and all of the index colors.
+** simple_search applies to several functions, e.g. \f[CR]<delete-pattern>\fP,
+** \f[CR]<limit>\fP, searching in the index, and all of the index colors.
 ** .pp
 ** For example, if you simply type "joe" at a search or limit prompt, NeoMutt
 ** will automatically expand it to the value specified by this variable by
@@ -4660,9 +4660,9 @@
 /*
 ** .pp
 ** This format string specifies a command which is used to decrypt
-** \fCapplication/pkcs7-mime\fP attachments.
+** \f[CR]application/pkcs7-mime\fP attachments.
 ** .pp
-** The OpenSSL command formats have their own set of \fCprintf(3)\fP-like sequences
+** The OpenSSL command formats have their own set of \f[CR]printf(3)\fP-like sequences
 ** similar to PGP's:
 ** .dl
 ** .dt %a .dd The algorithm used for encryption.
@@ -4675,11 +4675,11 @@
 ** .dt %i .dd Intermediate certificates
 ** .dt %k .dd The key-pair specified with $$smime_default_key
 ** .dt %s .dd Expands to the name of a file containing the signature part
-**            of a \fCmultipart/signed\fP attachment when verifying it.
+**            of a \f[CR]multipart/signed\fP attachment when verifying it.
 ** .de
 ** .pp
-** For examples on how to configure these formats, see the \fCsmime.rc\fP in
-** the \fCsamples/\fP subdirectory which has been installed on your system
+** For examples on how to configure these formats, see the \f[CR]smime.rc\fP in
+** the \f[CR]samples/\fP subdirectory which has been installed on your system
 ** alongside the documentation.
 ** (S/MIME only)
 */
@@ -4721,7 +4721,7 @@
 ** This command is used to create encrypted S/MIME messages.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 ** .pp
 ** Encrypt the message to $$smime_default_key too.
@@ -4748,7 +4748,7 @@
 ** This command is used to extract X509 certificates from a PKCS7 structure.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 
@@ -4760,7 +4760,7 @@
 ** certificate was issued for the sender's mailbox).
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 
@@ -4772,7 +4772,7 @@
 ** email's "From:" field.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 
@@ -4782,7 +4782,7 @@
 ** This command is used to import a certificate via smime_keys.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.  NOTE: %c and %k will default
+** possible \f[CR]printf(3)\fP-like sequences.  NOTE: %c and %k will default
 ** to $$smime_sign_as if set, otherwise $$smime_default_key.
 ** (S/MIME only)
 */
@@ -4819,7 +4819,7 @@
 ** in order to extract the public X509 certificate(s).
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 #endif
@@ -4845,10 +4845,10 @@
 /*
 ** .pp
 ** This command is used to created S/MIME signatures of type
-** \fCmultipart/signed\fP, which can be read by all mail clients.
+** \f[CR]multipart/signed\fP, which can be read by all mail clients.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 
@@ -4871,10 +4871,10 @@
 { "smime_verify_command", D_STRING_COMMAND, 0 },
 /*
 ** .pp
-** This command is used to verify S/MIME signatures of type \fCmultipart/signed\fP.
+** This command is used to verify S/MIME signatures of type \f[CR]multipart/signed\fP.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 
@@ -4882,10 +4882,10 @@
 /*
 ** .pp
 ** This command is used to verify S/MIME signatures of type
-** \fCapplication/pkcs7-mime\fP.
+** \f[CR]application/pkcs7-mime\fP.
 ** .pp
 ** This is a format string, see the $$smime_decrypt_command command for
-** possible \fCprintf(3)\fP-like sequences.
+** possible \f[CR]printf(3)\fP-like sequences.
 ** (S/MIME only)
 */
 #endif
@@ -4996,11 +4996,11 @@
 ** a synonym for "unsorted".
 ** .pp
 ** The values of "threads" and "reverse-threads" are legacy options,
-** which cause the value of \fC$$sort_aux\fP to also control sorting
+** which cause the value of \f[CR]$$sort_aux\fP to also control sorting
 ** between threads, and they may not be used with the "last-" prefix.
 ** The preferred way to enable a threaded view is via
-** \fC$$use_threads\fP.  This variable can also be set via the
-** \fC<sort-mailbox>\fP and \fC<sort-reverse>\fP functions.
+** \f[CR]$$use_threads\fP.  This variable can also be set via the
+** \f[CR]<sort-mailbox>\fP and \f[CR]<sort-reverse>\fP functions.
 ** .pp
 ** Note: When $$use_threads is "threads", the last thread sorts to the
 ** bottom; when it is "reversed", the last thread sorts to the top.
@@ -5029,7 +5029,7 @@
 ** .pp
 ** would mean that if a new message is received in a thread, that
 ** subthread becomes the last one displayed (or the first, if you have
-** "\fCset use_threads=reverse\fP".)  When using $$use_threads, it is
+** "\f[CR]set use_threads=reverse\fP".)  When using $$use_threads, it is
 ** more common to use "last-" with $$sort and not with $$sort_aux.
 ** .pp
 ** See the "Use Threads Feature" section for further explanation and
@@ -5066,8 +5066,8 @@
 ** it, you can specify its location with this variable. The description from
 ** "named-mailboxes" or "virtual-mailboxes" may be used for the spool_file.
 ** .pp
-** If not specified, then the environment variables \fC$$$MAIL\fP and
-** \fC$$$MAILDIR\fP will be checked.
+** If not specified, then the environment variables \f[CR]$$$MAIL\fP and
+** \f[CR]$$$MAILDIR\fP will be checked.
 */
 
 #ifdef USE_SSL_GNUTLS
@@ -5130,14 +5130,14 @@
 { "ssl_starttls", DT_QUAD, MUTT_YES },
 /*
 ** .pp
-** If \fIset\fP (the default), NeoMutt will attempt to use \fCSTARTTLS\fP on servers
+** If \fIset\fP (the default), NeoMutt will attempt to use \f[CR]STARTTLS\fP on servers
 ** advertising the capability. When \fIunset\fP, NeoMutt will not attempt to
-** use \fCSTARTTLS\fP regardless of the server's capabilities.
+** use \f[CR]STARTTLS\fP regardless of the server's capabilities.
 ** .pp
-** \fBNote\fP that \fCSTARTTLS\fP is subject to many kinds of
+** \fBNote\fP that \f[CR]STARTTLS\fP is subject to many kinds of
 ** attacks, including the ability of a machine-in-the-middle to
 ** suppress the advertising of support.  Setting $$ssl_force_tls is
-** recommended if you rely on \fCSTARTTLS\fP.
+** recommended if you rely on \f[CR]STARTTLS\fP.
 */
 #endif
 
@@ -5209,7 +5209,7 @@
 ** If \fIset\fP (the default), NeoMutt will not automatically accept a server
 ** certificate that is either not yet valid or already expired. You should
 ** only unset this for particular known hosts, using the
-** \fC$<account-hook>\fP function.
+** \f[CR]$<account-hook>\fP function.
 */
 
 { "ssl_verify_host", DT_BOOL, true },
@@ -5218,7 +5218,7 @@
 ** If \fIset\fP (the default), NeoMutt will not automatically accept a server
 ** certificate whose host name does not match the host used in your folder
 ** URL. You should only unset this for particular known hosts, using
-** the \fC$<account-hook>\fP function.
+** the \f[CR]$<account-hook>\fP function.
 */
 #endif
 
@@ -5249,7 +5249,7 @@
 ** .dt 2 .dd * .dd Mailbox has been changed and needs to be resynchronized
 ** .dt 3 .dd % .dd Mailbox is read-only, or will not be written when exiting.
 **                 (You can toggle whether to write changes to a mailbox
-**                 with the \fC<toggle-write>\fP operation, bound by default
+**                 with the \f[CR]<toggle-write>\fP operation, bound by default
 **                 to "%")
 ** .dt 4 .dd A .dd Folder opened in attach-message mode.
 **                 (Certain operations like composing a new mail, replying,
@@ -5262,7 +5262,7 @@
 ** .pp
 ** Controls the format of the status line displayed in the "index"
 ** menu.  This string is similar to $$index_format, but has its own
-** set of \fCprintf(3)\fP-like sequences:
+** set of \f[CR]printf(3)\fP-like sequences:
 ** .dl
 ** .dt %b  .dd * .dd Number of mailboxes with new mail
 ** .dt %d  .dd * .dd Number of deleted messages
@@ -5304,7 +5304,7 @@
 ** particularly meaningful.  To optionally print a string based upon one
 ** of the above sequences, the following construct is used:
 ** .pp
-**  \fC%<sequence_char?optional_string>\fP
+**  \f[CR]%<sequence_char?optional_string>\fP
 ** .pp
 ** where \fIsequence_char\fP is a character from the table above, and
 ** \fIoptional_string\fP is the string you would like printed if
@@ -5314,11 +5314,11 @@
 ** Here is an example illustrating how to optionally print the number of
 ** new messages in a mailbox:
 ** .pp
-** \fC%<n?%n new messages>\fP
+** \f[CR]%<n?%n new messages>\fP
 ** .pp
 ** You can also switch between two strings using the following construct:
 ** .pp
-** \fC%<sequence_char?if_string&else_string>\fP
+** \f[CR]%<sequence_char?if_string&else_string>\fP
 ** .pp
 ** If the value of \fIsequence_char\fP is non-zero, \fIif_string\fP will
 ** be expanded, otherwise \fIelse_string\fP will be expanded.
@@ -5327,12 +5327,12 @@
 ** $$sort_aux or $$use_threads and $$sort, based on whether threads
 ** are enabled with $$use_threads:
 ** .pp
-** \fC%<T?%s/%S&%T/%s>\fP
+** \f[CR]%<T?%s/%S&%T/%s>\fP
 ** .pp
-** You can force the result of any \fCprintf(3)\fP-like sequence to be lowercase
+** You can force the result of any \f[CR]printf(3)\fP-like sequence to be lowercase
 ** by prefixing the sequence character with an underscore ("_") sign.
 ** For example, if you want to display the local hostname in lowercase,
-** you would use: "\fC%_h\fP".
+** you would use: "\f[CR]%_h\fP".
 ** .pp
 ** If you prefix the sequence character with a colon (":") character, NeoMutt
 ** will replace any dots in the expansion by underscores. This might be helpful
@@ -5365,18 +5365,18 @@
 ** .pp
 ** When \fIunset\fP, NeoMutt won't stop when the user presses the terminal's
 ** \fIsusp\fP key, usually "^Z". This is useful if you run NeoMutt
-** inside an xterm using a command like "\fCxterm -e neomutt\fP".
+** inside an xterm using a command like "\f[CR]xterm -e neomutt\fP".
 ** .pp
 ** On startup NeoMutt tries to detect if it is the process session leader.
 ** If so, the default of $suspend is "no" otherwise "yes".  This default covers
-** the above mentioned use case of "\fCxterm -e neomutt\fP".
+** the above mentioned use case of "\f[CR]xterm -e neomutt\fP".
 */
 
 { "text_flowed", DT_BOOL, false },
 /*
 ** .pp
 ** When \fIset\fP, NeoMutt will generate "format=flowed" bodies with a content type
-** of "\fCtext/plain; format=flowed\fP".
+** of "\f[CR]text/plain; format=flowed\fP".
 ** This format is easier to handle for some mailing software, and generally
 ** just looks like ordinary text.  To actually make use of this format's
 ** features, you'll need support in your editor.
@@ -5391,7 +5391,7 @@
 { "thorough_search", DT_BOOL, true },
 /*
 ** .pp
-** Affects the \fC~b\fP, \fC~B\fP, and \fC~h\fP search operations described in
+** Affects the \f[CR]~b\fP, \f[CR]~B\fP, and \f[CR]~h\fP search operations described in
 ** section "$patterns".  If \fIset\fP, the headers and body/attachments of
 ** messages to be searched are decoded before searching. If \fIunset\fP,
 ** messages are searched as they appear in the folder.
@@ -5461,8 +5461,8 @@
 ** This variable allows you to specify where NeoMutt will place its
 ** temporary files needed for displaying and composing messages.
 ** .pp
-** If this variable is not set, the environment variable \fC$$$TMPDIR\fP is
-** used.  Failing that, then "\fC/tmp\fP" is used.
+** If this variable is not set, the environment variable \f[CR]$$$TMPDIR\fP is
+** used.  Failing that, then "\f[CR]/tmp\fP" is used.
 */
 
 { "to_chars", DT_MBTABLE, " +TCFLR" },
@@ -5484,8 +5484,8 @@
 { "toggle_quoted_show_levels", DT_NUMBER, 0 },
 /*
 ** .pp
-** Quoted text may be filtered out using the \fC<toggle-quoted>\fP command.
-** If set to a number greater than 0, then the \fC<toggle-quoted>\fP
+** Quoted text may be filtered out using the \f[CR]<toggle-quoted>\fP command.
+** If set to a number greater than 0, then the \f[CR]<toggle-quoted>\fP
 ** command will only filter out quote levels above this number.
 */
 
@@ -5577,10 +5577,10 @@
 /*
 ** .pp
 ** \fBWarning:\fP do not set this variable unless you are using a version
-** of sendmail which supports the \fC-B8BITMIME\fP flag (such as sendmail
+** of sendmail which supports the \f[CR]-B8BITMIME\fP flag (such as sendmail
 ** 8.8.x) or you may not be able to send mail.
 ** .pp
-** When \fIset\fP, NeoMutt will invoke $$sendmail with the \fC-B8BITMIME\fP
+** When \fIset\fP, NeoMutt will invoke $$sendmail with the \f[CR]-B8BITMIME\fP
 ** flag when sending 8-bit messages to enable ESMTP negotiation.
 */
 
@@ -5601,9 +5601,9 @@
 ** "From:" header.
 ** .pp
 ** Note that this information is passed to sendmail command using the
-** \fC-f\fP command line switch. Therefore setting this option is not useful
-** if the $$sendmail variable already contains \fC-f\fP or if the
-** executable pointed to by $$sendmail doesn't support the \fC-f\fP switch.
+** \f[CR]-f\fP command line switch. Therefore setting this option is not useful
+** if the $$sendmail variable already contains \f[CR]-f\fP or if the
+** executable pointed to by $$sendmail doesn't support the \f[CR]-f\fP switch.
 */
 
 { "use_from", DT_BOOL, true },
@@ -5634,14 +5634,14 @@
 ** message). For convenience, the value "yes" is a synonym for
 ** "threads", and "no" is a synonym for "flat".
 ** .pp
-** If this variable is never set, then \fC$$sort\fP controls whether
-** threading is used, \fC$$sort_aux\fP controls both the sorting of
-** threads and subthreads, and using \fC<sort-mailbox>\fP to select
-** threads affects only \fC$$sort\fP.  Once this variable is set,
-** attempting to set \fC$$sort\fP to a value using "threads" will
-** warn, the value of \fC$$sort\fP controls the sorting between
-** threads while \fC$$sort_aux\fP controls sorting within a thread,
-** and \fC<sort-mailbox>\fP toggles \fC$$use_threads\fP.
+** If this variable is never set, then \f[CR]$$sort\fP controls whether
+** threading is used, \f[CR]$$sort_aux\fP controls both the sorting of
+** threads and subthreads, and using \f[CR]<sort-mailbox>\fP to select
+** threads affects only \f[CR]$$sort\fP.  Once this variable is set,
+** attempting to set \f[CR]$$sort\fP to a value using "threads" will
+** warn, the value of \f[CR]$$sort\fP controls the sorting between
+** threads while \f[CR]$$sort_aux\fP controls sorting within a thread,
+** and \f[CR]<sort-mailbox>\fP toggles \f[CR]$$use_threads\fP.
 ** .pp
 ** Example:
 ** .ts
@@ -5679,9 +5679,9 @@
 /*
 ** .pp
 ** Controls whether NeoMutt will ask you to press a key after an external command
-** has been invoked by these functions: \fC<shell-escape>\fP,
-** \fC<pipe-message>\fP, \fC<pipe-entry>\fP, \fC<print-message>\fP,
-** and \fC<print-entry>\fP commands.
+** has been invoked by these functions: \f[CR]<shell-escape>\fP,
+** \f[CR]<pipe-message>\fP, \f[CR]<pipe-entry>\fP, \f[CR]<print-message>\fP,
+** and \f[CR]<print-entry>\fP commands.
 ** .pp
 ** It is also used when viewing attachments with "$auto_view", provided
 ** that the corresponding mailcap entry has a \fIneedsterminal\fP flag,
diff --git a/docs/makedoc.c b/docs/makedoc.c
index 3baf0de..4765658 100644
--- a/docs/makedoc.c
+++ b/docs/makedoc.c
@@ -467,7 +467,7 @@ static int print_it(enum OutputFormats format, int special, char *str, FILE *fp_
         }
         case SP_START_TT:
         {
-          fputs("\\fC", fp_out);
+          fputs("\\f[CR]", fp_out);
           docstat |= D_TT;
           docstat &= ~(D_BF | D_EM);
           break;
@@ -933,11 +933,11 @@ static int handle_docline(enum OutputFormats format, char *l, FILE *fp_out, int
       docstat = print_it(format, SP_START_BF, NULL, fp_out, docstat);
       s += 2;
     }
-    else if (strncmp(s, "\\fC", 3) == 0)
+    else if (strncmp(s, "\\f[CR]", 6) == 0)
     {
       docstat = commit_buf(format, buf, &d, fp_out, docstat);
       docstat = print_it(format, SP_START_TT, NULL, fp_out, docstat);
-      s += 2;
+      s += 5;
     }
     else if (strncmp(s, "\\fP", 3) == 0)
     {
diff --git a/docs/neomuttrc.man.head b/docs/neomuttrc.man.head
index d65d35d..bd51e7a 100644
--- a/docs/neomuttrc.man.head
+++ b/docs/neomuttrc.man.head
@@ -476,13 +476,13 @@ lb|lb
 l|l .
 Example Symbol	Description
 _
-\fCsidebar_format\fP	Config variable
-\fCstatus-color\fP, \fCimap\fP	Compiled-in feature
-\fCpgp-menu\fP, \fCgroup-related\fP	Function
-\fCindex-format-hook\fP, \fCtag-transforms\fP	Command
-\fCmy_var\fP	My variable
-\fClmdb\fP, \fCtokyocabinet\fP	Store (database)
-\fCHOME\fP, \fCCOLUMNS\fP	Environment variable
+\f[CR]sidebar_format\fP	Config variable
+\f[CR]status-color\fP, \f[CR]imap\fP	Compiled-in feature
+\f[CR]pgp-menu\fP, \f[CR]group-related\fP	Function
+\f[CR]index-format-hook\fP, \f[CR]tag-transforms\fP	Command
+\f[CR]my_var\fP	My variable
+\f[CR]lmdb\fP, \f[CR]tokyocabinet\fP	Store (database)
+\f[CR]HOME\fP, \f[CR]COLUMNS\fP	Environment variable
 .TE
 .
 .IP
 |