Merge branch 'next'
This commit is contained in:
27
README.md
27
README.md
@@ -106,27 +106,27 @@ To build the book with the default language (here: 'en'), change
|
|||||||
into the root directory of the element-call submodule and type:
|
into the root directory of the element-call submodule and type:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ mdbook build --dest-dir book/en
|
$ mdbook build --dest-dir book_en
|
||||||
```
|
```
|
||||||
|
|
||||||
The rendered HTML output will be placed underneath the
|
The rendered HTML output will be placed underneath the
|
||||||
`book/en` subdirectory. To check it out, open it in your web
|
`book_en` subdirectory. To check it out, open it in your web
|
||||||
browser.
|
browser.
|
||||||
|
|
||||||
_Firefox:_
|
_Firefox:_
|
||||||
```console
|
```console
|
||||||
$ firefox book/en/html/index.html # Linux
|
$ firefox book_en/html/index.html # Linux
|
||||||
$ open -a "Firefox" book/en/html/index.html # OS X
|
$ open -a "Firefox" book_en/html/index.html # OS X
|
||||||
$ Start-Process "firefox.exe" .\book\en\html\index.html # Windows (PowerShell)
|
$ Start-Process "firefox.exe" .\book_en\html\index.html # Windows (PowerShell)
|
||||||
$ start firefox.exe .\book\en\html\index.html # Windows (Cmd)
|
$ start firefox.exe .\book_en\html\index.html # Windows (Cmd)
|
||||||
```
|
```
|
||||||
|
|
||||||
_Chrome:_
|
_Chrome:_
|
||||||
```console
|
```console
|
||||||
$ google-chrome book/en/html/index.html # Linux
|
$ google-chrome book_en/html/index.html # Linux
|
||||||
$ open -a "Google Chrome" book/en/html/index.html # OS X
|
$ open -a "Google Chrome" book_en/html/index.html # OS X
|
||||||
$ Start-Process "chrome.exe" .\book\en\html\index.html # Windows (PowerShell)
|
$ Start-Process "chrome.exe" .\book_en\html\index.html # Windows (PowerShell)
|
||||||
$ start chrome.exe .\book\en\html\index.html # Windows (Cmd)
|
$ start chrome.exe .\book_en\html\index.html # Windows (Cmd)
|
||||||
```
|
```
|
||||||
|
|
||||||
Executing `mdbook serve` will have **mdbook** act has a web service
|
Executing `mdbook serve` will have **mdbook** act has a web service
|
||||||
@@ -141,6 +141,7 @@ $ mdbook test
|
|||||||
<!--
|
<!--
|
||||||
##### Building a language variant of the book
|
##### Building a language variant of the book
|
||||||
|
|
||||||
|
WIP: adapt to mdbook-i18n-helpers
|
||||||
Translated version of the book will be placed inside the code tree
|
Translated version of the book will be placed inside the code tree
|
||||||
in the subdirectory `src/<language id`.
|
in the subdirectory `src/<language id`.
|
||||||
|
|
||||||
@@ -148,12 +149,12 @@ E.g. if you like to render the german version (language id: 'de'), change
|
|||||||
into Element-Call books root directory and type:
|
into Element-Call books root directory and type:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ MDBOOK_BOOK__src=src/de mdbook build --dest-dir book/de --open
|
$ MDBOOK_BOOK__src=src_de mdbook build --dest-dir book_de --open
|
||||||
```
|
```
|
||||||
|
|
||||||
The rendered HTML output will be placed underneath the
|
The rendered HTML output will be placed underneath the
|
||||||
`book/de` subdirectory. Since we appended the `--open` parameter, your default browser should be fired up and ... tada!
|
`book_de` subdirectory. Since we appended the `--open` parameter, your default browser should be fired up and ... tada!
|
||||||
!-->
|
-->
|
||||||
|
|
||||||
#### 🛠️ Development
|
#### 🛠️ Development
|
||||||
==================
|
==================
|
||||||
|
|||||||
24
src/lib.rs
24
src/lib.rs
@@ -116,18 +116,42 @@
|
|||||||
//!
|
//!
|
||||||
//! _Firefox:_
|
//! _Firefox:_
|
||||||
//! ```console
|
//! ```console
|
||||||
|
<<<<<<< HEAD
|
||||||
//! $ firefox book/en/html/index.html # Linux
|
//! $ firefox book/en/html/index.html # Linux
|
||||||
//! $ open -a "Firefox" book_en/html/index.html # OS X
|
//! $ open -a "Firefox" book_en/html/index.html # OS X
|
||||||
//! $ Start-Process "firefox.exe" .\book_en\html\index.html # Windows (PowerShell)
|
//! $ Start-Process "firefox.exe" .\book_en\html\index.html # Windows (PowerShell)
|
||||||
//! $ start firefox.exe .\book_en\html\index.html # Windows (Cmd)
|
//! $ start firefox.exe .\book_en\html\index.html # Windows (Cmd)
|
||||||
|
||||||| 1d3c838a
|
||||||
|
//! $ firefox book/en/html/index.html # Linux
|
||||||
|
//! $ open -a "Firefox" book/en/html/index.html # OS X
|
||||||
|
//! $ Start-Process "firefox.exe" .\book\en\html\index.html # Windows (PowerShell)
|
||||||
|
//! $ start firefox.exe .\book\en\html\index.html # Windows (Cmd)
|
||||||
|
=======
|
||||||
|
//! $ firefox book_en/html/index.html # Linux
|
||||||
|
//! $ open -a "Firefox" book_en/html/index.html # OS X
|
||||||
|
//! $ Start-Process "firefox.exe" .\book_en\html\index.html # Windows (PowerShell)
|
||||||
|
//! $ start firefox.exe .\book_en\html\index.html # Windows (Cmd)
|
||||||
|
>>>>>>> next
|
||||||
//! ```
|
//! ```
|
||||||
//!
|
//!
|
||||||
//! _Chrome:_
|
//! _Chrome:_
|
||||||
//! ```console
|
//! ```console
|
||||||
|
<<<<<<< HEAD
|
||||||
//! $ google-chrome book/en/html/index.html # Linux
|
//! $ google-chrome book/en/html/index.html # Linux
|
||||||
//! $ open -a "Google Chrome" book_en/html/index.html # OS X
|
//! $ open -a "Google Chrome" book_en/html/index.html # OS X
|
||||||
//! $ Start-Process "chrome.exe" .\book_en\html\index.html # Windows (PowerShell)
|
//! $ Start-Process "chrome.exe" .\book_en\html\index.html # Windows (PowerShell)
|
||||||
//! $ start chrome.exe .\book_en\html\index.html # Windows (Cmd)
|
//! $ start chrome.exe .\book_en\html\index.html # Windows (Cmd)
|
||||||
|
||||||| 1d3c838a
|
||||||
|
//! $ google-chrome book/en/html/index.html # Linux
|
||||||
|
//! $ open -a "Google Chrome" book/en/html/index.html # OS X
|
||||||
|
//! $ Start-Process "chrome.exe" .\book\en\html\index.html # Windows (PowerShell)
|
||||||
|
//! $ start chrome.exe .\book\en\html\index.html # Windows (Cmd)
|
||||||
|
=======
|
||||||
|
//! $ google-chrome book_en/html/index.html # Linux
|
||||||
|
//! $ open -a "Google Chrome" book_en/html/index.html # OS X
|
||||||
|
//! $ Start-Process "chrome.exe" .\book_en\html\index.html # Windows (PowerShell)
|
||||||
|
//! $ start chrome.exe .\book_en\html\index.html # Windows (Cmd)
|
||||||
|
>>>>>>> next
|
||||||
//! ```
|
//! ```
|
||||||
//!
|
//!
|
||||||
//! Executing `mdbook serve` will have **mdbook** act has a web service
|
//! Executing `mdbook serve` will have **mdbook** act has a web service
|
||||||
|
|||||||
Reference in New Issue
Block a user