From 47193f42c7672c51e28e8705a13be4d431e32fc3 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Feb 25 2019 13:56:35 +0000
Subject: Synchronize with upstream


---

diff --git a/Dockerfile b/Dockerfile
index a585b5d..43fdf5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ENV NAME=fedora-toolbox VERSION=31
 LABEL com.redhat.component="$NAME" \
       name="$FGC/$NAME" \
       version="$VERSION" \
-      usage="This image is meant to be used with the fedora-toolbox command" \
+      usage="This image is meant to be used with the toolbox command" \
       summary="Base image for creating Fedora toolbox containers" \
       maintainer="Debarshi Ray <rishi@fedoraproject.org>"
 
diff --git a/README.md b/README.md
index fe3056f..b8b81a5 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,41 @@
-# Fedora Toolbox — Hacking on your OSTree-based Fedora
-
-[Fedora Toolbox](https://github.com/debarshiray/fedora-toolbox) is a tool that
-offers a familiar RPM based environment for developing and debugging software
-on locked down [OSTree](https://ostree.readthedocs.io/en/latest/) based Fedora
-systems like [Silverblue](https://silverblue.fedoraproject.org/). Such
-operating systems are shipped as *immutable* OSTree images, where it's
-difficult to setup a development environment with your favorite tools, editors
-and SDKs. A toolbox container solves that problem by providing a RPM based
-*mutable* container. You can tweak it to your heart's content and use DNF to
-install your favorite packages, all without worrying about breaking your
-operating system.
-
-The toolbox environment is based on the `fedora-toolbox` image. This image is
-then customized for the current user to create a toolbox container that
-seamlessly integrates with the rest of the operating system.
+# Toolbox — Unprivileged development environment
 
-## Usage
+[Toolbox](https://github.com/debarshiray/toolbox) is a tool that offers a
+familiar RPM based environment for developing and debugging software that runs
+fully unprivileged using [Podman](https://podman.io/).
 
-### Create the basic Fedora Toolbox image:
-```
-[user@hostname fedora-toolbox]$ buildah bud --tag fedora-toolbox:31 .
-STEP 1: FROM docker://registry.fedoraproject.org/fedora:31
-Getting image source signatures
-…
-…
-…
-[user@hostname fedora-toolbox]$
-```
-Modify the Dockerfile to match your taste and Fedora version. The image should
-be tagged as `fedora-toolbox` with a suffix matching the host Fedora version.
-eg., `fedora-toolbox:31`, etc..
+The toolbox container is a fully *mutable* container; when you see
+`yum install ansible` for example, that's something you can do inside your
+toolbox container, without affecting the base operating system.
+
+This is particularly useful on
+[OSTree](https://ostree.readthedocs.io/en/latest/) based Fedora systems like
+[Silverblue](https://silverblue.fedoraproject.org/).  The intention of these
+systems is to discourage installation of software on the host, and instead
+install software as (or in) containers.
+
+However this project doesn't *require* using an OSTree based system — it
+works equally well if you're running e.g. existing Fedora Workstation or
+Server, and that's a useful way to incrementally adopt containerization.
 
-### Create your Fedora Toolbox container:
+The toolbox environment is based on an [OCI](https://www.opencontainers.org/)
+image. On Fedora this is the `fedora-toolbox` image. This image is then
+customized for the current user to create a toolbox container that seamlessly
+integrates with the rest of the operating system.
+
+## Usage
+
+### Create your toolbox container:
 ```
-[user@hostname fedora-toolbox]$ ./fedora-toolbox create
-[user@hostname fedora-toolbox]$
+[user@hostname ~]$ toolbox create
+[user@hostname ~]$
 ```
 This will create a container, and an image, called
-`fedora-toolbox-<your-username>:31` that's specifically customised for your
-host user.
+`fedora-toolbox-<your-username>:<version-id>` that's specifically customised
+for your host user.
 
-### Enter the Toolbox:
+### Enter the toolbox:
 ```
-[user@hostname fedora-toolbox]$ ./fedora-toolbox enter
+[user@hostname ~]$ toolbox enter
 🔹[user@toolbox ~]$
 ```
-
diff --git a/extra-packages b/extra-packages
index bcfb241..366a082 100644
--- a/extra-packages
+++ b/extra-packages
@@ -2,8 +2,8 @@ bash-completion
 bzip2
 diffutils
 dnf-plugins-core
-fpaste
 findutils
+fpaste
 git
 gnupg
 gnupg2-smime