Skip to content

Commit b7ffdd3

Browse files
authored
Merge pull request #285 from dcolebatch/1-improve-look-and-feel-of-documentation
improve look and feel of documentation
2 parents c9a1f63 + 0e3103f commit b7ffdd3

File tree

14 files changed

+453
-298
lines changed

14 files changed

+453
-298
lines changed

Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.1
1+
FROM ruby:3.3.4
22
33

44
RUN apt-get clean \
@@ -8,18 +8,21 @@ RUN apt-get clean \
88
RUN apt-get update
99

1010
RUN apt-get install -y \
11-
node \
12-
python-pygments \
11+
nodejs \
12+
python3-pygments \
13+
build-essential \
14+
libxml2-dev \
15+
libxslt-dev \
1316
&& apt-get clean \
1417
&& rm -rf /var/lib/apt/lists/
1518

1619
WORKDIR /tmp
1720
ADD Gemfile /tmp/
1821
ADD Gemfile.lock /tmp/
19-
RUN bundle install
22+
RUN gem install bundler && bundle install
2023

2124
VOLUME /src
2225
EXPOSE 4000
2326

2427
WORKDIR /src
25-
ENTRYPOINT ["jekyll", "serve", "-H", "0.0.0.0"]
28+
ENTRYPOINT ["bundle", "exec", "jekyll", "serve", "-H", "0.0.0.0"]

Gemfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
source "https://rubygems.org"
22

3+
# Pinning problematic gems to compatible versions
4+
gem "commonmarker", "~> 0.23.8"
5+
gem "unf_ext", "~> 0.0.7.7"
6+
gem "eventmachine", "~> 1.2.5"
7+
gem "http_parser.rb", "~> 0.6.0"
8+
gem "racc", "~> 1.5.2"
9+
310
group :jekyll_plugins do
4-
gem 'github-pages'
11+
gem 'github-pages', '~> 232'
512
gem 'jekyll-feed'
613
gem 'jekyll-redirect-from'
714
gem 'jekyll-sitemap'
815
end
16+
17+

Gemfile.lock

