diff options
| author |   Justin <jlec@gentoo.org> | 2015-08-20 09:03:09 +0200 |
|---|---|---|
| committer | Justin <jlec@gentoo.org> | 2015-08-20 09:03:09 +0200 |
| commit | cf304a48244efe55f90eef5e72ca95d123264bd4 (patch) | |
| tree | 49936da358e36377a7349f66a5d7c701921af614 | |
| parent | Merge pull request #32 from johu/eapi-declaration (diff) | |
| parent | Replace cvs to rsync with git to rsync (diff) | |
| download | devmanual-cf304a48244efe55f90eef5e72ca95d123264bd4.tar.gz devmanual-cf304a48244efe55f90eef5e72ca95d123264bd4.tar.bz2 devmanual-cf304a48244efe55f90eef5e72ca95d123264bd4.zip | |
Merge pull request #31 from johu/git-to-rsync
Replace cvs to rsync with git to rsync
| -rw-r--r-- | general-concepts/git-to-rsync/diagram.svg (renamed from general-concepts/cvs-to-rsync/diagram.svg) | 4 | ||||
| -rw-r--r-- | general-concepts/git-to-rsync/text.xml (renamed from general-concepts/cvs-to-rsync/text.xml) | 12 | ||||
| -rw-r--r-- | general-concepts/mirrors/text.xml | 2 | ||||
| -rw-r--r-- | general-concepts/text.xml | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/general-concepts/cvs-to-rsync/diagram.svg b/general-concepts/git-to-rsync/diagram.svg index ed31af7..8cf7414 100644 --- a/general-concepts/cvs-to-rsync/diagram.svg +++ b/general-concepts/git-to-rsync/diagram.svg @@ -1,5 +1,5 @@ <?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg width="700" height="250" xmlns="http://www.w3.org/2000/svg" version="1.1"> <desc>CVS to RSYNC Propagation</desc> @@ -31,7 +31,7 @@ <rect x="130" y="110" width="80" height="30" fill="#ffffff" stroke="black" stroke-width="2" /> - <text style="text-anchor: middle;" x="170" y="130">CVS</text> + <text style="text-anchor: middle;" x="170" y="130">Git Remote</text> <line x1="210" y1="125" x2="250" y2="125" stroke-width="2" stroke="black" /> <line x1="250" y1="125" x2="242" y2="120" stroke-width="2" stroke="black" /> diff --git a/general-concepts/cvs-to-rsync/text.xml b/general-concepts/git-to-rsync/text.xml index 9a379e6..7cef764 100644 --- a/general-concepts/cvs-to-rsync/text.xml +++ b/general-concepts/git-to-rsync/text.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> -<guide self="general-concepts/cvs-to-rsync/"> +<guide self="general-concepts/git-to-rsync/"> <chapter> -<title>CVS to RSYNC</title> +<title>Git to RSYNC</title> <body> @@ -11,10 +11,10 @@ <ul> <li> - Developer commits to CVS. + Developer commits to local Git clone and pushes to central remote Git epository. Commits and pushes are signed using Git mechanisms based on GPG. </li> <li> - Staging box syncs from CVS and generates the metadata cache. + Staging box syncs from central Git repository, generates the metadata cache, ChangeLogs and signed Manifests from Git history. </li> <li> <c>rsync1</c> syncs from the staging box. @@ -27,8 +27,8 @@ </li> </ul> -<figure short="CVS to RSYNC Propagation" link="diagram.png"> - Diagram showing CVS to RSYNC Propagation +<figure short="Git to RSYNC Propagation" link="diagram.png"> + Diagram showing Git to RSYNC Propagation </figure> <p> diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml index 7a804d9..8d81d44 100644 --- a/general-concepts/mirrors/text.xml +++ b/general-concepts/mirrors/text.xml @@ -106,7 +106,7 @@ To manually upload a file to <c>mirror://gentoo</c>, <c>scp</c> it to <c>dev.gentoo.org:/space/distfiles-local</c>. You must ensure that the permissions are set to <c>ug+rw</c> manually. The file should appear on the mirrors within four hours (note that this is <e>less frequent</e> than -<uri link="::general-concepts/cvs-to-rsync"/>). +<uri link="::general-concepts/git-to-rsync"/>). If the upstream download location for a package uses a non-standard TCP port (anything other than 21, 80 or 443), you <e>must</e> manually mirror the files. Not diff --git a/general-concepts/text.xml b/general-concepts/text.xml index 108fe00..c8c2b90 100644 --- a/general-concepts/text.xml +++ b/general-concepts/text.xml @@ -21,7 +21,7 @@ writing ebuilds or working with the Portage tree. <include href="autotools/"/> <include href="config-protect/"/> -<include href="cvs-to-rsync/"/> +<include href="git-to-rsync/"/> <include href="dependencies/"/> <include href="manifest/"/> <include href="distributed-building/"/> |
