Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Feb 2016 11:38:05 +0100
From:      Remko Lodder <remko@FreeBSD.org>
To:        Eitan Adler <eadler@freebsd.org>
Cc:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   Re: svn commit: r48152 - head/en_US.ISO8859-1/share/xml
Message-ID:  <18A55171-E858-417B-A7F4-F6CC9EA99150@FreeBSD.org>
In-Reply-To: <201602040828.u148Sv78094086@repo.freebsd.org>
References:  <201602040828.u148Sv78094086@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--Apple-Mail=_CB44212F-75DF-4099-B960-FC87B72F9CE6
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii


> On 04 Feb 2016, at 09:28, Eitan Adler <eadler@freebsd.org> wrote:
>=20
> Author: eadler
> Date: Thu Feb  4 08:28:57 2016
> New Revision: 48152
> URL: https://svnweb.freebsd.org/changeset/doc/48152
>=20
> Log:
>  Update glossary
>  	- remove CVS terms which don't matter anymore
>  	- update svn to not explain itself itself in terms of CVS
>=20
> Modified:
>  head/en_US.ISO8859-1/share/xml/glossary.ent
>=20
> Modified: head/en_US.ISO8859-1/share/xml/glossary.ent
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- 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=3D"cts-glossary"/>
>     </glossentry>
>=20
> -    <glossentry>
> -      <glossterm>CVS</glossterm>
> -      <glosssee otherterm=3D"cvs-glossary"/>
> -    </glossentry>
> -
>     <glossentry xml:id=3D"cd-glossary">
>       <glossterm>Carrier Detect</glossterm>
>       <acronym>CD</acronym>
> @@ -375,18 +370,6 @@
>         <para/>
>       </glossdef>
>     </glossentry>
> -
> -    <glossentry xml:id=3D"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>
>=20
>   <glossdiv>
> @@ -1346,8 +1329,8 @@
>       <glossterm>Perforce</glossterm>
>       <glossdef>
> 	<para>A source code control product made by
> -	  <link xlink:href=3D"http://www.perforce.com/">Perforce =
Software</link>
> -	  which is more advanced than CVS.  Although not open source, =
its use
> +	  <link xlink:href=3D"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>
>=20
> 	<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>
>=20
> -	<glossseealso otherterm=3D"cvs-glossary"/>
> 	<glossseealso otherterm=3D"svn-glossary"/>
>       </glossdef>
>     </glossentry>
> @@ -1629,32 +1610,6 @@
>       </glossdef>
>     </glossentry>
>=20
> -    <glossentry>
> -      <glossterm>repocopy</glossterm>
> -      <glosssee otherterm=3D"repocopy-glossary"/>
> -    </glossentry>
> -
> -    <glossentry xml:id=3D"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=3D"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=3D"cvs-glossary"/>
> +	<para>Subversion is a version control system
> +          currently used by the &os; project.</para>
>       </glossdef>
>     </glossentry>
>=20
>=20

--
Best regards,

Remko Lodder




--Apple-Mail=_CB44212F-75DF-4099-B960-FC87B72F9CE6
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIcBAEBCAAGBQJWsyoNAAoJEKjD27JZ84ywsJQP/imHm7MjVH1/ezVZxJAk0u5C
TucREoB5xaXKLECIB3jEpuFG3c2ApW+rz3j8tMSx4srkbyTuOH0WsOXqCWoqJ6Qd
WF290mNfws/++hov4IMtWz1XwpuVjlibEh7R0w8bvZ5eO+Yh90vNLNzlQB1dw17Y
3iYODSZeFc0EDX2cp0ewVyKb/4laGa1JYWsn6exAYy2P+RJE71LBPVGr7o9NZmve
+jgBnoqcQjqtzee9taCF3jKBb6FjRYJKOLhUSydChLVflkBuLMxcIbYmumOGXeMa
NLo3T/A0hUKnIT7tHifgRnQyzwzGgIzfNaiREWg3p/O3AH4IZicdpOvtvM5k5AYc
72WcnkqyWajzFZYaIwb8D0XCw+rGu0aNbbEiX3pduv8HGSRxFLbe9ZEsI1d0RZLr
FOvLKJmxiM/S9+5VLizV2sqKprsA38oEe2xhQKxLmoO0frCslrTxO0V1iuxr/LOW
pMPMMRnAvqW6/1u0cvaw8vwOD+kA6zQG/itfnO6fhPSNE34JErzWTi34qOKXIqTq
hc+TDO9gRw4oYt7OYP0tWqHuWYEN+RMR3TFuCO12ulvKnMvJYHmljGQYckdUd+X2
7mkkxHg99LSxfe5z0Nw0+vifK91FMuQPHf/KpgObmdgPTA/V0Ycgd/kq4vjrFYJn
/WSMO33jUbpgmYi59xUY
=lDPk
-----END PGP SIGNATURE-----

--Apple-Mail=_CB44212F-75DF-4099-B960-FC87B72F9CE6--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18A55171-E858-417B-A7F4-F6CC9EA99150>