Merge pull request #9560 from tknippenberg/SOLP-3139

On-premises Git screenshot update + Subversion removal

Author: MariaShaposhnikova

content/en/docs/refguide/version-control/on-premises-git.md

@@ -42,7 +42,7 @@ With most providers, HTTP basic authentication takes the form of using of person
 
 To use PAT (or another equivalent), you need to specify it in the **Password** field when Studio Pro requests credentials for the version control server:
 
-{{< figure src="/attachments/refguide/version-control/on-premises-git/sign-in-dialog.png" alt="Sign In dialog" class="no-border" >}}
+{{< figure src="/attachments/refguide/version-control/on-premises-git/sign-in-dialog.png" alt="Sign In dialog" class="no-border"  width="600">}}
 
 {{% alert color="info" %}}When using a PAT for the Mendix platform, fill in your email in the **Username** field. For more information on how to create a PAT for the Mendix platform, see the [Personal Access Tokens](/community-tools/mendix-profile/user-settings/#pat) section in *User Settings*.{{% /alert %}}
 
@@ -88,15 +88,15 @@ To interact with this private repository from Studio Pro, you need a link to the
 
 To use on-premise Git, you need to configure name and email values that will be used to identify your commit in Studio Pro by navigating to **Edit** > **Preferences** > **Version Control**:
 
-{{< figure src="/attachments/refguide/version-control/on-premises-git/preferences-git.png" alt="Preferences dialog" class="no-border" >}}
+{{< figure src="/attachments/refguide/version-control/on-premises-git/preferences-git.png" alt="Preferences dialog" class="no-border" width="800" >}}
 
 Studio Pro now is set up to support Git.
 
 ### Creating an App {#create-app}
 
 Create an unversioned app in Studio Pro:
 
-{{< figure src="/attachments/refguide/version-control/on-premises-git/app-settings.png" alt="App Settings dialog" class="no-border" >}}
+{{< figure src="/attachments/refguide/version-control/on-premises-git/app-settings.png" alt="App Settings dialog" class="no-border" width="600">}}
 
 Once the app is created, you can upload it to your private Git repository. For more information on how to upload it, see the [Uploading to the Private Git Server](#upload-to-private-git-server) section below.
 
@@ -116,7 +116,7 @@ Now that you have a Git app on your server, you can download it to another direc
 1. Click **OK**. 
 1. In the **Sign In** dialog box, enter your credentials:
 
-    {{< figure src="/attachments/refguide/version-control/on-premises-git/sign-in-dialog.png" alt="Sign In dialog" class="no-border" >}}
+    {{< figure src="/attachments/refguide/version-control/on-premises-git/sign-in-dialog.png" alt="Sign In dialog" class="no-border" width="600">}}
 
 1. Enter username (it can be anything except empty) and use PAT from your Git provider you created earlier as the password. 
 
@@ -148,9 +148,7 @@ For the previous checkout method do the following:
 1. Open from previous checkout.
 2. Enable the **Private server** radio button and enter the link to the repository. 
 3. Click **Connect**. 
-4. If you have checked out the app at least once, you can then pick one of the existing locations on disk and the app will open (shown here with two previous checkouts):
-
-    {{< figure src="/attachments/refguide/version-control/on-premises-git/open-app-dialog.png" alt="Open App dialog" class="no-border" >}}
+4. If you have checked out the app at least once, you can then pick one of the existing locations on disk and the app will open.
 
 For the previous local disk method do the following:
 
@@ -169,28 +167,34 @@ The repository has to be completely empty (this includes the `README.md` and `.g
 
 To upload your app, do the following:
 
-1. Open the app in Studio Pro and go to **Version Control > Upload to Version Control Server**:
-
-    {{< figure src="/attachments/refguide/version-control/on-premises-git/upload-to-vc-menu.png" alt="Upload to Version Control Server Menu" class="no-border" >}}
-
+1. Open the app in Studio Pro and go to **Version Control** > **Upload to Version Control Server**.
 2. In the **Upload to Version Control Server** dialog box, select **Private server**. 
-3. Select **Git** as the private server type (if you have both **Subversion** and **Git** enabled in the **Preferences Form**). 
-4. Enter the link to the repository you want to upload this app to and click **OK**:
+3. Enter the link to the repository you want to upload this app to and click **OK**:
 
     {{< figure src="/attachments/refguide/version-control/on-premises-git/upload-to-vc-server.png" alt="Upload to Version Control Server dialog" class="no-border" >}}
     It might ask you to sign into the server, depending on whether you have previously signed in and choose to stay logged in.
-5. You can see the upload process in the **Upload Project to Team Server** pop-up window.
+4. You can see the upload process in the **Upload Project to Team Server** pop-up window.
 
 The app is uploaded successfully. You can check on your private server and see that the app is now on the selected repository:
 
 {{< figure src="/attachments/refguide/version-control/on-premises-git/project-uploaded-confirmation.png" alt="App Uploaded confirmation window" class="no-border" >}}
 
-### Moving a Subversion App to Git
+### Moving an Existing Versioned App to Private Git
+
+If you already have an existing versioned app that you would like to upload to your Git private server, you can fully migrate the history or start with a fresh repository.
+
+#### Retaining History
+
+To migrate a repository from one Git server to another private Git server, follow your new Git provider's documentation for transferring a complete repository clone to their platform.
+
+After migration, download a fresh clone in Studio Pro from your private Git server.
+
+{{% alert color="warning" %}} After migrating from Mendix Team Server, to link an existing folder to a new repository and avoid errors in Studio Pro, remove the `sprintr-project-id` setting from the *.git/config* file in your local repository clone.{{% /alert %}}
 
-If you already have an existing versioned app (with Subversion) that you would like to upload to your Git private server instead, you can export it, then re-import it, and uploading it to your server.
+#### Starting with a Fresh Repository
 
 {{% alert color="info" %}}
-This creates an unversioned app, based on the branch you are working on in Studio Pro. This means that you will not get version history or other branches in the Git repo.
+This process creates an unversioned app, based on the branch you are working on in Studio Pro. This means that you will not get version history or other branches in the Git repo.
 
 You can move the whole app, including branches and history, to the Mendix Git repository by following the instructions in [Migrate to Git](/developerportal/general/migrate-to-git/)
 {{% /alert %}}
@@ -202,36 +206,22 @@ Follow the steps below:
 
     {{< figure src="/attachments/refguide/version-control/on-premises-git/export-project-package-dialog.png" alt="Export App Package dialog" class="no-border" >}}
 
-3. The **Progress** pop-up window appears, and once it is completed, you can close the app in **Studio Pro**:
-
-    {{< figure src="/attachments/refguide/version-control/on-premises-git/progress-dialog.png" alt="Progress dialog" class="no-border" >}}
-
-4. Now you can import the package again, and from there you can choose to upload it to your Git private server. Go to **File** > **Import App Package**:
-
-    {{< figure src="/attachments/refguide/version-control/on-premises-git/import-project-package-menu.png" alt="Import App Package menu"   width="250"  class="no-border" >}}
+3. The **Progress** pop-up window appears, and once it is completed, you can close the app in **Studio Pro**.
 
+4. Now you can import the package again, and from there you can choose to upload it to your Git private server. Open **File** > **Import App Package**.
 5. Once the file browser dialog box is open, navigate to the location you save the *.mpk* file during the export process.
 6. In the **Import App Package** dialog box, select **Private server** option in the **Where should we store your App?** section. 
-7. In the **Private Server Type** option, select **Git** (if you have both **Subversion** and **Git** enabled in the **Preferences** form).  
-8. Enter the link to the private repository in the address textbox and click **OK**. Remember, the repository **must be completely empty**, or **Studio Pro** will not be able to upload an app to it:
+7. Enter the link to the private repository in the **App repository address** field and click **OK**. Please note that the repository must be completely empty, or Studio Pro will not be able to upload an app to it:
 
     {{< figure src="/attachments/refguide/version-control/on-premises-git/import-project-package-git-dialog.png" alt="Import Git Package menu" class="no-border" >}}
 
-9. Click **OK**. 
+8. Click **OK**. 
 
-After the import process is completed, your previous Subversion app will be now versioned using Git.
+After the import process is completed, your previously version controlled app will be now versioned using Private Git.
 
 Note that your previous app still exists, **Studio Pro** will simply make an unversioned copy and upload it to your private Git server. So, in your **Recent Apps** list, you will still see both:
 
-{{< figure src="/attachments/refguide/version-control/on-premises-git/recent-apps.png" alt="Recent Apps form" class="no-border" >}}
-
-### Moving from Team Server to a Private Git Server
-
-To migrate from Mendix Team Server to a private Git server, follow your Git provider's documentation for uploading a full repository clone to their platform.
-
-After migration, download a fresh clone in Studio Pro from your private Git server.
-
-{{% alert color="warning" %}} When redirecting an existing clone by updating the `config` file in the `.git` folder, make sure you remove the `sprintr-project-id` setting to prevent errors in Studio Pro. {{% /alert %}}
+{{< figure src="/attachments/refguide/version-control/on-premises-git/recent-apps.png" alt="Recent Apps form" class="no-border" width="600">}}
 
 ## Read More
 

content/en/docs/refguide10/version-control/on-premises-git.md

@@ -148,9 +148,7 @@ For the previous checkout method do the following:
 1. Open from previous checkout.
 2. Enable the **Private server** radio button and enter the link to the repository. 
 3. Click **Connect**. 
-4. If you have checked out the app at least once, you can then pick one of the existing locations on disk and the app will open (shown here with two previous checkouts):
-
-    {{< figure src="/attachments/refguide10/version-control/on-premises-git/open-app-dialog.png" alt="Open App dialog" class="no-border" >}}
+4. If you have checked out the app at least once, you can then pick one of the existing locations on disk and the app will open.
 
 For the previous local disk method do the following:
 
@@ -169,28 +167,34 @@ The repository has to be completely empty (this includes the `README.md` and `.g
 
 To upload your app, do the following:
 
-1. Open the app in Studio Pro and go to **Version Control > Upload to Version Control Server**:
-
-    {{< figure src="/attachments/refguide10/version-control/on-premises-git/upload-to-vc-menu.png" alt="Upload to Version Control Server Menu" class="no-border" >}}
-
+1. Open the app in Studio Pro and go to **Version Control** > **Upload to Version Control Server**.
 2. In the **Upload to Version Control Server** dialog box, select **Private server**. 
-3. Select **Git** as the private server type (if you have both **Subversion** and **Git** enabled in the **Preferences Form**). 
-4. Enter the link to the repository you want to upload this app to and click **OK**:
+3. Enter the link to the repository you want to upload this app to and click **OK**:
 
     {{< figure src="/attachments/refguide10/version-control/on-premises-git/upload-to-vc-server.png" alt="Upload to Version Control Server dialog" class="no-border" >}}
     It might ask you to sign into the server, depending on whether you have previously signed in and choose to stay logged in.
-5. You can see the upload process in the **Upload Project to Team Server** pop-up window.
+4. You can see the upload process in the **Upload Project to Team Server** pop-up window.
 
 The app is uploaded successfully. You can check on your private server and see that the app is now on the selected repository:
 
 {{< figure src="/attachments/refguide10/version-control/on-premises-git/project-uploaded-confirmation.png" alt="App Uploaded confirmation window" class="no-border" >}}
 
-### Moving a Subversion App to Git
+### Moving an Existing Versioned App to Private Git
+
+If you already have an existing versioned app that you would like to upload to your Git private server, you can fully migrate the history or start with a fresh repository.
+
+#### Retaining History
+
+To migrate a repository from one Git server to another private Git server, follow your new Git provider's documentation for transferring a complete repository clone to their platform.
+
+After migration, download a fresh clone in Studio Pro from your private Git server.
+
+{{% alert color="warning" %}} After migrating from Mendix Team Server, to link an existing folder to a new repository and avoid errors in Studio Pro, remove the `sprintr-project-id` setting from the *.git/config* file in your local repository clone. {{% /alert %}}
 
-If you already have an existing versioned app (with Subversion) that you would like to upload to your Git private server instead, you can export it, then re-import it, and uploading it to your server.
+#### Starting with a Fresh Repository
 
 {{% alert color="info" %}}
-This creates an unversioned app, based on the branch you are working on in Studio Pro. This means that you will not get version history or other branches in the Git repo.
+This process creates an unversioned app, based on the branch you are working on in Studio Pro. This means that you will not get version history or other branches in the Git repo.
 
 You can move the whole app, including branches and history, to the Mendix Git repository by following the instructions in [Migrate to Git](/developerportal/general/migrate-to-git/)
 {{% /alert %}}
@@ -202,37 +206,23 @@ Follow the steps below:
 
     {{< figure src="/attachments/refguide10/version-control/on-premises-git/export-project-package-dialog.png" alt="Export App Package dialog" class="no-border" >}}
 
-3. The **Progress** pop-up window appears, and once it is completed, you can close the app in **Studio Pro**:
-
-    {{< figure src="/attachments/refguide10/version-control/on-premises-git/progress-dialog.png" alt="Progress dialog" class="no-border" >}}
-
-4. Now you can import the package again, and from there you can choose to upload it to your Git private server. Go to **File** > **Import App Package**:
-
-    {{< figure src="/attachments/refguide10/version-control/on-premises-git/import-project-package-menu.png" alt="Import App Package menu"   width="250"  class="no-border" >}}
+3. The **Progress** pop-up window appears, and once it is completed, you can close the app in **Studio Pro**.
 
+4. Now you can import the package again, and from there you can choose to upload it to your Git private server. Go to **File** > **Import App Package**.
 5. Once the file browser dialog box is open, navigate to the location you save the *.mpk* file during the export process.
 6. In the **Import App Package** dialog box, select **Private server** option in the **Where should we store your App?** section. 
-7. In the **Private Server Type** option, select **Git** (if you have both **Subversion** and **Git** enabled in the **Preferences** form).  
-8. Enter the link to the private repository in the address textbox and click **OK**. Remember, the repository **must be completely empty**, or **Studio Pro** will not be able to upload an app to it:
+7. Enter the link to the private repository in the address textbox and click **OK**. Remember, the repository **must be completely empty**, or **Studio Pro** will not be able to upload an app to it:
 
     {{< figure src="/attachments/refguide10/version-control/on-premises-git/import-project-package-git-dialog.png" alt="Import Git Package menu" class="no-border" >}}
 
-9. Click **OK**. 
+8. Click **OK**. 
 
-After the import process is completed, your previous Subversion app will be now versioned using Git.
+After the import process is completed, your previously version controlled app will be now versioned using Private Git.
 
 Note that your previous app still exists, **Studio Pro** will simply make an unversioned copy and upload it to your private Git server. So, in your **Recent Apps** list, you will still see both:
 
 {{< figure src="/attachments/refguide10/version-control/on-premises-git/recent-apps.png" alt="Recent Apps form" class="no-border" >}}
 
-### Moving from Team Server to a Private Git Server
-
-To migrate from Mendix Team Server to a private Git server, follow your Git provider's documentation for uploading a full repository clone to their platform.
-
-After migration, download a fresh clone in Studio Pro from your private Git server.
-
-{{% alert color="warning" %}} When redirecting an existing clone by updating the `config` file in the `.git` folder, make sure you remove the `sprintr-project-id` setting to prevent errors in Studio Pro. {{% /alert %}}
-
 ## Read More
 
 * [Version Control Reference Guide](/refguide10/version-control/)