help: remove last occurrences of ".. note::" without two newlines
When we add two newlines after ".. note::" translators will not see this
entry. And all versions of docutils interpret this paragraph correctly
(details in de16c673455b).
--- a/contrib/check-code.py Tue Feb 18 14:48:56 2014 -0800
+++ b/contrib/check-code.py Wed Feb 19 13:25:28 2014 +0100
@@ -311,6 +311,7 @@
txtpats = [
[
('\s$', 'trailing whitespace'),
+ ('.. note::[ \n][^\n]', 'add two newlines after note::')
],
[]
]
--- a/mercurial/help/config.txt Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/config.txt Wed Feb 19 13:25:28 2014 +0100
@@ -85,7 +85,9 @@
be read. Mercurial checks each of these locations in the specified
order until one or more configuration files are detected.
-.. note:: The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
+.. note::
+
+ The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
is used when running 32-bit Python on 64-bit Windows.
Syntax
@@ -204,7 +206,9 @@
stable5 = latest -b stable
-.. note:: It is possible to create aliases with the same names as
+.. note::
+
+ It is possible to create aliases with the same names as
existing commands, which will then override the original
definitions. This is almost always a bad idea!
@@ -235,7 +239,9 @@
``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg
echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``.
-.. note:: Some global configuration options such as ``-R`` are
+.. note::
+
+ Some global configuration options such as ``-R`` are
processed before shell aliases and will thus not be passed to
aliases.
@@ -362,7 +368,9 @@
of an empty temporary file, where the filtered data must be written by
the command.
-.. note:: The tempfile mechanism is recommended for Windows systems,
+.. note::
+
+ The tempfile mechanism is recommended for Windows systems,
where the standard shell I/O redirection operators often have
strange effects and may corrupt the contents of your files.
@@ -708,13 +716,17 @@
in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
-.. note:: It is generally better to use standard hooks rather than the
+.. note::
+
+ It is generally better to use standard hooks rather than the
generic pre- and post- command hooks as they are guaranteed to be
called in the appropriate contexts for influencing transactions.
Also, hooks like "commit" will be called in all contexts that
generate a commit (e.g. tag) and not just the commit command.
-.. note:: Environment variables with empty values may not be passed to
+.. note::
+
+ Environment variables with empty values may not be passed to
hooks on platforms such as Windows. As an example, ``$HG_PARENT2``
will have an empty value under Unix-like platforms for non-merge
changesets, while it will not be available at all under Windows.
--- a/mercurial/help/hgignore.txt Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/hgignore.txt Wed Feb 19 13:25:28 2014 +0100
@@ -69,6 +69,7 @@
regexp pattern, start it with ``^``.
.. note::
+
Patterns specified in other than ``.hgignore`` are always rooted.
Please see :hg:`help patterns` for details.
--- a/mercurial/help/merge-tools.txt Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/merge-tools.txt Wed Feb 19 13:25:28 2014 +0100
@@ -73,6 +73,7 @@
8. The merge of the file fails and must be resolved before commit.
.. note::
+
After selecting a merge program, Mercurial will by default attempt
to merge the files using a simple merge algorithm first. Only if it doesn't
succeed because of conflicting changes Mercurial will actually execute the
--- a/mercurial/help/patterns.txt Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/patterns.txt Wed Feb 19 13:25:28 2014 +0100
@@ -7,6 +7,7 @@
Alternate pattern notations must be specified explicitly.
.. note::
+
Patterns specified in ``.hgignore`` are not rooted.
Please see :hg:`help hgignore` for details.
--- a/mercurial/help/phases.txt Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/phases.txt Wed Feb 19 13:25:28 2014 +0100
@@ -42,6 +42,7 @@
- secret changesets are neither pushed, pulled, or cloned
.. note::
+
Pulling a draft changeset from a publishing server does not mark it
as public on the server side due to the read-only nature of pull.
@@ -55,10 +56,12 @@
See :hg:`help config` for more information on configuration files.
.. note::
+
Servers running older versions of Mercurial are treated as
publishing.
.. note::
+
Changesets in secret phase are not exchanged with the server. This
applies to their content: file names, file contents, and changeset
metadata. For technical reasons, the identifier (e.g. d825e4025e39)
--- a/mercurial/help/subrepos.txt Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/subrepos.txt Wed Feb 19 13:25:28 2014 +0100
@@ -39,6 +39,7 @@
repositories states when committing in the parent repository.
.. note::
+
The ``.hgsubstate`` file should not be edited manually.