5 files changed, 21 insertions, 43 deletions
diff --git a/doc/man/git-bug-bridge-new.1 b/doc/man/git-bug-bridge-new.1
index 73d01ada..5911843e 100644
--- a/doc/man/git-bug-bridge-new.1
+++ b/doc/man/git-bug-bridge-new.1
@@ -67,10 +67,7 @@ Configure a new bridge by passing flags or/and using interactive terminal prompt
 
 
 .SH EXAMPLE
-.PP
-.RS
-
-.nf
+.EX
 # Interactive example
 [1]: github
 [2]: gitlab
@@ -81,8 +78,7 @@ target: 1
 name [default]: default
 
 Detected projects:
-[1]: github.com/a-hilaly/git-bug
-[2]: github.com/git-bug/git-bug
+[1]: github.com/git-bug/git-bug
 
 [0]: Another project
 
@@ -108,9 +104,9 @@ Successfully configured bridge: default
 git bug bridge new \\
     --name=default \\
     --target=github \\
-    --owner=$(OWNER) \\
-    --project=$(PROJECT) \\
-    --token=$(TOKEN)
+    --owner=example-owner
+    --project=example-repo \\
+    --token=$TOKEN
 
 # For Launchpad
 git bug bridge new \\
@@ -121,12 +117,10 @@ git bug bridge new \\
 # For Gitlab
 git bug bridge new \\
     --name=default \\
-    --target=github \\
-    --url=https://gitlab.com/git-bug/git-bug \\
-    --token=$(TOKEN)
-
-.fi
-.RE
+    --target=gitlab \\
+    --url=https://github.com/example-org/example-repo \\
+    --token=$TOKEN
+.EE
 
 
 .SH SEE ALSO
diff --git a/doc/man/git-bug-bug-deselect.1 b/doc/man/git-bug-bug-deselect.1
index fd342245..a648735e 100644
--- a/doc/man/git-bug-bug-deselect.1
+++ b/doc/man/git-bug-bug-deselect.1
@@ -23,18 +23,13 @@ Clear the implicitly selected bug
 
 
 .SH EXAMPLE
-.PP
-.RS
-
-.nf
+.EX
 git bug select 2f15
 git bug comment
 git bug status
 git bug deselect
 
-
-.fi
-.RE
+.EE
 
 
 .SH SEE ALSO
diff --git a/doc/man/git-bug-bug-select.1 b/doc/man/git-bug-bug-select.1
index d73cd606..397cb9e8 100644
--- a/doc/man/git-bug-bug-select.1
+++ b/doc/man/git-bug-bug-select.1
@@ -32,17 +32,12 @@ The complementary command is "git bug deselect" performing the opposite operatio
 
 
 .SH EXAMPLE
-.PP
-.RS
-
-.nf
+.EX
 git bug select 2f15
 git bug comment
 git bug status
 
-
-.fi
-.RE
+.EE
 
 
 .SH SEE ALSO
diff --git a/doc/man/git-bug-bug.1 b/doc/man/git-bug-bug.1
index db26518e..413d3ea4 100644
--- a/doc/man/git-bug-bug.1
+++ b/doc/man/git-bug-bug.1
@@ -70,10 +70,7 @@ You can pass an additional query to filter and order the list. This query can be
 
 
 .SH EXAMPLE
-.PP
-.RS
-
-.nf
+.EX
 List open bugs sorted by last edition with a query:
 git bug status:open sort:edit-desc
 
@@ -86,9 +83,7 @@ git bug "foo bar" baz
 Use queries, flags, and full text search:
 git bug status:open --by creation "foo bar" baz
 
-
-.fi
-.RE
+.EE
 
 
 .SH SEE ALSO
diff --git a/doc/md/git-bug_bridge_new.md b/doc/md/git-bug_bridge_new.md
index 46dcb900..443ee385 100644
--- a/doc/md/git-bug_bridge_new.md
+++ b/doc/md/git-bug_bridge_new.md
@@ -23,8 +23,7 @@ target: 1
 name [default]: default
 
 Detected projects:
-[1]: github.com/a-hilaly/git-bug
-[2]: github.com/git-bug/git-bug
+[1]: github.com/git-bug/git-bug
 
 [0]: Another project
 
@@ -50,9 +49,9 @@ Successfully configured bridge: default
 git bug bridge new \
     --name=default \
     --target=github \
-    --owner=$(OWNER) \
-    --project=$(PROJECT) \
-    --token=$(TOKEN)
+    --owner=example-owner
+    --project=example-repo \
+    --token=$TOKEN
 
 # For Launchpad
 git bug bridge new \
@@ -64,8 +63,8 @@ git bug bridge new \
 git bug bridge new \
     --name=default \
     --target=gitlab \
-    --url=https://gitlab.com/git-bug/git-bug \
-    --token=$(TOKEN)
+    --url=https://github.com/example-org/example-repo \
+    --token=$TOKEN
 ```
 
 ### Options