Update master

_data/xcodes.yml

@@ -1,4 +1,63 @@
 osx_images:
+  - image: xcode12.2
+    xcode: "12.2"
+    osx_version: "10.15.7"
+    xcode_full_version: "12.2"
+    xcode_build_version: "12B5018i"
+    image_publish_date: 2020-10-06
+    sdks:
+      - iphoneos14.2
+      - iphonesimulator14.2
+      - macosx11.0
+      - appletvos14.2
+      - appletvsimulator14.2
+      - watchos7.1
+      - watchsimulator7.1
+    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 12.2
+      - iOS 12.4
+      - iOS 13.0
+      - iOS 13.1
+      - iOS 13.2
+      - iOS 13.3
+      - iOS 13.4
+      - iOS 13.5
+      - iOS 14.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 12.2
+      - tvOS 12.4
+      - tvOS 13.0
+      - tvOS 13.2
+      - tvOS 13.3
+      - tvOS 13.4
+      - tvOS 14.0      
+      - watchOS 3.2
+      - watchOS 4.0
+      - watchOS 4.1
+      - watchOS 4.2
+      - watchOS 5.0 
+      - watchOS 5.1
+      - watchOS 5.2
+      - watchOS 5.3
+      - watchOS 6.1
+      - watchOS 6.2
+      - watchOS 7.0  
+    jdk: "14.0.2"
   - image: xcode12u 
     xcode: "12 (Universal)"
     osx_version: "10.15.5"
@@ -15,14 +74,14 @@ osx_images:
     jdk: "14.0.1"  
   - image: xcode12
     xcode: "12"
-    osx_version: "10.15.5"
-    xcode_full_version: "12.0"
-    xcode_build_version: "12A8189h"
-    image_publish_date: 2020-08-24
+    osx_version: "10.15.7"
+    xcode_full_version: "12.0.1"
+    xcode_build_version: "12A7300"
+    image_publish_date: 2020-10-06
     sdks:
       - iphoneos14.0
       - iphonesimulator14.0
-      - macosx11.0
+      - macosx10.15
       - appletvos14.0
       - appletvsimulator14.0
       - watchos7

_includes/deploy/providers/ecr.md

