X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=2a10dd30fca79cacbbd40929e52cf73690be1768;hb=1da274c54037898e191f9b8dd8dcfeb303f98154;hp=99c160b7257b4e1b4b91eb8e0aedfe6a0dc7a089;hpb=bfe855a5566b68aecfdc33a2b7a0fe2b6e88d0a9;p=build.git

diff --git a/module-tools.py b/module-tools.py
index 99c160b7..2a10dd30 100755
--- a/module-tools.py
+++ b/module-tools.py
@@ -955,7 +955,7 @@ that for other purposes than tagging""" % options.workdir
             if not prompt ("No pending difference in module %s, want to tag anyway"%self.pathname,False):
                 return
 
-        # side effect in trunk's specfile
+        # side effect in head's specfile
         self.patch_spec_var(spec_dict)
 
         # prepare changelog file 
@@ -1367,11 +1367,11 @@ module-tools : a set of tools to manage subversion tags and specfile
   * define *version* and *taglevel*
   OR alternatively 
   * define redirection variables module_version_varname / module_taglevel_varname
-Trunk:
-  by default, the trunk of modules is taken into account
+Master:
+  by default, the 'master' branch of modules is the target
   in this case, just mention the module name as <module_desc>
 Branches:
-  if you wish to work on a branch rather than on the trunk, 
+  if you wish to work on another branch, 
   you can use something like e.g. Mom:2.1 as <module_desc>
 """
     release_usage="""Usage: %prog [options] tag1 .. tagn