Documentation fixes.

eclipse · Aug 16, 2018 · 8949200 · 8949200
1 parent 9d157f8
commit 8949200
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,9 +31,9 @@ Foundation IP policy.
 
 Please read the [Eclipse Foundation policy on accepting contributions via Git](http:https://wiki.eclipse.org/Development_Resources/Contributing_via_Git).
 
-1. Sign the [Eclipse CLA](http:https://www.eclipse.org/legal/CLA.php)
+1. Sign the [Eclipse ECA](http:https://www.eclipse.org/legal/ECA.php)
  1. Register for an Eclipse Foundation User ID. You can register [here](https://dev.eclipse.org/site_login/createaccount.php).
- 2. Log into the [Projects Portal](https://projects.eclipse.org/), and click on the '[Eclipse CLA](https://projects.eclipse.org/user/sign/cla)' link.
+ 2. Log into the [Projects Portal](https://projects.eclipse.org/), and click on the '[Eclipse ECA](https://projects.eclipse.org/user/sign/eca)' link.
 2. Go to your [account settings](https://dev.eclipse.org/site_login/myaccount.php#open_tab_accountsettings) and add your GitHub username to your account.
 3. Make sure that you _sign-off_ your Git commits in the following format:
  ``` Signed-off-by: John Smith <[email protected]> ``` This is usually at the bottom of the commit message. You can automate this by adding the '-s' flag when you make the commits. e.g. ```git commit -s -m "Adding a cool feature"```

diff --git a/compiling.txt b/compiling.txt
@@ -1,8 +1,7 @@
 The following packages can be used to add features to mosquitto. All of them
 are optional.
 
-<<<<<<< HEAD
-* openssl (version 1.0.0 or greater if TLS-PSK support is needed)
+* openssl
 * c-ares (for DNS-SRV support, disabled by default)
 * libuuid (from util-linux, can be disabled)
 * tcp-wrappers (optional, package name libwrap0-dev)