Lines changed: 52 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ GEM
1111
coffee-script (2.4.1)
1212
coffee-script-source
1313
execjs
14-
coffee-script-source (1.11.1)
14+
coffee-script-source (1.12.2)
1515
colorator (1.1.0)
1616
commonmarker (0.23.10)
1717
concurrent-ruby (1.2.2)
18+
csv (3.3.4)
1819
dnsruby (1.61.9)
1920
simpleidn (~> 0.1)
2021
em-websocket (0.5.3)
@@ -31,16 +32,16 @@ GEM
3132
ffi (1.15.5)
3233
forwardable-extended (2.6.0)
3334
gemoji (3.0.1)
34-
github-pages (228)
35-
github-pages-health-check (= 1.17.9)
36-
jekyll (= 3.9.3)
37-
jekyll-avatar (= 0.7.0)
38-
jekyll-coffeescript (= 1.1.1)
39-
jekyll-commonmark-ghpages (= 0.4.0)
40-
jekyll-default-layout (= 0.1.4)
41-
jekyll-feed (= 0.15.1)
35+
github-pages (232)
36+
github-pages-health-check (= 1.18.2)
37+
jekyll (= 3.10.0)
38+
jekyll-avatar (= 0.8.0)
39+
jekyll-coffeescript (= 1.2.2)
40+
jekyll-commonmark-ghpages (= 0.5.1)
41+
jekyll-default-layout (= 0.1.5)
42+
jekyll-feed (= 0.17.0)
4243
jekyll-gist (= 1.5.0)
43-
jekyll-github-metadata (= 2.13.0)
44+
jekyll-github-metadata (= 2.16.1)
4445
jekyll-include-cache (= 0.2.1)
4546
jekyll-mentions (= 1.6.0)
4647
jekyll-optional-front-matter (= 0.3.2)
@@ -67,30 +68,32 @@ GEM
6768
jekyll-theme-tactile (= 0.2.0)
6869
jekyll-theme-time-machine (= 0.2.0)
6970
jekyll-titles-from-headings (= 0.5.3)
70-
jemoji (= 0.12.0)
71-
kramdown (= 2.3.2)
71+
jemoji (= 0.13.0)
72+
kramdown (= 2.4.0)
7273
kramdown-parser-gfm (= 1.1.0)
7374
liquid (= 4.0.4)
7475
mercenary (~> 0.3)
7576
minima (= 2.5.1)
76-
nokogiri (>= 1.13.6, < 2.0)
77-
rouge (= 3.26.0)
77+
nokogiri (>= 1.16.2, < 2.0)
78+
rouge (= 3.30.0)
7879
terminal-table (~> 1.4)
79-
github-pages-health-check (1.17.9)
80+
webrick (~> 1.8)
81+
github-pages-health-check (1.18.2)
8082
addressable (~> 2.3)
8183
dnsruby (~> 1.60)
82-
octokit (~> 4.0)
83-
public_suffix (>= 3.0, < 5.0)
84+
octokit (>= 4, < 8)
85+
public_suffix (>= 3.0, < 6.0)
8486
typhoeus (~> 1.3)
8587
html-pipeline (2.14.3)
8688
activesupport (>= 2)
8789
nokogiri (>= 1.4)
88-
http_parser.rb (0.8.0)
90+
http_parser.rb (0.6.0)
8991
i18n (1.14.1)
9092
concurrent-ruby (~> 1.0)
91-
jekyll (3.9.3)
93+
jekyll (3.10.0)
9294
addressable (~> 2.4)
9395
colorator (~> 1.0)
96+
csv (~> 3.0)
9497
em-websocket (~> 0.5)
9598
i18n (>= 0.7, < 2)
9699
jekyll-sass-converter (~> 1.0)
@@ -101,27 +104,28 @@ GEM
101104
pathutil (~> 0.9)
102105
rouge (>= 1.7, < 4)
103106
safe_yaml (~> 1.0)
104-
jekyll-avatar (0.7.0)
107+
webrick (>= 1.0)
108+
jekyll-avatar (0.8.0)
105109
jekyll (>= 3.0, < 5.0)
106-
jekyll-coffeescript (1.1.1)
110+
jekyll-coffeescript (1.2.2)
107111
coffee-script (~> 2.2)
108-
coffee-script-source (~> 1.11.1)
112+
coffee-script-source (~> 1.12)
109113
jekyll-commonmark (1.4.0)
110114
commonmarker (~> 0.22)
111-
jekyll-commonmark-ghpages (0.4.0)
112-
commonmarker (~> 0.23.7)
113-
jekyll (~> 3.9.0)
115+
jekyll-commonmark-ghpages (0.5.1)
116+
commonmarker (>= 0.23.7, < 1.1.0)
117+
jekyll (>= 3.9, < 4.0)
114118
jekyll-commonmark (~> 1.4.0)
115119
rouge (>= 2.0, < 5.0)
116-
jekyll-default-layout (0.1.4)
117-
jekyll (~> 3.0)
118-
jekyll-feed (0.15.1)
120+
jekyll-default-layout (0.1.5)
121+
jekyll (>= 3.0, < 5.0)
122+
jekyll-feed (0.17.0)
119123
jekyll (>= 3.7, < 5.0)
120124
jekyll-gist (1.5.0)
121125
octokit (~> 4.2)
122-
jekyll-github-metadata (2.13.0)
126+
jekyll-github-metadata (2.16.1)
123127
jekyll (>= 3.4, < 5.0)
124-
octokit (~> 4.0, != 4.4.0)
128+
octokit (>= 4, < 7, != 4.4.0)
125129
jekyll-include-cache (0.2.1)
126130
jekyll (>= 3.7, < 5.0)
127131
jekyll-mentions (1.6.0)
@@ -192,11 +196,11 @@ GEM
192196
jekyll (>= 3.3, < 5.0)
193197
jekyll-watch (2.2.1)
194198
listen (~> 3.0)
195-
jemoji (0.12.0)
196-
gemoji (~> 3.0)
199+
jemoji (0.13.0)
200+
gemoji (>= 3, < 5)
197201
html-pipeline (~> 2.2)
198202
jekyll (>= 3.0, < 5.0)
199-
kramdown (2.3.2)
203+
kramdown (2.4.0)
200204
rexml
201205
kramdown-parser-gfm (1.1.0)
202206
kramdown (~> 2.0)
@@ -205,27 +209,27 @@ GEM
205209
rb-fsevent (~> 0.10, >= 0.10.3)
206210
rb-inotify (~> 0.9, >= 0.9.10)
207211
mercenary (0.3.6)
208-
mini_portile2 (2.8.1)
212+
mini_portile2 (2.8.8)
209213
minima (2.5.1)
210214
jekyll (>= 3.5, < 5.0)
211215
jekyll-feed (~> 0.9)
212216
jekyll-seo-tag (~> 2.1)
213217
minitest (5.19.0)
214-
nokogiri (1.14.3)
215-
mini_portile2 (~> 2.8.0)
218+
nokogiri (1.18.8)
219+
mini_portile2 (~> 2.8.2)
216220
racc (~> 1.4)
217221
octokit (4.25.1)
218222
faraday (>= 1, < 3)
219223
sawyer (~> 0.9)
220224
pathutil (0.16.2)
221225
forwardable-extended (~> 2.6)
222226
public_suffix (4.0.7)
223-
racc (1.6.2)
227+
racc (1.5.2)
224228
rb-fsevent (0.11.2)
225229
rb-inotify (0.10.1)
226230
ffi (~> 1.0)
227-
rexml (3.2.5)
228-
rouge (3.26.0)
231+
rexml (3.4.1)
232+
rouge (3.30.0)
229233
ruby2_keywords (0.0.5)
230234
rubyzip (2.3.2)
231235
safe_yaml (1.0.5)
@@ -247,17 +251,23 @@ GEM
247251
concurrent-ruby (~> 1.0)
248252
unf (0.1.4)
249253
unf_ext
250-
unf_ext (0.0.8.2)
254+
unf_ext (0.0.7.7)
251255
unicode-display_width (1.8.0)
256+
webrick (1.9.1)
252257

