From f44599d3f1be25a76553c69b11f0a95f0161f887 Mon Sep 17 00:00:00 2001
From: Graham whaley <graham.whaley@intel.com>
Date: Tue, 10 Apr 2018 11:48:51 +0100
Subject: [PATCH] vendoring: update information around `prune`

The new `dep` now automatically prunes, and has deprecated the
command line prune command.

Update the doc to reflect this. Also add a note that we like to
use the `non-go = true` option for prune as well if we can.

Fixes: #20

Signed-off-by: Graham whaley <graham.whaley@intel.com>
---
 VENDORING.md | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/VENDORING.md b/VENDORING.md
index 6b2049ab53..c0bb869a65 100644
--- a/VENDORING.md
+++ b/VENDORING.md
@@ -36,7 +36,6 @@ $ export PATH=$GOPATH/bin:$PATH
 
 - `dep init`: Initialize a new project with manifest and lock files.
 - `dep ensure`: Ensure a dependency is safely vendored in the project.
-- `dep prune`: Prune the vendor tree of unused packages.
 
 ## Vendoring use cases
 
@@ -83,19 +82,37 @@ The following is what `Gopkg.toml` should look like:
 # [[override]]
 #  name = "github.com/x/y"
 #  version = "2.4.0"
-
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
 ```
+
 This file contains all the information you need to modify it properly.
 
 At this point you can vendor any package needed from your code.
 
+### Pruning non-go files
+
+`dep` provides the feature to remove all non-go files from your vendor tree
+during its prune phase. By default this is not enabled, but generally for
+Kata Containers repositories, we do enable this feature. If possible, modify your
+`[prune]` section to enable this feature:
+
+```toml
+ [prune]
+   non-go = true
+   go-tests = true
+   unused-packages = true
+```
+
 ### Vendor a newly imported package
 
 The following case describes a situation when you add new code that relies
 on a package that has never been imported (e.g. `github.com/foo/bar`):
 ```bash
 $ dep ensure
-$ dep prune
 ```
 
 At this point, only the required files will be copied into `vendor`.
@@ -158,7 +175,6 @@ updating the vendoring version:
 Let `dep` update the vendoring by relying on this new revision:
 ```bash
 $ dep ensure
-$ dep prune
 ```
 
 ### Remove a vendored package
@@ -169,7 +185,6 @@ removes the vendored package from `vendor` directory and from
 `Gopkg.lock`:
 ```bash
 $ dep ensure
-$ dep prune
 ```
 
 If a constraint is set in `Gopkg.toml`, it is your responsibility to remove