Skip to content

Commit

Permalink
Change most internal references to Bitmover the company to refer to
Browse files Browse the repository at this point in the history
BitKeeper.  Also all email addresses are @bitkeeper.com.

On documentation update copyright year and clean up language a bit.
Mostly replaced "contact the BitKeeper support team" with
"contact support@bitkeeper.com" and ditto for the sales team.

Some bitmover's were left unchanged:
  - windows registry keys
  - the 'bkdmail' proxy and internal magic addresses like install@bitmover.com
    and bkd_version@bitmover.com
  - anything in EULAs
  - executible signing

bk: 555b948dTP9IJjn6YaVs_fjKrsz_8A
  • Loading branch information
wscott committed May 19, 2015
1 parent 9f70af5 commit ec7426c
Show file tree
Hide file tree
Showing 93 changed files with 241 additions and 240 deletions.
5 changes: 3 additions & 2 deletions RELEASE-NOTES-5.x
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,7 @@ The product feature makes it possible, even pleasant, to manage large
collections of files with good performance.
A more detailed overview of the technology is available; contact
sales@bitmover.com for more info.
sales@bitkeeper.com for more info.
Backwards compatibility
-----------------------
Expand Down Expand Up @@ -1117,7 +1117,8 @@ bk clone
bk csetprune
The 5.0 csetprune fixes some rare bugs but in doing so creates
repositories that 4.x will not read. The bugs, while rare, are real
and BitMover recommends that all csetprune operations be done with 5.x.
and the BitKeeper support team recommends that all csetprune
operations be done with 5.x.

bk id
New option '-5' - return the repo rootkey as an md5key.
Expand Down
8 changes: 4 additions & 4 deletions doc/Specs/ReviewTool.doc
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ Example CCT file:
# Some comment about this file format
# and version of bk that created it
V 1.0
C ask@bitmover.com|ChangeSet|20001030171131|10528
R lm@bitmover.com
C ask@bitkeeper.com|ChangeSet|20001030171131|10528
R lm@bitkeeper.com
d 30OCT2000 (should be a real date format)
<==>
F ask@bitmover.com|srg/gui/setuptool|20000209033051|20390|8b828de3ce7fe93d
F ask@bitkeeper.com|srg/gui/setuptool|20000209033051|20390|8b828de3ce7fe93d
D 3
c Move the globals into an array variable
<==>
F ask@bitmover.com|srg/gui/citool|20000209033051|20390|8b828de3ce7fe93d
F ask@bitkeeper.com|srg/gui/citool|20000209033051|20390|8b828de3ce7fe93d
D 1
c Use a better font on NT

