Manual merging with dev

3 files changed, 22 insertions, 4 deletions

diff --git a/docs/.s3_website.yaml b/docs/.s3_website.yaml
new file mode 100644
index 00000000..02c4a996
--- /dev/null
+++ b/docs/.s3_website.yaml
@@ -0,0 +1,3 @@
+s3_bucket: docs.binary.ninja
+site: ../site
+s3_reduced_redundancy: True
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 82c833a5..c78aa737 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -62,6 +62,7 @@ Switching views happens multiple ways. In some instances, it's automatic (clicki
  - `;` : Adds a comment
  - `i` : Switches between disassembly and low-level il in graph view
  - `y` : Change type
+ - `a` : Change the data type to an ASCII string
  - [1248] : Change type directly to a data variable of the indicated widths
  - `d` : Switches between data variables of various widths
  - `r` : Change the data type to single ASCII character
diff --git a/docs/guide/troubleshooting.md b/docs/guide/troubleshooting.md
index 68a4d328..a74ecb68 100644
--- a/docs/guide/troubleshooting.md
+++ b/docs/guide/troubleshooting.md
@@ -9,22 +9,36 @@
 
 ## License Problems
 
-- If experiencing problems with Windows UAC permissions during an update, the easiest fix is to completely un-install and re-download the latest installer. Preferences are saved outside the installation folder and are preserved, though you might want to remove your [license](/getting-started/index.html#license).
+- 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/index.html#license).
 - If you need to change the email address on your license, contact [support].
 
-## Arch Linux
+## Linux
 
-Arch Linux is not an officially supported operating system, but many of our users have run it, and there are a few pitfalls to watch out for.
+Given the diversity of Linux distributions, some work-arounds are required to run Binary Ninja on platforms that are not [officially supported][faq].
+
+### Arch Linux
 
  - Install python2 from the [official repositories][archrepo]
  - Install the [libcurl-compat] library from AUR, and run Binary Ninja via `LD_PRELOAD=libcurl.so.3 ~/binaryninja/binaryninja`
 
+### KDE
+
+To run Binary Ninja in a KDE based environment, set the `QT_PLUGIN_PATH` to the `QT` sub-folder:
+
+```
+cd ~/binaryninja
+QT_PLUGIN_PATH=./qt ./binaryninja
+```
+
+
 ## API
 
- - If the GUI launches but the license file is not valid, check that you're using the right version of Python. Only a 64-bit Python 2.7 is supported at this time.
+ - If the GUI launches but the license file is not valid when launched from the command-line, check that you're using the right version of Python. Only a 64-bit Python 2.7 is supported at this time. Additionally, the [personal][purchase] edition does not support headless operation.
 
 [known issues]: https://github.com/Vector35/binaryninja-api/issues?q=is%3Aissue
 [libcurl-compat]: https://aur.archlinux.org/packages/libcurl-compat/
 [archrepo]: https://wiki.archlinux.org/index.php/Official_repositories
 [recover]: https://binary.ninja/recover.html
 [support]: https://binary.ninja/support.html
+[faq]: https://binary.ninja/faq.html
+[purchase]: https://binary.ninja/purchase.html