# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1282046377 -7200
# Node ID 528ff7610cbac3585358bad659e74a6aee9eafbf
# Parent  2be70ca1731165935aaf751c60f161655c87a7f5
glossary: add entry for "Branch, inactive"

diff -r 2be70ca17311 -r 528ff7610cba mercurial/help/glossary.txt
--- a/mercurial/help/glossary.txt	Sat Aug 14 01:30:54 2010 +0200
+++ b/mercurial/help/glossary.txt	Tue Aug 17 13:59:37 2010 +0200
@@ -42,6 +42,17 @@
 Branch head
     See 'Head, branch'.
 
+Branch, inactive
+    If a named branch has no topological heads, it is considered to be
+    inactive. As an example, a feature branch becomes inactive when it
+    is merged into the default branch. The :hg:`branches` command
+    shows inactive branches by default, though they can be hidden with
+    :hg:`branches --active`.
+
+    NOTE: this concept is deprecated because it is too implicit.
+    Branches show now be explicitly closed using :hg:`commit
+    --close-branch` when they are no longer needed.
+
 Branch, named
     A collection of changesets which have the same branch name. By
     default, children of a changeset in a named branch belong to the