Merge remote-tracking branch 'remotes/upstream/master' into next

docs/rationale.md

@@ -187,7 +187,7 @@ This practice is also common in [standard] which uses a semicolon-free style.
 
 The [`--print-width`](options.md#print-width) is more of a guideline to Prettier than a hard rule. It generally means “try to make lines this long, go shorter if needed and longer in special cases.”
 
-There are some edge cases, such as really long string literals, regexps, comments and variable names, which cannot be broken across lines (without using code transforms which [Prettier doesn’t do](#what-prettier-is-not-concerned-about)). Or if you nest your code 50 levels deep your lines are of course going to be mostly indentation :)
+There are some edge cases, such as really long string literals, regexps, comments and variable names, which cannot be broken across lines (without using code transforms which [Prettier doesn’t do](#what-prettier-is-_not_-concerned-about)). Or if you nest your code 50 levels deep your lines are of course going to be mostly indentation :)
 
 Apart from that, there are a few cases where Prettier intentionally exceeds the print width.
 

scripts/release/package.json

@@ -4,7 +4,7 @@
     "chalk": "2.4.1",
     "dedent": "0.7.0",
     "execa": "0.10.0",
-    "minimist": "1.2.0",
+    "minimist": "1.2.2",
     "node-fetch": "2.1.2",
     "semver": "5.5.0",
     "string-width": "2.1.1"

scripts/release/yarn.lock

@@ -80,9 +80,9 @@ isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
-minimist@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+minimist@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
 
 nice-try@^1.0.4:
   version "1.0.4"

website/data/users.yml

@@ -236,3 +236,6 @@
 - caption: Estalee
   image: /images/users/estalee.svg
   infoLink: https://estalee.com/
+- caption: SwissDev DevOps Jobs
+  image: /images/users/swissdev-devops-jobs-200-100.png
+  infoLink: https://swissdevjobs.ch/jobs/Dev-Ops/All

website/versioned_docs/version-stable/rationale.md

@@ -188,7 +188,7 @@ This practice is also common in [standard] which uses a semicolon-free style.
 
 The [`--print-width`](options.md#print-width) is more of a guideline to Prettier than a hard rule. It generally means “try to make lines this long, go shorter if needed and longer in special cases.”
 
-There are some edge cases, such as really long string literals, regexps, comments and variable names, which cannot be broken across lines (without using code transforms which [Prettier doesn’t do](#what-prettier-is-not-concerned-about)). Or if you nest your code 50 levels deep your lines are of course going to be mostly indentation :)
+There are some edge cases, such as really long string literals, regexps, comments and variable names, which cannot be broken across lines (without using code transforms which [Prettier doesn’t do](#what-prettier-is-_not_-concerned-about)). Or if you nest your code 50 levels deep your lines are of course going to be mostly indentation :)
 
 Apart from that, there are a few cases where Prettier intentionally exceeds the print width.