From f6247273bd8c2ec54f76ee91291e4c1dc0b9b75d Mon Sep 17 00:00:00 2001
From: Bruno Lesieur <bruno.lesieur@gmail.com>
Date: Sat, 14 Oct 2017 10:19:57 +0200
Subject: [PATCH 1/5] New in with + symbol

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>
---
 src/v2/guide/events.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/v2/guide/events.md b/src/v2/guide/events.md
index bb084488d9..1172992559 100644
--- a/src/v2/guide/events.md
+++ b/src/v2/guide/events.md
@@ -259,7 +259,7 @@ In the above example, the handler will only be called if `$event.key === 'PageDo
 
 ## System Modifier Keys
 
-> New in 2.1.0
+> New in 2.1.0+
 
 You can use the following modifiers to trigger mouse or keyboard event listeners only when the corresponding modifier key is pressed:
 
@@ -284,7 +284,7 @@ For example:
 
 ### `.exact` Modifier
 
-> New in 2.5.0
+> New in 2.5.0+
 
 The `.exact` modifier should be used in combination with other system modifiers to indicate that the exact combination of modifiers must be pressed for the handler to fire.
 

From b64e9cfe6026dcdfae7ce4fbf6fe192a0406f5e8 Mon Sep 17 00:00:00 2001
From: Bruno Lesieur <bruno.lesieur@gmail.com>
Date: Sat, 14 Oct 2017 10:54:47 +0200
Subject: [PATCH 2/5] Review of 2.5.0 doc

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>
---
 src/v2/guide/typescript.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/v2/guide/typescript.md b/src/v2/guide/typescript.md
index eb78541d58..922a523745 100644
--- a/src/v2/guide/typescript.md
+++ b/src/v2/guide/typescript.md
@@ -4,7 +4,7 @@ type: guide
 order: 404
 ---
 
-> In Vue 2.5.0 we have greatly improved our type declarations to work with the default object-based API. At the same time it introduces a few changes that require upgrade actions. Read [this blog post](https://medium.com/the-vue-point/upcoming-typescript-changes-in-vue-2-5-e9bd7e2ecf08) for more details.
+> In Vue 2.5.0+ we have greatly improved our type declarations to work with the default object-based API. At the same time it introduces a few changes that require upgrade actions. Read [this blog post](https://medium.com/the-vue-point/upcoming-typescript-changes-in-vue-2-5-e9bd7e2ecf08) for more details.
 
 ## Official Declaration in NPM Packages
 
@@ -128,7 +128,7 @@ import Vue from 'vue'
 
 declare module 'vue/types/vue' {
   // Global properties can be declared
-  // on the VueConstructor interface
+  // on the `VueConstructor` interface
   interface VueConstructor {
     $myGlobal: string
   }

From 22e62ea938ce70240ac9aaebc3f8e73eaf47a102 Mon Sep 17 00:00:00 2001
From: Bruno Lesieur <bruno.lesieur@gmail.com>
Date: Sat, 14 Oct 2017 11:30:15 +0200
Subject: [PATCH 3/5] Review

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>
---
 src/v2/api/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v2/api/index.md b/src/v2/api/index.md
index 6c766df1a2..33abc848f7 100644
--- a/src/v2/api/index.md
+++ b/src/v2/api/index.md
@@ -115,7 +115,7 @@ type: api
   Vue.config.ignoredElements = [
     'my-custom-web-component',
     'another-web-component',
-    // Use a RegExp to ignore all elements that start with "ion-"
+    // Use a `RegExp` to ignore all elements that start with "ion-"
     // 2.5+ only
     /^ion-/
   ]

From 3555c29b3e47e8e9945b3f232c9e8a51aa8b24cf Mon Sep 17 00:00:00 2001
From: Bruno Lesieur <bruno.lesieur@gmail.com>
Date: Sat, 11 Nov 2017 17:56:33 +0100
Subject: [PATCH 4/5] Remove Single-file component top-level element order

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>
---
 src/v2/style-guide/index.md | 56 -------------------------------------
 1 file changed, 56 deletions(-)

diff --git a/src/v2/style-guide/index.md b/src/v2/style-guide/index.md
index 3e40a7c0bb..0912d39195 100644
--- a/src/v2/style-guide/index.md
+++ b/src/v2/style-guide/index.md
@@ -1474,62 +1474,6 @@ computed: {
 
 
 
-### Single-file component top-level element order <sup data-p="c">recommended</sup>
-
-**[Single-file components](../guide/single-file-components.html) should always order `template`, `script`, and `style` tags consistently, with `<style>` last, because at least one of the other two is always necessary.**
-
-{% raw %}<div class="style-example example-bad">{% endraw %}
-#### Bad
-
-``` html
-<style>/* ... */</style>
-<template>...</template>
-<script>/* ... */</script>
-```
-
-``` html
-<!-- ComponentA.vue -->
-<script>/* ... */</script>
-<template>...</template>
-<style>/* ... */</style>
-
-<!-- ComponentB.vue -->
-<template>...</template>
-<script>/* ... */</script>
-<style>/* ... */</style>
-```
-{% raw %}</div>{% endraw %}
-
-{% raw %}<div class="style-example example-good">{% endraw %}
-#### Good
-
-``` html
-<!-- ComponentA.vue -->
-<template>...</template>
-<script>/* ... */</script>
-<style>/* ... */</style>
-
-<!-- ComponentB.vue -->
-<template>...</template>
-<script>/* ... */</script>
-<style>/* ... */</style>
-```
-
-``` html
-<!-- ComponentA.vue -->
-<script>/* ... */</script>
-<template>...</template>
-<style>/* ... */</style>
-
-<!-- ComponentB.vue -->
-<script>/* ... */</script>
-<template>...</template>
-<style>/* ... */</style>
-```
-{% raw %}</div>{% endraw %}
-
-
-
 ## Priority D Rules: Use with Caution (Potentially Dangerous Patterns)
 
 

From 8620b3601115609bc42d38475aa7a846a073f174 Mon Sep 17 00:00:00 2001
From: Bruno Lesieur <bruno.lesieur@gmail.com>
Date: Sun, 12 Nov 2017 14:13:53 +0100
Subject: [PATCH 5/5] Just change order of template and script

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>
---
 src/v2/style-guide/index.md | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/src/v2/style-guide/index.md b/src/v2/style-guide/index.md
index 0912d39195..d6a129bbf7 100644
--- a/src/v2/style-guide/index.md
+++ b/src/v2/style-guide/index.md
@@ -1474,6 +1474,62 @@ computed: {
 
 
 
+### Single-file component top-level element order <sup data-p="c">recommended</sup>
+
+**[Single-file components](../guide/single-file-components.html) should always order `<script>`, `<template>`, and `<style>` tags consistently, with `<style>` last, because at least one of the other two is always necessary.**
+
+{% raw %}<div class="style-example example-bad">{% endraw %}
+#### Bad
+
+``` html
+<style>/* ... */</style>
+<template>...</template>
+<script>/* ... */</script>
+```
+
+``` html
+<!-- ComponentA.vue -->
+<script>/* ... */</script>
+<template>...</template>
+<style>/* ... */</style>
+
+<!-- ComponentB.vue -->
+<template>...</template>
+<script>/* ... */</script>
+<style>/* ... */</style>
+```
+{% raw %}</div>{% endraw %}
+
+{% raw %}<div class="style-example example-good">{% endraw %}
+#### Good
+
+``` html
+<!-- ComponentA.vue -->
+<script>/* ... */</script>
+<template>...</template>
+<style>/* ... */</style>
+
+<!-- ComponentB.vue -->
+<script>/* ... */</script>
+<template>...</template>
+<style>/* ... */</style>
+```
+
+``` html
+<!-- ComponentA.vue -->
+<template>...</template>
+<script>/* ... */</script>
+<style>/* ... */</style>
+
+<!-- ComponentB.vue -->
+<template>...</template>
+<script>/* ... */</script>
+<style>/* ... */</style>
+```
+{% raw %}</div>{% endraw %}
+
+
+
 ## Priority D Rules: Use with Caution (Potentially Dangerous Patterns)