Skip to content

Commit e0bd21e

Browse files
authored
Update web page (#1079)
The main improvements are: * Add one-line summary of what Dhall is This is based on user feedback that some people could not tell what Dhall was based on the home page * Replace "Tough on messes" section with "Integration friendly" section This is based on user feedback that the nethack example wasn't working for them and also because of a large number of questions in online discussions about how to integrate Dhall * Fix tutorial examples to put public/private keys under `~/.ssh` * Link to newly-added Wiki pages
1 parent 90b62ee commit e0bd21e

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

dhall-try/index.html

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@
8282
<a class="nav-link" href="https://github.com/dhall-lang/dhall-lang/wiki/Safety-guarantees">Safety guarantees</a>
8383
<div class="dropdown-divider"></div>
8484
<a class="nav-link" href="https://github.com/dhall-lang/dhall-lang/wiki/Dhall-in-production">Dhall in production</a>
85+
<div class="dropdown-divider"></div>
86+
<a class="nav-link" href="https://github.com/dhall-lang/dhall-lang/wiki/Design-choices">Design choices</a>
8587
</div>
8688
</li>
8789
<li class="nav-item dropdown">
@@ -99,6 +101,8 @@
99101
How-to guides
100102
</a>
101103
<div class="dropdown-menu" aria-labelledby="howtoDropdown">
104+
<a class="nav-link" href="https://github.com/dhall-lang/dhall-lang/wiki/How-to-integrate-Dhall">How to integrate Dhall</a>
105+
<div class="dropdown-divider"></div>
102106
<a class="nav-link" href="https://github.com/dhall-lang/dhall-lang/wiki/Cheatsheet">Cheatsheet</a>
103107
<div class="dropdown-divider"></div>
104108
<a class="nav-link" href="https://github.com/dhall-lang/dhall-lang/wiki/Frequently-Asked-Questions-%28FAQ%29">Frequently Asked Questions (FAQ)</a>
@@ -141,7 +145,7 @@
141145
<div class="dropdown-divider"></div>
142146
<a class="nav-link" href="https://github.com/dhall-lang/dhall-haskell/blob/master/dhall/README.md"><img src = "./img/haskell-logo.png" height="32px" alt="Haskell logo"><span>Haskell</span></a>
143147
<div class="dropdown-divider"></div>
144-
<a class="nav-link" href="https://github.com/dhall-lang/dhall-nix/blob/master/README.md"><img src = "./img/nix-logo.png" height="32px" alt="Nix logo"><span>Nix</span></a>
148+
<a class="nav-link" href="https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-nix"><img src = "./img/nix-logo.png" height="32px" alt="Nix logo"><span>Nix</span></a>
145149
<div class="dropdown-divider"></div>
146150
<a class="nav-link" href="https://git.sr.ht/~singpolyma/dhall-ruby"><img src = "./img/ruby-logo.svg" height="32px" alt="Ruby logo"><span>Ruby</span></a>
147151
</div>
@@ -164,8 +168,14 @@
164168
</nav>
165169
<header>
166170
<h1 class="text-center">The Dhall configuration language</h1>
167-
<p class="text-center">The non-repetitive alternative to YAML</p>
171+
<p class="lead text-center">The non-repetitive alternative to YAML</p>
168172
</header>
173+
<div class="container">
174+
<p class="lead text-center">
175+
Dhall is a <a href="https://github.com/dhall-lang/dhall-lang/wiki/Programmable-configuration-files">programmable configuration language</a>
176+
that you can think of as: JSON + functions + types + imports
177+
</p>
178+
</div>
169179
<div id="editor">
170180
<div id="input-pane">
171181
<ul class="nav nav-tabs example-tab">
@@ -227,15 +237,13 @@ <h1 class="display-4">Turing-completeness is not a feature</h1>
227237
<a href="https://github.com/dhall-lang/dhall-lang/wiki/Safety-guarantees"class="btn btn-lg btn-outline-dark bg-light">Safety Guarantees<i class="fas fa-shield-alt"></i></a>
228238
</div>
229239
<div class="container jumbotron" style="background-color: #cfebfb">
230-
<h1 class="display-4">Tough on messes</h1>
231-
<p class="lead">Dhall is built for large and weird configuration
232-
schemas.</p>
240+
<h1 class="display-4">Integration friendly</h1>
241+
<p class="lead">Dhall provides a smooth migration path for mature enterprise deployments.</p>
233242
<hr class="my-4">
234-
<p>Don't use YAML? No problem!</p>
235-
<p>Dhall can integrate with messy APIs and tools. You can even convert
236-
Dhall to ad-hoc and non-standard
237-
configuration file formats.</p>
238-
<a href="https://github.com/dhall-lang/dhall-nethack" class="btn btn-lg btn-outline-dark bg-light">See an Example <i class="fas fa-cogs"></i></a>
243+
<p>You can convert both ways between Dhall and JSON/YAML or read Dhall
244+
configuration files directly into a language that supports a native
245+
language binding.</p>
246+
<a href="https://github.com/dhall-lang/dhall-lang/wiki/How-to-integrate-Dhall" class="btn btn-lg btn-outline-dark bg-light">Integrations <i class="fas fa-cogs" ></i></a>
239247
</div>
240248
<div class="container jumbotron" style="background-color: #fbf3c8">
241249
<h1 class="display-4">Tired of YAML?</h1>
@@ -324,8 +332,8 @@ <h1 class="display-4">Tired of YAML?</h1>
324332
-}
325333
326334
{ home = "/home/bill"
327-
, privateKey = "/home/bill/id_ed25519"
328-
, publicKey = "/home/blil/id_ed25519.pub"
335+
, privateKey = "/home/bill/.ssh/id_ed25519"
336+
, publicKey = "/home/blil/.ssh/id_ed25519.pub"
329337
}`
330338

331339
let example1 = `{- Don't repeat yourself!
@@ -335,8 +343,8 @@ <h1 class="display-4">Tired of YAML?</h1>
335343
336344
let user = "bill"
337345
in { home = "/home/\${user}"
338-
, privateKey = "/home/\${user}/id_ed25519"
339-
, publicKey = "/home/\${user}/id_ed25519.pub"
346+
, privateKey = "/home/\${user}/.ssh/id_ed25519"
347+
, publicKey = "/home/\${user}/.ssh/id_ed25519.pub"
340348
}
341349
342350
{- Change the name "bill" to "jane" -}`;
@@ -345,7 +353,7 @@ <h1 class="display-4">Tired of YAML?</h1>
345353
346354
let makeUser = \\(user : Text) ->
347355
let home = "/home/\${user}"
348-
let privateKey = "\${home}/id_ed25519"
356+
let privateKey = "\${home}/.ssh/id_ed25519"
349357
let publicKey = "\${privateKey}.pub"
350358
in { home = home
351359
, privateKey = privateKey
@@ -370,7 +378,7 @@ <h1 class="display-4">Tired of YAML?</h1>
370378
371379
let makeUser : Text -> Config = \\(user : Text) ->
372380
let home : Text = "/home/\${user}"
373-
let privateKey : Text = "\${home}/id_ed25519"
381+
let privateKey : Text = "\${home}/.ssh/id_ed25519"
374382
let publicKey : Text = "\${privateKey}.pub"
375383
let config : Config =
376384
{ home = home
@@ -405,7 +413,7 @@ <h1 class="display-4">Tired of YAML?</h1>
405413
406414
let makeUser = \\(user : Text) ->
407415
let home = "/home/\${user}"
408-
let privateKey = "\${home}/id_ed25519"
416+
let privateKey = "\${home}/.ssh/id_ed25519"
409417
let publicKey = "\${privateKey}.pub"
410418
in { home = home
411419
, privateKey = privateKey

0 commit comments

Comments
 (0)