@@ -0,0 +1,45 @@
+{% unless include.minimal == false %}
+For a minimal configuration, add the following to your `.travis.yml`:
+
+```yaml
+deploy:
+  provider: ecr
+  access_key_id: <encrypted access_key_id>
+  secret_access_key: <encrypted secret_access_key>
+  source: <source>
+  target: <target>
+  edge: true # opt in to dpl v2
+```
+{: data-file=".travis.yml"}
+
+
+
+{{ include.content }}
+{% endunless %}
+
+## Status
+
+Support for deployments to AWS ECR is in **alpha**. Please see [Maturity Levels](/user/deployment-v2#maturity-levels) for details.
+## Known options
+
+Use the following options to further configure the deployment.
+
+| `access_key_id` | AWS access key &mdash; **required**, **secret**, type: string |
+| `secret_access_key` | AWS secret access key &mdash; **required**, **secret**, type: string |
+| `account_id` | AWS Account ID &mdash; type: string, note: Required if the repository is owned by a different account than the IAM user |
+| `source` | Image to push &mdash; **required**, type: string, note: can be the id or the name and optional tag (e.g. mysql:5.6) |
+| `target` | Comma separated list of partial repository names to push to &mdash; **required**, type: string |
+| `region` | Comma separated list of regions to push to &mdash; type: string, default: `us-east-1` |
+
+### Shared options
+
+| `cleanup` | Clean up build artifacts from the Git working directory before the deployment &mdash; type: boolean |
+| `run` | Commands to execute after the deployment finished successfully &mdash; type: string or array of strings |
+
+## Environment variables
+
+All options can be given as environment variables if prefixed with `AWS_`.
+
+For example, `access_key_id` can be given as `AWS_ACCESS_KEY_ID=<access_key_id>`.
+
+{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %}

_includes/sidebar.html

@@ -135,6 +135,12 @@ <h3>Developer Program</h3>
         <li><a href="/user/triggering-builds/">Triggering Builds with API V3</a></li>
         <li><a href="https://github.com/travis-ci/travis#ruby-library">The Ruby Library</a></li>
       </ul>
+
+      <h3>Hosted Billing</h3>
+      <ul>
+        <li class="is-overview"><a href="/user/billing-overview/">Overview</a></li>
+        <li><a href="/user/billing-faq/">FAQ</a></li>
+      </ul>
 
       <h3>Travis CI Enterprise</h3>
       <ul>

user/billing-faq.md

@@ -0,0 +1,98 @@
+---
+title: Billing FAQ
+layout: en
+permalink: /user/billing-faq/
+
+---
+
+> Please see our **[Billing overview](/user/billing-overview/)** first.
+
+## How can I get on an annual plan? 
+
+The annual based plans are available by contacting the Travis CI support team. 
+
+
+## How can I get on the usage based plan?
+
+The usage based plan is available by contacting theTravis CI support team. 
+
+## How are the credits deducted?
+
+The credits will be deducted from the credits pool after each build job is executed depending on the operation system used.
+
+## How  can I check how much I will pay for user licenses at the end of the month?
+
+The unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates in a selected plan.
+
+By default Travis CI system provides the possibility to trigger a build to all members of your team on GitHub, Bitbucket, GitLab and Assembla who have writing rights on repositories.
+If the team member has not triggered the build during the billing period Travis CI will not charge you for that user.
+
+
+To check how much active users you got during the last billing cycle please contact the support.
+Travis CI is working on the user management functionality where you will be able:
+
+* To see how many users has rights to trigger the build
+* To see how many was active/trigger the build during the last month
+* Select the users who are able to trigger the build 
+
+## What if I am building open source?
+
+Each of the Travis CI Plans can have an amount of special OSS credits per month assigned to run builds only on public repositories. To find out more about it please contact the Travis CI support team. 
+
+
+## How do I use credits?
+
+You can use your credits to run builds on your public and private repositories.
+You may have been assigned an amount of OSS credits to run builds on public repositories. When you run out of OSS credits but want to keep building on public repositories you can go to the Plan page and turn the Credits consumption for OSS switcher to `On`. In this case,  once the ‘OSS credits’ pool is depleted, the system starts deducting from the ‘paid credits’ pool. Builds for OSS repositories will be allowed to start, and deducted from the paid credits. 
+
+## How do I recharge my credits balance?
+
+You can buy additional build credits anytime you need them by clicking on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and  press the ‘Buy add-ons’ button.
+Please be advised that it is not possible to buy additional credits on Free Plan. 
+
+
+## Do credits expire?
+
+No, the credits you purchased do not expire. 
+
+## Can you send me an invoice?
+
+The invoice is sent automatically by the Travis CI system after the Plan purchase or subsequent user license charge is made. 
+
+
+## Can I get a refund?
+
+Upon cancellation of your account or switching back to the Free Plan, you can request a refund under the following conditions:
+
+* You haven’t used any paid credits
+* Request made up to and including 14 days after the billing date: applicable for full refund
+
+Contact our support team at [email protected] Specify the GitHub/Bitbucket/GitLab/Assembla handle of the account for which you’re requesting a refund, and send us a copy of your payment and/or invoice.
+
+
+## How do I cancel my paid plan?
+
+If you want to cancel your paid plan, click on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and  press the ‘Change Plan’ button and choose the Free Plan.
+Travis CI Free plan will provide you with 10,000 build credits to try it out for public and private repositories builds and unlimited number of users with no charge.
+If you want your account to be deleted, please contact the Travis CI support.  
+
+
+## Do these prices include tax?
+
+No, all prices do not include tax. 
+
+## Can I sign up for automatic renewals for usage based plan?
+
+The per-seats licence invoice will be charged and sent automatically after each month you use the Travis CI service, based on the maximum number of unique users who triggered the build during the given month. 
+Unfortunately, right now it is not possible to configure automatic renewals for build credits. You need to manually buy credits each time you are about to run out of them. We intend to make it more convenient in the near future.
+To help you track the build credit consumption Travis CI system will send the notification emails each time your credit balance is used up by 50, 75 and 100%.
+
+## Are add-ons limited to a certain number of users?
+
+You can buy additional add-ons any time you feel it is needed. You and your organization’s members can use the bought add-ons with no limitations.
+
+## Why my credits balance is negative?
+
+Most probably your last build costed more than you had available in your credit balance. You won't be able to run any builds until your balance gets positive. Replenish your credits (the negative balance will be deducted upon arrival of new credits creating new balance - see our [billing overview](/user/billing-overview/#negative-credits).
+
+