Merge branch 'upstream'

[mirror_zfs-debian.git] / README.markdown

diff --git a/README.markdown b/README.markdown
index f0b382ec910cea99f86d8cb48dba0d83c953fab4..1c305b35dabee19341e9e310c8c921033507c776 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -1,11 +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!
+![img](http://zfsonlinux.org/images/zfs-linux.png)
 
-$ ./configure
-$ make pkg
+ZFS on Linux is an advanced file system and volume manager which was originally
+developed for Solaris and is now maintained by the OpenZFS community.
 
-Full documentation for building, configuring, and using ZFS can be
-found at: <http://zfsonlinux.org>
+[![codecov](https://codecov.io/gh/zfsonlinux/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/zfsonlinux/zfs)
+
+# 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/)
+
+# Installation
+Full documentation for installing ZoL on your favorite Linux distribution can
+be found at [our site](http://zfsonlinux.org/).
+
+# Contribute & Develop
+We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).