From fb5ce5089b54904d21ff8b9fec9f5d9701696281 Mon Sep 17 00:00:00 2001
From: Abhinav Bhatele <bhatele@llnl.gov>
Date: Mon, 30 Jul 2018 23:47:58 -0700
Subject: [PATCH] try 1

---
 docs/conf.py       | 2 +-
 docs/userguide.rst | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0ac51204d..a0eb5acfb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,7 +14,7 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('../hatchet'))
+sys.path.insert(0, os.path.abspath('../'))
 
 
 # -- Project information -----------------------------------------------------
diff --git a/docs/userguide.rst b/docs/userguide.rst
index d48c45ad0..29b5366f3 100644
--- a/docs/userguide.rst
+++ b/docs/userguide.rst
@@ -49,8 +49,8 @@ of the node and MPI rank is used to index into the dataframe.
 
 Graph-centric Operations
 ------------------------
-**Prune**: The ``prune`` operation is always performed after a ``filter`` is
-done on the dataframe. ``Prune`` removes nodes from the graph that were
+**Squash**: The ``squash`` operation is always performed after a ``filter`` is
+done on the dataframe. ``Squash`` removes nodes from the graph that were
 filtered out due to a previous ``filter`` operation. When one or more nodes on
 a path are removed from the graph, the nearest alive ancestor is connected by
 an edge to the nearest alive child on the path.
@@ -61,6 +61,9 @@ an edge to the nearest alive child on the path.
 **Diff**:
 
 
+**Groupby and Aggregate**:
+
+
 Dataframe-centric Operations
 ----------------------------
 **Filter**: ``filter`` takes a user supplied function and applies that to all
@@ -69,3 +72,4 @@ dataframe to only return rows that are True. The returned graphframe preserves
 the graph provided as input.
 
 **Fill**:
+