From ee5490503556ef46ddbc96587d6e3c4f47fdf8a3 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 22 Jun 2016 16:18:46 -0700 Subject: [PATCH] fixed... a quotation mark --- docs/android_zt_sdk.md | 2 +- docs/osx_zt_sdk.md | 16 +++++----------- make-linux.mk | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docs/android_zt_sdk.md b/docs/android_zt_sdk.md index 9a9735b..748f185 100644 --- a/docs/android_zt_sdk.md +++ b/docs/android_zt_sdk.md @@ -25,7 +25,7 @@ In this example we aim to set up a minimal [Android Studio](https://developer.an package ZeroTierSDK; public class ZeroTierSDK_Wrapper { public native void startOneService(); - static { System.loadLibrary("ZeroTierOneJNIā€); } // Loads JNI code + static { System.loadLibrary("ZeroTierOneJNI"); } // Loads JNI code } ``` diff --git a/docs/osx_zt_sdk.md b/docs/osx_zt_sdk.md index dd02acf..55010ee 100644 --- a/docs/osx_zt_sdk.md +++ b/docs/osx_zt_sdk.md @@ -3,7 +3,7 @@ OSX + ZeroTier SDK Welcome! -Imagine a flat, encrypted, no-configuration LAN for all of the instances of your OSX app. +Imagine a flat, encrypted, no-configuration LAN for all of the instances of your OSX app. This short tutorial will show you how to enable ZeroTier functionality for your iOS app with little to no code modification. Check out our [ZeroTier SDK](https://www.zerotier.com/blog) page for more info on how the integration works and [Shim Techniques](https://www.zerotier.com/blog) for a discussion of shims available for your app/technology. @@ -37,7 +37,7 @@ func ztnc_start_service() { } ``` -...and then start it. If you enabled the proxy service via `-DUSE_SOCKS_PROXY` it will start automatically and be reachable at `0.0.0.0:1337`: +...and then start it. If you enabled the proxy service via `-DUSE_SOCKS_PROXY` it will start automatically and be reachable at `0.0.0.0:1337`: ``` dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), { @@ -46,13 +46,13 @@ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), { }); ``` -**Step 5: Pick an [API](# API) to use** +**Step 5: Pick an API** **Step 6: Join a network!** - Simply call `zt_join_network("XXXXXXXXXXXXXXXX")` *** -## Linking into an application on Mac OSX +## Linking into an application on Mac OSX Example: @@ -86,7 +86,7 @@ Run application **Step 5: Join a network!** - Simply call `zt_join_network("XXXXXXXXXXXXXXXX")` -*** +*** ## API This integration allows for the following shim combinations: @@ -112,9 +112,3 @@ inputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey) outputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey) // END proxy configuration ``` - - - - - - diff --git a/make-linux.mk b/make-linux.mk index 606d472..8ea9a81 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -61,7 +61,7 @@ ifeq ($(ZT_TRACE),1) DEFS+=-DZT_TRACE endif -# Debug output for Network Containers +# Debug output for Network Containers # Specific levels can be controlled in netcon/common.inc.c ifeq ($(SDK_DEBUG),1) DEFS+=-DSDK_DEBUG