diff --git a/13/umbraco-deploy/deployment-workflow/restoring-content/README.md b/13/umbraco-deploy/deployment-workflow/restoring-content/README.md index 0db7fc8e740..e0a4005a278 100644 --- a/13/umbraco-deploy/deployment-workflow/restoring-content/README.md +++ b/13/umbraco-deploy/deployment-workflow/restoring-content/README.md @@ -30,7 +30,7 @@ This will restore **all** content and media, plus any other entities configured 3. When it's complete select _Open Umbraco_ to go to the backoffice. 4. You will now see all your content and media in the Umbraco backoffice. -![Restore from start-up](../../../umbraco-cloud/deployment/restoring-content/images/Normal-Restore.gif) +![Restore from start-up](images/Normal-Restore.gif) ### Restore everything through the Umbraco backoffice diff --git a/13/umbraco-deploy/deployment-workflow/restoring-content/partial-restore.md b/13/umbraco-deploy/deployment-workflow/restoring-content/partial-restore.md index 51b9ab1c09e..eadbd37da8e 100644 --- a/13/umbraco-deploy/deployment-workflow/restoring-content/partial-restore.md +++ b/13/umbraco-deploy/deployment-workflow/restoring-content/partial-restore.md @@ -57,4 +57,4 @@ Imagine that you are working with your Umbraco project locally. One of your cont 6. Start the restore by clicking _Restore_ 7. When the restore is done, reload the content tree to see the changes -![Partial restore](../../../umbraco-cloud/deployment/restoring-content/images/partialRestore-onEnvWithContent.png) +![Partial restore](images/partialRestore-onEnvWithContent.png) diff --git a/13/umbraco-deploy/getting-started/images/test-UDA (1) (1) (1).png b/13/umbraco-deploy/getting-started/images/test-UDA (1) (1) (1).png deleted file mode 100644 index 2c929784cdc..00000000000 Binary files a/13/umbraco-deploy/getting-started/images/test-UDA (1) (1) (1).png and /dev/null differ diff --git a/13/umbraco-deploy/getting-started/images/test-UDA (1) (1).png b/13/umbraco-deploy/getting-started/images/test-UDA (1) (1).png deleted file mode 100644 index 2c929784cdc..00000000000 Binary files a/13/umbraco-deploy/getting-started/images/test-UDA (1) (1).png and /dev/null differ diff --git a/13/umbraco-deploy/getting-started/images/test-UDA (1).png b/13/umbraco-deploy/getting-started/images/test-UDA (1).png deleted file mode 100644 index 2c929784cdc..00000000000 Binary files a/13/umbraco-deploy/getting-started/images/test-UDA (1).png and /dev/null differ diff --git a/13/umbraco-deploy/installation/install-configure.md b/13/umbraco-deploy/installation/install-configure.md index 9af30dd86c0..1bee75188f8 100644 --- a/13/umbraco-deploy/installation/install-configure.md +++ b/13/umbraco-deploy/installation/install-configure.md @@ -16,7 +16,7 @@ Ensure to first read and follow the setup guides for either new or existing proj Here we will cover how to install and set up Umbraco Deploy on a new website. -#### Requirement +### Requirement * Visual Studio 2017 v15.9.6 or later * Umbraco Deploy license @@ -45,7 +45,7 @@ Here we will cover the steps in order for you to install Umbraco deploy on your We will cover how to install and set up Umbraco deploy on your website and how to generate the UDA files based on your production website's database. -#### Requirement +### Requirement * Visual Studio 2017 v15.9.6 or later * Umbraco Deploy license @@ -81,7 +81,7 @@ When Umbraco has been installed in a repository, we can continue to install and After the Umbraco files have been committed add the following lines to the .gitignore so that they will not be picked up by Git when we are deploying. -``` +```none **/media/* # Umbraco deploy specific @@ -251,6 +251,7 @@ You will need to generate a unique GUID for each environment. This can be done i 5. Generate a "New GUID" for each environment you will be adding to your setup. Or by running the following PowerShell command: + ```pwsh [guid]::NewGuid().ToString() ``` @@ -263,7 +264,7 @@ Once the configuration has been set up with the correct information we can now g This can be done by going to the `/umbraco/Deploy/Revision` folder of the project and create a test `.uda` file, and then check in either your Git GUI or in the command line and verify whether the test file is being tracked. -![Test UDA file]() +![Test UDA file](../getting-started/images/test-UDA.png) We can see that the file has been created and it is being tracked by Git and we can go ahead and delete the test file. diff --git a/13/umbraco-deploy/installation/the-licensing-model.md b/13/umbraco-deploy/installation/the-licensing-model.md index d346004a0ba..33bcdf31174 100644 --- a/13/umbraco-deploy/installation/the-licensing-model.md +++ b/13/umbraco-deploy/installation/the-licensing-model.md @@ -35,8 +35,8 @@ A single license covers one Umbraco solution. It includes all domains hosted by To clarify the above: -* You only need one license when you have a solution covering multiple domains- for example, www.mysite.com and www.mysite.dk - load balanced in production over multiple servers running from the same database, managed from the same backoffice instance, and with any number of non-production environments (staging, QA, etc.) -* You need two licenses if you have a web presence that consists of two separate websites hosted on different domains or sub-domains - for example, www.mysite.com and shop.mysite.com - with each of these managed as a separate Umbraco installation using their own database and backoffice in production. +* You only need one license when you have a solution covering multiple domains- for example, `www.mysite.com` and `www.mysite.dk` - load balanced in production over multiple servers running from the same database, managed from the same backoffice instance, and with any number of non-production environments (staging, QA, etc.) +* You need two licenses if you have a web presence that consists of two separate websites hosted on different domains or sub-domains - for example, `www.mysite.com` and shop.mysite.com - with each of these managed as a separate Umbraco installation using their own database and backoffice in production. {% hint style="info" %} The license for Umbraco Deploy comes with a recurring yearly fee. Learn more about this and pricing on [Umbraco.com](https://umbraco.com/products/umbraco-deploy/). @@ -81,9 +81,9 @@ Umbraco Cloud projects use a license file placed in the `/umbraco/Licenses` fold On start-up and on a schedule, Umbraco running Deploy On-premise will call out to a service. It will pass the configured license key to determine its validity. The response triggers a notification that the Umbraco Deploy will handle. It will amend the available functionality as appropriate to a valid, invalid or expired license. -You can view the status of the Umbraco Deploy On-premise license in the backoffice. This is available via the _Settings_ section, listed along with any other products using the same licensing service: +You can view the status of the Umbraco Deploy On-premise license in the backoffice. This is available via the _Settings_ section, listed along with any other products using the same licensing service. -![Licenses screen in Umbraco backoffice](./images/licenses-screen.png) +![Licenses screen in Umbraco backoffice](../images/licenses-screen.png) ### When and how to configure an `UmbracoApplicationUrl` diff --git a/13/umbraco-deploy/release-notes.md b/13/umbraco-deploy/release-notes.md index 6109ebd22e4..256504280df 100644 --- a/13/umbraco-deploy/release-notes.md +++ b/13/umbraco-deploy/release-notes.md @@ -36,7 +36,7 @@ This section contains the release notes for Umbraco Deploy 13 including all chan * Ensure environment-to-environment actions are executed asynchronously on background job (fixes timeout issues on large deployments) [#179](https://github.com/umbraco/Umbraco.Deploy.Issues/issues/179) * Only require default, allowed and master templates and their associated files to exist (avoids schema mismatches on template changes) [156](https://github.com/umbraco/Umbraco.Deploy.Issues/issues/156) -### [13.3.1](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aissue+is%3Aclosed+label%3Arelease%2F13.3.1) (November 29th 2024) +### 13.3.1 (November 29th 2024) * Update documentation links in management dashboard to include major version in the URL * Add `ValidateDependenciesOnImport` setting to management dashboard diff --git a/13/umbraco-deploy/test-the-release-candidate.md b/13/umbraco-deploy/test-the-release-candidate.md index 4796a46c231..2bbde5d0bf9 100644 --- a/13/umbraco-deploy/test-the-release-candidate.md +++ b/13/umbraco-deploy/test-the-release-candidate.md @@ -35,4 +35,4 @@ Remember to enable **pre-releases**. ## How to provide feedback -If you find issues that are not already [reported](https://github.com/umbraco/Umbraco.Deploy.Issues/issues?q=is%3Aopen+is%3Aissue+label%3Aproject%2Fv12+), please report them on the Umbraco Deploy [GitHub tracker](https://github.com/umbraco/Umbraco.Deploy.Issues/issues/new?assignees=\&labels=\&projects=\&template=1\_Bug.md). +If you find issues that are not already [reported](https://github.com/umbraco/Umbraco.Deploy.Issues/issues), please report them on the Umbraco Deploy [GitHub tracker](https://github.com/umbraco/Umbraco.Deploy.Issues/issues/new?assignees=\&labels=\&projects=\&template=1\_Bug.md).