Merge branch 'master' into patch-1

Author: plaindocs

.ruby-version

@@ -1 +1 @@
-2.4.3
+ruby-2.6.3

.travis.yml

@@ -37,8 +37,7 @@ notifications:
   webhooks:
     https://docs.travis-ci.com/update_webhook_payload_doc
 install:
-  - rvm use 2.4.3 --install
-  - gem install bundler -v '< 2'
+  - rvm use 2.6.3 --install
   - bundle install --deployment
   - sudo apt-get install libcurl4-openssl-dev # required to avoid SSL errors
 script:

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.4.3'
+ruby '2.6.3'
 
 gem 'faraday'
 gem 'html-proofer', '~> 3.0'
@@ -27,8 +27,9 @@ gem "middleman-syntax"
 gem 'middleman-gh-pages'
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.3.0"
+gem "middleman-livereload"
 
+# Needed for Slate / middleman
 gem 'redcarpet'
 
 # Cross-templating language block fix for Ruby 1.8

Gemfile.lock

@@ -237,7 +237,7 @@ DEPENDENCIES
   jekyll-redirect-from
   middleman
   middleman-gh-pages
-  middleman-livereload (~> 3.3.0)
+  middleman-livereload
   middleman-syntax
   pry
   puma
@@ -251,7 +251,7 @@ DEPENDENCIES
   therubyracer
 
 RUBY VERSION
-   ruby 2.4.3p205
+   ruby 2.6.3p62
 
 BUNDLED WITH
    1.17.3

STYLE.md

@@ -12,6 +12,8 @@ We'll be using a subset (TBD) of the full [list of checks][checks].
 
 [checks]: https://github.com/coala/bear-docs/blob/master/docs/MarkdownBear.rst#settings "MarkdownBear checks"
 
