fix conflicts

_config.yml

@@ -26,6 +26,8 @@ whitelist:
 - jekyll-redirect-from
 markdown: kramdown
 highlighter: rouge
+include:
+- .gitbook
 exclude:
 - Gemfile
 - Gemfile.lock

_data/projects.yml

@@ -4,21 +4,21 @@
   description: Guides for the basic usage of Rocket.Chat.
   path: user-guides/
   pages:
-    Connecting to a Server: connecting-to-a-server/
-    Registration: registration/
-    Channels: channels/
-    Direct messages between multiple users: direct-messages-between-multiple-users/
-    Messaging: messaging/
-    Managing your Account: managing-your-account/
-    Talking to users from another server: talking-to-users-from-another-server/
+    Connecting to a Server: connecting-to-a-server.html
+    Registration: registration.html
+    Channels: channels.html
+    Direct messages between multiple users: direct-messages-between-multiple-users.html
+    Messaging: messaging.html
+    Managing your Account: managing-your-account.html
+    Talking to users from another server: talking-to-users-from-another-server.html
 
 -
   name: Installation Guides
   icon: install.svg
   description: Guides for installing and deploying Rocket.Chat
   path: installation/
   pages:
-    Cloud: rocket-chat-cloud/
+    Cloud: rocket-chat-cloud.html
     PaaS Deployments: paas-deployments/
     Docker Containers: docker-containers/
     Manual Installation: manual-installation/
@@ -31,10 +31,10 @@
   description: Guides for managing and configuring Rocket.Chat
   path: administrator-guides/
   pages:
-    Account Settings: account-settings/
+    Account Settings: account-settings.html
     Email: email/
-    Federation: federation/
-    Permissions: permissions/
+    Federation: federation.html
+    Permissions: permissions.html
     Livechat: livechat/
     File Upload: file-upload/
     Integrations: integrations/
@@ -46,18 +46,18 @@
   description: Guides for developing and modifying Rocket.Chat's code
   path: developer-guides/
   pages:
-    Quick Start: quick-start/
-    Branches and Releases: branches-and-releases/
-    Testing: testing/
+    Quick Start: quick-start.html
+    Branches and Releases: branches-and-releases.html
+    Testing: testing.html
     Rest API: rest-api/
     Realtime API: realtime-api/
-    Livechat API: livechat-api/
+    Livechat API: livechat-api.html
 
 -
   name: Security
   icon: install.svg
   description: Security documentation
-  path: security/
+  path: security.html
   pages:
 
 -
@@ -66,9 +66,9 @@
   description: Guides for using bots in Rocket.Chat
   path: bots/
   pages:
-    Bots Architecture: bots-architecture/
+    Bots Architecture: bots-architecture.html
     Create a Bot: create-and-run-a-bot/
-    Configuring Bots: configure-bot-environment/
+    Configuring Bots: configure-bot-environment.html
 
 -
   name: Contributing
@@ -77,16 +77,16 @@
   path: contributing/
   pages:
     Developing: developing/
-    Reporting Issues: reporting-issues/
+    Reporting Issues: reporting-issues.html
     Documentation: documentation/
     Security: security/
-    Translating: translating/
+    Translating: translating.html
 
 -
   name: Getting Support
   icon: getting-support.svg
   description: Guides getting support for Rocket.Chat
-  path: getting-support/
+  path: getting-support.html
 
 -
   name: Android

administrator-guides/account-settings.md