253258
PLATFORMS
254259
ruby
255260

256261
DEPENDENCIES
257-
github-pages
262+
commonmarker (~> 0.23.8)
263+
eventmachine (~> 1.2.5)
264+
github-pages (~> 232)
265+
http_parser.rb (~> 0.6.0)
258266
jekyll-feed
259267
jekyll-redirect-from
260268
jekyll-sitemap
269+
racc (~> 1.5.2)
270+
unf_ext (~> 0.0.7.7)
261271

262272
BUNDLED WITH
263-
1.17.3
273+
2.6.8

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ repository: tomjoht/documentation-theme-jekyll
33
output: web
44
# this property is useful for conditional filtering of content that is separate from the PDF.
55

6-
topnav_title: Tidal
6+
topnav_title: Tidal.cloud Guides
77
# this appears on the top navigation bar next to the home button
88

9-
site_title: Tidal
9+
site_title: Tidal.cloud Guides
1010
# this appears in the html browser tab for the site title (seen mostly by search engines, not users)
1111

1212
company_name: Tidal SW Inc

_data/sidebars/main_sidebar.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,81 +7,81 @@ entries:
77
folderitems:
88
- title: Layering Discovery Techniques
99
output: web
10-
url: index.html
10+
url: /index.html
1111
- title: Setup Tidal Tools
1212
output: web
13-
url: tidal-tools.html
13+
url: /tidal-tools.html
1414
- title: Setup Tidal Tools on AWS
1515
output: web
16-
url: tidal-tools-aws.html
16+
url: /tidal-tools-aws.html
1717
- title: Setup Tidal Tools on GCP
1818
output: web
19-
url: tidal-tools-gcp.html
19+
url: /tidal-tools-gcp.html
2020
- title: Tidal Tools Autocompletion
2121
output: web
22-
url: autocompletion.html
22+
url: /autocompletion.html
2323
- title: Tidal Offline
2424
output: web
25-
url: tidal-offline.html
25+
url: /tidal-offline.html
2626

