# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1301682344 18000
# Node ID 3cbf5c6dcdb8bca829e51b1624dfbcb5823b8ac1
# Parent  1209e1d52b6866fa693642869cb9c1786b62aeb5# Parent  f911b1de5fa0145b2413b39a96635b6167b7161c
merge with stable

diff -r 1209e1d52b68 -r 3cbf5c6dcdb8 .hgsigs
--- a/.hgsigs	Thu Mar 31 15:49:53 2011 -0400
+++ b/.hgsigs	Fri Apr 01 13:25:44 2011 -0500
@@ -36,3 +36,4 @@
 2b2155623ee2559caf288fd333f30475966c4525 0 iD8DBQBNSJeBywK+sNU5EO8RAm1KAJ4hW9Cm9nHaaGJguchBaPLlAr+O3wCgqgmMok8bdAS06N6PL60PSTM//Gg=
 2616325766e3504c8ae7c84bd15ee610901fe91d 0 iD8DBQBNbWy9ywK+sNU5EO8RAlWCAJ4mW8HbzjJj9GpK98muX7k+7EvEHwCfaTLbC/DH3QEsZBhEP+M8tzL6RU4=
 aa1f3be38ab127280761889d2dca906ca465b5f4 0 iD8DBQBNeQq7ywK+sNU5EO8RAlEOAJ4tlEDdetE9lKfjGgjbkcR8PrC3egCfXCfF3qNVvU/2YYjpgvRwevjvDy0=
+b032bec2c0a651ca0ddecb65714bfe6770f67d70 0 iD8DBQBNlg5kywK+sNU5EO8RAnGEAJ9gmEx6MfaR4XcG2m/93vwtfyzs3gCgltzx8/YdHPwqDwRX/WbpYgi33is=
diff -r 1209e1d52b68 -r 3cbf5c6dcdb8 .hgtags
--- a/.hgtags	Thu Mar 31 15:49:53 2011 -0400
+++ b/.hgtags	Fri Apr 01 13:25:44 2011 -0500
@@ -48,3 +48,4 @@
 2b2155623ee2559caf288fd333f30475966c4525 1.7.5
 2616325766e3504c8ae7c84bd15ee610901fe91d 1.8
 aa1f3be38ab127280761889d2dca906ca465b5f4 1.8.1
+b032bec2c0a651ca0ddecb65714bfe6770f67d70 1.8.2
diff -r 1209e1d52b68 -r 3cbf5c6dcdb8 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Thu Mar 31 15:49:53 2011 -0400
+++ b/i18n/pt_BR.po	Fri Apr 01 13:25:44 2011 -0500
@@ -5450,11 +5450,11 @@
 "notícias, além de mail archives."
 
 msgid ""
-"To configure other defaults, add a section like this to your hgrc\n"
-"file::"
+"To configure other defaults, add a section like this to your\n"
+"configuration file::"
 msgstr ""
 "Para configurar outros padrões, adicione uma seção como esta em seu\n"
-"arquivo hgrc::"
+"arquivo de configuração::"
 
 msgid ""
 "  [email]\n"
@@ -13120,10 +13120,10 @@
 "de configuração web.."
 
 msgid ""
-"This file uses the same syntax as hgrc configuration files, but only\n"
-"the following sections are recognized:"
-msgstr ""
-"Este arquivo usa a mesma sintaxe de arquivos de configuração hgrc,\n"
+"This file uses the same syntax as other Mercurial configuration files,\n"
+"but only the following sections are recognized:"
+msgstr ""
+"Este arquivo usa a mesma sintaxe de arquivos de configuração do Mercurial,\n"
 "mas apenas as seguintes seções são reconhecidas:"
 
 msgid ""
@@ -13137,10 +13137,13 @@
 
 msgid ""
 "The ``web`` section can specify all the settings described in the web\n"
-"section of the hgrc documentation."
+"section of the hgrc(5) documentation. See :hg:`help config` for\n"
+"information on where to find the manual page."
 msgstr ""
 "A seção ``web`` pode especificar todas as configurações descritas na\n"
-"seção web da documentação do hgrc."
+"seção web da documentação do hgrc (man page hgrc(5)). Veja\n"
+":hg:`help config` para informações sobre onde encontrar a página\n"
+"de manual."
 
 msgid ""
 "The ``paths`` section provides mappings of physical repository\n"