From 164c3da79c230aa6e7b7cd5987f456514d153940 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 25 May 2012 16:44:43 +0000 Subject: [PATCH] Update fdp-primer/translations/chapter.sgml to reflect the CVS->SVN conversion, plus some additional fixes: - Update CVS-specific notes with SVN-specific counterparts - Provide an in-document example of a checkout from svn - Note devel/subversion is required - Replace a TODO item with an example of how to obtain a diff between two versions of a file - Replace "?" with "." at the end of a non-question - Replace "doc/" with "head/" as the top-level directory where necessary - Add the new "htdocs/" directory to the sample sv_SE directory layout - Update sample FreeBSD RCS IDs to the svn-style --- .../fdp-primer/translations/chapter.sgml | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml index fc68b35cd3..7784054b5c 100644 --- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml +++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml @@ -133,21 +133,28 @@ It is strongly recommended that you maintain a local - copy of the FreeBSD CVS repository (at least the - documentation part) either using - CTM or - CVSup. The "Staying current with - FreeBSD" chapter in the Handbook explains how to use these - applications. + copy of the FreeBSD Subversion repository (at least the + documentation part). This can be done by running: + + &prompt.user; svn checkout svn://svn.FreeBSD.org/doc/head/ head + + + This will require the devel/subversion package to + be installed. + You should be comfortable using - CVS. This will allow you to see + svn. This will allow you to see what has changed between different versions of the files that make up the documentation. - [XXX To Do -- write a tutorial that shows how to use - CVSup to get just the documentation, check it out, and see - what has changed between two arbitrary revisions] + For example, to view the differences between revisions + r33733 and r33734 of + en_US.ISO8859-1/books/fdp-primer/book.sgml, + run: + + &prompt.user; svn diff -r33733:33734 en_US.ISO8859-1/books/fdp-primer/book.sgml @@ -237,7 +244,7 @@ We are a translation team, and want to submit documentation that our members have translated for - us? + us. @@ -246,7 +253,7 @@ documentation tree and build straight away. Currently, the FreeBSD documentation is stored in a top - level directory called doc/. + level directory called head/. Directories below this are named according to the language code they are written in, as defined in ISO639 (/usr/share/misc/iso639 on a version of @@ -262,9 +269,11 @@ For example, a hypothetical Swedish translation might look like: - doc/ + head/ sv_SE.ISO8859-1/ Makefile + htdocs/ + docproj/ books/ faq/ Makefile @@ -440,14 +449,14 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.5 2000/07/07 18:38:38 dannyboy Exp $ + $FreeBSD: head/en_US.ISO8859-1/books/faq/book.sgml 38674 2012-04-14 13:52:52Z $ --> The exact boilerplate may change, but it will always include a $FreeBSD$ line and the phrase The FreeBSD Documentation Project. Note that the $FreeBSD part is expanded automatically - by CVS, so it should be empty (just + by Subversion, so it should be empty (just $FreeBSD$) for new files. @@ -465,8 +474,8 @@ <!-- The FreeBSD Spanish Documentation Project - $FreeBSD: doc/es_ES.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.3 1999/06/24 19:12:32 jesusr Exp $ - Original revision: 1.11 + $FreeBSD: head/es_ES.ISO8859-1/books/faq/book.sgml 38826 2012-05-17 19:12:14Z hrs $ + Original revision: r38674 -->