2727
- title: Discover
2828
output: web
2929
folderitems:
3030
- title: Importing Data From Excel
3131
output: web
32-
url: import-from-excel.html
32+
url: /import-from-excel.html
3333
- title: Bulk Editing Records
3434
output: web
35-
url: bulk-edits.html
35+
url: /bulk-edits.html
3636
- title: Tidal Discover
3737
output: web
38-
url: discover.html
38+
url: /discover.html
3939
- title: Public URL Discovery
4040
output: web
41-
url: public-urls.html
41+
url: /public-urls.html
4242
- title: Tidal Analyze
4343
output: web
44-
url: analyze.html
44+
url: /analyze.html
4545
- title: Sync your Server Inventory
4646
output: web
47-
url: sync-servers.html
47+
url: /sync-servers.html
4848
- title: Gathering Machine Stats
4949
output: web
50-
url: machine_stats.html
50+
url: /machine_stats.html
5151
- title: Host discovery with Nmap
5252
output: web
53-
url: host-discovery.html
53+
url: /host-discovery.html
5454
- title: Integrating with vSphere
5555
output: web
56-
url: vsphere.html
56+
url: /vsphere.html
5757
- title: Integrating with Ansible Tower
5858
output: web
59-
url: ansible-tower.html
59+
url: /ansible-tower.html
6060
- title: Integrating with Azure Migrate
6161
output: web
62-
url: azure-migrate.html
62+
url: /azure-migrate.html
6363
- title: Windows DNS Zonefile Export
6464
output: web
65-
url: windows-zone-export.html
65+
url: /windows-zone-export.html
6666
- title: Tidal Tools Virtual Machine Image
6767
output: web
68-
url: tidal-discovery-vm.html
68+
url: /tidal-discovery-vm.html
6969

7070
- title: Assess
7171
output: web
7272
folderitems:
7373
- title: Code Analysis Overview
7474
output: web
75-
url: code-analysis-overview.html
75+
url: /code-analysis-overview.html
7676
- title: Performing Code Analysis
7777
output: web
78-
url: analyze-source-code.html
78+
url: /analyze-source-code.html
7979
- title: HTTP Web Log Analysis
8080
output: web
81-
url: analyze-logs.html
81+
url: /analyze-logs.html
8282
- title: Application Interview Best Practices
8383
output: web
84-
url: interviews.html
84+
url: /interviews.html
8585
- title: Creating interview questions
8686
output: web
8787
url: /create-interview-questions.html
@@ -146,17 +146,17 @@ entries:
146146
folderitems:
147147
- title: General Troubleshooting
148148
output: web
149-
url: general-troubleshooting.html
149+
url: /general-troubleshooting.html
150150
- title: Tidal Tools Troubleshooting
151151
output: web
152-
url: troubleshooting.html
152+
url: /troubleshooting.html
153153
- title: Troubleshooting Ansible Tower Integration
154154
output: web
155-
url: troubleshoot-ansible.html
155+
url: /troubleshoot-ansible.html
156156

157157
- title: Downloads
158158
output: web
159159
folderitems:
160160
- title: Downloads
161161
output: web
162-
url: downloads.html
162+
url: /downloads.html

_data/strings.yml

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

22

33
# placed here for translation purposes
4-
search_placeholder_text: search...
4+
search_placeholder_text: Search...
55
search_no_results_text: No results found.

0 commit comments

Comments
 (0)