luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #4149 from hashicorp/docs-fixes 

Docs fixes
This commit is contained in:
Michael Schurter 2018-04-12 17:32:51 -07:00 committed by GitHub
parent 9268762348 be86ee4025
commit 7d5049aa6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/Gemfile
View File

@ -1,3 +1,3 @@
source "https://rubygems.org"
gem "middleman-hashicorp", "0.3.34"
gem "middleman-hashicorp", "0.3.35"

10
website/Gemfile.lock
View File

@ -6,7 +6,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
autoprefixer-rails (8.2.0)
autoprefixer-rails (8.1.0.1)
execjs
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
@ -78,7 +78,7 @@ GEM
rack (>= 1.4.5, < 2.0)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
middleman-hashicorp (0.3.34)
middleman-hashicorp (0.3.35)
bootstrap-sass (~> 3.3)
builder (~> 3.2)
middleman (~> 3.4)
@ -113,9 +113,9 @@ GEM
padrino-support (0.12.9)
activesupport (>= 3.1)
rack (1.6.9)
rack-livereload (0.3.17)
rack-livereload (0.3.16)
rack
rack-test (1.0.0)
rack-test (0.8.3)
rack (>= 1.0, < 3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
@ -153,7 +153,7 @@ PLATFORMS
ruby
DEPENDENCIES
middleman-hashicorp (= 0.3.34)
middleman-hashicorp (= 0.3.35)
BUNDLED WITH
1.16.1

2
website/Makefile
View File

@ -1,4 +1,4 @@
VERSION?="0.3.34"
VERSION?="0.3.35"
build:
@echo "==> Starting build in Docker..."

2
website/packer.json
View File

@ -9,7 +9,7 @@
"builders": [
{
"type": "docker",
"image": "hashicorp/middleman-hashicorp:0.3.28",
"image": "hashicorp/middleman-hashicorp:0.3.35",
"discard": "true",
"volumes": {
"{{ pwd }}": "/website"

2
website/source/docs/job-specification/reschedule.html.md
View File

@ -112,7 +112,7 @@ defaults by job type:
### Rescheduling during deployments
The [update stanza](docs/job-specification/update.html) controls rolling updates and canary deployments. A task
The [update stanza](/docs/job-specification/update.html) controls rolling updates and canary deployments. A task
group's reschedule stanza does not take affect during a deployment. For example, if a new version of the job
is rolled out and the deployment failed due to a failing allocation, Nomad will not reschedule it.

2
website/source/docs/operating-a-job/failure-handling-strategies/index.html.md
View File

@ -22,4 +22,4 @@ Please see one of the guides below or use the navigation on the left for details
1. [Local Restarts](/docs/operating-a-job/failure-handling-strategies/restart.html)
1. [Check Restarts](/docs/operating-a-job/failure-handling-strategies/check-restart.html)
1. [Rescheduling](/docs/operating-a-job/failure-handling-strategies/rescheduling.html)
1. [Rescheduling](/docs/operating-a-job/failure-handling-strategies/reschedule.html)

12
website/source/docs/upgrade/upgrade-specific.html.md
View File

@ -19,11 +19,13 @@ standard upgrade flow.
### Raft Protocol Version Compatibility
When upgrading to Nomad 0.8.0 from a version lower than 0.7.0, users will need to
set the [`-raft-protocol`](/docs/agent/options.html#_raft_protocol) option to 1 in
order to maintain backwards compatibility with the old servers during the upgrade.
After the servers have been migrated to version 0.8.0, `-raft-protocol` can be moved
up to 2 and the servers restarted to match the default.
When upgrading to Nomad 0.8.0 from a version lower than 0.7.0, users will need
to set the
[`raft_protocol`](/docs/agent/configuration/server.html#raft_protocol) option
in their `server` stanza to 1 in order to maintain backwards compatibility with
the old servers during the upgrade. After the servers have been migrated to
version 0.8.0, `raft_protocol` can be moved up to 2 and the servers restarted
to match the default.
The Raft protocol must be stepped up in this way; only adjacent version numbers are
compatible (for example, version 1 cannot talk to version 3). Here is a table of the

2
website/source/guides/ui.html.md
View File

@ -156,7 +156,7 @@ for pausing and playing log streaming, jumping to the head or tail of the log, a
[![Task Logs][img-task-logs]][img-task-logs]
~> **Note.** Only `stdout` and `stderr` are available in the UI. Any logs written to a file are available from the
~> CLI using the [`nomad alloc fs`]('/docs/commands/alloc/fs.html'), but filesystem access is not yet in the Web UI.
~> CLI using the [`nomad alloc fs`](/docs/commands/alloc/fs.html), but filesystem access is not yet in the Web UI.
## Reviewing Clients