Merge pull request #5768 from github/repo-sync

repo sync

Author: Octomerger

content/admin/configuration/command-line-utilities.md

@@ -642,14 +642,14 @@ git-import-svn-raw
 
 #### git-import-tfs-raw
 
-This utility imports from Team Foundation Version Control. For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
+This utility imports from Team Foundation Version Control (TFVC). For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
 ```shell
 git-import-tfs-raw
 ```
 
 #### git-import-rewrite
 
-This utility rewrites the imported repository. This gives you a chance to rename authors and, for Subversion and TFS, produces Git branches based on folders. For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
+This utility rewrites the imported repository. This gives you a chance to rename authors and, for Subversion and TFVC, produces Git branches based on folders. For more information, see "[Importing data from third party version control systems](/enterprise/admin/guides/migrations/importing-data-from-third-party-version-control-systems/)."
 ```shell
 git-import-rewrite
 ```

content/github/importing-your-projects-to-github/about-github-importer.md

@@ -1,6 +1,6 @@
 ---
 title: About GitHub Importer
-intro: 'If you have source code in Subversion, Mercurial, Team Foundation Server, or another Git repository, you can move it to GitHub using GitHub Importer.'
+intro: 'If you have source code in Subversion, Mercurial, Team Foundation Version Control (TFVC), or another Git repository, you can move it to GitHub using GitHub Importer.'
 redirect_from:
   - /articles/about-github-importer
 versions:
@@ -13,7 +13,7 @@ GitHub Importer is a tool that quickly imports source code repositories, includi
 
 During an import, depending on the version control system you're importing from, you can authenticate with your remote repository, update commit author attribution, and import repositories with large files (or remove large files if you don't want to use Git Large File Storage).
 
-| Import action | Subversion | Mercurial | Team Foundation Server | Git |
+| Import action | Subversion | Mercurial | TFVC | Git |
 |:--------------|:----------:|:---------:|:----------------------:|:---:|
 | Authenticate with remote repository | **X** | **X** | **X** | **X** |
 | [Update commit author attribution](/articles/updating-commit-author-attribution-with-github-importer) | **X** | **X** | **X** | |

content/github/importing-your-projects-to-github/source-code-migration-tools.md

@@ -12,7 +12,7 @@ versions:
 
 {% if currentVersion == "free-pro-team@latest" %}
 
-We recommend using [GitHub Importer](/articles/about-github-importer) to import projects from Subversion, Mercurial, Team Foundation Server, or another Git repository. You can also use these external tools to convert your project to Git.
+We recommend using [GitHub Importer](/articles/about-github-importer) to import projects from Subversion, Mercurial, Team Foundation Version Control (TFVC), or another Git repository. You can also use these external tools to convert your project to Git.
 
 {% endif %}
 
@@ -32,12 +32,9 @@ We recommend these tools for converting Subversion repositories to Git:
 
 We recommend [hg-fast-export](https://github.com/frej/fast-export) for converting Mercurial repositories to Git.
 
-### Importing from Team Foundation Server
+### Importing from TFVC
 
-We recommend these tools for moving changes between Team Foundation Server and Git:
-
-- [git-tfs](https://github.com/git-tfs/git-tfs)
-- [Git-TF](https://gittf.codeplex.com/)
+We recommend [git-tfs](https://github.com/git-tfs/git-tfs) for moving changes between TFVC and Git.
 
 {% tip %}
 

data/glossaries/internal.yml

@@ -53,6 +53,12 @@
   description: Amazon Web Services. A secure cloud services platform.
 - term: Azure
   description: A Microsoft cloud-computing platform.
+- term: Azure DevOps
+  description: >-
+    A Microsoft product offering source code hosting, issues, CI/CD
+    pipelines, and other developer services. The on-premises version
+    was formerly known as Team Foundation Server. The cloud-hosted
+    version was formerly known as Visual Studio Team Services.
 - term: bare repository
   description: >-
     A bare repository is normally an appropriately named directory with a .git
@@ -600,8 +606,8 @@
     which case it is called a "signed tag object".
 - term: Team Foundation Server
   description: >-
-    A Microsoft product that provides source code management and other team
-    services.
+    The former name of a Microsoft product that provides source code management and other team
+    services. Now known as Azure DevOps Server.
 - term: Textile
   description: >-
     A lightweight markup language that uses a text formatting syntax to convert

data/variables/migrations.yml

@@ -4,6 +4,6 @@ organization_migrations_intro: >-
   The organization migrations API lets you move a repository from GitHub to {% data variables.product.prodname_ghe_server %}.
 source_imports_intro: >-
   The Source Import API lets you start an import from a Git, Subversion,
-  Mercurial, or Team Foundation Server source repository. This is the same
+  Mercurial, or Team Foundation Version Control source repository. This is the same
   functionality as the {% data variables.product.prodname_dotcom %}
   Importer. For more information, see "[Importing a repository with {% data variables.product.prodname_dotcom %} Importer](/github/importing-your-projects-to-github/importing-a-repository-with-github-importer)."