Merge branch 'master' of feistymeow.org:feisty_meow

[feisty_meow.git] / octopi / library / octopus / tentacle.h

diff --git a/octopi/library/octopus/tentacle.h b/octopi/library/octopus/tentacle.h
index c4352d8501abfc1ff15af5add9eb051b99d47444..d04af24bac26a88269eff81ed80449539233c256 100644 (file)
--- a/octopi/library/octopus/tentacle.h
+++ b/octopi/library/octopus/tentacle.h
@@ -142,7 +142,7 @@ public:
     /*!< this function locates the next request for the tentacle when it is
     in its consume() method.  the returned infoton was previously passed
     to the enqueue() method and needs to be processed.  if there are no
-    requests ready, NIL is returned. */
+    requests ready, NULL_POINTER is returned. */
 
   bool store_product(infoton *product, const octopus_request_id &original_id);
     //!< used by tentacles to store the objects they produce from infotons.