[PATCH 4 of 5] help: the 'glossary' topic is more like a dictionary of concepts

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1343773187 -7200
# Branch stable
# Node ID 866aa792fd62193e76f0f71b4bebb743798c7bb5
# Parent  7ef0ac99b879924036731f3c62d58ede1720cba9
help: the 'glossary' topic is more like a dictionary of concepts

- and 'concepts' comes first in the topic list.

This also changes a localized string.

diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -157,8 +157,8 @@
     (["extensions"], _("Using Additional Features"), extshelp),
     (["subrepos", "subrepo"], _("Subrepositories"), loaddoc('subrepos')),
     (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
-    (["glossary", "dictionary", "vocabulary", "nomenclature", "concepts"],
-     _("Glossary"), loaddoc('glossary')),
+    (["concepts", "glossary", "dictionary", "vocabulary", "nomenclature"],
+     _("Dictionary of Mercurial Concepts"), loaddoc('glossary')),
     (["hgignore", "ignore"], _("Syntax for Mercurial Ignore Files"),
      loaddoc('hgignore')),
     (["phases"], _("Working with Phases"), loaddoc('phases')),
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -340,13 +340,13 @@
   
   additional help topics:
   
+   concepts      Dictionary of Mercurial Concepts
    config        Configuration Files
    dates         Date Formats
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
    filesets      Specifying File Sets
-   glossary      Glossary
    hgignore      Syntax for Mercurial Ignore Files
    hgweb         Configuring hgweb
    merge-tools   Merge Tools
@@ -424,13 +424,13 @@
   
   additional help topics:
   
+   concepts      Dictionary of Mercurial Concepts
    config        Configuration Files
    dates         Date Formats
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
    filesets      Specifying File Sets
-   glossary      Glossary
    hgignore      Syntax for Mercurial Ignore Files
    hgweb         Configuring hgweb
    merge-tools   Merge Tools
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -107,13 +107,13 @@
   
   additional help topics:
   
+   concepts      Dictionary of Mercurial Concepts
    config        Configuration Files
    dates         Date Formats
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
    filesets      Specifying File Sets
-   glossary      Glossary
    hgignore      Syntax for Mercurial Ignore Files
    hgweb         Configuring hgweb
    merge-tools   Merge Tools
@@ -185,13 +185,13 @@
   
   additional help topics:
   
+   concepts      Dictionary of Mercurial Concepts
    config        Configuration Files
    dates         Date Formats
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
    filesets      Specifying File Sets
-   glossary      Glossary
    hgignore      Syntax for Mercurial Ignore Files
    hgweb         Configuring hgweb
    merge-tools   Merge Tools
@@ -674,13 +674,13 @@
   
   additional help topics:
   
+   concepts      Dictionary of Mercurial Concepts
    config        Configuration Files
    dates         Date Formats
    diffs         Diff Formats
    environment   Environment Variables
    extensions    Using Additional Features
    filesets      Specifying File Sets
-   glossary      Glossary
    hgignore      Syntax for Mercurial Ignore Files
    hgweb         Configuring hgweb
    merge-tools   Merge Tools
@@ -781,9 +781,9 @@
   $ hg help -k clone
   Topics:
   
+   concepts   Dictionary of Mercurial Concepts
    config     Configuration Files
    extensions Using Additional Features
-   glossary   Glossary
    phases     Working with Phases
    subrepos   Subrepositories
    urls       URL Paths