From 5cc3e6c4690ad73466bf0acdd2414a4ae2fad589 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Thu, 12 Oct 2017 00:36:23 +0800 Subject: [PATCH] chore: update docs --- README.md | 1 + dev.html | 2 +- docs/de-de/deploy.md | 24 ++++++++++++++++++++++++ docs/de-de/quickstart.md | 3 ++- docs/quickstart.md | 1 + docs/zh-cn/deploy.md | 24 ++++++++++++++++++++++++ docs/zh-cn/quickstart.md | 1 + 7 files changed, 54 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 438b2489..6b107fd3 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ Create an `index.html`. + diff --git a/dev.html b/dev.html index a19a0d5a..367102d6 100644 --- a/dev.html +++ b/dev.html @@ -3,7 +3,7 @@ docsify - + diff --git a/docs/de-de/deploy.md b/docs/de-de/deploy.md index 3309f356..b138435f 100644 --- a/docs/de-de/deploy.md +++ b/docs/de-de/deploy.md @@ -16,6 +16,30 @@ Es wird empfohlen, deine Dateien im `./docs` Unterordner im `master` branch dein !> Du kannst die Dateien auch im Hauptverzeichnis speichern und dann `master branch` in den Einstellungen auswählen. + +## GitLab Pages + +If you are deploying your master branch, include `.gitlab-ci.yml` with the following script: + +?> The `.public` workaround is so `cp` doesn't also copy `public/` to itself in an infinite loop. + +``` YAML +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - master +``` + +!> You can replace script with `- cp -r docs/. public`, if `./docs` is your Docsify subfolder. + + ## VPS Verwende folgende nginx config. diff --git a/docs/de-de/quickstart.md b/docs/de-de/quickstart.md index ba2e0678..ea7173d1 100644 --- a/docs/de-de/quickstart.md +++ b/docs/de-de/quickstart.md @@ -44,7 +44,8 @@ Wenn du `npm` nicht verwenden möchtest, oder Probleme bei der Installation des - dict. + + diff --git a/docs/quickstart.md b/docs/quickstart.md index 7bcc0913..1f3a4627 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -44,6 +44,7 @@ If you don't like `npm` or have trouble installing the tool, you can manually cr + diff --git a/docs/zh-cn/deploy.md b/docs/zh-cn/deploy.md index 7126f556..39a2273c 100644 --- a/docs/zh-cn/deploy.md +++ b/docs/zh-cn/deploy.md @@ -15,6 +15,30 @@ GitHub Pages 支持从三个地方读取文件 !> 可以将文档放在根目录下，然后选择 **master 分支** 作为文档目录。 + +## GitLab Pages + +If you are deploying your master branch, include `.gitlab-ci.yml` with the following script: + +?> The `.public` workaround is so `cp` doesn't also copy `public/` to itself in an infinite loop. + +``` YAML +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - master +``` + +!> You can replace script with `- cp -r docs/. public`, if `./docs` is your Docsify subfolder. + + ## VPS 和部署所有静态网站一样，只需将服务器的访问根目录设定为 `index.html` 文件。 diff --git a/docs/zh-cn/quickstart.md b/docs/zh-cn/quickstart.md index e62a174e..e05b957f 100644 --- a/docs/zh-cn/quickstart.md +++ b/docs/zh-cn/quickstart.md @@ -44,6 +44,7 @@ docsify serve docs +