Merge with stable

hgext/acl.py

@@ -25,7 +25,7 b' is no way to distinguish them.'
 To use this hook, configure the acl extension in your hgrc like this::
 
   [extensions]
-  hgext.acl =
+  acl =
 
   [hooks]
   pretxnchangegroup.acl = python:hgext.acl.hook

hgext/bugzilla.py

@@ -103,7 +103,7 b' baseurl'
 Activating the extension::
 
     [extensions]
-    hgext.bugzilla =
+    bugzilla =
 
     [hooks]
     # run bugzilla hook on every change pulled or pushed in here

hgext/notify.py

@@ -14,7 +14,7 b' To use, configure the notify extension a'
 this::
 
   [extensions]
-  hgext.notify =
+  notify =
 
   [hooks]
   # one email for each incoming changeset

hgext/pager.py

@@ -8,7 +8,7 b''
 # To load the extension, add it to your .hgrc file:
 #
 #   [extension]
-#   hgext.pager =
+#   pager =
 #
 # Run "hg help pager" to get info on configuration.
 

hgext/win32text.py

@@ -10,7 +10,7 b''
 To perform automatic newline conversion, use::
 
   [extensions]
-  hgext.win32text =
+  win32text =
   [encode]
   ** = cleverencode:
   # or ** = macencode:

tests/test-notify.out

@@ -6,7 +6,7 b' messages to stdout, for testing and conf'
 To use, configure the notify extension and enable it in hgrc like this:
 
   [extensions]
-  hgext.notify =
+  notify =
 
   [hooks]
   # one email for each incoming changeset