From 4488ccf02bcc22b0a6ff2a19fe9c7bd52238dd9c Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Wed, 15 Oct 2014 21:08:31 -0700 Subject: [PATCH] clarify comments on dev branch --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 29c692d..8056dfe 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## About -EncFS provides an encrypted filesystem in user-space. It runs in userspace, +EncFS provides an encrypted filesystem in user-space. It runs in userspace, using the FUSE library for the filesystem interface. EncFS is open source software, licensed under the LGPL. @@ -15,7 +15,7 @@ use and released the first version to Open Source in 2003. EncFS encrypts individual files, by translating all requests for the virtual EncFS filesystem into the equivalent encrypted operations on the raw -filesystem. +filesystem. ## Status @@ -38,8 +38,11 @@ more complete, introduction page at http://www.arg0.net/encfs ## Development -Development is ongoing in the [dev](https://github.com/vgough/encfs/tree/dev) -branch. The code there is not guaranteed to be stable, and there is no -guarantee of backward compatibility. +The master branch contains the latest stable codebase. This is where bug fixes +and improvments should go. +The [dev](https://github.com/vgough/encfs/tree/dev) branch contains experimental +work, some of which may be back-ported to the master branch when it is stable. The +dev branch is not stable, and there is no guarantee of backward compatibility +between changes.