svn commit: r48152 - head/en_US.ISO8859-1/share/xml

[Remko Lodder]

> On 04 Feb 2016, at 09:28, Eitan Adler <eadler at freebsd.org> wrote:
> 
> 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 @@
>       <glosssee otherterm="cts-glossary"/>
>     </glossentry>
> 
> -    <glossentry>
> -      <glossterm>CVS</glossterm>
> -      <glosssee otherterm="cvs-glossary"/>
> -    </glossentry>
> -
>     <glossentry xml:id="cd-glossary">
>       <glossterm>Carrier Detect</glossterm>
>       <acronym>CD</acronym>
> @@ -375,18 +370,6 @@
>         <para/>
>       </glossdef>
>     </glossentry>
> -
> -    <glossentry xml:id="cvs-glossary">
> -      <glossterm>Concurrent Versions System</glossterm>
> -      <acronym>CVS</acronym>
> -      <glossdef>
> -	<para>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.</para>
> -      </glossdef>
> -    </glossentry>
>   </glossdiv>
> 
>   <glossdiv>
> @@ -1346,8 +1329,8 @@
>       <glossterm>Perforce</glossterm>
>       <glossdef>
> 	<para>A source code control product made by
> -	  <link xlink:href="http://www.perforce.com/">Perforce Software</link>
> -	  which is more advanced than CVS.  Although not open source, its use
> +	  <link xlink:href="http://www.perforce.com/">Perforce Software</link>.
> +	  Although not open source, its use
> 	  is free of charge to open-source projects such as &os;.</para>
> 
> 	<para>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

Like Git, Subversion, Mercurial.. i understand why CVS is removed, but not SVN.

Remko

>           to install, configure, and start using for a small set of
> -          files.  Implementations of RCS can be found on every major
> -          UNIX-like OS.</para>
> +          files.</para>
> 
> -	<glossseealso otherterm="cvs-glossary"/>
> 	<glossseealso otherterm="svn-glossary"/>
>       </glossdef>
>     </glossentry>
> @@ -1629,32 +1610,6 @@
>       </glossdef>
>     </glossentry>
> 
> -    <glossentry>
> -      <glossterm>repocopy</glossterm>
> -      <glosssee otherterm="repocopy-glossary"/>
> -    </glossentry>
> -
> -    <glossentry xml:id="repocopy-glossary">
> -      <glossterm>Repository Copy</glossterm>
> -      <glossdef>
> -	<para>A direct copying of files within the CVS repository.</para>
> -
> -	<para>Without a repocopy, if a file needed to be copied or
> -	  moved to another place in the repository, the committer would
> -	  run <command>cvs add</command> to put the file in its new
> -	  location, and then <command>cvs rm</command> on the old file
> -	  if the old copy was being removed.</para>
> -
> -	<para>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.</para>
> -      </glossdef>
> -    </glossentry>
> -
>     <glossentry xml:id="rfc-glossary">
>       <glossterm>Request For Comments</glossterm>
>       <acronym>RFC</acronym>
> @@ -1794,9 +1749,8 @@
>       <glossterm>Subversion</glossterm>
>       <acronym>SVN</acronym>
>       <glossdef>
> -	<para>Subversion is a version control system, similar to CVS, but
> -	  with an expanded feature list.</para>
> -	<glossseealso otherterm="cvs-glossary"/>
> +	<para>Subversion is a version control system
> +          currently used by the &os; project.</para>
>       </glossdef>
>     </glossentry>
> 
> 

--
Best regards,

Remko Lodder



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 841 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-doc-head/attachments/20160204/ff58565b/attachment.sig>