From owner-svn-doc-head@freebsd.org Thu Feb 4 08:28:58 2016 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D493A9BB5C; Thu, 4 Feb 2016 08:28:58 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4417B9D0; Thu, 4 Feb 2016 08:28:58 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u148SvAV094087; Thu, 4 Feb 2016 08:28:57 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u148Sv78094086; Thu, 4 Feb 2016 08:28:57 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201602040828.u148Sv78094086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 4 Feb 2016 08:28:57 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r48152 - head/en_US.ISO8859-1/share/xml X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2016 08:28:58 -0000 Author: eadler Date: Thu Feb 4 08:28:57 2016 New Revision: 48152 URL: https://svnweb.freebsd.org/changeset/doc/48152 Log: Update glossary - remove CVS terms which don't matter anymore - update svn to not explain itself itself in terms of CVS Modified: head/en_US.ISO8859-1/share/xml/glossary.ent Modified: head/en_US.ISO8859-1/share/xml/glossary.ent ============================================================================== --- head/en_US.ISO8859-1/share/xml/glossary.ent Thu Feb 4 08:05:16 2016 (r48151) +++ head/en_US.ISO8859-1/share/xml/glossary.ent Thu Feb 4 08:28:57 2016 (r48152) @@ -315,11 +315,6 @@ - - CVS - - - Carrier Detect CD @@ -375,18 +370,6 @@ - - - Concurrent Versions System - CVS - - A version control system, providing a method of working with and - keeping track of many different revisions of files. CVS provides the - ability to extract, merge and revert individual changes or sets of - changes, and offers the ability to keep track of which changes were - made, by who and for what reason. - - @@ -1346,8 +1329,8 @@ Perforce A source code control product made by - Perforce Software - which is more advanced than CVS. Although not open source, its use + Perforce Software. + Although not open source, its use is free of charge to open-source projects such as &os;. Some &os; developers use a Perforce repository as a staging @@ -1572,12 +1555,10 @@ identification and merging of multiple revisions for each file. RCS consists of many small tools that work together. It lacks some of the features found in more modern revision - control systems, like CVS or Subversion, but it is very simple + control systems, like Git, but it is very simple to install, configure, and start using for a small set of - files. Implementations of RCS can be found on every major - UNIX-like OS. + files. - @@ -1629,32 +1610,6 @@ - - repocopy - - - - - Repository Copy - - A direct copying of files within the CVS repository. - - Without a repocopy, if a file needed to be copied or - moved to another place in the repository, the committer would - run cvs add to put the file in its new - location, and then cvs rm on the old file - if the old copy was being removed. - - The disadvantage of this method is that the history - (i.e. the entries in the CVS logs) of the file would not be - copied to the new location. As the &os; Project considers - this history very useful, a repository copy is often used - instead. This is a process where one of the repository meisters - will copy the files directly within the repository, rather than - using the &man.cvs.1; program. - - - Request For Comments RFC @@ -1794,9 +1749,8 @@ Subversion SVN - Subversion is a version control system, similar to CVS, but - with an expanded feature list. - + Subversion is a version control system + currently used by the &os; project.