diff --git a/CHANGELOG.md b/CHANGELOG.md index 31fb68794458..3e3cc9ebd6eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] +## [1.14.0] - 2019-10-20 + +**Added** + +- feat: allow specifying meta desc in front matter ([#1859])(https://github.com/facebook/docusaurus/pull/1859) + +**Docs** + +- docs: document docker is optional ([#1848])(https://github.com/facebook/docusaurus/pull/1848) + ## [1.13.0] - 2019-09-15 **Fixed** diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json index 81cb71665d9b..12b64af29137 100644 --- a/packages/docusaurus-1.x/package.json +++ b/packages/docusaurus-1.x/package.json @@ -1,7 +1,7 @@ { "name": "docusaurus", "description": "Easy to Maintain Open Source Documentation Websites", - "version": "2.0.0-alpha.27", + "version": "1.14.0", "license": "MIT", "keywords": [ "documentation", diff --git a/packages/docusaurus-init-1.x/package.json b/packages/docusaurus-init-1.x/package.json index b1f117fee786..fa2905f14ff1 100644 --- a/packages/docusaurus-init-1.x/package.json +++ b/packages/docusaurus-init-1.x/package.json @@ -1,7 +1,7 @@ { "name": "docusaurus-init", "description": "Initialization script for Docusaurus", - "version": "2.0.0-alpha.27", + "version": "1.14.0", "license": "MIT", "preferGlobal": true, "keywords": [ diff --git a/website-1.x/package.json b/website-1.x/package.json index 42b80983f2d7..0d02e7452aa1 100644 --- a/website-1.x/package.json +++ b/website-1.x/package.json @@ -15,6 +15,6 @@ }, "dependencies": { "async": "^2.5.0", - "docusaurus": "^2.0.0-alpha.27" + "docusaurus": "^1.14.0" } } diff --git a/website-1.x/versioned_docs/version-1.14.0/api-doc-markdown.md b/website-1.x/versioned_docs/version-1.14.0/api-doc-markdown.md new file mode 100644 index 000000000000..1e62d12e178d --- /dev/null +++ b/website-1.x/versioned_docs/version-1.14.0/api-doc-markdown.md @@ -0,0 +1,254 @@ +--- +id: version-1.14.0-doc-markdown +title: Markdown Features +original_id: doc-markdown +--- + +Docusaurus uses [GitHub Flavored Markdown (GFM)](https://guides.github.com/features/mastering-markdown/). Find out more about Docusaurus-specific fields when writing Markdown. + +## Markdown Headers + +### Documents + +Documents use the following markdown header fields that are enclosed by a line `---` on either side: + +- `id`: A unique document id. If this field is not present, the document's `id` will default to its file name (without the extension). +- `title`: The title of your document. If this field is not present, the document's `title` will default to its `id`. +- `hide_title`: Whether to hide the title at the top of the doc. +- `description`: The description of your document which will become the `` and `` in ``, used by search engines. If this field is not present, it will default to the first line of the contents. +- `sidebar_label`: The text shown in the document sidebar and in the next/previous button for this document. If this field is not present, the document's `sidebar_label` will default to its `title`. + +For example: + +```yaml +--- +id: doc1 +title: My Document +sidebar_label: Document +--- +``` + +Versioned documents have their ids altered to include the version number when they get copied. The new `id` is `version-${version}-${id}` where `${version}` is the version number of that document and `${id}` is the original `id`. Additionally, versioned documents get an added `original_id` field with the original document id. + +For example: + +```yaml +--- +id: version-1.0.0-doc1 +title: My Document +sidebar_label: Document +original_id: doc1 +--- +``` + +`custom_edit_url`: The URL for editing this document. If this field is not present, the document's edit URL will fall back to `editUrl` from optional fields of `siteConfig.js`. See [siteConfig.js](api-site-config.md) docs for more information. + +For example: + +```yaml +--- +id: doc-markdown +title: Markdown Features +custom_edit_url: https://github.com/facebook/docusaurus/edit/master/docs/api-doc-markdown.md +--- +``` + +### Blog Posts + +Blog posts use the following markdown header fields that are enclosed by a line `---` on either side: + +`title`: The title of this blog post. + +`author`: The author of this blog post. If this field is omitted, no author name will be shown. + +`authorURL`: A page to link to when a site user clicks the author's name. If this field is omitted, the author's name will not link to anything. + +`authorFBID`: The author's Facebook id, used only to get the author's profile picture to display with the blog post. If this field is omitted, no author picture will be shown for the blog post. + +For example: + +```yaml +--- +title: My First Blog Post +author: Frank Li +authorURL: http://twitter.com/franchementli +authorFBID: 100002976521003 +--- +``` + +## Extra Features + +Docusaurus supports some extra features when writing documentation in markdown. + +### Linking other Documents + +You can use relative URLs to other documentation files which will automatically get converted to the corresponding HTML links when they get rendered. + +Example: + +```md +[This links to another document](other-document.md) +``` + +This markdown will automatically get converted into a link to `/docs/other-document.html` (or the appropriately translated/versioned link) once it gets rendered. + +This can help when you want to navigate through docs on GitHub since the links there will be functional links to other documents (still on GitHub), but the documents will have the correct HTML links when they get rendered. + +### Linking to Images and Other Assets + +Static assets can be linked to in the same way that documents are, using relative URLs. Static assets used in documents and blogs should go into `docs/assets` and `website/blog/assets`, respectively. The markdown will get converted into correct link paths so that these paths will work for documents of all languages and versions. + +Example: + +```md +![alt-text](assets/doc-image.png) +``` + +### Generating Table of Contents + +You can make an auto-generated list of links, which can be useful as a table of contents for API docs. + +In your markdown file, insert a line with the text <AUTOGENERATED_TABLE_OF_CONTENTS>. Write your documentation using `h3` headers for each function inside a code block. These will be found by Docusaurus and a list of links to these sections will be inserted at the text ``. + +Example: + +```md +### `docusaurus.function(a, b)` + +Text describing my function + +### `docdoc(file)` + +Text describing my function +``` + +will lead to a table of contents of the functions: + +```md +- `docusaurus.function(a, b)` +- `docdoc(file)` +``` + +and each function will link to their corresponding sections in the page. + + +### Language-specific Code Tabs + +Display code in multiple programming languages using code tabs. First, mark the start and end of a code tabs group, by using `` and `` respectively in your markdown. Then start each tab with ``. + +Adding the following code to your Markdown file: + + + +produces this: + + + + +```js +console.log('Hello, world!'); +``` + + +```py +print('Hello, world!') +``` + + +```C +#include + +int main() { + printf("Hello World!"); + return 0; +} +``` + + +```Pascal +program HelloWorld; +begin + WriteLn('Hello, world!'); +end. +``` + + + +## Syntax Highlighting + +Syntax highlighting is enabled by default on fenced code blocks. The language should be detected automatically, but you can sometimes get better results by specifying the language. You can do so using an [info string](https://github.github.com/gfm/#example-111), following the three opening backticks. The following JavaScript example... + + ```js + ReactDOM.render(

