diff --git a/ChangeLog b/ChangeLog
index 23a22133..a92d1c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,6 @@
 - Added 'export' command.
 - Added 'extensions' command.
 - Added 'help' command.
-- Added 'log' command.
 - Added 'start' command.
 - Added 'stop' command.
 - Added 'tags' command.
diff --git a/doc/data.txt b/doc/data.txt
index ef42903e..5d6ab1f4 100644
--- a/doc/data.txt
+++ b/doc/data.txt
@@ -99,32 +99,5 @@ The undo stack will be stored as:
   ~/.timewarrior/undo.data
 
 
-Logging
--------
-Timewarrior will log many messages, but the logging will be configurable. The
-configuration will be:
-
-  define configuration:
-    logging:
-      file /path/to/log/file
-      categories a,b,c,!d
-
-This indicates that categories 'a', 'b', and 'c' are desired, and 'd' is
-explicitly not desired. The categories are:
-
-  command        (distinguishes tty and non-tty commands)
-  performance
-  rules
-  io
-  parsing
-  warnings
-  errors
-  info
-  debug
-
-A log entry will have this form:
-
-  YYYY-MM-DDTHH:MM:SS <version> <category> <message...>
-
 --- Raw Notes ---
 
diff --git a/doc/grammar.txt b/doc/grammar.txt
index 48f9ad46..83d890fc 100644
--- a/doc/grammar.txt
+++ b/doc/grammar.txt
@@ -31,7 +31,6 @@ The CLI shall have a well-defined and unambiguous grammar.
 
     timew help [<command>|<keyword>|examples]
     timew diagnostics
-    timew log mark|<string>
 
 
 CLI Grammar
diff --git a/doc/intro.txt b/doc/intro.txt
index 815c51d5..9fb30f89 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -115,8 +115,8 @@ There is also a rules system that can impose constraints on the data, such as
 automatically shutting off tracking after 40 hours is tracked per week, warnings
 about overtime, and more.
 
-There is built-in configuration support, logging, and assorted tools to help
-you enact policy.
+There is built-in configuration support and assorted tools to help you enact
+policy.
 
 The data will be stored as plain text, and there will a way to merge data from
 multiple sources.
diff --git a/doc/project.txt b/doc/project.txt
index 0225d9cb..734ee7cb 100644
--- a/doc/project.txt
+++ b/doc/project.txt
@@ -97,7 +97,7 @@ to be added as extensions, while being handled as though they were built-ins.
 
 Undo
 ----
-All commands that change configuration or data need to be logged as-is in the
+All commands that change configuration or data need to be recorded as-is in the
 undo.data file, so that an 'undo' command can later rewind the changes properly.
 
 All undo will happen at the command level, not the delta level. That means if
diff --git a/doc/rules.txt b/doc/rules.txt
index 977bb1c0..f31957df 100644
--- a/doc/rules.txt
+++ b/doc/rules.txt
@@ -158,13 +158,6 @@ hierarchy for grouping:
 In the example, value2 can be referred to by it's normalized name
 'group1.group2.name2'.
 
-An example is logging:
-
-  define configuration:
-    logging:
-      file = /path/to/log/file
-      categories = a b c !d
-
 Initially, all settings are stored as simple name/value pairs at the top level
 of the configuration files:
 
@@ -227,10 +220,9 @@ Built-in Functions
 ------------------
 There are several built-in functions, which may be used by rules:
 
-  error("...")         Logs, emits and terminates
-  warning("...")       Logs, emits and continues
-  info("...")          Logs, emits and continues
-  log("...")           Logs and continues
+  error("...")         Emits and terminates
+  warning("...")       Emits and continues
+  info("...")          Emits and continues
   sum_week("tag1")     Sums minutes in the current week for "tag1"