[Monotone-commits-diffs] net.venge.monotone: b3a8f899fd7e7f7083da1d36a5e3b8e0bb7972ea

[code]

revision:            b3a8f899fd7e7f7083da1d36a5e3b8e0bb7972ea
date:                2011-02-24T08:01:12
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '50d4b978840e3f511a165296b243b4114cc3ec4d'
     and '5de99356eec9570c892b2eecc7d3eeb6f8f53008'

manifest:
format_version "1"

new_manifest [cd20c79822d2370d2e759cccaf04d26e60c5ac25]

old_revision [50d4b978840e3f511a165296b243b4114cc3ec4d]

patch "doc/Makefile.am"
 from [88c2b91289880ea9c9ef32f08e224547287f8fd7]
   to [dcc8331723e96245ccf9788fef5c02946580031e]

old_revision [5de99356eec9570c892b2eecc7d3eeb6f8f53008]

patch "doc/monotone.texi"
 from [5c18cff828089e592f5f2d53c2d60793715a4a40]
   to [0e40017dfe8ba652e6af4585a2ac176c8bd12dcc]
============================================================
--- doc/Makefile.am	88c2b91289880ea9c9ef32f08e224547287f8fd7
+++ doc/Makefile.am	dcc8331723e96245ccf9788fef5c02946580031e
@@ -48,9 +48,9 @@ EXTRA_DIST = \
 monotone_TEXINFOS = $(top_srcdir)/src/std_hooks.lua $(TEXI_FRAGMENTS)
 
 EXTRA_DIST = \
-	$(PDF_FIGURES) $(PNG_FIGURES) $(TEXI_FRAGMENTS)	$(HTML_EXTRA)	\
+	$(PDF_FIGURES) $(PNG_FIGURES) $(PNG_IMAGES) $(TEXI_FRAGMENTS)	\
 	figures/monotone-logo.svg figures/oo-figures.sxd		\
-	figures/pdfcrop.pl figures/README
+	figures/pdfcrop.pl figures/README $(HTML_EXTRA)
 
 AM_MAKEINFOFLAGS= -I $(top_srcdir)/src -I $(srcdir)
 
============================================================
--- doc/monotone.texi	5c18cff828089e592f5f2d53c2d60793715a4a40
+++ doc/monotone.texi	0e40017dfe8ba652e6af4585a2ac176c8bd12dcc
@@ -1045,19 +1045,38 @@ @subsection Branch Names
 
 @subsection Branch Names
 
-The branch names used in the above section are fine for an example, but
-they would be bad to use in a real project.  The reason is, monotone
-branch names must be @emph{globally} unique, over all branches in the
-world.  Otherwise, bad things can happen.  Fortunately, we have a handy
-source of globally unique names --- the DNS system.
+The branch names used in the above section are fine for an example,
+but they would be bad to use in a real project.  The reason is,
+monotone branch names should be @emph{globally} unique, over all
+branches in the world.  Otherwise, when your branch eventually gets
+distributed, you could get name collisions with other people's
+work.
 
-When naming a branch, always prepend the reversed, fully qualified, domain
-name of a host that you control or are otherwise authorized to use.  For
-example, monotone development happens on the branch @code{net.venge.monotone},
-because @code{venge.net} belongs to monotone's original author.  The idea is
-that this way, you can coordinate with other people using a host to make sure
-there are no conflicts --- in the example, monotone's original author can
-be certain that no-one else using @code{venge.net} will start up a
+Having two separate projects with the same monotone branch names means
+those projects cannot be stored in the same database. In general,
+monotone supports storing unrelated branches in a single database,
+which simplifies servers. But that requires unique branch names, so
+ensuring globally unique branch names allows using globally accessible
+monotone servers.
+
+monotone does @emph{not} support renaming branches (because that would
+be modifying history), so choosing a good branch name up front is
+important. It is possible to work around this by propagating from your
+branch to one with a better name, but that is a painful process if
+there are many people using the original branch name.
+
+Even if you are @emph{absolutely} sure that your branch will never be
+distributed, things could change in the future!
+
+Fortunately, we have a handy source of globally unique names --- the
+DNS system. When naming a branch, always prepend the reversed, fully
+qualified, domain name of a host that you control or are otherwise
+authorized to use.  For example, monotone development happens on the
+branch @code{net.venge.monotone}, because @code{venge.net} belongs to
+monotone's original author.  The idea is that this way, you can
+coordinate with other people using a host to make sure there are no
+conflicts --- in the example, monotone's original author can be
+certain that no-one else using @code{venge.net} will start up a
 different program named @code{monotone}.  If you work for Yoyodyne,
 Inc. (owners of yoyodyne.com), then all your branch names should look
 like @address@hidden
@@ -4659,7 +4678,8 @@ @subsection Global Options
 
 @item --help
 Display help information. This is the same as the @command{mtn help}
-command.
+command, but note that it can be placed at the end of a command line,
+while @command{mtn help} must be the first non-option on the command line.
 
 @item --ignore-suspend-certs
 @itemx --no-ignore-suspend-certs