backport docs from master

1 files changed, 12 insertions, 9 deletions

diff --git a/TODO.md b/TODO.md
index 7116507..ec9ca2d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,15 +3,18 @@ TODO
 
 This is a loose list of what to do. Maybe for the next releae or maybe for a later one.
 
-[ ] Client 4.x should print a warning when trying to connect to a 3.x server.
-[ ] Client 3.x should print a warning when trying to connect to a 4.x server.
-[ ] Update docs for color configuration
-[ ] Update animated gifs
-[ ] Document that can use additional args as file lists
-[ ] Document spartan mode
-[ ] Document serverless mode
-[ ] Go through the git history and document more stuff
+[ ] Manually add back all changes from mimecast master to this branch.
+[ ] Client 4.x should print an error and exit when trying to connect to a 3.x server.
+[ ] Client 3.x should print an error and exit when trying to connect to a 4.x server.
+[ ] Create a GitHub Wiki
+  [ ] Migrate existing documentation + update animated Gifs
+  [ ] Document that can use additional args as file lists
+  [ ] Document spartan mode
+  [ ] Document serverless mode
+  [ ] Document color configuratio
+  [ ] Go through the git history and document more stuff
 [ ] Manual test/adjust dtail colors
 [ ] More integration test colors (via dcat?)
+[ ] Integration test grep context'
 [ ] Integration test for dtail in serverless mode
-[ ] Integration test for dtail normal mode
+[x] Integration test for dtail normal mode