aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-08 15:23:30 -0500
committerNick Mathewson <nickm@torproject.org>2011-03-08 15:23:30 -0500
commitd5907e7d9d79297cc7359aeae810972a1b834e23 (patch)
tree799dc235420d86b270c985970e4dbedbfc8e45c6 /doc
parent26009a3ed06549b7d7def9b96b327b906db16bd8 (diff)
parent9ad083d5731c983ea3e961822306c50ce32dfcc2 (diff)
downloadtor-d5907e7d9d79297cc7359aeae810972a1b834e23.tar.gz
tor-d5907e7d9d79297cc7359aeae810972a1b834e23.zip
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'doc')
-rw-r--r--doc/HACKING10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/HACKING b/doc/HACKING
index 486fe6d10a..bdb86c06c6 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -312,11 +312,11 @@ operation.
If a library function is currently called such that failure always means ERR,
then the library function should log WARN and let the caller log ERR.
-[XXX Proposed convention: every message of severity INFO or higher should
-either (A) be intelligible to end-users who don't know the Tor source; or (B)
-somehow inform the end-users that they aren't expected to understand the
-message (perhaps with a string like "internal error"). Option (A) is to be
-preferred to option (B). -NM]
+Every message of severity INFO or higher should either (A) be intelligible
+to end-users who don't know the Tor source; or (B) somehow inform the
+end-users that they aren't expected to understand the message (perhaps
+with a string like "internal error"). Option (A) is to be preferred to
+option (B).
Doxygen
~~~~~~~~