Patchwork [6,of,6,stable] glossary: don't mention obsolete graphlog extension

login
register
mail settings
Submitter Martin Geisler
Date Nov. 23, 2013, 7:02 p.m.
Message ID <18af826f057c6cc1328a.1385233377@hbox.dyndns.org>
Download mbox | patch
Permalink /patch/3111/
State Accepted
Commit 7547bcc1a3addfa8237db10fbd7da33a02443159
Headers show

Comments

Martin Geisler - Nov. 23, 2013, 7:02 p.m.
# HG changeset patch
# User Martin Geisler <martin@geisler.net>
# Date 1385143987 -3600
#      Fri Nov 22 19:13:07 2013 +0100
# Branch stable
# Node ID 18af826f057c6cc1328a6a9a1c8ad0ff6e180527
# Parent  9761f375f4be6db970597f2f44b9e2b7ba50b07b
glossary: don't mention obsolete graphlog extension
Sean Farley - Nov. 23, 2013, 7:15 p.m.
mg@lazybytes.net writes:

> # HG changeset patch
> # User Martin Geisler <martin@geisler.net>
> # Date 1385143987 -3600
> #      Fri Nov 22 19:13:07 2013 +0100
> # Branch stable
> # Node ID 18af826f057c6cc1328a6a9a1c8ad0ff6e180527
> # Parent  9761f375f4be6db970597f2f44b9e2b7ba50b07b
> glossary: don't mention obsolete graphlog extension
>
> diff --git a/mercurial/help/glossary.txt b/mercurial/help/glossary.txt
> --- a/mercurial/help/glossary.txt
> +++ b/mercurial/help/glossary.txt
> @@ -173,9 +173,9 @@
>      system (DVCS) can be described as a directed acyclic graph (DAG),
>      consisting of nodes and edges, where nodes correspond to
>      changesets and edges imply a parent -> child relation. This graph
> -    can be visualized by graphical tools such as :hg:`glog`
> -    (graphlog). In Mercurial, the DAG is limited by the requirement
> -    for children to have at most two parents.
> +    can be visualized by graphical tools such as :hg:`log --graph`. In
> +    Mercurial, the DAG is limited by the requirement for children to
> +    have at most two parents.
>  
>  Default branch
>      See 'Branch, default'.
> @@ -218,7 +218,7 @@
>      extensions. See :hg:`help phases`.
>  
>  Graph
> -    See DAG and :hg:`help graphlog`.
> +    See DAG and :hg:`log --graph`.
>  
>  Head
>      The term 'head' may be used to refer to both a branch head or a

Excellent. Another great patch series.

Patch

diff --git a/mercurial/help/glossary.txt b/mercurial/help/glossary.txt
--- a/mercurial/help/glossary.txt
+++ b/mercurial/help/glossary.txt
@@ -173,9 +173,9 @@ 
     system (DVCS) can be described as a directed acyclic graph (DAG),
     consisting of nodes and edges, where nodes correspond to
     changesets and edges imply a parent -> child relation. This graph
-    can be visualized by graphical tools such as :hg:`glog`
-    (graphlog). In Mercurial, the DAG is limited by the requirement
-    for children to have at most two parents.
+    can be visualized by graphical tools such as :hg:`log --graph`. In
+    Mercurial, the DAG is limited by the requirement for children to
+    have at most two parents.
 
 Default branch
     See 'Branch, default'.
@@ -218,7 +218,7 @@ 
     extensions. See :hg:`help phases`.
 
 Graph
-    See DAG and :hg:`help graphlog`.
+    See DAG and :hg:`log --graph`.
 
 Head
     The term 'head' may be used to refer to both a branch head or a