Skip to content

Commit 93a8a01

Browse files
authored
Merge pull request #399 from olleolleolle/fix-help-command
Avoid HTML comment preamble in man page output from Pandoc
2 parents e0e1b4b + 14126ca commit 93a8a01

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

.rubocop-bundler.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ Lint/AssignmentInCondition:
1515
Lint/UnusedMethodArgument:
1616
Enabled: false
1717

18-
Lint/UriEscapeUnescape:
19-
Enabled: true
20-
21-
2218
# Style
2319

2420
Layout/EndAlignment:

docs/gemstash-configuration.5.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ Boolean values `true` or `false`
221221
`:fetch_timeout`
222222

223223
This is the number of seconds to allow for fetching a gem from upstream.
224-
It covers establishing the connection and receiving the response. Fetching
225-
gems over a slow connection may cause timeout errors. If you experience
226-
timeout errors, you may want to increase this value. The default is `20`
227-
seconds.
224+
It covers establishing the connection and receiving the response.
225+
Fetching gems over a slow connection may cause timeout errors. If you
226+
experience timeout errors, you may want to increase this value. The
227+
default is `20` seconds.
228228

229229
## Default value
230230

@@ -239,10 +239,10 @@ Integer value with a minimum of `1`
239239
`:open_timeout`
240240

241241
The timeout setting for opening the connection to an upstream gem
242-
server. On high-latency networks, even establishing the connection
243-
to an upstream gem server can take a while. If you experience
244-
connection failures instead of timeout errors, you may want to
245-
increase this value. The default is `2` seconds.
242+
server. On high-latency networks, even establishing the connection to an
243+
upstream gem server can take a while. If you experience connection
244+
failures instead of timeout errors, you may want to increase this value.
245+
The default is `2` seconds.
246246

247247
## Default value
248248

docs/gemstash-private-gems.7.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
Stashing private gems in your Gemstash server requires a bit of
77
additional setup. If you haven’t read through the [Quickstart
8-
Guide](../README.md#quickstart-guide), you should do that first. By the
8+
Guide](../readme.md#quickstart-guide), you should do that first. By the
99
end of this guide, you will be able to interact with your Gemstash
1010
server to store and retrieve your private gems.
1111

lib/gemstash/env.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def db
129129
db = if RUBY_PLATFORM == "java"
130130
Sequel.connect("jdbc:sqlite:#{db_path}", config.database_connection_config)
131131
else
132-
Sequel.connect("sqlite://#{CGI.escape(db_path)}", config.database_connection_config)
132+
Sequel.connect("sqlite://#{db_path}", config.database_connection_config)
133133
end
134134
when "postgres", "mysql", "mysql2"
135135
db_url = config[:db_url]

rakelib/doc.rake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ class Doc
9191
content = ::File.read(to_file)
9292
content.gsub!("](./", "](docs/")
9393
content.gsub!(/\A---(.|\n)*?---/, "")
94-
::File.write to_file, "<!-- Automatically generated by Pandoc -->\n#{content}"
94+
prefix = format == "man" ? "" : "<!-- Automatically generated by Pandoc -->\n"
95+
::File.write to_file, "#{prefix}#{content}"
9596
end
9697

9798
def export_path(dir, filename)

0 commit comments

Comments
 (0)