# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1261439415 -3600
# Node ID f76984a27b3dfdfda17ef93683a3cb9a04e2dc43
# Parent  27457d31ae3f3b466edb784fe0ea0a14a917f812# Parent  703db37d186b31b1e04cc44d0fe10cadf9c27cc9
Merge with stable

diff -r 27457d31ae3f -r f76984a27b3d hgext/acl.py
--- a/hgext/acl.py	Mon Dec 14 00:32:29 2009 +0900
+++ b/hgext/acl.py	Tue Dec 22 00:50:15 2009 +0100
@@ -25,7 +25,7 @@
 To use this hook, configure the acl extension in your hgrc like this::
 
   [extensions]
-  hgext.acl =
+  acl =
 
   [hooks]
   pretxnchangegroup.acl = python:hgext.acl.hook
diff -r 27457d31ae3f -r f76984a27b3d hgext/bugzilla.py
--- a/hgext/bugzilla.py	Mon Dec 14 00:32:29 2009 +0900
+++ b/hgext/bugzilla.py	Tue Dec 22 00:50:15 2009 +0100
@@ -103,7 +103,7 @@
 Activating the extension::
 
     [extensions]
-    hgext.bugzilla =
+    bugzilla =
 
     [hooks]
     # run bugzilla hook on every change pulled or pushed in here
diff -r 27457d31ae3f -r f76984a27b3d hgext/notify.py
--- a/hgext/notify.py	Mon Dec 14 00:32:29 2009 +0900
+++ b/hgext/notify.py	Tue Dec 22 00:50:15 2009 +0100
@@ -14,7 +14,7 @@
 this::
 
   [extensions]
-  hgext.notify =
+  notify =
 
   [hooks]
   # one email for each incoming changeset
diff -r 27457d31ae3f -r f76984a27b3d hgext/pager.py
--- a/hgext/pager.py	Mon Dec 14 00:32:29 2009 +0900
+++ b/hgext/pager.py	Tue Dec 22 00:50:15 2009 +0100
@@ -8,7 +8,7 @@
 # To load the extension, add it to your .hgrc file:
 #
 #   [extension]
-#   hgext.pager =
+#   pager =
 #
 # Run "hg help pager" to get info on configuration.
 
diff -r 27457d31ae3f -r f76984a27b3d hgext/win32text.py
--- a/hgext/win32text.py	Mon Dec 14 00:32:29 2009 +0900
+++ b/hgext/win32text.py	Tue Dec 22 00:50:15 2009 +0100
@@ -10,7 +10,7 @@
 To perform automatic newline conversion, use::
 
   [extensions]
-  hgext.win32text =
+  win32text =
   [encode]
   ** = cleverencode:
   # or ** = macencode:
diff -r 27457d31ae3f -r f76984a27b3d tests/test-notify.out
--- a/tests/test-notify.out	Mon Dec 14 00:32:29 2009 +0900
+++ b/tests/test-notify.out	Tue Dec 22 00:50:15 2009 +0100
@@ -6,7 +6,7 @@
 To use, configure the notify extension and enable it in hgrc like this:
 
   [extensions]
-  hgext.notify =
+  notify =
 
   [hooks]
   # one email for each incoming changeset