Merge branch 'develop' into release/1.3.2

cryptomator · Jun 16, 2017 · b61c2de · b61c2de
2 parents 15a28da + 630db0d
commit b61c2de
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProperties.java b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProperties.java
@@ -23,7 +23,6 @@
 import java.util.function.Consumer;
 
 import org.apache.commons.lang3.StringUtils;
-import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags;
 
 /**
  * Properties to pass to
@@ -237,6 +236,7 @@ public Builder withPepper(byte[] pepper) {
 		/**
 		 * Sets the flags for a CryptoFileSystem.
 		 * 
+		 * @param flags File system flags
 		 * @return this
 		 * @since 1.3.1
 		 */
@@ -247,6 +247,7 @@ public Builder withFlags(FileSystemFlags... flags) {
 		/**
 		 * Sets the flags for a CryptoFileSystem.
 		 * 
+		 * @param flags collection of file system flags
 		 * @return this
 		 * @since 1.3.0
 		 */
@@ -260,7 +261,7 @@ public Builder withFlags(Collection<FileSystemFlags> flags) {
 		 * Sets the readonly flag for a CryptoFileSystem.
 		 * 
 		 * @return this
-		 * @deprecated Will be removed in 2.0.0. Use {@link #withFlags(FileSystemFlags.READONLY)}
+		 * @deprecated Will be removed in 2.0.0. Use {@link #withFlags(FileSystemFlags...) withFlags(FileSystemFlags.READONLY)}
 		 */
 		@Deprecated
 		public Builder withReadonlyFlag() {