Merge branch 'develop' of github.com:syncany/syncany into develop

syncany · Aug 3, 2014 · 02ffbce · 02ffbce
2 parents f3af327 + 6263f20
commit 02ffbce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Change Log
 ### Syncany 0.1.8-alpha (Date: tbd.)
 - Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
 - Features and significant changes:
+  + New Samba / Windows share plugin #172
   + Public key authentication for the SFTP plugin #134
 - Bugfixes and other things:
   + Fixed cross dependency issue with plugins #162

diff --git a/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManager.java b/syncany-lib/src/main/java/org/syncany/plugins/transfer/TransferManager.java
@@ -74,8 +74,7 @@ public interface TransferManager {
 	 * Initialize remote storage. This method is called to set up a new repository.
 	 * 
 	 * @param  createIfRequired true if the method should handle repo creation
-	 * 	       if it does not exists
-	 * @throws StorageException If the repository is already initialized, or any other
+	 * @throws StorageException If the connection drops, or any other
 	 *         exception occurs. 
 	 */
 	public void init(boolean createIfRequired) throws StorageException;