From 009899a011a3df3619c24b9df3ce917b332a52ec Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 12 Oct 2024 17:02:14 -0400
Subject: [PATCH 1/2] Update dependencies in v1

---
 go.mod | 4 ++--
 go.sum | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index a3a0032208..0a35d2fca0 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/urfave/cli
 go 1.11
 
 require (
-	github.com/BurntSushi/toml v1.3.2
-	github.com/cpuguy83/go-md2man/v2 v2.0.4
+	github.com/BurntSushi/toml v1.4.0
+	github.com/cpuguy83/go-md2man/v2 v2.0.5
 	github.com/stretchr/testify v1.9.0
 	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
index c8ab63410b..73d73fe4f2 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,11 @@
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

From e33bf2d1d98604d8cfb555a384913921aa9d333f Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 12 Oct 2024 20:15:02 -0400
Subject: [PATCH 2/2] Update file test doc to match current md2man format

and compare without worrying about leading/trailing space
---
 fish_test.go                   |  2 +-
 testdata/expected-doc-full.man | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/fish_test.go b/fish_test.go
index 0fe928656c..b2fdb6ee6a 100644
--- a/fish_test.go
+++ b/fish_test.go
@@ -72,7 +72,7 @@ func expectFileContent(t *testing.T, file, expected string) {
 	data, err := os.ReadFile(file)
 	require.Nil(t, err)
 
-	require.Equal(t, strings.ReplaceAll(string(data), "\r\n", "\n"), expected)
+	require.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(strings.ReplaceAll(string(data), "\r\n", "\n")))
 }
 
 func TestFishCompletion(t *testing.T) {
diff --git a/testdata/expected-doc-full.man b/testdata/expected-doc-full.man
index f6395fc1e6..ec91b70aa8 100644
--- a/testdata/expected-doc-full.man
+++ b/testdata/expected-doc-full.man
@@ -4,12 +4,10 @@
 .SH Harrison
 
 .SH NAME
-.PP
-greet - Some app
+greet \- Some app
 
 
 .SH SYNOPSIS
-.PP
 greet
 
 .EX
@@ -20,7 +18,6 @@ greet
 
 
 .SH DESCRIPTION
-.PP
 app [first_arg] [second_arg]
 
 .PP
@@ -32,7 +29,6 @@ greet [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]
 
 
 .SH GLOBAL OPTIONS
-.PP
 \fB--another-flag, -b\fP: another usage text
 
 .PP
@@ -44,7 +40,6 @@ greet [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]
 
 .SH COMMANDS
 .SH config, c
-.PP
 another usage test
 
 .PP
@@ -54,7 +49,6 @@ another usage test
 \fB--flag, --fl, -f\fP="":
 
 .SS sub-config, s, ss
-.PP
 another usage test
 
 .PP
@@ -64,7 +58,6 @@ another usage test
 \fB--sub-flag, --sub-fl, -s\fP="":
 
 .SH info, i, in
-.PP
 retrieve generic information
 
-.SH some-command
\ No newline at end of file
+.SH some-command