diff --git a/.rubocop-bundler.yml b/.rubocop-bundler.yml
index 9ae7ace2..c5a7bd5f 100644
--- a/.rubocop-bundler.yml
+++ b/.rubocop-bundler.yml
@@ -15,10 +15,6 @@ Lint/AssignmentInCondition:
 Lint/UnusedMethodArgument:
   Enabled: false
 
-Lint/UriEscapeUnescape:
-  Enabled: true
-
-
 # Style
 
 Layout/EndAlignment:
diff --git a/docs/gemstash-configuration.5.md b/docs/gemstash-configuration.5.md
index a7590023..36d4ec04 100644
--- a/docs/gemstash-configuration.5.md
+++ b/docs/gemstash-configuration.5.md
@@ -221,10 +221,10 @@ Boolean values `true` or `false`
 `:fetch_timeout`
 
 This is the number of seconds to allow for fetching a gem from upstream.
-It covers establishing the connection and receiving the response. Fetching
-gems over a slow connection may cause timeout errors. If you experience
-timeout errors, you may want to increase this value. The default is `20`
-seconds.
+It covers establishing the connection and receiving the response.
+Fetching gems over a slow connection may cause timeout errors. If you
+experience timeout errors, you may want to increase this value. The
+default is `20` seconds.
 
 ## Default value
 
@@ -239,10 +239,10 @@ Integer value with a minimum of `1`
 `:open_timeout`
 
 The timeout setting for opening the connection to an upstream gem
-server. On high-latency networks, even establishing the connection
-to an upstream gem server can take a while. If you experience
-connection failures instead of timeout errors, you may want to
-increase this value. The default is `2` seconds.
+server. On high-latency networks, even establishing the connection to an
+upstream gem server can take a while. If you experience connection
+failures instead of timeout errors, you may want to increase this value.
+The default is `2` seconds.
 
 ## Default value
 
diff --git a/docs/gemstash-private-gems.7.md b/docs/gemstash-private-gems.7.md
index f68b60f1..80f687ae 100644
--- a/docs/gemstash-private-gems.7.md
+++ b/docs/gemstash-private-gems.7.md
@@ -5,7 +5,7 @@
 
 Stashing private gems in your Gemstash server requires a bit of
 additional setup. If you haven’t read through the [Quickstart
-Guide](../README.md#quickstart-guide), you should do that first. By the
+Guide](../readme.md#quickstart-guide), you should do that first. By the
 end of this guide, you will be able to interact with your Gemstash
 server to store and retrieve your private gems.
 
diff --git a/lib/gemstash/env.rb b/lib/gemstash/env.rb
index 2a16db4a..221aa1c7 100644
--- a/lib/gemstash/env.rb
+++ b/lib/gemstash/env.rb
@@ -129,7 +129,7 @@ def db
           db = if RUBY_PLATFORM == "java"
             Sequel.connect("jdbc:sqlite:#{db_path}", config.database_connection_config)
           else
-            Sequel.connect("sqlite://#{CGI.escape(db_path)}", config.database_connection_config)
+            Sequel.connect("sqlite://#{db_path}", config.database_connection_config)
           end
         when "postgres", "mysql", "mysql2"
           db_url = config[:db_url]
diff --git a/rakelib/doc.rake b/rakelib/doc.rake
index 1dbff0ee..8696d519 100644
--- a/rakelib/doc.rake
+++ b/rakelib/doc.rake
@@ -91,7 +91,8 @@ class Doc
       content = ::File.read(to_file)
       content.gsub!("](./", "](docs/")
       content.gsub!(/\A---(.|\n)*?---/, "")
-      ::File.write to_file, "<!-- Automatically generated by Pandoc -->\n#{content}"
+      prefix = format == "man" ? "" : "<!-- Automatically generated by Pandoc -->\n"
+      ::File.write to_file, "#{prefix}#{content}"
     end
 
     def export_path(dir, filename)