Skip to content

Commit

Permalink
Relabel "Experimental" to "Early Access" and reorganise pages (digita…
Browse files Browse the repository at this point in the history
…l-asset#5411)

CHANGELOG_BEGIN

- Move daml2ts, bindings-ts and JSON API out of experimental section in docs
- Rename Experimental to Early Access in docs and assistant
- Reorganise the docs a little bit to de-emphasise the Ledger API

CHANGELOG_END
  • Loading branch information
bame-da authored Apr 3, 2020
1 parent 62da572 commit c496e2b
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 67 deletions.
4 changes: 2 additions & 2 deletions compiler/damlc/lib/DA/Cli/Damlc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,14 @@ cmdInspect =

cmdVisual :: Mod CommandFields Command
cmdVisual =
command "visual" $ info (helper <*> cmd) $ progDesc "Generate visual from dar" <> fullDesc
command "visual" $ info (helper <*> cmd) $ progDesc "Generate visual from dar (early access)" <> fullDesc
where
cmd = vis <$> inputDarOpt <*> dotFileOpt
vis a b = Command Visual Nothing $ execVisual a b

cmdVisualWeb :: Mod CommandFields Command
cmdVisualWeb =
command "visual-web" $ info (helper <*> cmd) $ progDesc "Generate D3-Web Visual from dar" <> fullDesc
command "visual-web" $ info (helper <*> cmd) $ progDesc "Generate D3-Web Visual from dar (early access)" <> fullDesc
where
cmd = vis <$> inputDarOpt <*> htmlOutFile <*> openBrowser
vis a b browser = Command Visual Nothing $ execVisualHtml a b browser
Expand Down
25 changes: 10 additions & 15 deletions docs/configs/pdf/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ Getting started
:maxdepth: 2

Installing the SDK <getting-started/installation>
Quickstart Guide <getting-started/quickstart>
getting-started/index
getting-started/testing

Writing DAML
------------
Expand All @@ -36,15 +37,13 @@ Building applications
:maxdepth: 2

app-dev/app-arch
app-dev/authentication
app-dev/ledger-api
app-dev/bindings-java/index
app-dev/bindings-scala/index
app-dev/bindings-js
app-dev/grpc/index
app-dev/bindings-x-lang/index
json-api/index
daml2js/index
app-dev/bindings-ts/index
DAML Script <daml-script/index>
upgrade/index
app-dev/authentication
app-dev/ledger-api

Deploying to DAML ledgers
-------------------------
Expand Down Expand Up @@ -78,7 +77,6 @@ Background concepts
concepts/glossary
concepts/ledger-model/index


Examples
--------

Expand All @@ -88,22 +86,19 @@ Examples

examples/examples

Experimental features
Early Access Features
---------------------

.. toctree::
:titlesonly:
:maxdepth: 2

experimental/warning
tools/navigator/console
tools/extractor
daml-integration-kit/index
json-api/index
triggers/index
daml-repl/index
tools/visual
daml2js/index
getting-started/index
getting-started/testing

Support and updates
-------------------
Expand Down
3 changes: 2 additions & 1 deletion docs/source/app-dev/bindings-java/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Java bindings
:hidden:

codegen
example
Ping Pong Example <example>
Iou Quickstart </getting-started/quickstart>

The Java bindings is a client implementation of the *Ledger API*
based on `RxJava <https://github.com/ReactiveX/RxJava>`_, a library for composing asynchronous and event-based programs using observable sequences for the Java VM. It provides an idiomatic way to write DAML Ledger applications.
Expand Down
6 changes: 0 additions & 6 deletions docs/source/app-dev/grpc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
gRPC
####

.. toctree::
:hidden:

proto-docs
daml-to-ledger-api

If you want to write an application for the ledger API in other languages, you'll need to use `gRPC <https://grpc.io>`__ directly.

If you're not familiar with gRPC and protobuf, we strongly recommend following the `gRPC quickstart <https://grpc.io/docs/quickstart/>`__ and `gRPC tutorials <https://grpc.io/docs/tutorials/>`__. This documentation is written assuming you already have an understanding of gRPC.
Expand Down
8 changes: 8 additions & 0 deletions docs/source/app-dev/ledger-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ The Ledger API
:hidden:

services
grpc/index
grpc/proto-docs
grpc/daml-to-ledger-api
daml-lf-translation
bindings-java/index
bindings-scala/index
bindings-js
bindings-x-lang/index


To write an application around a DAML ledger, you'll need to interact with the **Ledger API** from
another language. Every ledger that DAML can run on exposes this same API.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/daml-repl/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
DAML REPL
###########

**WARNING:** DAML REPL is an experimental feature that is actively
**WARNING:** DAML REPL is an early access feature that is actively
being designed and is *subject to breaking changes*.
We welcome feedback about the DAML REPL on
`our issue tracker <https://github.com/digital-asset/daml/issues/new>`_
Expand Down
2 changes: 1 addition & 1 deletion docs/source/daml-script/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DAML Script

daml-script-docs

DAML scenarios provide a simple API for experimenting with DAML models
DAML scenarios provide a simple API for testing DAML models
and getting quick feedback in DAML studio. However, scenarios are run
in a special process and do not interact with an actual ledger. This
means that you cannot use scenarios to test other ledger clients,
Expand Down
2 changes: 1 addition & 1 deletion docs/source/examples/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ We have plenty of example code, both of DAML and of applications around DAML, on
- `Repurchase agreement example <https://github.com/digital-asset/ex-repo-market>`_: DAML code and automation using the Java bindings
- `Upgrading DAML templates example <https://github.com/digital-asset/ex-upgrade>`_: DAML code
- `Java bindings tutorial <https://github.com/digital-asset/ex-java-bindings>`_: Three examples using the Java bindings with a very simple DAML model
- `Node.js tutorial <https://github.com/digital-asset/ex-tutorial-nodejs>`_: Step-by-step running through using the experimental Node.js bindings
- `Node.js tutorial <https://github.com/digital-asset/ex-tutorial-nodejs>`_: Step-by-step running through using the Node.js bindings
14 changes: 0 additions & 14 deletions docs/source/experimental/warning.rst

This file was deleted.

28 changes: 11 additions & 17 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ DAML SDK documentation
:caption: Getting started

Installing the SDK <getting-started/installation>
Quickstart Guide <getting-started/quickstart>
getting-started/index
getting-started/testing

.. toctree::
:titlesonly:
Expand All @@ -41,16 +42,13 @@ DAML SDK documentation
:caption: Building applications

app-dev/app-arch
app-dev/authentication
app-dev/ledger-api
json-api/index
daml2js/index
app-dev/bindings-ts/index
app-dev/bindings-java/index
app-dev/bindings-scala/index
app-dev/bindings-js
app-dev/grpc/index
app-dev/bindings-x-lang/index
DAML Script <daml-script/index>
upgrade/index
app-dev/authentication
app-dev/ledger-api

.. toctree::
:titlesonly:
Expand Down Expand Up @@ -95,18 +93,14 @@ DAML SDK documentation
:titlesonly:
:maxdepth: 2
:hidden:
:caption: Experimental features
:caption: Early Access Features

experimental/warning
tools/navigator/console
tools/extractor
daml-integration-kit/index
tools/ledger-api-test-tool/index
json-api/index
DAML Triggers <triggers/index>
DAML Repl <daml-repl/index>
triggers/index
daml-repl/index
tools/visual
daml2js/index
getting-started/index
getting-started/testing

.. toctree::
:titlesonly:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/triggers/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DAML Triggers - Off-Ledger Automation in DAML

trigger-docs

**WARNING:** DAML Triggers are an experimental feature that is actively
**WARNING:** DAML Triggers are an early access feature that is actively
being designed and is *subject to breaking changes*.
We welcome feedback about DAML triggers on
`our issue tracker <https://github.com/digital-asset/daml/issues/new?milestone=DAML+Triggers>`_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ object Arguments {
.children(hostname, port)

cmd("console")
.text("start the console")
.text("start the console (early access)")
.action(
(_, arguments) =>
arguments.copy(
Expand Down
14 changes: 7 additions & 7 deletions release/sdk-config.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ commands:
completion: true
- name: create-daml-app
path: daml-helper/daml-helper
desc: "Create a new DAML project based on create-daml-app (experimental)"
desc: "Create a new DAML project based on create-daml-app"
args: ["create-daml-app"]
completion: true
- name: init
Expand Down Expand Up @@ -58,11 +58,11 @@ commands:
args: ["run-jar", "--logback-config=daml-sdk/navigator-logback.xml", "daml-sdk/daml-sdk.jar", "navigator"]
- name: extractor
path: daml-helper/daml-helper
desc: "Launch the Extractor"
desc: "Launch the Extractor (early access)"
args: ["run-jar", "--logback-config=daml-sdk/extractor-logback.xml", "daml-sdk/daml-sdk.jar", "extractor"]
- name: ledger
path: daml-helper/daml-helper
desc: "Interact with a DAML ledger (experimental)"
desc: "Interact with a DAML ledger"
args: ["ledger"]
completion: true
- name: codegen
Expand All @@ -72,20 +72,20 @@ commands:
completion: true
- name: deploy
path: daml-helper/daml-helper
desc: "Deploy DAML project to a ledger (experimental)"
desc: "Deploy DAML project to a ledger"
args: ["deploy"]
completion: true
- name: ide
path: damlc/damlc
args: ["lax", "ide"]
- name: json-api
path: daml-helper/daml-helper
desc: "Launch the HTTP JSON API (experimental)"
desc: "Launch the HTTP JSON API"
args: ["run-jar", "--logback-config=daml-sdk/json-api-logback.xml", "daml-sdk/daml-sdk.jar", "json-api"]
- name: trigger
path: daml-helper/daml-helper
args: ["run-jar", "--logback-config=daml-sdk/trigger-logback.xml", "daml-sdk/daml-sdk.jar", "trigger"]
desc: "Run a DAML trigger (experimental)"
desc: "Run a DAML trigger (early access)"
- name: script
path: daml-helper/daml-helper
args: ["run-jar", "--logback-config=daml-sdk/script-logback.xml", "daml-sdk/daml-sdk.jar", "script"]
Expand All @@ -97,4 +97,4 @@ commands:
- name: repl
path: damlc/damlc
args: ["repl"]
desc: "Launch the DAML REPL (experimental)"
desc: "Launch the DAML REPL (early access)"

0 comments on commit c496e2b

Please sign in to comment.