[PATCH] help: move topic "files" from /doc/hg.1.txt to /mercurial/help/ (issue2760)

[yun lee]

# HG changeset patch
# User Yun Lee <yun.lee.bj at gmail.com>
# Date 1302363595 -28800
# Node ID 6d86d2c0f948173cf6a090e408c4884adf3820e5
# Parent  8f81d6f4047fedc325dc0ff7ba507188d7b9d67d
help: move topic "files" from /doc/hg.1.txt to /mercurial/help/ (issue2760)

diff -r 8f81d6f4047f -r 6d86d2c0f948 doc/hg.1.txt
--- a/doc/hg.1.txt      Fri Apr 08 17:47:58 2011 +0300
+++ b/doc/hg.1.txt      Sat Apr 09 23:39:55 2011 +0800
@@ -47,29 +47,6 @@

 .. include:: hg.1.gendoc.txt

-Files
------
-
-``.hgignore``
-    This file contains regular expressions (one per line) that
-    describe file names that should be ignored by **hg**. For details,
-    see |hgignore(5)|_.
-
-``.hgtags``
-    This file contains changeset hash values and text tag names (one
-    of each separated by spaces) that correspond to tagged versions of
-    the repository contents.
-
-``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
-    This file contains defaults and configuration. Values in
-    ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
-    settings made in the global ``/etc/mercurial/hgrc`` configuration.
-    See |hgrc(5)|_ for details of the contents and format of these
-    files.
-
-Some commands (e.g. revert) produce backup files ending in ``.orig``,
-if the ``.orig`` file already exists and is not tracked by Mercurial,
-it will be overwritten.

 Bugs
 ----
diff -r 8f81d6f4047f -r 6d86d2c0f948 mercurial/help.py
--- a/mercurial/help.py Fri Apr 08 17:47:58 2011 +0300
+++ b/mercurial/help.py Sat Apr 09 23:39:55 2011 +0800
@@ -106,6 +106,7 @@
    (["subrepo", "subrepos"], _("Subrepositories"), loaddoc('subrepos')),
    (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
    (["glossary"], _("Glossary"), loaddoc('glossary')),
+    (["files"], _("Files"), loaddoc("files")),
 ])

 # Map topics to lists of callable taking the current topic help and
diff -r 8f81d6f4047f -r 6d86d2c0f948 mercurial/help/files.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/help/files.txt  Sat Apr 09 23:39:55 2011 +0800
@@ -0,0 +1,20 @@
+``.hgignore``
+    This file contains regular expressions (one per line) that
+    describe file names that should be ignored by ``hg``. For details,
+    see http://www.selenic.com/mercurial/hgignore.5.html.
+
+``.hgtags``
+    This file contains changeset hash values and text tag names (one
+    of each separated by spaces) that correspond to tagged versions of
+    the repository contents.
+
+``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
+    This file contains defaults and configuration. Values in
+    ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
+    settings made in the global ``/etc/mercurial/hgrc`` configuration.
+    See http://www.selenic.com/mercurial/hgrc.5.html for details of
+    the contents and format of these files.
+
+Some commands (e.g. revert) produce backup files ending in ``.orig``,
+if the ``.orig`` file already exists and is not tracked by Mercurial,
+it will be overwritten.
diff -r 8f81d6f4047f -r 6d86d2c0f948 tests/test-globalopts.t
--- a/tests/test-globalopts.t   Fri Apr 08 17:47:58 2011 +0300
+++ b/tests/test-globalopts.t   Sat Apr 09 23:39:55 2011 +0800
@@ -338,6 +338,7 @@
   diffs        Diff Formats
   environment  Environment Variables
   extensions   Using additional features
+   files        Files
   glossary     Glossary
   hgweb        Configuring hgweb
   merge-tools  Merge Tools
@@ -417,6 +418,7 @@
   diffs        Diff Formats
   environment  Environment Variables
   extensions   Using additional features
+   files        Files
   glossary     Glossary
   hgweb        Configuring hgweb
   merge-tools  Merge Tools
diff -r 8f81d6f4047f -r 6d86d2c0f948 tests/test-help.t
--- a/tests/test-help.t Fri Apr 08 17:47:58 2011 +0300
+++ b/tests/test-help.t Sat Apr 09 23:39:55 2011 +0800
@@ -108,6 +108,7 @@
   diffs        Diff Formats
   environment  Environment Variables
   extensions   Using additional features
+   files        Files
   glossary     Glossary
   hgweb        Configuring hgweb
   merge-tools  Merge Tools
@@ -181,6 +182,7 @@
   diffs        Diff Formats
   environment  Environment Variables
   extensions   Using additional features
+   files        Files
   glossary     Glossary
   hgweb        Configuring hgweb
   merge-tools  Merge Tools
@@ -708,6 +710,7 @@
   diffs        Diff Formats
   environment  Environment Variables
   extensions   Using additional features
+   files        Files
   glossary     Glossary
   hgweb        Configuring hgweb
   merge-tools  Merge Tools