From 5dc729a6fc9f166aa733cdd6a75d0661075c4593 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Sun, 9 Oct 2016 14:56:48 +0800 Subject: [PATCH] Do not red code table and alerts --- website/source/assets/stylesheets/_docs.scss | 6 ++++++ website/source/docs/agent/config.html.md | 17 +++++++++-------- website/source/docs/agent/telemetry.html.md | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 1d1529ce5..3e7e3c73d 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -22,6 +22,12 @@ body.layout-intro{ } } } + + table code, + .alert code { + background-color: transparent; + color: inherit; + } } .docs-sidebar{ diff --git a/website/source/docs/agent/config.html.md b/website/source/docs/agent/config.html.md index dacc727b6..f16c64b85 100644 --- a/website/source/docs/agent/config.html.md +++ b/website/source/docs/agent/config.html.md @@ -19,7 +19,9 @@ the Nomad agent. When specifying multiple config file options on the command-line, the files are loaded in the order they are specified. For example: - nomad agent -config server.conf -config /etc/nomad -config extra.json +```shell +$ nomad agent -config=server.conf -config=/etc/nomad -config=extra.json +``` Will load configuration from `server.conf`, from `.hcl` and `.json` files under `/etc/nomad`, and finally from `extra.json`. @@ -44,9 +46,9 @@ refer to the sections below for the details of each option. The preferred configuration syntax is HCL, which supports comments, but you can also use JSON. Below is an example configuration file in HCL syntax. -``` +```hcl bind_addr = "0.0.0.0" -data_dir = "/var/lib/nomad" +data_dir = "/var/lib/nomad" advertise { # We need to specify our host's IP because we can't @@ -55,12 +57,12 @@ advertise { } server { - enabled = true + enabled = true bootstrap_expect = 3 } client { - enabled = true + enabled = true network_speed = 10 options { "driver.raw_exec.enable" = "1" @@ -68,13 +70,12 @@ client { } consul { - # Consul's HTTP Address - address = "1.2.3.4:8500" + address = "1.2.3.4:8500" } atlas { infrastructure = "hashicorp/mars" - token = "atlas.v1.AFE84330943" + token = "atlas.v1.AFE84330943" } ``` diff --git a/website/source/docs/agent/telemetry.html.md b/website/source/docs/agent/telemetry.html.md index 46f096cbf..0e41f617f 100644 --- a/website/source/docs/agent/telemetry.html.md +++ b/website/source/docs/agent/telemetry.html.md @@ -325,7 +325,7 @@ page for more details. -## Allocation Metrics +## Allocation Metrics