浏览代码

Merge branch 'stable'

Piotrek Koszuliński 7 年之前
父节点
当前提交
76e0497915

二进制
docs/assets/img/feature-link-balloon.gif


二进制
docs/assets/img/feature-link-editing.png


二进制
docs/assets/img/feature-link-preview.png


+ 9 - 12
docs/builds/guides/overview.md

@@ -20,12 +20,13 @@ The following CKEditor 5 Builds are currently available:
  * [Classic editor](#classic-editor)
  * [Inline editor](#inline-editor)
  * [Balloon editor](#balloon-editor)
+ * [Document editor](#document-editor)
 
 ### Classic editor
 
-Classic editor is what most users traditionally learnt to associate with a rich text editor  a toolbar with an editing area placed in a specific position on the page, usually as a part of a form that you use to submit some content to the server.
+Classic editor is what most users traditionally learnt to associate with a rich text editor — a toolbar with an editing area placed in a specific position on the page, usually as a part of a form that you use to submit some content to the server.
 
-During its initialisation the editor hides the used editable element on the page and renders "instead" of it. This is why it is usually used to replace `<textarea>` elements.
+During its initialization the editor hides the used editable element on the page and renders "instead" of it. This is why it is usually used to replace `<textarea>` elements.
 
 In CKEditor 5 the concept of the "boxed" editor was reinvented:
 
@@ -35,7 +36,7 @@ In CKEditor 5 the concept of the "boxed" editor was reinvented:
 
 {@img assets/img/editor-classic.png 778 Screenshot of a classic editor.}
 
-To try it out online, check the {@link examples/builds/classic-editor classic editor example}. Jump to {@link builds/guides/quick-start#classic-editor quick start} to start using it.
+To try it out online, check the {@link examples/builds/classic-editor classic editor example}. Jump to {@link builds/guides/quick-start#classic-editor Quick start} to start using it.
 
 ### Inline editor
 
@@ -45,7 +46,7 @@ A common scenario for using inline editor is offering users the possibility to e
 
 {@img assets/img/editor-inline.png 776 Screenshot of an inline editor.}
 
-To try it out online, check the {@link examples/builds/inline-editor inline editor example}. Jump to {@link builds/guides/quick-start#inline-editor quick start} to start using it.
+To try it out online, check the {@link examples/builds/inline-editor inline editor example}. Jump to {@link builds/guides/quick-start#inline-editor Quick start} to start using it.
 
 ### Balloon editor
 
@@ -53,7 +54,7 @@ Balloon editor is very similar to inline editor. The difference between them is
 
 {@img assets/img/editor-balloon.png 789 Screenshot of a balloon toolbar editor.}
 
-To try it out online, check the {@link examples/builds/balloon-editor balloon editor example}. Jump to {@link builds/guides/quick-start#balloon-editor quick start} to start using it.
+To try it out online, check the {@link examples/builds/balloon-editor balloon editor example}. Jump to {@link builds/guides/quick-start#balloon-editor Quick start} to start using it.
 
 ### Document editor
 
@@ -61,7 +62,7 @@ The document editor is focused on rich text editing experience similar to the na
 
 {@img assets/img/editor-document.png 786 Screenshot of the user interface of the document editor.}
 
-To try it out online, check the {@link examples/builds/document-editor document editor example}. Jump to {@link builds/guides/quick-start#document-editor quick start} to start using it.
+To try it out online, check the {@link examples/builds/document-editor document editor example}. Jump to {@link builds/guides/quick-start#document-editor Quick start} to start using it.
 
 ## Build customization
 
@@ -85,13 +86,9 @@ Each build was designed to satisfy as many use cases as possible. They differ in
 * Include features that contribute to creating quality content.
 * Provide setups as generic as possible, based on research and community feedback.
 
-<info-box>
-	Features like fonts, colors and alignment will be introduced in the future, when new types of builds will be introduced with the purpose of satisfying document editing scenarios.
-</info-box>
-
 ### Use cases
 
-Each of the builds fits several different use cases. Just think about any possible use for writing rich-text in applications.
+Each of the builds fits several different use cases. Just think about any possible use for writing rich text in applications.
 
 The following are **some** common use cases:
 
@@ -114,7 +111,7 @@ The following are **some** common use cases:
 
 ### When NOT to use builds?
 
-The {@link framework/index CKEditor 5 Framework} should be used, instead of builds, in the following cases:
+{@link framework/index CKEditor 5 Framework} should be used, instead of builds, in the following cases:
 
 * When you want to create your own text editor and have full control over its every aspect, from UI to features.
 * When the solution proposed by the builds does not fit your specific use case.

+ 6 - 6
docs/builds/guides/quick-start.md

@@ -181,10 +181,10 @@ Load the document editor build (here [CDN](https://cdn.ckeditor.com/) location i
 <script src="https://cdn.ckeditor.com/ckeditor5/{@var ckeditor5-version}/decoupled-document/ckeditor.js"></script>
 ```
 
-Call the {@link module:editor-decoupled/decouplededitor~DecoupledEditor.create `DecoupledEditor.create()`} method. The decoupled editor requires you to inject the toolbar into DOM and the best place to do that is somewhere in the promise chain (e.g. one of the `then( () => { ... } )` blocks).
+Call the {@link module:editor-decoupled/decouplededitor~DecoupledEditor.create `DecoupledEditor.create()`} method. The decoupled editor requires you to inject the toolbar into the DOM and the best place to do that is somewhere in the promise chain (e.g. one of the `then( () => { ... } )` blocks).
 
 <info-box>
-	The following snippet will run the document editor but to make the most of it check out the {@link framework/guides/document-editor comprehensive tutorial} which explains step—by—step how to configure and style the the application for the best editing experience.
+	The following snippet will run the document editor but to make the most of it check out the {@link framework/guides/document-editor comprehensive tutorial} which explains step—by—step how to configure and style the application for the best editing experience.
 </info-box>
 
 ```html
@@ -209,16 +209,16 @@ Call the {@link module:editor-decoupled/decouplededitor~DecoupledEditor.create `
 <html>
 <head>
 	<meta charset="utf-8">
-	<title>CKEditor 5 – document editor</title>
+	<title>CKEditor 5 – Document editor</title>
 	<script src="https://cdn.ckeditor.com/ckeditor5/{@var ckeditor5-version}/decoupled-document/ckeditor.js"></script>
 </head>
 <body>
 	<h1>Document editor</h1>
 
-	<!-- The toolbar will be rendered in this container -->
+	<!-- The toolbar will be rendered in this container. -->
 	<div id="toolbar-container"></div>
 
-	<!-- This container will become the editable -->
+	<!-- This container will become the editable. -->
 	<div id="editor">
 		<p>This is the initial editor content.</p>
 	</div>
@@ -241,4 +241,4 @@ Call the {@link module:editor-decoupled/decouplededitor~DecoupledEditor.create `
 
 ## Next steps
 
-Check the {@link builds/guides/integration/configuration Configuration guide} to learn how to configure the editor – e.g. change the default toolbar.
+Check the {@link builds/guides/integration/configuration Configuration guide} to learn how to configure the editor &mdash; for example, change the default toolbar.

+ 4 - 5
docs/builds/guides/whats-new.md

@@ -32,10 +32,9 @@ When integrated with {@link features/image-upload#easy-image Easy Image}, upload
 
 ### Simple linking
 
-No more complex dialogs for links.
+No more complex dialogs for links. When you click a link, first you will see a balloon with an option to either edit the link or open it in a new tab.
 
-{@img assets/img/feature-link-preview.png 738 Simplified link preview popup.}
-{@img assets/img/feature-link-editing.png 738 Simplified link editing popup.}
+{@img assets/img/feature-link-balloon.gif Simplified link balloon.}
 
 ### Autoformatting
 
@@ -55,7 +54,7 @@ The toolbar is now always visible when the user scrolls the page down.
 
 ### Inlined content
 
-The editor content is now placed inline in the page &mdash; it is now much easier to style it. Additionally, the editor grows with the content (or not, it is up to you!).
+The editor content is now placed inline in the page &mdash; it is thus much easier to style it. Additionally, the editor grows with the content (or not, it is up to you!).
 
 <iframe width="600" height="337" src="https://www.youtube.com/embed/igoI02wBykA?rel=0" frameborder="0" allowfullscreen></iframe>
 
@@ -73,7 +72,7 @@ The editor is much more lightweight and fast. It brings a fantastic user experie
 
 ## Highly customizable
 
-CKEditor 5 Builds are based on the {@link framework/index CKEditor 5 Framework}, which gives powerful customizability and extensibility.
+CKEditor 5 Builds are based on {@link framework/index CKEditor 5 Framework}, which gives powerful customizability and extensibility.
 
 ## Custom data model
 

+ 1 - 1
docs/framework/guides/contributing/development-environment.md

@@ -210,7 +210,7 @@ git pull
 git co master-revisions~30
 
 # Check out subpackages to correct hashes.
-mgit update
+mgit co
 ```
 
 Once you found the point in history which interests you, you can go straight to a commit in a subpackage and PR. For example: