From 0d4e23d64264b2f2c8dd7ee7c651134a489ecf9c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 19 Oct 2002 09:16:45 +0000 Subject: [PATCH] it's the little fixes that do us in Original commit message from CVS: it's the little fixes that do us in --- docs/random/caps | 4 ++-- docs/random/release | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/random/caps b/docs/random/caps index 348b0e4f1b..415a74a5a8 100644 --- a/docs/random/caps +++ b/docs/random/caps @@ -5,9 +5,9 @@ SOME OF THE FIRST IDEAS, PRETTY OUTDATED During the course of a discussion on IRC, it turned out that there are many possible ways to handle the capabilities. -A capabilitiy is bascially a set of properties attached to a +A capability is basically a set of properties attached to a mimetype in order to more closely describe the mimetype. -Capabiltities are supposed to be attached to pads so that the +Capabilities are supposed to be attached to pads so that the autoplugging algorithm has more specific information to connect compatible pads. diff --git a/docs/random/release b/docs/random/release index 1ccc16185b..c837bbd25e 100644 --- a/docs/random/release +++ b/docs/random/release @@ -121,8 +121,10 @@ TODO : - Later on, if necessary, merge back latest release branch to current dev branch (if patches to source were made) * change to a HEAD branch, make sure it's updated - * cvs diff -r RELEASE-0_3_4-30SECONDFRENCHMAN -R - gives a list of differences between head and release tag + * cvs diff -R -r RELEASE-0_3_4-30SECONDFRENCHMAN + gives a list of differences between head and release tag, + stuff with > is how it's in HEAD, < is in the rel branch + * cvs update -j BRANCH-RELEASE-0_3_4 merges the difference made in that branch to the current source this is what you want to use when merging back the branch