diff --git a/README.md b/README.md index 1cbbaad..731c902 100644 --- a/README.md +++ b/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: ```console -$ mdbook build --dest-dir book/en +$ mdbook build --dest-dir book_en ``` 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. _Firefox:_ ```console -$ 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) ``` _Chrome:_ ```console -$ 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) ``` Executing `mdbook serve` will have **mdbook** act has a web service @@ -141,6 +141,7 @@ $ mdbook test +`book_de` subdirectory. Since we appended the `--open` parameter, your default browser should be fired up and ... tada! +--> #### 🛠️ Development ================== diff --git a/src/lib.rs b/src/lib.rs index 260fe27..d53be60 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -116,18 +116,42 @@ //! //! _Firefox:_ //! ```console +<<<<<<< HEAD //! $ 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) +||||||| 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:_ //! ```console +<<<<<<< HEAD //! $ 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) +||||||| 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