Merge branch 'next'

* include links to the github sources
* prepare hint on howto create other language versions

README.md

@@ -154,7 +154,7 @@ $ MDBOOK_BOOK__src=src_de mdbook build --dest-dir book_de --open
 
 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!
-!-->
+-->
 
 #### 🛠️ Development
 ==================

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