Merge branch 'master' into jammy-docs

Author: stan-travis

_data/snippets.yml

@@ -30,6 +30,8 @@ all_note: |
   >  * [Trusty](/user/reference/trusty/)
   >  * [Xenial](/user/reference/xenial/)
   >  * [Bionic](/user/reference/bionic/)
+  >  * [Focal](/user/reference/focal/)
+  >  * [Jammy](/user/reference/jammy/)
   >  * [macOS](/user/reference/osx/)
   >  * [Windows](/user/reference/windows/)
   >  * [FreeBSD](/user/reference/freebsd/)
@@ -40,6 +42,8 @@ unix_note: |
   >  * [Trusty](/user/reference/trusty/)
   >  * [Xenial](/user/reference/xenial/)
   >  * [Bionic](/user/reference/bionic/)
+  >  * [Focal](/user/reference/focal/)
+  >  * [Jammy](/user/reference/jammy/)
   >  * [macOS](/user/reference/osx/)
   >  * [FreeBSD](/user/reference/freebsd/)
 linux_note: |
@@ -49,13 +53,17 @@ linux_note: |
   >  * [Trusty](/user/reference/trusty/)
   >  * [Xenial](/user/reference/xenial/)
   >  * [Bionic](/user/reference/bionic/)
+  >  * [Focal](/user/reference/focal/)
+  >  * [Jammy](/user/reference/jammy/)
 linux_windows_note: |
   > For Language versions and other build-environment specific
   > information visit our reference pages:
   >  * [Precise](/user/reference/precise/)
   >  * [Trusty](/user/reference/trusty/)
   >  * [Xenial](/user/reference/xenial/)
   >  * [Bionic](/user/reference/bionic/)
+  >  * [Focal](/user/reference/focal/)
+  >  * [Jammy](/user/reference/jammy/)
   >  * [Windows](/user/reference/windows/)
   >  * [FreeBSD](/user/reference/freebsd/)
 concurrent_jobs: |

user/database-setup.md

@@ -55,9 +55,9 @@ and a blank password.
 > `root` user does.
 
 
-|       | Ubuntu Precise | Ubuntu Trusty | Ubuntu Xenial | Ubuntu Bionic |
-|:------|:---------------|:--------------|:--------------|:--------------|
-|  MySQL | 5.5.x          | 5.6.x         | 5.7.x        | 5.7.x         |
+|       | Ubuntu Precise | Ubuntu Trusty | Ubuntu Xenial | Ubuntu Bionic | Ubuntu Focal  | Ubuntu Jammy  |
+|:------|:---------------|:--------------|:--------------|:--------------|:--------------|:--------------|
+|  MySQL | 5.5.x          | 5.6.x         | 5.7.x        | 5.7.x         | 8.0.x         | 8.0.x         |
 
 You can also [install MySQL 5.7](#mysql-57) on Ubuntu Trusty.
 

user/languages/python.md

@@ -104,7 +104,7 @@ python:
   - "3.8"
   # PyPy versions
   - "pypy"   # currently Python 2.7.13, PyPy 7.1.1
-  - "pypy3"  # currently Python 3.6.1,  PyPy 7.1.1-beta0
+  - "pypy3"  # currently Python 3.6.9,  PyPy 7.3.1
 # command to install dependencies
 install:
   - pip install -r requirements.txt

user/travis-ci-vcs-proxy-get-started.md

@@ -22,6 +22,7 @@ After you sign up to Travis CI using Travis CI VCS Proxy, we will review the acc
 To get started with Travis CI VCS Proxy, first, you will need:
 
 1. An organization with at least one repository assigned in TCI VCS Proxy. 
+
 2. To configure the repository with the appropriate credentials in TCI VCS Proxy, in particular tokens.
 
 For more information read the [Setting up Travis CI VCS Proxy](/user/travis-ci-vcs-proxy/).
@@ -59,7 +60,7 @@ The following example specifies a Ruby project built with Ruby 2.2 and the lates
 
 The defaults for Ruby projects are a `bundle install` to [install dependencies](/user/job-lifecycle/#customizing-the-installation-phase), and `rake` to build the project.
 
-6. Add the `.travis.yml` file to repository, commit to the repository to trigger a Travis CI build:
+7. Add the `.travis.yml` file to repository, commit to the repository to trigger a Travis CI build:
 
    > Travis only runs builds on the commits you push *after* you've added a `.travis.yml` file.
 
@@ -78,7 +79,7 @@ Perforce depot/repository may be very heavy, so downloading it fully for build (
    {: data-file=".travis.yml"}
 
 
-Perforce and SVN builds during Closed Beta are **available only for Linux Ubuntu, Bionic Beaver and Focal Fossa** build environments. In order to use these, following tags must be used in the `.travis.yml`:
+Perforce and SVN builds during Closed Beta are **available only for Linux Ubuntu, Bionic Beaver and Focal Fossa** and standard amd64 CPU architecture build environments. In order to use these, following tags must be used in the `.travis.yml`:
 
    ```yaml
    dist: bionic