Merge branch 'release/v1.1.6'

Former-commit-id: 85f1fb9
d2-projects · Aug 1, 2018 · 7348ae2 · 7348ae2
2 parents e986561 + 09c6116
commit 7348ae2
Show file tree

Hide file tree

Showing 9 changed files with 944 additions and 20 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -52,7 +52,7 @@ module.exports = {
           '/zh/guide/': sideBarGuide('指南'),
           '/zh/plugins/': sideBarPlugins('插件'),
           '/zh/components/': sideBarComponents('组件'),
-          '/zh/article/': sideBarArticle('版本更新'),
+          '/zh/article/': sideBarArticle('Cookbook', '版本更新'),
           '/zh/others/': sideBarOthers('其它')
         }
       }
@@ -109,13 +109,20 @@ function sideBarComponents (title) {
   ]
 }
 
-function sideBarArticle (titleUpdate) {
+function sideBarArticle (titleCookBook, titleUpdate) {
   return [
+    {
+      title: titleCookBook,
+      collapsable: false,
+      children: [
+        'cookbook/what-is-cookbook',
+        'cookbook/combinable-questionnaire',
+      ]
+    },
     {
       title: titleUpdate,
       collapsable: false,
       children: [
-        '',
         'update/1.1.5',
         'update/1.1.4',
         'update/0.0.0'

diff --git a/docs/zh/article/README.md b/docs/zh/article/README.md
@@ -1,3 +1,3 @@
-# 章节介绍
+# 文章
 
-这个章节下收录关于 D2Admin 的一些介绍，用法，以及每次发布新版本时的推广文章，也是每篇新文章的首发地址。
+请在侧边栏目录选择文章阅读