Merge branch 'master' into jammy-docs

Author: stan-travis

user/enterprise/tcie-3.x-overview.md

@@ -8,9 +8,9 @@ Travis CI Enterprise 3.x is a major release of Travis CI Enterprise line. It int
 ## Main features
 
 * High feature parity between Travis CI Enterprise 3.x and travis-ci.com, including (but not only):
-  * Updated User Interface: user profile settings and repository specific settings, incl. environmental variables, custom keys and security settings
+  * Updated User Interface: user profile settings and repository specific settings, incl. environmental variables, custom SSH keys for repository access and security settings
   * Updated User Interface notifications and build/build job information
-  * Updated build configuration service, including ability to [import shared build configuration](/user/build-config-imports) to your .travis.yml, even from other repositories
+  * Updated build configuration service, including ability to [import shared build configuration](/user/build-config-imports) to your .travis.yml, even from other repositories (which may come in handy when structuring complex build definitions or e.g. importing secrets shared accross repositories)
   * [Build configuration validator](/user/build-config-validation) hinting you on what may be wrong with .travis.yml for your builds 
   * Multiple integrations with Version Control systems: 
     * GitHub Cloud

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

@@ -45,7 +45,7 @@ When you do it for the first time, a Travis CI VCS Proxy page will pop-up with a
 5. Please select a Trial Plan or wait for us to assign special Beta Plan to your account and/or organization(s). In Travis CI each individual User account and each Organization entity must have a separate plans assigned.
 > *Please note:* If assigning a plan doesn't remove automatically the insufficient user license/lack of credits error message in your Travis CI Beta application screen, please refresh your browser window manually (Ctrl/Cmd + F5).
 
-6. Add a `.travis.yml` file to your repository to tell Travis CI what to do.
+6. Create a `.travis.yml` file to tell Travis CI what to do.
 
 The following example specifies a Ruby project built with Ruby 2.2 and the latest versions of JRuby.
 
@@ -62,7 +62,7 @@ The defaults for Ruby projects are a `bundle install` to [install dependencies](
 
 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.
+   > Travis only runs builds on the commits you push *after* you've added a `.travis.yml` file. As of now, only commits performed by the TCI VCS Proxy users with correct P4/SVN credentials may trigger automatic builds in the Travis CI.
 
  **IMPORTANT**
 

user/travis-ci-vcs-proxy.md

@@ -81,10 +81,10 @@ The next step is to add a repository to your Organization. Use the `Add Reposito
     1. First, navigate to your selected SVN Repository, and select the `Source` option.
     2. On the right-hand menu, use the `Checkout` option, **select 'SSH'** and note down both the `REPO_NAME` and the `svn+ssh://` link. You will need these in TCI VS Proxy.
     3. Navigate to your SVN Repository `Settings` option, and select the `Deploy SSH keys` option - add here the **public** key you intend to use with TCI VCS Proxy and Travis CI (or copy an already added one if you wish to). Please refer to [Assembla - using SVN+SSH protocol](https://articles.assembla.com/en/articles/1137042-using-svn-ssh-protocol) for more details.
-        - **Please note**: for the integration with Travis CI VCS Proxy you will need a key with no passphrase generated, e.g. via `ssh-keygen -t rsa -f test_key_with_no_passphrase -N ""` due to Travis CI VCS Proxy conciously not wanting to store your SSH key passwords for automated connection
+        - **Please note**: for the integration with Travis CI VCS Proxy you will need a key in PEM format with no passphrase generated, e.g. via `ssh-keygen -t rsa -f test_key_with_no_passphrase -N "" -m PEM` due to Travis CI VCS Proxy conciously not wanting to store your SSH key passwords for automated connection
         - **Please note**: When pasting a public SSH Key in Assembla Repository settings, make sure it has 'write access' checked in order to make the integration with TCI VCS Proxy work. This is current Assembla requirement for authorizing the connection. Neither Travis CI VCS Proxy nor Travis CI requires write access to your repositories - only read access is needed to set up Travis CI VCS Proxy and trigger builds in Travis CI.
     4. Next, navigate to your SVN Repository `Settings` option, and select `Travis VCS Proxy integration` - enter the same listener token previously defined in your TCI VCS Proxy Organization.
-2. In **TCI VCS Proxy** (from the `Add Repository` view):
+2. In **TCI VCS Proxy** (from the `Add Repository` view, `Checkout` -> `SSH` ):
     1. First, select TCI VCS Proxy Organization.
     2. In the `Name` field - paste the REPO_NAME copied from Assembla.
     3. In the `URL` field - paste the **svn+ssh://** url copied from Assembla.
@@ -183,7 +183,7 @@ Upon synchronizing of TCI VCS Proxy organization with Travis CI, a `member` beco
 | SVN             | first user adding repository to TCI VCS Proxy organization | all subsequent users adding repository (write-access can commit and trigger a build) | N/A |
 
 
-The builds in Travis CI are executed based on the personal access credentials for each account configured in TCI VCS Proxy. Thus, only commits performed by the TCI VCS Proxy users with correct P4/SVn credentials may trigger automatic builds in the Travis CI.
+The builds in Travis CI are executed based on the personal access credentials for each account configured in TCI VCS Proxy. Thus, as of now, **only commits performed by the TCI VCS Proxy users with correct P4/SVN credentials may trigger automatic builds in the Travis CI**.
 
 ## TCI VCS Proxy listener tokens