From c3cc0cd9a3cbac0635256c0704384dd78d3823da Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Feb 01 2018 18:31:36 +0000
Subject: package-management: rpm-ostree/atomic


Currently Atomic Host uses rpm-ostree/atomic.  There's also going
to be an Atomic Workstation, so let's mention the existence of these
tools.  For now I'm just linking to the upstream documentation.

---

diff --git a/en-US/package-management/intro-package-management.adoc b/en-US/package-management/intro-package-management.adoc
index e1b6085..7b10520 100644
--- a/en-US/package-management/intro-package-management.adoc
+++ b/en-US/package-management/intro-package-management.adoc
@@ -2,4 +2,21 @@ include::en-US/entities.adoc[]
 
 = Package Management
 
-All software on a {MAJOROS} system is divided into RPM packages, which can be installed, upgraded, or removed. This part describes how to manage packages on {MAJOROS} using [application]*DNF*.
+There are two types of {MAJOROS} system; "traditional", which use DNF, and "image-based" which use rpm-ostree.
+
+= Traditional package management
+
+On a traditional {MAJOROS} system, software is divided into RPM packages, which
+can be managed via [application]*DNF*.
+
+= Hybrid image/package management
+
+The "Atomic" variant of {MAJOROS} uses [application]*rpm-ostree* to update the
+host. `rpm-ostree` is a hybrid image/package system. By default, installations
+are in "image" mode using OSTree, but additional packages can be installed.  It
+also supports overrides, rebases, and many other features.  For more information,
+see link:++http://www.projectatomic.io/docs/os-updates/++[its online documentation].
+
+Additionally, the `atomic` CLI supports installation of system containers, which
+are Docker/OCI images distinct from the host user space.  For more information,
+see link:++http://www.projectatomic.io/docs/usr-bin-atomic/++[its online documentation].
diff --git a/en-US/package-management/rpm-ostree.adoc b/en-US/package-management/rpm-ostree.adoc
new file mode 100644
index 0000000..d251e73
--- /dev/null
+++ b/en-US/package-management/rpm-ostree.adoc
@@ -0,0 +1,12 @@
+
+:experimental:
+include::en-US/entities.adoc[]
+
+[[ch-rpm-ostree]]
+= rpm-ostree
+
+[application]*rpm-ostree* is a hybrid image/package system for {OSORG}.  One of
+the most important things to understand is that available RPMs come from the same
+`/etc/yum.repos.d` sources.
+
+For more information, see the [upstream documentation](https://rpm-ostree.readthedocs.io/en/latest/).