diff options
authorJohannes Huber <johu@gentoo.org>2015-08-17 17:01:39 +0200
committerJohannes Huber <johu@gentoo.org>2015-08-18 13:59:27 +0200
commit8c1cb7c99809541c4782055a1591155f5e7749a2 (patch)
tree49936da358e36377a7349f66a5d7c701921af614 /general-concepts
parentMerge pull request #32 from johu/eapi-declaration (diff)
Replace cvs to rsync with git to rsync
Due to git migration.
Diffstat (limited to 'general-concepts')
-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
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"
<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/">
-<title>CVS to RSYNC</title>
+<title>Git to RSYNC</title>
@@ -11,10 +11,10 @@
- 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.
- 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.
<c>rsync1</c> syncs from the staging box.
@@ -27,8 +27,8 @@
-<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
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/"/>