diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 3771aaf0ab..0fbb011b36 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -1,3 +1,5 @@ +_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/CONTRIBUTING.md) to go to the v8 branch_ + # Contributing to Umbraco CMS 👍🎉 First off, thanks for taking the time to contribute! 🎉👍 diff --git a/docs/README.md b/docs/README.md index 8231e53420..5f9e7dc513 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,5 +1,7 @@ [![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7) +_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/temp8) to go to the v8 branch_ + Umbraco CMS =========== The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com) @@ -11,7 +13,7 @@ Umbraco is a free open source Content Management System built on the ASP.NET pla ## Watch an introduction video -[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/) +[![ScreenShot](https://shop.umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/) ## Umbraco - The Friendly CMS diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html index 3d913012d7..1204af7ca4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html @@ -31,7 +31,7 @@
- + {{ group.totalWarning }}
diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json index 836b7a965c..4556fd6496 100644 --- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json +++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json @@ -73,7 +73,7 @@ { "element": "#applications [data-element='section-help']", "title": "Help", - "content": "If you ever find yourself in trouble click here to open the help drawer.", + "content": "If you ever find yourself in trouble click here to open the Help drawer.", "event": "click", "backdropOpacity": 0.6 }, @@ -108,7 +108,7 @@ "steps": [ { "title": "Create your first Document Type", - "content": "

Step 1 of any site is to create a Document Type.
A Document Type is a template for content. For each type of content you want to create you'll create a Document Type. This will define were content based on this Document Type can be created, how many properties it holds and what the input method should be for these properties.

When you have at least one Document type in place you can start creating content and this content can the be used in a template.

In this tour you will learn how to set up a basic Document Type with a property to enter a short text.

", + "content": "

Step 1 of any site is to create a Document Type.
A Document Type is a template for content. For each type of content you want to create you'll create a Document Type. This will define where content based on this Document Type can be created, how many properties it holds and what the input method should be for these properties.

When you have at least one Document type in place you can start creating content and this content can then be used in a template.

In this tour you will learn how to set up a basic Document Type with a property to enter a short text.

", "type": "intro" }, { @@ -121,14 +121,14 @@ { "element": "#tree [data-element='tree-item-documentTypes']", "title": "Create Document Type", - "content": "

Hover the Document Type tree and click the three small dots to open the context menu.

", + "content": "

Hover over the Document Type tree and click the three small dots to open the context menu.

", "event": "click", "eventElement": "#tree [data-element='tree-item-documentTypes'] [data-element='tree-item-options']" }, { "element": "#dialog [data-element='action-documentType']", "title": "Create Document Type", - "content": "

Click Document Type to create a new document type with a template. The template will be automatically created and set as the default template for this Document Type

You will use the template in a later tour render content.

", + "content": "

Click Document Type to create a new document type with a template. The template will be automatically created and set as the default template for this Document Type

You will use the template in a later tour to render content.

", "event": "click" }, { @@ -157,7 +157,7 @@ { "element": "[data-element='property-add']", "title": "Add a property", - "content": "

Properties are the different input fields on a content page.

On our Home Page we wan't to add a welcome text.

Click Add property to open the property dialog.

", + "content": "

Properties are the different input fields on a content page.

On our Home Page we want to add a welcome text.

Click Add property to open the property dialog.

", "event": "click" }, { @@ -181,7 +181,7 @@ "element": "[data-element~='overlay-editor-picker']", "elementPreventClick": true, "title": "Editor picker", - "content": "

In the editor picker dialog we can pick one of the many build in editor.

You can choose from preconfigured data types (Reuse) or create a new configuration (Available editors)

" + "content": "

In the editor picker dialog we can pick one of the many built-in editor.

You can choose from preconfigured data types (Reuse) or create a new configuration (Available editors)

" }, { "element": "[data-element~='overlay-editor-picker'] [data-element='editor-Textarea']", @@ -193,12 +193,12 @@ "element": "[data-element~='overlay-editor-settings']", "elementPreventClick": true, "title": "Editor settings", - "content": "Each property editor can have individual settings. For the textarea editor you can set a charachter limit but in this case it is not needed" + "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed" }, { "element": "[data-element~='overlay-editor-settings'] [data-element='button-overlaySubmit']", "title": "Save editor", - "content": "Click Submit to save the editor.", + "content": "Click Submit to save the changes.", "event": "click" }, { @@ -245,7 +245,7 @@ { "element": "[data-element='tree-root']", "title": "Open context menu", - "content": "

Open the context menu by hovering the root of the content section.

Now click the three small dots to the right.

", + "content": "

Open the context menu by hovering over the root of the content section.

Now click the three small dots to the right.

", "event": "click", "eventElement": "[data-element='tree-root'] [data-element='tree-item-options']" },