From 45239449a6de5f746f3f0475ebc031c3317a954a Mon Sep 17 00:00:00 2001
From: "luz.paz" <luzpaz@users.noreply.github.com>
Date: Mon, 29 Jan 2018 19:24:57 -0500
Subject: [PATCH] More typos

these need a little  more review.
---
 Utilities/GitSetup/git-gitlab-sync                 | 2 +-
 vtkm/rendering/ConnectivityProxy.cxx               | 2 +-
 vtkm/rendering/raytracing/ConnectivityBase.h       | 2 +-
 vtkm/rendering/raytracing/ConnectivityTracerBase.h | 2 +-
 vtkm/worklet/NDimsHistogram.h                      | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Utilities/GitSetup/git-gitlab-sync b/Utilities/GitSetup/git-gitlab-sync
index 275a5d2e6..012b25972 100755
--- a/Utilities/GitSetup/git-gitlab-sync
+++ b/Utilities/GitSetup/git-gitlab-sync
@@ -64,7 +64,7 @@ test -n "$remote" || remote="gitlab"
 # Identify and validate the topic branch name.
 head="$(git symbolic-ref HEAD)" && topic="${head#refs/heads/}" || topic=''
 if test -z "$topic" -o "$topic" = "master"; then
-  die 'You cant sync the master branch, please checkout the correct a branch with:
+  die 'You can\'t sync the master branch, please checkout the correct a branch with:
   git checkout <branch>'
 fi
 
diff --git a/vtkm/rendering/ConnectivityProxy.cxx b/vtkm/rendering/ConnectivityProxy.cxx
index 8e2105ab0..3e4714fc6 100644
--- a/vtkm/rendering/ConnectivityProxy.cxx
+++ b/vtkm/rendering/ConnectivityProxy.cxx
@@ -202,7 +202,7 @@ public:
     }
     else
     {
-      throw vtkm::cont::ErrorBadValue("ENGERY MODE Not implemented for this use case\n");
+      throw vtkm::cont::ErrorBadValue("ENERGY MODE Not implemented for this use case\n");
     }
 
     Tracer->Trace(rays);
diff --git a/vtkm/rendering/raytracing/ConnectivityBase.h b/vtkm/rendering/raytracing/ConnectivityBase.h
index 5df12ef77..405553223 100644
--- a/vtkm/rendering/raytracing/ConnectivityBase.h
+++ b/vtkm/rendering/raytracing/ConnectivityBase.h
@@ -50,7 +50,7 @@ public:
   virtual void SetVolumeData(const vtkm::cont::Field& scalarField,
                              const vtkm::Range& scalarBounds) = 0;
 
-  virtual void SetEnergyData(const vtkm::cont::Field& absorbtion,
+  virtual void SetEnergyData(const vtkm::cont::Field& absorption,
                              const vtkm::Int32 numBins,
                              const vtkm::cont::Field& emission = vtkm::cont::Field()) = 0;
 
diff --git a/vtkm/rendering/raytracing/ConnectivityTracerBase.h b/vtkm/rendering/raytracing/ConnectivityTracerBase.h
index 634aea112..908ce8667 100644
--- a/vtkm/rendering/raytracing/ConnectivityTracerBase.h
+++ b/vtkm/rendering/raytracing/ConnectivityTracerBase.h
@@ -82,7 +82,7 @@ protected:
   bool ReEnterMesh; // Do not try to re-enter the mesh
   bool CreatePartialComposites;
   bool FieldAssocPoints;
-  bool HasEmission; // Mode for integrating through engery bins
+  bool HasEmission; // Mode for integrating through energy bins
 
   // timers
   vtkm::Float64 IntersectTime;
diff --git a/vtkm/worklet/NDimsHistogram.h b/vtkm/worklet/NDimsHistogram.h
index dad0da144..f3690c7f1 100644
--- a/vtkm/worklet/NDimsHistogram.h
+++ b/vtkm/worklet/NDimsHistogram.h
@@ -82,12 +82,12 @@ public:
   // Execute N-Dim histogram worklet to get N-Dims histogram from input fields
   // Input arguments:
   //   binId: returned bin id of NDims-histogram, binId has n arrays, if length of fieldName is n
-  //   freqs: returned frequncy(count) array
+  //   freqs: returned frequency(count) array
   //     Note: the ND-histogram is returned in the fashion of sparse representation.
-  //           (no zero freqncy in freqs array)
+  //           (no zero frequency in freqs array)
   //           the length of all arrays in binId and freqs array must be the same
   //           if the length of fieldNames is n (compute a n-dimensional hisotgram)
-  //           freqs[i] is the freqncy of the bin with bin Ids{ binId[0][i], binId[1][i], ... binId[n-1][i] }
+  //           freqs[i] is the frequency of the bin with bin Ids{ binId[0][i], binId[1][i], ... binId[n-1][i] }
   template <typename DeviceAdapter>
   void Run(std::vector<vtkm::cont::ArrayHandle<vtkm::Id>>& binId,
            vtkm::cont::ArrayHandle<vtkm::Id>& freqs,