Merge tag 'upstream/0.7.5'

[mirror_zfs-debian.git] / README.markdown

diff --git a/README.markdown b/README.markdown
index a8abb00d348480be771d799ea7a44f18ea7575f7..fd2ca8c866517777aca7e0289608cd626e9509f2 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -1,17 +1,19 @@
-Native ZFS for Linux! ZFS is an advanced file system and volume manager
-which was originally developed for Solaris. It has been successfully 
-ported to FreeBSD and now there is a functional Linux ZFS kernel port
-too. The port currently includes a fully functional and stable SPA, DMU,
-and ZVOL with a ZFS Posix Layer (ZPL) on the way!
+<p align="center"><img src="http://zfsonlinux.org/images/zfs-linux.png"/></p>
+ZFS is an advanced file system and volume manager which was originally
+developed for Solaris and is now maintained by the Illumos community.
 
-    $ ./configure
-    $ make pkg
+ZFS on Linux, which is also known as ZoL, is currently feature complete.  It
+includes fully functional and stable SPA, DMU, ZVOL, and ZPL layers. And it's native!
 
-To copy the kernel code inside your kernel source tree for builtin
-compilation:
+# Official Resources
+  * [Site](http://zfsonlinux.org)
+  * [Wiki](https://github.com/zfsonlinux/zfs/wiki)
+  * [Mailing lists](https://github.com/zfsonlinux/zfs/wiki/Mailing-Lists)
+  * [OpenZFS site](http://open-zfs.org/)
 
-    $ ./configure --enable-linux-builtin --with-linux=/usr/src/linux-...
-    $ ./copy-builtin /usr/src/linux-...
+# Installation
+Full documentation for installing ZoL on your favorite Linux distribution can
+be found at [our site](http://zfsonlinux.org/).
 
-Full documentation for building, configuring, and using ZFS can be
-found at: <http://zfsonlinux.org>
+# Contribute & Develop
+We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).
\ No newline at end of file