Hello, world!

, document.getElementById('root')); + ``` + +...would be rendered with syntax highlighting like so: + +```js +ReactDOM.render(

Hello, world!

, document.getElementById('root')); +``` + +Highlighting is provided by [Highlight.js](https://highlightjs.org) using the theme specified in your `siteConfig.js` file as part of the `highlight` key: + +```js +{ + ... + highlight: { + theme: 'default' + } + ... +} +``` + +You can find the full list of supported themes in the Highlight.js [`styles`](https://github.com/isagalaev/highlight.js/tree/master/src/styles) directory. + +### Registering additional languages + +While Highlight.js provides support for [many popular languages out of the box](https://highlightjs.org/static/demo/), you may find the need to register additional language support. For these cases, we provide an escape valve by exposing the `hljs` constant as part of the `highlight` config key. This in turn allows you to call [`registerLanguage`](http://highlightjs.readthedocs.io/en/latest/api.html#registerlanguage-name-language): + +```js +{ + ... + highlight: { + theme: 'default', + hljs: function(hljs) { + hljs.registerLanguage('galacticbasic', function(hljs) { + // ... + }); + } + } +} +``` + +### Using Prism as additional syntax highlighter + +You can also opt to use Prism to syntax highlight certain languages available in the list [here](https://github.com/PrismJS/prism/tree/master/components). Include those languages in `usePrism` field in your [siteConfig.js](api-site-config.md) + +Example: + +``` +// siteConfig.js +usePrism: ['jsx'] +``` + +Notice that the code block below uses JSX syntax highlighting from Prism. + +```jsx +class Example extends React.Component { + render() { + return ( + + Docusaurus +