Merge branch 'dev' into fpu

3 files changed, 27 insertions, 5 deletions

diff --git a/docs/getting-started.md b/docs/getting-started.md
index 692c1e67..88945f7b 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -210,6 +210,8 @@ By default the interactive python prompt has a number of convenient helper funct
 - `bv` / `current_view` / : the current [BinaryView](https://api.binary.ninja/binaryninja.BinaryView.html)
 - `current_function`: the current [Function](https://api.binary.ninja/binaryninja.Function.html)
 - `current_basic_block`: the current [BasicBlock](https://api.binary.ninja/binaryninja.BasicBlock.html)
+- `current_llil`: the current [LowLevelILBasicBlock](https://api.binary.ninja/binaryninja.lowlevelil.LowLevelILBasicBlock.html)
+- `current_mlil`: the current [MediumLevelILBasicBlock](https://api.binary.ninja/binaryninja.mediumlevelil.MediumLevelILBasicBlock.html)
 - `current_selection`: a tuple of the start and end addresses of the current selection
 - `write_at_cursor(data)`: function that writes data to the start of the current selection
 - `get_selected_data()`: function that returns the data in the current selection
@@ -253,6 +255,8 @@ Settings are stored in the _user_ directory in the file `settings.json`. Each to
 
 |Plugin | Setting                  | Type         | Default                                        | Description                                                                                   |
 |------:|-------------------------:|-------------:|-----------------------------------------------:|:----------------------------------------------------------------------------------------------|
+| core  | linux\_ca\_bundle        | string       | ""                                             | Certificate authority (.pem or .crt) file to be used for secure downloads                     |
+| core  | linux\_ca\_dir           | string       | ""                                             | Certificate authority directory (for distributions without a CA bundle)                       |
 | ui    | activeContent            | boolean      | True                                           | Allow Binary Ninja to connect to the web to check for updates                                 |
 | ui    | colorblind               | boolean      | True                                           | Choose colors that are visible to those with red/green colorblind                             |
 | ui    | debug                    | boolean      | False                                          | Enable developer debugging features (Additional views: Lifted IL, and SSA forms)              |
diff --git a/docs/guide/plugins.md b/docs/guide/plugins.md
index 9c67d44f..442d6fe4 100644
--- a/docs/guide/plugins.md
+++ b/docs/guide/plugins.md
@@ -36,9 +36,9 @@ Binary Ninja now offers a [PluginManager API] which can simplify the process of
 ['__class__', '__delattr__', '__dict__', '__doc__', '__format__', '__getattribute__', '__hash__', '__init__', '__module__', '__new__', '__reduce__', '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', '__str__', '__subclasshook__', '__weakref__', 'add_repository', 'check_for_updates', 'default_repository', 'disable_plugin', 'enable_plugin', 'handle', 'install_plugin', 'plugins', 'repositories', 'uninstall_plugin', 'update_plugin']
 >>> mgr.plugins
 {'default': [<binaryninja-bookmarks not-installed/disabled>, <binaryninja-msp430 not-installed/disabled>, <binaryninja-radare2 not-installed/disabled>, <binaryninja-spu not-installed/disabled>, <binja-avr not-installed/disabled>, <binja_smali not-installed/disabled>, <binjatron not-installed/disabled>, <binoculars not-installed/disabled>, <easypatch not-installed/disabled>, <liil installed/enabled>, <list_comments not-installed/disabled>, <x64dbgbinja not-installed/disabled>]}
->>> mgr.install_plugin(easypatch)
+>>> mgr.install_plugin("easypatch")
 True
->>> mgr.enable(easypatch)
+>>> mgr.enable_plugin("easypatch")
 True
 ```
 
diff --git a/docs/guide/troubleshooting.md b/docs/guide/troubleshooting.md
index a640d47e..5e310dfb 100644
--- a/docs/guide/troubleshooting.md
+++ b/docs/guide/troubleshooting.md
@@ -36,6 +36,16 @@ Next, if running a python plugin, make sure the python requirements are met by y
 - If experiencing problems with Windows UAC permissions during an update, the easiest fix is to completely un-install and [recover][recover] the latest installer and license. Preferences are saved outside the installation folder and are preserved, though you might want to remove your [license](/getting-started/#license).
 - If you need to change the email address on your license, contact [support].
 
+## OS X
+
+While OS X is generally the most trouble-free environment for Binary Ninja, very old versions may have problems with the RPATH for our binaries and libraries. There are two solutions. First, run Binary Ninja with: 
+
+```
+DYLD_LIBRARY_PATH="/Applications/Binary Ninja.app/Contents/MacOS" /Applications/Binary\ Ninja.app/Contents/MacOS/binaryninja
+```
+
+Or second, modify the binary itself using the [install_name_tool](https://blogs.oracle.com/dipol/dynamic-libraries,-rpath,-and-mac-os).
+
 ## Linux
 
 Given the diversity of Linux distributions, some work-arounds are required to run Binary Ninja on platforms that are not [officially supported][faq].
@@ -67,9 +77,17 @@ QT_PLUGIN_PATH=./qt ./binaryninja
 For Debian variants that (Kali, eg) don't match packages with Ubuntu LTS or the latest stable, the following might fix problems with libssl and libcrypto:
 
 ```
-$ cd binaryninja/plugins
-$ ln -s libssl.so libssl.so.1.0.0
-$ ln -s libcrypto.so libcrypto.so.1.0.0
+$ cd binaryninja
+$ ln -s plugins/libssl.so libssl.so.1.0.0
+$ ln -s plugins/libcrypto.so libcrypto.so.1.0.0
+```
+
+Alternatively, you might need to (as root):
+
+```
+apt-get install libssl-dev
+ln -s /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.2 /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
+ln -s /usr/lib/x86_64-linux-gnu/libssl.so.1.0.2 /usr/lib/x86_64-linux-gnu/libssl.so.1.0.0
 ```
 
 ### Gentoo