+We use Kramdown, with [GFM](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) codeblocks, and a few Kramdown related exceptions introduced with `{: }` such as class names for specific formatting of columns and notes.
+
 ### Headings
 
 For historical reasons, the top level heading in Jekyll markdown files is level 2 (##) not level 1 (#).
@@ -49,15 +51,19 @@ All pages have tables of contents generated automatically from H2 and H3
 
 To remove the TOC from a page add `no_toc: true` to the frontmatter.
 
-### Beta features
+### Note, warnings and blocks
+
+We use the blockquote symbol `>` for general purpose notes and warnings.
+
+#### Beta features
 
 Mark all beta features with a specially formatted note. Both the `> BETA` and
 the `{: .beta}` are required.
 
 > BETA Awesome new feature that might not be enabled and is subject to change.
 {: .beta}
 
-### Alpha features
+#### Alpha features
 
 Mark all alpha features with a specially formatted note. Both the `> ALPHA` and
 the `{: alpha}` are required.

_data/xcodes.yml

@@ -1,4 +1,45 @@
 osx_images:
+  - image: xcode11
+    xcode: "11.0"
+    osx_version: "10.14"
+    xcode_full_version: "11.0"
+    xcode_build_version: "11M362v"
+    image_publish_date: 2019-07-05
+    sdks:
+      - iphoneos13.0
+      - iphonesimulator13.0
+      - macosx10.15
+      - appletvos13.0
+      - appletvsimulator13.0
+      - watchos6.0
+      - watchsimulator6.0
+    simulators:
+      - iOS 10.3
+      - iOS 11.0
+      - iOS 11.1
+      - iOS 11.2
+      - iOS 11.3
+      - iOS 11.4
+      - iOS 12.0
+      - iOS 12.1
+      - iOS 13.0
+      - tvOS 10.2 
+      - tvOS 11.0
+      - tvOS 11.1
+      - tvOS 11.2
+      - tvOS 11.3
+      - tvOS 11.4
+      - tvOS 12.0
+      - tvOS 12.1
+      - tvOS 13.0
+      - watchOS 3.2
+      - watchOS 4.0
+      - watchOS 4.1
+      - watchOS 4.2
+      - watchOS 5.0 
+      - watchOS 5.1
+      - watchOS 6.0
+    jdk: "12.0.1"
   - image: xcode10.2
     xcode: "10.2"
     osx_version: "10.14"

user/database-setup.md

@@ -357,7 +357,7 @@ before_script:
 
 ## RabbitMQ
 
-RabbitMQ requires `setuid` flags, so you can only run RabbitMQ on macOS or Ubuntu Trusty infrastructure.
+RabbitMQ requires `setuid` flags, so you can only run RabbitMQ as a service on macOS or Ubuntu Trusty infrastructure.
 
 Start RabbitMQ in your `.travis.yml`:
 
@@ -375,6 +375,14 @@ RabbitMQ uses the default configuration:
 
 You can set up more vhosts and roles in the `before_script` section of your `.travis.yml`.
 
+RabbitMQ [can be launched](https://docs.travis-ci.com/user/reference/xenial/#third-party-apt-repositories-removed) on Ubuntu Xenial using the APT addon in `.travis.yml`:
+```yaml
+addons:
+  apt:
+    packages:
+    - rabbitmq-server 
+```
+
 ## Riak
 
 > Riak is only available in the [Ubuntu Trusty environment](/user/reference/trusty/).

user/deployment/releases.md

@@ -60,8 +60,12 @@ This gives you an opportunity to examine and edit the draft release.
 
 ## Setting the tag at deployment time
 
-GitHub Releases needs a tag at the deployment time.
-While `on.tags: true` guarantees this, you can postpone setting the tag until
+GitHub Releases needs the present commit to be tagged at the deployment time.
+If you set `on.tags: true`, the commit is guaranteed to have a tag. 
+
+Depending on the workflow, however, this is not desirable.
+
+In such cases, it is possible to postpone setting the tag until
 you have all the information you need.
 A natural place to do this is `before_deploy`.
 For example:

user/encryption-keys.md

@@ -36,10 +36,10 @@ Then, you can use `encrypt` command to encrypt data (This example assumes you ar
 travis encrypt SOMEVAR="secretvalue"
 ```
 
-Or, if you are using [travis-ci.com](https://travis-ci.com), you will need to add `--com` to the CLI:
+Or, if you are using [travis-ci.com](https://travis-ci.com), you will need to add `--pro` to the CLI:
 
 ```bash
-travis encrypt --com SOMEVAR="secretvalue"
+travis encrypt --pro SOMEVAR="secretvalue"
 ```
 
 This will output a string looking something like:

user/languages/minimal-and-generic.md

@@ -6,7 +6,7 @@ layout: en
 
 ## What This Guide Covers
 
-Travis CI supports many popular programming languages, but can never hope to support them all. `language: minimal` and `language: generic` are images available in Ubuntu Xenial `dist: xenial`and Ubuntu Trusty `dist:trusty`, that are not tailored to any particular programming language. As their names suggest, one is optimized be faster and use less disk space, the other to have more languages and services available.
+Travis CI supports many popular programming languages, but can never hope to support them all. `language: minimal` and `language: generic` are images available in Ubuntu Xenial `dist: xenial`and Ubuntu Trusty `dist:trusty`, that are not tailored to any particular programming language. As their names suggest, one is optimized to be faster and use less disk space, the other to have more languages and services available.
 
 > Note that `language: minimal` is not the same as omitting the `language` key, if you do that the default language is set to Ruby.
 

user/sonarcloud.md

@@ -64,10 +64,14 @@ addons:
       secure: "*********" # encrypted value of your token
 script:
   # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis
-  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar
+  - mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=myorg_myrepo
 ```
 {: data-file=".travis.yml"}
 
+> Please note the following:
+- the "coverage" profile activates the generation of the JaCoCo XML report
+- "sonar.projectKey" can also be set as a property on the main POM file. Its value can be found on the right side of the project homepage on SonarCloud
+
 Please take a look at the [live Maven-based example project](https://github.com/SonarSource/sq-com_example_java-maven-travis) to know more about this use case.
 
 ## Analysis of internal pull requests