diff --git a/Rakefile b/Rakefile
index 2566281f..51eb32ce 100644
--- a/Rakefile
+++ b/Rakefile
@@ -46,7 +46,7 @@ def normalize_bullets(markdown)
 end
 
 def linkify_prs(markdown)
-  markdown.gsub(%r!#(\d+)!) do |word|
+  markdown.gsub(%r!(?<\!&)#(\d+)!) do |word|
     "[#{word}]({{ site.repository }}/issues/#{word.delete("#")})"
   end
 end
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 98cbc1a5..6d628241 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -29,7 +29,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Update frontmatter.md ([#6371]({{ site.repository }}/issues/6371))
 - Elaborate on excluding items from processing ([#6136]({{ site.repository }}/issues/6136))
 - Style lists in tables ([#6379]({{ site.repository }}/issues/6379))
-- Remove duplicate &[#34]({{ site.repository }}/issues/34);available&[#34]({{ site.repository }}/issues/34); ([#6380]({{ site.repository }}/issues/6380))
+- Remove duplicate &#34;available&#34; ([#6380]({{ site.repository }}/issues/6380))
 
 ### Development Fixes
 {: #development-fixes-v3-6-1}
@@ -63,14 +63,14 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - kramdown: symbolize keys in-place ([#6247]({{ site.repository }}/issues/6247))
 - Call `to_s` on site.url before attempting to concatenate strings ([#6253]({{ site.repository }}/issues/6253))
 - Enforce Style/FrozenStringLiteralComment ([#6265]({{ site.repository }}/issues/6265))
-- Update theme-template README to note &[#39]({{ site.repository }}/issues/39);assets&[#39]({{ site.repository }}/issues/39); directory ([#6257]({{ site.repository }}/issues/6257))
+- Update theme-template README to note &#39;assets&#39; directory ([#6257]({{ site.repository }}/issues/6257))
 - Memoize the return value of `Document#url` ([#6266]({{ site.repository }}/issues/6266))
 - delegate `StaticFile#to_json` to `StaticFile#to_liquid` ([#6273]({{ site.repository }}/issues/6273))
 - Fix `Drop#key?` so it can handle a nil argument ([#6281]({{ site.repository }}/issues/6281))
 - Guard against type error in absolute url ([#6280]({{ site.repository }}/issues/6280))
-- Mutable drops should fallback to their own methods when a mutation isn&[#39]({{ site.repository }}/issues/39);t present ([#6350]({{ site.repository }}/issues/6350))
+- Mutable drops should fallback to their own methods when a mutation isn&#39;t present ([#6350]({{ site.repository }}/issues/6350))
 - Skip adding binary files as posts ([#6344]({{ site.repository }}/issues/6344))
-- Don&[#39]({{ site.repository }}/issues/39);t break if bundler is not installed ([#6377]({{ site.repository }}/issues/6377))
+- Don&#39;t break if bundler is not installed ([#6377]({{ site.repository }}/issues/6377))
 
 ### Documentation
 
@@ -82,11 +82,11 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - name unification - buddy details ([#6317]({{ site.repository }}/issues/6317))
 - name unification - application index ([#6318]({{ site.repository }}/issues/6318))
 - trim and relocate plugin info across docs ([#6311]({{ site.repository }}/issues/6311))
-- update Jekyll&[#39]({{ site.repository }}/issues/39);s README ([#6321]({{ site.repository }}/issues/6321))
+- update Jekyll&#39;s README ([#6321]({{ site.repository }}/issues/6321))
 - add SUPPORT file for GitHub ([#6324]({{ site.repository }}/issues/6324))
 - Rename CODE_OF_CONDUCT to show in banner ([#6325]({{ site.repository }}/issues/6325))
-- Docs : illustrate page.id for a collection&[#39]({{ site.repository }}/issues/39);s document ([#6329]({{ site.repository }}/issues/6329))
-- Docs: post&[#39]({{ site.repository }}/issues/39);s date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
+- Docs : illustrate page.id for a collection&#39;s document ([#6329]({{ site.repository }}/issues/6329))
+- Docs: post&#39;s date can be overriden in YAML front matter ([#6334]({{ site.repository }}/issues/6334))
 - Docs: `site.url` behavior on development and production environments ([#6270]({{ site.repository }}/issues/6270))
 - Fix typo in site.url section of variables.md :-[ ([#6337]({{ site.repository }}/issues/6337))
 - Docs: updates ([#6343]({{ site.repository }}/issues/6343))
@@ -255,7 +255,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Be more specific on what to upload ([#6119]({{ site.repository }}/issues/6119))
 - Remove Blank Newlines from "Jekyll on Windows" Page ([#6126]({{ site.repository }}/issues/6126))
 - Link the troubleshooting page in the quickstart page ([#6134]({{ site.repository }}/issues/6134))
-- add documentation about the &[#34]({{ site.repository }}/issues/34);pinned&[#34]({{ site.repository }}/issues/34); label ([#6147]({{ site.repository }}/issues/6147))
+- add documentation about the &#34;pinned&#34; label ([#6147]({{ site.repository }}/issues/6147))
 - docs(JekyllOnWindows): Add a new Installation way ([#6141]({{ site.repository }}/issues/6141))
 - corrected windows.md ([#6149]({{ site.repository }}/issues/6149))
 - Refine documentation for Windows ([#6153]({{ site.repository }}/issues/6153))