[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] small manual changes
From: |
Bruce Stephens |
Subject: |
[Monotone-devel] small manual changes |
Date: |
Thu, 01 Dec 2005 19:57:16 +0000 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
Just an attempt to remove "file certificates" and "manifest
certificates" from the manual. (Or is the term "manifest certificate"
just another term for revision certificate? In which case those could
be left.)
It also changes "ancestor" to "branch" in the example for
get_revision_cert_trust; I'm not sure the result has a similar enough
effect, but at least it will do something.
#
# old_revision [9f2c7c9a1d3834bd8de01c427370bd2aa736d490]
#
# patch "monotone.texi"
# from [11687dcc11a586d90f591c8a91efb8ddb1028b82]
# to [7266653275342cbf856bdcb36ea27a4a0d30677c]
#
============================================================
--- monotone.texi 11687dcc11a586d90f591c8a91efb8ddb1028b82
+++ monotone.texi 7266653275342cbf856bdcb36ea27a4a0d30677c
@@ -2890,11 +2890,8 @@
@section File Attributes
Monotone contains a mechanism for storing @dfn{persistent file
-attributes}. These differ from file certificates in an important way:
-attributes are associated with a path name in your working copy,
-rather than a particular version of a file. Otherwise they are
-similar: a file attribute associates a simple name/value pair with a
-file in your working copy.
+attributes}. A file attribute associates a simple name/value pair
+with a file in your working copy.
The attribute mechanism is motivated by the fact that some people like
to store executable programs in version control systems, and would like
@@ -3666,7 +3663,7 @@
the new default branch of the working copy.
The @command{commit} command also synthesizes a number of
-certificates, which it attaches to the new manifest version and copies
+certificates, which it attaches to the new version and copies
into your database:
@itemize
@item
@@ -5711,7 +5708,7 @@
change log entries. For each logical tree-wide change, monotone
synthesizes a manifest and revision, and commits them (along with all
associated file deltas) to your database. It also copies all change log
-entries, author identifiers, and date stamps to manifest certificates.
+entries, author identifiers, and date stamps to certificates.
In normal use, @var{pathname} will be a CVS module, though it is
possible to point it at a directory within a module as well. Whatever
@@ -6092,8 +6089,8 @@
if t == nil then return false end
- if (name ~= "ancestor" and table.getn(t) >= 1)
- or (name == "ancestor" and table.getn(t) >= 2)
+ if (name ~= "branch" and table.getn(t) >= 1)
+ or (name == "branch" and table.getn(t) >= 2)
then
return true
else
@@ -6105,9 +6102,9 @@
In this example, any revision certificate is trusted if it is signed
by at least one of three ``trusted'' keys, unless it is an
address@hidden certificate, in which case it must be signed by
address@hidden certificate, in which case it must be signed by
@emph{two} or more trusted keys. This is one way of requiring that
-ancestry assertions go through an extra ``reviewer'' before they are
+branch assertions go through an extra ``reviewer'' before they are
accepted.
@item accept_testresult_change (@var{old_results}, @var{new_results})
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-devel] small manual changes,
Bruce Stephens <=