⭐ new: main branch asking

kazupon · Jun 8, 2016 · fbb8802 · fbb8802
1 parent 6274b4e
commit fbb8802
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/meta.js b/meta.js
@@ -15,6 +15,12 @@ module.exports = {
       type: 'string',
       message: 'Author'
     },
+    branch: {
+      type: 'string',
+      required: true,
+      message: 'Development main branch name',
+      default: 'dev'
+    },
     githubAccount: {
       type: 'string',
       required: false,

diff --git a/template/README.md b/template/README.md
@@ -27,7 +27,7 @@ See [here](http://{{ githubAccount }}.github.io/{{ name }}/){{/unless_eq}}{{/git
     npm test
 
 ## Changelog
-Details changes for each release are documented in the {{#unless_eq githubAccount ""}}[CHANGELOG.md](/~https://github.com/{{ githubAccount }}/{{ name }}/blob/master/CHANGELOG.md){{/unless_eq}}{{#if_eq githubAccount ""}}`CHANGELOG.md`{{/if_eq}}.
+Details changes for each release are documented in the {{#unless_eq githubAccount ""}}[CHANGELOG.md](/~https://github.com/{{ githubAccount }}/{{ name }}/blob/{{ branch }}/CHANGELOG.md){{/unless_eq}}{{#if_eq githubAccount ""}}`CHANGELOG.md`{{/if_eq}}.
 
 {{#issue}}
 ## Issues
@@ -38,11 +38,11 @@ Please make sure to read the [Issue Reporting Checklist](/~https://github.com/vuej
 {{#contribution}}Please make sure to read the [Contributing Guide](/~https://github.com/vuejs/vue/blob/dev/CONTRIBUTING.md) before making a pull request.
 {{/contribution}}
 - Fork it !
-- Create your top branch from `dev`: `git branch my-new-topic origin/dev`
+- Create your top branch from `{{ branch }}`: `git branch my-new-topic origin/{{ branch }}`
 - Commit your changes: `git commit -am 'Add some topic'`
 - Push to the branch: `git push origin my-new-topic`
 {{#unless_eq githubAccount ""}}
-- Submit a pull request to `dev` branch of `{{ githubAccount }}/{{ name }}` repository !
+- Submit a pull request to `{{ branch }}` branch of `{{ githubAccount }}/{{ name }}` repository !
 {{/unless_eq}}
 
 ## License

diff --git a/template/docs/book.json b/template/docs/book.json
@@ -4,7 +4,7 @@
   "pluginsConfig": {
     {{#unless_eq githubAccount ""}}
     "edit-link": {
-      "base": "/~https://github.com/{{ githubAccount }}/{{ name }}/tree/master/docs",
+      "base": "/~https://github.com/{{ githubAccount }}/{{ name }}/tree/{{ branch }}/docs",
       "label": "Edit This Page"
     },
     "github": {

diff --git a/template/docs/en/SUMMARY.md b/template/docs/en/SUMMARY.md
@@ -3,7 +3,7 @@
 > {{ description }}
 
 {{#unless_eq githubAccount ""}}
-**[CHANGELOG](/~https://github.com/{{ githubAccount }}/{{ name }}/blob/master/CHANGELOG.md)**
+**[CHANGELOG](/~https://github.com/{{ githubAccount }}/{{ name }}/blob/{{ branch }}/CHANGELOG.md)**
 {{/unless_eq}}
 
 - [Installation](installation.md)
diff --git a/template/docs/en/installation.md b/template/docs/en/installation.md
@@ -3,7 +3,7 @@
 {{#unless_eq githubAccount ""}}
 ## Direct Download
 
-See [dist folder](/~https://github.com/{{ githubAccount }}/{{ name }}/tree/master/dist). Note the dist files are always the latest stable - it's not update-to-date with the master branch source.
+See [dist folder](/~https://github.com/{{ githubAccount }}/{{ name }}/tree/{{ branch }}/dist). Note the dist files are always the latest stable - it's not update-to-date with the {{ branch }} branch source.
 {{/unless_eq}}
 
 ## NPM

diff --git a/template/issue_template.md b/template/issue_template.md
@@ -5,14 +5,14 @@ Got a question?
 ===============
 The issue list of this repo is **exclusively** for bug reports and feature requests. For simple questions, please use the following resources:
 
-- Read the docs: /~https://github.com/{{ githubAccount }}/{{ name }}/blob/dev/README.md
+- Read the docs: /~https://github.com/{{ githubAccount }}/{{ name }}/blob/{{ branch }}/README.md
 - Ask in the Gitter chat room: https://gitter.im/vuejs/vue
 - Ask on the forums: http://forum.vuejs.org/
 - Look for/ask questions on stack overflow: https://stackoverflow.com/questions/ask?tags={{ name }}
 
 Reporting a bug?
 ================
-- Try to search for your issue, it may have already been answered or even fixed in the development branch.
+- Try to search for your issue, it may have already been answered or even fixed in the `{{ branch }}` branch.
 
 - Check if the issue is reproducible with the latest stable version of Vue. If you are using a pre-release, please indicate the specific version you are using.