Expand Down
6 changes: 3 additions & 3 deletions doc/bk_refcard.tr
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ BitKeeper Reference Card
.br
1-888-401-8808 (toll free in US & Canada)
.br
Copyright (c) 1998-2006 BitMover, Inc.
Copyright (c) 1998-2015 BitKeeper Inc.
.br
\f(CBhttp://www.bitkeeper.com \fP
.ce 0
Expand Down Expand Up @@ -732,9 +732,9 @@ http://db.bitkeeper.com/
.LP
To search existing bug reports
.H2
mail support@bitmover.com
mail support@bitkeeper.com
.LP
For support from BitMover.
For BitKeeper support.
.H2
+1-408-370-9911 (international & California)
.br
Expand Down
8 changes: 4 additions & 4 deletions doc/protocols/bkd_protocols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ setClientInfo
PROTOCOL=1.3
RELEASE=2.0
USER=awc
HOST=etp2.bitmover.com
HOST=etp2.bitkeeper.com
@END@
cd /project/root/path
push_part1 [-z[0..9]] [-d] [-e]
Expand Down Expand Up @@ -71,7 +71,7 @@ setClientInfo
PROTOCOL=1.3
RELEASE=2.0
USER=awc
HOST=etp2.bitmover.com
HOST=etp2.bitkeeper.com
@END@
cd /project/root/path
push_part2 [-z[0..9]] [-d] [-e]
Expand Down Expand Up @@ -121,7 +121,7 @@ setClientInfo
PROTOCOL=1.3
RELEASE=2.0
USER=awc
HOST=etp2.bitmover.com
HOST=etp2.bitkeeper.com
@END@
pull_part1 [-z[0..9]] [-d] [-e] [-n] [-l] [-q]
==================>
Expand All @@ -146,7 +146,7 @@ setClientInfo
PROTOCOL=1.3
RELEASE=2.0
USER=awc
HOST=etp2.bitmover.com
HOST=etp2.bitkeeper.com
@END@
pull_part2 [-z[0..9]] [-d] [-e] [-n] [-l] [-q]
@MATCH@
Expand Down
Binary file modified doc/tags/logo.ps
Binary file not shown.
2 changes: 1 addition & 1 deletion doc/tags/tags.ms
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ delim $$
.AU
Larry McVoy
.AI
lm@bitmover.com
lm@bitkeeper.com
415-401-8808
.AB
\*(BK\** is a distributed source management system. Because \*(BK is truly
Expand Down
6 changes: 3 additions & 3 deletions doc/triggers/makeprune
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2003 BitMover Inc.
# No warranty expressed or implied.
# DO NOT USE WITHOUT UNDERSTANDING!! ASK QUESTIONS!!
# Mail: support@bitmover.com
# Mail: support@bitkeeper.com
#
# User is free to modify and use.
# User must not redistribute in either unchanged or modified form.
Expand Down Expand Up @@ -59,10 +59,10 @@ strig=BitKeeper/triggers/SCCS/s.post-incoming.zzzprune
cat <<'MKEOF' > trig
#!/bin/sh
# Copyright (c) 2003 BitMover Inc.
# Copyright (c) 2015 BitKeeper Inc.
# No warranty expressed or implied.
# DO NOT USE WITHOUT UNDERSTANDING!! ASK QUESTIONS!!
# Mail: support@bitmover.com
# Mail: support@bitkeeper.com
#
# User is free to modify and use.
# User must not redistribute in either unchanged or modified form.
Expand Down
3 changes: 2 additions & 1 deletion doc/tutorial/all.ms
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ source in the repository. This is known as
.I importing.
BitKeeper can import regular files, RCS files, CVS files, SCCS files,
and Teamware files. There is an experimental version of the import code
which finds changeset boundaries, contact BitMover for more information.
which finds changeset boundaries, contact support@bitkeeper.com
for more information.
To learn how to use the import tools, run
.CS
bk help import
Expand Down
4 changes: 2 additions & 2 deletions man/bitsccs.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.so .bitmacros
.TH \*(BS 1 "April, 1998" "BitMover, Inc."
.TH \*(BS 1 "April, 1998" "BitKeeper Inc."
.SH NAME
\*(BS \- introduction to the \*(BM version of \*S
.SH DESCRIPTION
Expand Down Expand Up @@ -407,7 +407,7 @@ to \*R.
Larry McVoy, lm@bitmover.com.
.SH BUGS
.LP
Bug reports to BitBugs@BitMover.com. Bug reports may be filed with
Bug reports to support@bitkeeper.com. Bug reports may be filed with
the bitbug(1) command.
.DE
.SH "SEE ALSO"
Expand Down
8 changes: 4 additions & 4 deletions man/bk-macros
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.\" Copyright (c) 1998-2006 BitMover, Inc.
.\" Copyright (c) 1998-2015 BitKeeper Inc.
.\" Do all this stuff only once
.so ../bkver-macro
.if !d bk-macros \{\
Expand Down Expand Up @@ -40,8 +40,8 @@
. if t .sp .5
..
.if n \{\
. ds BC BitMover, Inc
. ds BM BitMover
. ds BC BitKeeper Inc
. ds BM BitKeeper
. ds BS BitSCCS
. ds BK BitKeeper
. ds UM \*(BK User's Manual
Expand All @@ -52,7 +52,7 @@
. ds UNIX UNIX
.\}
.if t \{\
. ds BM B\s-2IT\s0M\s-2OVER\s0
. ds BM B\s-2IT\s0K\s-2EEPER\s0
. ds BC \*(BM, \s-2INC.\s0
. ds BS \s-1B\s0\s-2IT\s0\s-1SCCS\s0
. ds BK B\s-2IT\s0K\s-2EEPER\s0
Expand Down
8 changes: 4 additions & 4 deletions man/internal/bk-manpage.1
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ The first command in a man page (after comment lines) should be
.RS \n[RS]u
.sp
.B .TH
.IR "topic section date \*(lqBitMover, Inc.\*(rq BitKeeper"
.IR "topic section date \*(lqBitKeeper Inc.\*(rq BitKeeper"
.sp
.RE
where:
Expand All @@ -101,7 +101,7 @@ The date of the last revision. You, and should, use SCCS keywords for this.
.tp
.I source
The source of the command. The source is usually
.I BitMover, Inc.,
.I BitKeeper Inc.,
but may be from some external organization if we have picked something up.
If it is from an external organization, be sure to have a
.B LICENSE
Expand Down Expand Up @@ -286,10 +286,10 @@ XXX This needs a better explanation - Amy's plate
Defined strings:
.TP
.B \&.BC
BitMover, Inc
BitKeeper Inc
.tp
.B \&.BM
BitMover
BitKeeper
.tp
.B \&.BS
BitSCCS
Expand Down
4 changes: 2 additions & 2 deletions man/man1/bk-Howto-BAM.1
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ If this variable is not set then BAM files use the
.B checkout
configuration variable.
For large collections of large files partitioned by directories,
BitMover suggests
the BitKeeper support team suggests
.BI BAM_checkout: last
as the best setting.
That setting will not pull BAM data into a clone until a user
Expand Down Expand Up @@ -108,4 +108,4 @@ bk lease renew
bk lease show
.DE
and if the options field has "BAM" listed then your license is BAM enabled.
If "BAM" is not listed, contact BitMover sales.
If "BAM" is not listed, contact sales@bitkeeper.com.
2 changes: 1 addition & 1 deletion man/man1/bk-alias.1
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,6 @@ bk lease show
.DE
If the options field has "SAM" listed then your license has this
feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\" help://aliases
.\}
2 changes: 1 addition & 1 deletion man/man1/bk-attach.1
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ bk lease show
.DE
If the options field has "SAM" listed then your
license has this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
2 changes: 1 addition & 1 deletion man/man1/bk-bk.1
Original file line number Diff line number Diff line change
Expand Up @@ -251,5 +251,5 @@ bk lease show
.DE
If the options field has "SAM" or "PL" listed then your
license has this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
4 changes: 2 additions & 2 deletions man/man1/bk-c2r.1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ bk c2r -r1.1234 foo.c
1.5
$ bk log -r1.5 foo.c
foo.c 1.5
2009-07-07 11:20:27-07:00 wscoot@desk.bitmover.com +4 -3
2009-07-07 11:20:27-07:00 wscoot@desk.bitkeeper.com +4 -3
Include system.h.
.DE
This command is the inverse of
Expand All @@ -28,7 +28,7 @@ in a single step like so:
.DS
$ bk log -r@1.1234 foo.c
foo.c 1.5
2009-07-07 11:20:27-07:00 wscoot@desk.bitmover.com +4 -3
2009-07-07 11:20:27-07:00 wscoot@desk.bitkeeper.com +4 -3
Include system.h.
.DE
.SH "SEE ALSO"
Expand Down
8 changes: 4 additions & 4 deletions man/man1/bk-changes.1
Original file line number Diff line number Diff line change
Expand Up @@ -410,15 +410,15 @@ $ bk changes --standalone
.SH EXAMPLES
Sample output:
.DS
ChangeSet@1.607, 2000-02-21 14:05:25-08:00, awc@bitmover.com
ChangeSet@1.607, 2000-02-21 14:05:25-08:00, awc@bitkeeper.com
update citool to use the "bk unedit" interface.

ChangeSet@1.606, 2000-02-21 13:35:21-08:00, awc@bitmover.com
ChangeSet@1.606, 2000-02-21 13:35:21-08:00, awc@bitkeeper.com
Allow \*(BK to be installed in an alternate directory.
The install directory is computed from the $PATH variable and
the bk symlink.

ChangeSet@1.605, 2000-02-20 01:32:19-08:00, lm@bitmover.com
ChangeSet@1.605, 2000-02-20 01:32:19-08:00, lm@bitkeeper.com
Fix a diagnostic in pull.
An aborted attempt at key compression.
.DE
Expand Down Expand Up @@ -462,5 +462,5 @@ bk lease show
.DE
If the options field has "nested" listed then your
license has this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
2 changes: 1 addition & 1 deletion man/man1/bk-clone.1
Original file line number Diff line number Diff line change
Expand Up @@ -201,5 +201,5 @@ bk lease show
.DE
If the options field has "nested" listed then your
license has this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
2 changes: 1 addition & 1 deletion man/man1/bk-comps.1
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ bk lease show
.DE
If the options field has "SAM" listed then your
license has this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
11 changes: 6 additions & 5 deletions man/man1/bk-config-etc.1
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ BAM_checkout:option
.DE
where option is as above.
.LP
BitMover recommends "BAM_checkout:last".
The BitKeeper support team recommends "BAM_checkout:last".
.SS CLOCK SKEW
.br
When \*[BK] is looking for modified files,
Expand Down Expand Up @@ -258,7 +258,7 @@ files created subsequently.
.LP
The use of \*(BK requires a commercial
license key. You can obtain a 30-day license for evaluation by
emailing a request to sales@bitmover.com.
emailing a request to sales@bitkeeper.com.
.LP
Once a license key is obtained, add license and signatures to one
of your configuration files as follows (or see LICENSE URL below):
Expand All @@ -280,8 +280,8 @@ licenseurl: bk://machine/lease-proxy
.DE
you might create a mostly empty repository named "lease-proxy",
that just contained the license keys and any needed triggers.
BitMover has an example script for this, contact support if you
would like a copy.
The BitKeeper support team has an example script for this,
contact support@bitkeeper.com if you would like a copy.
.LP
If you wish to limit access to a particular set of users, either on
read-only or read-write basis, you may do so using a pre-lease-proxy
Expand Down Expand Up @@ -500,7 +500,8 @@ For example,
.DS
upgrade_url: http://www.example.com/bk-release/
.DE
The contents of that directory will need to be manually mirrored from BitMover.
The contents of that directory will need to be manually mirrored
from BitKeeper Inc.
.SS USER PREFERENCES
.LP
Repository preferences can be defined in your configuration:
Expand Down
2 changes: 1 addition & 1 deletion man/man1/bk-config-gui.1
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ can do 65536 different colors.
.tp
\f(CW[winfo screen .]\fP
Returns the name of the screen in the form displayName.screenIndex,
i.e., \*(lqdisks.bitmover.com:0.0\*(rq.
i.e., \*(lqdisks.bitkeeper.com:0.0\*(rq.
.tp
\f(CW[winfo screenheight .]\fP
returns the height of the screen in pixels.
Expand Down
2 changes: 1 addition & 1 deletion man/man1/bk-config-logging.hide
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ bk -R get -p BitKeeper/etc/config | grep logging:
If you do not want Open Logging, you must specify some other email address
or the word "none" for the logging field, i.e.,
.DS
logging: dev@bitmover.com
logging: dev@bitkeeper.com
.DE
or
.DS
Expand Down
2 changes: 1 addition & 1 deletion man/man1/bk-credits.1
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,6 @@ library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
.SH SOURCE
The source code for the versions of GNU tools shipped by \*(BM is available at
.BR ftp://ftp.bitmover.com/gnu .
.BR ftp://ftp.bitkeeper.com/gnu .
.SH CATEGORY
.B Compat
2 changes: 1 addition & 1 deletion man/man1/bk-detach.1
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ bk lease show
.DE
If the options field has "PL" listed then your
license has this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
4 changes: 2 additions & 2 deletions man/man1/bk-diff.1
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,10 @@ match any pattern contained in
.TP
.B \-y
Use the side by side output format.
.\" XXX I get connection refused by ftp.bitmover.com
.\" XXX I get connection refused by ftp.bitkeeper.com
.\".SH SOURCE
.\"The source code for the versions of GNU tools shipped by \*(BM is available at
.\".BR ftp://ftp.bitmover.com/gnu .
.\".BR ftp://ftp.bitkeeper.com/gnu .
.SH EXIT STATUS
.B bk diff
returns exit status:
Expand Down
2 changes: 1 addition & 1 deletion man/man1/bk-gate.1
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ bk lease show
.DE
If the options field has "SAM" listed then your license has
this feature enabled.
If not, contact BitMover sales.
If not, contact sales@bitkeeper.com.
.\}
Loading

0 comments on commit ec7426c

Please sign in to comment.