Skip to content

Commit 2b3d792

Browse files
committed
Merge branch 'master' into ruby-docs
2 parents 6f1d5a6 + b7d580a commit 2b3d792

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
RDOC_USE_PRISM_PARSER: true
5454
- if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
5555
run: bundle exec rake rdoc
56+
- if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
57+
run: bundle exec rake install
5658
lint:
5759
runs-on: ubuntu-latest
5860
steps:

doc/rdoc/markup_reference.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -918,10 +918,6 @@
918918
#
919919
# - Linked: <tt>https://github.com</tt> links to https://github.com.
920920
#
921-
# [Protocol +www+]
922-
#
923-
# - Linked: <tt>www.yahoo.com</tt> links to www.yahoo.com.
924-
#
925921
# [Protocol +ftp+]
926922
#
927923
# - Linked: <tt>ftp://nosuch.site</tt> links to ftp://nosuch.site.

lib/rdoc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# see RDoc::Markup and refer to <tt>rdoc --help</tt> for command line usage.
2222
#
2323
# If you want to set the default markup format see
24-
# RDoc::Markup@Supported+Formats
24+
# RDoc::Markup@Markup+Formats
2525
#
2626
# If you want to store rdoc configuration in your gem (such as the default
2727
# markup format) see RDoc::Options@Saved+Options

lib/rdoc/generator/template/darkfish/css/rdoc.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ nav a:hover {
223223
position: fixed;
224224
top: 10px;
225225
left: 20px;
226+
cursor: pointer;
226227
}
227228

228229
#navigation-toggle[aria-expanded="true"] {
@@ -307,7 +308,7 @@ main h6 {
307308

308309
#search-field {
309310
width: 100%;
310-
padding: 0.5em 1em 0.5em 2em;
311+
padding: 0.5em 1em 0.5em 2.5em;
311312
border: 1px solid var(--border-color);
312313
border-radius: 20px;
313314
font-size: 14px;

lib/rdoc/rdoc.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ def generate
520520
Dir.chdir @options.op_dir do
521521
unless @options.quiet then
522522
$stderr.puts "\nGenerating #{@generator.class.name.sub(/^.*::/, '')} format into #{Dir.pwd}..."
523+
$stderr.puts "\nYou can visit the home page at: \e]8;;file://#{Dir.pwd}/index.html\e\\file://#{Dir.pwd}/index.html\e]8;;\e\\"
523524
end
524525

525526
@generator.generate

rdoc.gemspec

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,27 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
4646
"LEGAL.rdoc",
4747
"LICENSE.rdoc",
4848
"README.rdoc",
49-
"RI.rdoc",
49+
"RI.md",
5050
"TODO.rdoc",
5151
"exe/rdoc",
5252
"exe/ri",
5353
"lib/rdoc.rb",
54-
"lib/rdoc/alias.rb",
55-
"lib/rdoc/anon_class.rb",
56-
"lib/rdoc/any_method.rb",
57-
"lib/rdoc/attr.rb",
58-
"lib/rdoc/class_module.rb",
54+
"lib/rdoc/code_object/alias.rb",
55+
"lib/rdoc/code_object/anon_class.rb",
56+
"lib/rdoc/code_object/any_method.rb",
57+
"lib/rdoc/code_object/attr.rb",
58+
"lib/rdoc/code_object/class_module.rb",
5959
"lib/rdoc/code_object.rb",
6060
"lib/rdoc/code_objects.rb",
6161
"lib/rdoc/comment.rb",
62-
"lib/rdoc/constant.rb",
63-
"lib/rdoc/context.rb",
64-
"lib/rdoc/context/section.rb",
62+
"lib/rdoc/code_object/constant.rb",
63+
"lib/rdoc/code_object/context.rb",
64+
"lib/rdoc/code_object/context/section.rb",
6565
"lib/rdoc/cross_reference.rb",
6666
"lib/rdoc/encoding.rb",
6767
"lib/rdoc/erb_partial.rb",
6868
"lib/rdoc/erbio.rb",
69-
"lib/rdoc/extend.rb",
69+
"lib/rdoc/code_object/extend.rb",
7070
"lib/rdoc/generator.rb",
7171
"lib/rdoc/generator/darkfish.rb",
7272
"lib/rdoc/generator/json_index.rb",
@@ -136,11 +136,11 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
136136
"lib/rdoc/generator/template/json_index/.document",
137137
"lib/rdoc/generator/template/json_index/js/navigation.js",
138138
"lib/rdoc/generator/template/json_index/js/searcher.js",
139-
"lib/rdoc/ghost_method.rb",
139+
"lib/rdoc/code_object/ghost_method.rb",
140140
"lib/rdoc/i18n.rb",
141141
"lib/rdoc/i18n/locale.rb",
142142
"lib/rdoc/i18n/text.rb",
143-
"lib/rdoc/include.rb",
143+
"lib/rdoc/code_object/include.rb",
144144
"lib/rdoc/known_classes.rb",
145145
"lib/rdoc/markdown.kpeg",
146146
"lib/rdoc/markdown/entities.rb",
@@ -180,11 +180,11 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
180180
"lib/rdoc/markup/to_test.rb",
181181
"lib/rdoc/markup/to_tt_only.rb",
182182
"lib/rdoc/markup/verbatim.rb",
183-
"lib/rdoc/meta_method.rb",
184-
"lib/rdoc/method_attr.rb",
185-
"lib/rdoc/mixin.rb",
186-
"lib/rdoc/normal_class.rb",
187-
"lib/rdoc/normal_module.rb",
183+
"lib/rdoc/code_object/meta_method.rb",
184+
"lib/rdoc/code_object/method_attr.rb",
185+
"lib/rdoc/code_object/mixin.rb",
186+
"lib/rdoc/code_object/normal_class.rb",
187+
"lib/rdoc/code_object/normal_module.rb",
188188
"lib/rdoc/options.rb",
189189
"lib/rdoc/parser.rb",
190190
"lib/rdoc/parser/c.rb",
@@ -201,7 +201,7 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
201201
"lib/rdoc/rd/inline.rb",
202202
"lib/rdoc/rd/inline_parser.ry",
203203
"lib/rdoc/rdoc.rb",
204-
"lib/rdoc/require.rb",
204+
"lib/rdoc/code_object/require.rb",
205205
"lib/rdoc/ri.rb",
206206
"lib/rdoc/ri/driver.rb",
207207
"lib/rdoc/ri/formatter.rb",
@@ -210,7 +210,7 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
210210
"lib/rdoc/ri/task.rb",
211211
"lib/rdoc/rubygems_hook.rb",
212212
"lib/rdoc/servlet.rb",
213-
"lib/rdoc/single_class.rb",
213+
"lib/rdoc/code_object/single_class.rb",
214214
"lib/rdoc/stats.rb",
215215
"lib/rdoc/stats/normal.rb",
216216
"lib/rdoc/stats/quiet.rb",
@@ -220,7 +220,7 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
220220
"lib/rdoc/text.rb",
221221
"lib/rdoc/token_stream.rb",
222222
"lib/rdoc/tom_doc.rb",
223-
"lib/rdoc/top_level.rb",
223+
"lib/rdoc/code_object/top_level.rb",
224224
"lib/rdoc/version.rb",
225225
"man/ri.1",
226226
]

0 commit comments

Comments
 (0)