@@ -92,9 +92,9 @@ The various settings that fall under this have simple descriptions for understan
 * **Use Default Blocked Domains List**: Will block the email domains listed on this [file](https://github.com/RocketChat/Rocket.Chat/blob/develop/packages/rocketchat-lib/server/lib/defaultBlockedDomainsList.js)
 * **Use DNS Domain Check**: When this is set to true, users won't be able to register with invalid domains.
 * **Registration Form**: This will change how the registration form is presented. Currently, there are 3 options:
-  * Public: The form will be public and anyone will be able to access;
-  * Disabled: The form will be disabled and users won't be able to register through it;
-  * Secret URL: The form will be only accessible using a specific URL;
+    * Public: The form will be public and anyone will be able to access;
+    * Disabled: The form will be disabled and users won't be able to register through it;
+    * Secret URL: The form will be only accessible using a specific URL;
 * **Registration Form Secret URL**: String to be added to the secret URL. Is recommended to use a random string for that. Example: `https://open.rocket.chat/register/[secret_hash]`.
 * **Invite URL Type**: URL type can either be direct or through a proxy.
 * **Registration Form Link Replacement Text**: Text to be shown in place of the registration form when the registration form is disabled.

administrator-guides/federation.md

@@ -11,16 +11,16 @@ When enabling federation on your server, your server becomes part of the Rocket.
 ## Features
 
 * **Current**
-  * Invite users from remote servers
-  * Direct chats between servers
-  * Public, private and broadcast rooms with remote users from any number of servers
-  * Read receipts, notifications and alerts distributed to remote servers
-  * Mute/Unmute remote users
-  * Share files among servers
+    * Invite users from remote servers
+    * Direct chats between servers
+    * Public, private and broadcast rooms with remote users from any number of servers
+    * Read receipts, notifications and alerts distributed to remote servers
+    * Mute/Unmute remote users
+    * Share files among servers
 * **Confirmed Next Features**
-  * Encrypted rooms
-  * Whitelist servers to communicate with
-  * Better federation set-up process, with helpers to validate the configuration
+    * Encrypted rooms
+    * Whitelist servers to communicate with
+    * Better federation set-up process, with helpers to validate the configuration
 
 ## Configuration
 

administrator-guides/rocket-chat-apps/bamboo-integration.md

@@ -26,13 +26,13 @@ After that, your Rocket.Chat will start receiving the configured notifications.
 > **Note**: Not all Build/Deployment events are supported by the Bamboo Integration at the time of this writing. Unsupported events will not result in any notification sent in Rocket.Chat. The list of supported events is as follows:
 
 * Plans:
-  * All Builds Completed
-  * Failed Builds and First Successful
+    * All Builds Completed
+    * Failed Builds and First Successful
 * Jobs:
-  * All Jobs Completed
-  * Failed Jobs and First Successful
-  * Job Error
+    * All Jobs Completed
+    * Failed Jobs and First Successful
+    * Job Error
 * Deployments:
-  * Deployment Started and Finished
-  * Deployment Failed
+    * Deployment Started and Finished
+    * Deployment Failed
 

administrator-guides/white-labeling/basic-white-labeling.md

@@ -454,10 +454,10 @@ Unread Counter Style:
 Here you will be able to change most of the logos on your server. Found in the administration menu.
 
 * logo \(svg, png, jpg\)
-  * Changes the logo on the footer of the left sidebar
-  * Changes the logo on the login page
+    * Changes the logo on the footer of the left sidebar
+    * Changes the logo on the login page
 * login background \(svg, png, jpg\)
-  * Changes the background of the login page
+    * Changes the background of the login page
 
 The next items are mostly icons for different operational systems and platforms, we recommend using the same image with the specified size and format on each item: Favicons are used in the browser tabs and as the icon for the server on the desktop application:
 
@@ -487,4 +487,3 @@ Tiles on Microsoft Windows 10 start menu:
 Safari pinned tab Icon:
 
 * safari pinned tab \(svg\)
-

contributing/developing.md

@@ -23,12 +23,11 @@ But that doesn't mean you can't contribute! Every issue is open and any help is
 
 Want a simple task to get you started? [We maintain a list of those](https://github.com/RocketChat/Rocket.Chat/labels/contrib%3A%20easy)! Or just search for issues tagged contrib:easy
 
-Check our [developer guides](../developer-guides/) for more detailed information about pull requests, workflow and API docs.
+Check our [developer guides](../../developer-guides/) for more detailed information about pull requests, workflow and API docs.
 
 ## Priority Features and/or Bug fixes
 
 If you want a feature or bug fix to be developed with a higher priority:
 
 * [Contact us directly](https://rocket.chat/contact) to sponsor it's development
 * [Add a bounty](https://www.bountysource.com/teams/rocketchat) to it
-

contributing/documentation/contribution-guidelines.md

@@ -13,9 +13,9 @@ You can find a list of issues [here](https://github.com/RocketChat/Rocket.Chat.D
 When you create a new pull request, we expect some requirements to be met.
 
 * Follow this naming convention for Pull Requests:
-  * When adding new documentation, add `New Documentation:` before the title. E.g. `New Documentation: Authentication Guide`.
-  * When fixing documentation, add `Fix Documentation:` before the title. E.g. `Fix Documentation: Authentication Guide`.
-  * When updating documentation, add `Update Documentation:` before the title. E.g. `Update Documentation: Authentication Guide`.
+    * When adding new documentation, add `New Documentation:` before the title. E.g. `New Documentation: Authentication Guide`.
+    * When fixing documentation, add `Fix Documentation:` before the title. E.g. `Fix Documentation: Authentication Guide`.
+    * When updating documentation, add `Update Documentation:` before the title. E.g. `Update Documentation: Authentication Guide`.
 * If your Pull Request closes an issue you need to write `Closes #ISSUE_NUMBER` where the `ISSUE_NUMBER` is the number in the end of the link url that will link your pull request to the issue, when merged will close that issue.
 * For each pull request made, we run tests to check if there are any broken links. You can find how to run these tests locally [here](https://docs.rocket.chat/developer-guides/testing/#testing)