Merge pull request hexojs#1016 from tomap/fix/MarkedNewVersion

Fix/marked new version

package.json

@@ -18,7 +18,7 @@
     "hexo-generator-feed": "^1.1.0",
     "hexo-generator-sitemap": "^1.1.2",
     "hexo-renderer-jade": "^0.4.1",
-    "hexo-renderer-marked": "^0.3.2",
+    "hexo-renderer-marked": "^1.0.1",
     "hexo-renderer-stylus": "^0.3.1",
     "hexo-server": "^0.3.3",
     "lodash": "^4.17.11",

source/docs/deployment.md

@@ -43,8 +43,9 @@ Option | Description
 `repo` | GitHub/Bitbucket/Coding/GitLab repository URL
 `branch` | Branch name. The deployer will detect the branch automatically if you are using GitHub or GitCafe.
 `message` | Customize commit message (Default to `Site updated: {% raw %}{{ now('YYYY-MM-DD HH:mm:ss') }}{% endraw %}`)
+
 3. Upload your site: `./node_modules/.bin/hexo clean && ./node_modules/.bin/hexo deploy` (or `hexo clean && hexo deploy` if you installed Hexo globally).
-4. On Github/BitBucket/Gitlab go to your repository settngs and change your main branch from `master` to `published` (or whatever you called it in your _config.yml). Now your site will show as your account's homepage.
+4. On Github/BitBucket/Gitlab go to your repository settings and change your main branch from `master` to `published` (or whatever you called it in your _config.yml). Now your site will show as your account's homepage.
 
 ### How does it work exactly?
 Your repository will have a **master** branch when you first made it. Keep working on this branch to create your site. When you deploy Hexo will create, or update, a new branch on the remote site (called **published** in the config above). Deployment won't create a new branch locally, nor will it mess with your existing source code in the master branch locally or on the remote. You still need to keep pushing commits to the master branch manually to the remote server to keep your site backed up. In addition, if you are using a CNAME file to customize your Github Pages domain name, you need to put the CNAME file under `source_dir` so that Hexo can push it to the published branch.

source/docs/helpers.md

@@ -674,7 +674,7 @@ Option | Description | Default
 `url` | Page URL (`og:url`) | `url`
 `image` | Page cover (`og:image`) | First image in the content
 `site_name` | Site name (`og:site_name`) | `config.title`
-`description` | Page description (`og:desription`) | Page excerpt or first 200 characters of the content
+`description` | Page description (`og:description`) | Page excerpt or first 200 characters of the content
 `twitter_card` | Twitter card type (`twitter:card`) | summary
 `twitter_id` | Twitter ID (`twitter:creator`) |
 `twitter_site` | Twitter Site (`twitter:site`) |

source/docs/setup.md

@@ -4,15 +4,15 @@ title: Setup
 
 {% youtube 0m2HnATkHOk %}
 
-Once Hexo is installed, run the following commands to initialise Hexo in the target `<folder>`.
+Once Hexo is installed, run the following commands to initialize Hexo in the target `<folder>`.
 
 ``` bash
 $ hexo init <folder>
 $ cd <folder>
 $ npm install
 ```
 
-Once initialised, here's what your project folder will look like:
+Once initialized, here's what your project folder will look like:
 
 ``` plain
 .

source/docs/variables.md

@@ -12,7 +12,7 @@ Variable | Description | Type
 `page` | Page specific information and custom variables set in front-matter. | `object`; see [Page Variables]
 `config` | Site configuration. | `object` (your site's _config file)
 `theme` | Theme configuration. Inherits from site configuration. | `object` (your theme's _config file)
-`_` (single underscore) | Lodash library | see [Lodash](https://lodash.com/  "Lodash" target="_blank") documentation
+`_` (single underscore) | Lodash library | see [Lodash](https://lodash.com/  'Lodash') documentation
 `path` | Path of current page | `string`
 `url` | Full URL of current page | `string`
 `env` | Environment variables | ???

source/ko/docs/variables.md

@@ -9,7 +9,7 @@ title: Variables
 `page` | 페이지 정보와 front-matter의 사용자 정의 변수 집합.
 `config` | 사이트 환경설정
 `theme` | 테마 환경설정. 사이트 환경설정을 상속합니다.
-`_` (하나의 underscore) | [Lodash](https://lodash.com/  "Lodash" target="_blank") 라이브러리
+`_` (하나의 underscore) | [Lodash](https://lodash.com/  'Lodash') 라이브러리
 `path` | 현재 페이지의 경로
 `url` | 현재 페이지의 전체 경로
 `env` | 환경설정 변수

source/pt-br/docs/variables.md

@@ -12,7 +12,7 @@ Variável | Descrição | Tipo
 `page` | Informações específicas da página e  variáveis personalizadas definidas no front-matter. | `object`; veja [Variáveis da Página]
 `config` | Configuração do site. | `object` (arquivo `_config` do seu site)
 `theme` | Configuração do tema. Herda a configuração do site. | `object` (arquivo `_config` do seu tema)
-`_` (sublinhado) | Biblioteca Lodash | veja a documentação do [Lodash](https://lodash.com/  "Lodash" target="_blank")
+`_` (sublinhado) | Biblioteca Lodash | veja a documentação do [Lodash](https://lodash.com/  'Lodash')
 `path` | Caminho da página atual | `string`
 `url` | URL completa da página atual | `string`
 `env` | Variáveis de ambiente | ???

source/ru/docs/variables.md

@@ -9,7 +9,7 @@ title: Переменные
 `page` | Информация о конкретной странице и переменные в шапке страницы.
 `config` | Конфигурация сайта.
 `theme` | Конфигурация темы. Наследуется от конфигурации сайта.
-`_` (одинарное подчёркивание) | Библиотека [Lodash](https://lodash.com/  "Lodash" target="_blank")
+`_` (одинарное подчёркивание) | Библиотека [Lodash](https://lodash.com/  'Lodash')
 `path` | Путь текущей страницы.
 `url` | Полная URL ссылка на текущую страницу.
 `env` | Переменные среды.

source/th/docs/variables.md

@@ -12,7 +12,7 @@ Variable | Description | Type
 `page` | Page specific information and custom variables set in front-matter. | `object`; see [Page Variables]
 `config` | Site configuration. | `object` (your site's _config file)
 `theme` | Theme configuration. Inherits from site configuration. | `object` (your theme's _config file)
-`_` (single underscore) | Lodash library | see [Lodash](https://lodash.com/  "Lodash" target="_blank") documentation
+`_` (single underscore) | Lodash library | see [Lodash](https://lodash.com/  'Lodash') documentation
 `path` | Path of current page | `string`
 `url` | Full URL of current page | `string`
 `env` | Environment variables | ???