Update of /cvsroot/fink/scripts/installer/dmg/doc/multilingual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7126
Modified Files:
multilingual.en.html
Log Message:
Various changes multilingual into dmg
Index: multilingual.en.html
===================================================================
RCS file: /cvsroot/fink/scripts/installer/dmg/doc/multilingual/multilingual.en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- multilingual.en.html 13 Mar 2004 02:03:22 -0000 1.1
+++ multilingual.en.html 15 Mar 2004 14:03:59 -0000 1.2
@@ -6,7 +6,7 @@
is intended to offer guidelines for people who want to contribute to the
i18n effort for the Fink website.</p>
<h2>Contents</h2><ul><li><a href="#intro"><b>1 Introduction</b></a><ul><li><a
href="#intro.what">1.1 What is going on with internationalization of the Fink
- website?</a></li><li><a href="#intro.languages">1.2 Languages</a></li><li><a
href="#intro.organization">1.3 Organization</a></li><li><a href="#intro.helping">1.4
Helping out.</a></li></ul></li><li><a href="#files"><b>2 The Documentation
Files</b></a><ul><li><a href="#files.requirements">2.1 Requirements</a></li><li><a
href="#files.setting-up">2.2 Environment Settings</a></li><li><a
href="#files.acquiring">2.3 Acquiring Files to Work on.</a></li><li><a
href="#files.file-standards">2.4 File Standards</a></li><li><a
href="#files.updating">2.5 Update to latest revision</a></li><li><a
href="#files.initial-translation">2.6 Initial Translation</a></li><li><a
href="#files.check-work">2.7 Check Your Work</a></li><li><a
href="#files.change-checkout">2.8 When You Get Commit Access (Team
Leaders)</a></li><li><a href="#files.committing">2.9 Committing the Changes (Team
Leaders)</a></li><li><a href="#files.website">2.10 Update our
website</a></li></ul></li><li><a href="#procedure"><b>3 Procedure for Updating
Documents</b></a><ul><li><a href="#procedure.new-translation">3.1 New
Translations</a></li><li><a href="#procedure.doc-updates">3.2 Content
Updates</a></li><li><a href="#procedure.call-to-translate">3.3 Call to
Translate</a></li><li><a href="#procedure.translate">3.4 Translation</a></li><li><a
href="#procedure.activation">3.5 Activating the Changes</a></li></ul></li><li><a
href="#resources"><b>4 Additional Resources.</b></a><ul><li><a
href="#resources.resources">4.1 Important Links</a></li><li><a
href="#resources.editors">4.2 Editors</a></li><li><a href="#resources.moretools">4.3
Useful Tools</a></li></ul></li><li><a href="#appendix"><b>5 Appendix</b></a><ul><li><a
href="#appendix.cvs-codes">5.1 CVS codes.</a></li></ul></li></ul><h2><a name="intro">1
Introduction</a></h2>
+ website?</a></li><li><a href="#intro.languages">1.2 Languages</a></li><li><a
href="#intro.organization">1.3 Organization</a></li><li><a href="#intro.helping">1.4
Helping out</a></li></ul></li><li><a href="#files"><b>2 The Documentation
Files</b></a><ul><li><a href="#files.requirements">2.1 Requirements</a></li><li><a
href="#files.setting-up">2.2 Environment Settings</a></li><li><a
href="#files.acquiring">2.3 Acquiring Files to Work on</a></li><li><a
href="#files.file-standards">2.4 File Standards</a></li><li><a
href="#files.updating">2.5 Update to latest revision</a></li><li><a
href="#files.initial-translation">2.6 Initial Translation</a></li><li><a
href="#files.check-work">2.7 Check Your Work</a></li><li><a
href="#files.change-checkout">2.8 When You Get Commit Access (Team
Leaders)</a></li><li><a href="#files.committing">2.9 Committing the Changes (Team
Leaders)</a></li><li><a href="#files.website">2.10 Update our
website</a></li></ul></li><li><a href="#procedure"><b>3 Procedure for Updating
Documents</b></a><ul><li><a href="#procedure.new-translation">3.1 New
Translations</a></li><li><a href="#procedure.doc-updates">3.2 Content
Updates</a></li><li><a href="#procedure.call-to-translate">3.3 Call to
Translate</a></li><li><a href="#procedure.translate">3.4 Translation</a></li><li><a
href="#procedure.activation">3.5 Activating the Changes</a></li></ul></li><li><a
href="#resources"><b>4 Additional Resources</b></a><ul><li><a
href="#resources.resources">4.1 Important Links</a></li><li><a
href="#resources.editors">4.2 Editors</a></li><li><a href="#resources.moretools">4.3
Useful Tools</a></li></ul></li><li><a href="#appendix"><b>5 Appendix</b></a><ul><li><a
href="#appendix.cvs-codes">5.1 CVS codes</a></li></ul></li></ul><h2><a name="intro">1
Introduction</a></h2>
@@ -18,7 +18,7 @@
<p>The Fink project has undertaken an effort to add full
internationalization support to its website, in order to make the site
more accessible worldwide. Thanks to Baba Yoshihiko, there is now a
- framework in which pages in multiple languages can be employed</p>
+ framework in which pages in multiple languages can be employed.</p>
<h3><a name="intro.languages">1.2 Languages</a></h3>
@@ -53,7 +53,7 @@
<p>A chart of the organization of the i18n team is available <a
href="http://micmacfr.homeunix.org/web/organisation/";>here</a>.</p>
- <h3><a name="intro.helping">1.4 Helping out.</a></h3>
+ <h3><a name="intro.helping">1.4 Helping out</a></h3>
<p>If you wish to help out with the internationalization effort, there
@@ -97,13 +97,13 @@
<ul>
<li>A CVS client to allow you to download the documentation from the
- Fink web tree.</li>
+ Fink xml tree.</li>
<li>A UTF-8 compatible text editor--a dedicated XML editor is a plus,
since many of the files on the Fink website are generated from XML
files.</li>
- <li>A checkout of the Fink web tree, as per the <a
href="#files.acquiring">instructions</a> below.</li>
+ <li>A checkout of the Fink xml tree, as per the <a
href="#files.acquiring">instructions</a> below.</li>
<li>Working knowledge of Fink is also beneficial.</li>
</ul>
@@ -133,27 +133,32 @@
<h3><a name="files.setting-up">2.2 Environment Settings</a></h3>
- <p>To save yourself some typing, you will want to set up your
+ <p>You will want to set up your
environment to save you some typing later on. The ensuing discussion
- assumes that you are using the built-in command-line tools on OSX or
+ assumes that you are using the built-in command-line tools on Mac OS X or
another Unix-like OS.</p>
<ol>
- <li>Modify your login files to add the CVS_RSH environment
+ <li><b>Team leaders only</b>: Modify your login files to add the CVS_RSH
environment
variable.<ol>
<li>If you are using <tt style="white-space: nowrap;">bash</tt> or
- <tt style="white-space: nowrap;">zsh</tt> add the following:<pre>export
- CVS_RSH=ssh</pre>to your <tt style="white-space:
nowrap;">.profile</tt>.</li>
+ <tt style="white-space: nowrap;">zsh</tt> add the following:
+ <pre>export CVS_RSH=ssh</pre>
+ to your <tt style="white-space: nowrap;">.profile</tt>.</li>
<li>If you're using <tt style="white-space: nowrap;">tcsh</tt> add the
- following:<pre>setenv CVS_RSH ssh</pre>to your
+ following:
+ <pre>setenv CVS_RSH ssh</pre>
+ to your
<tt style="white-space: nowrap;">.cshrc</tt>. <p>This will tell
<tt style="white-space: nowrap;">cvs</tt> to use ssh to gain access to
the files.
This is required.</p></li>
</ol></li>
- <li>Create a file called .cvsrc in your home directory with the
- following line in it:<pre>cvs -z3</pre>By doing this, CVS
+ <li><b>All members</b>: Create a file called .cvsrc in your home directory
with the
+ following line in it:
+ <pre>cvs -z3</pre>
+ By doing this, CVS
will use level 3 compression by default (it's a good thing!)</li>
</ol>
@@ -161,7 +166,7 @@
make sure your CVS_RSH environment is set.</p>
- <h3><a name="files.acquiring">2.3 Acquiring Files to Work on.</a></h3>
+ <h3><a name="files.acquiring">2.3 Acquiring Files to Work on</a></h3>
<p>For now, you must check out the xml branch of the web site:</p>
@@ -169,31 +174,30 @@
<ol>
<li>Open a terminal</li>
- <li>Create a directory somewhere to contain the Fink web branch, e.g:
+ <li>Create a directory somewhere to contain the Fink xml branch, e.g:
<pre>mkdir -p ~/Documents/Fink-i18n</pre></li>
- <li>Move to that directory: <pre>cd
- ~/Documents/Fink-i18n</pre></li>
+ <li>Move to that directory:
+ <pre>cd ~/Documents/Fink-i18n</pre></li>
<li><b>For non-leader team members (or leaders awaiting access):
</b>Login to cvs.sourceforge.net anonymously: <ol>
- <li><pre>cvs
- -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink
- login</pre></li>
+ <li>
+ <pre>cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink login</pre></li>
<li>Push the enter key (no password, anonymous as default)</li>
- <li>Check out the xml module: <pre>cvs
- -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink co
- xml</pre></li>
+ <li>Check out the xml module:
+ <pre>cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink co xml</pre></li>
</ol><b>Team leaders: </b>Check out using your username:<ol>
<li>You don't have to do the login step above, but can go right
- to<pre>cvs
- -d:ext:[EMAIL PROTECTED]:/cvsroot/fink co
- xml</pre>where <b>yourusername</b> is of course your
- SourceForge username.</li>
+ to
+ <pre>cvs -d:ext:[EMAIL PROTECTED]:/cvsroot/fink co xml</pre>
+ where <b>yourusername</b> is of course your
+ SourceForge username. You may get a message about the DSA key of the
server
+ being unknown. Go ahead and answer yes.</li>
- <li>In this case you should enter your SourceForge passport at the
+ <li>In this case you should enter your SourceForge passphrase at the
prompt.</li>
</ol></li>
</ol>
@@ -223,21 +227,22 @@
<h3><a name="files.updating">2.5 Update to latest revision</a></h3>
- <p>Since other translators will change some files (don't afraid about
+ <p>Since other translators will change some files (don't be afraid about
that, CVS can take good care of it) after you checked out the files, it
- is a good idea that update your working copy to the latest revision
+ is a good idea that you update your working copy to the latest revision
frequently. For updating, you can:</p>
<ol>
- <li>Follow steps 4 - 6 above, login to CVS.</li>
-
<li>Move to the directory that contains the files you checked out,
- e.g: <pre>cd ~/Documents/Fink-i18n/xml</pre></li>
+ e.g:
+ <pre>cd ~/Documents/Fink-i18n/xml</pre></li>
- <li>Update it, e.g:<pre>cvs
- -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink
- update</pre>for team members without commit access,
- or<pre>cvs update</pre>for team leaders.</li>
+ <li>Update it, e.g:
+ <pre>cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/fink update -dP</pre>
+ for team members without commit access,
+ or
+ <pre>cvs update -dP</pre>
+ for team leaders.</li>
</ol>
<p>You may find a letter in front of one or more of the filenames when
@@ -258,19 +263,17 @@
<li>Static PHP files (e.g. <tt style="white-space:
nowrap;">xml/web/*.en.php</tt>)</li>
- <li>User's Guide (<tt style="white-space: nowrap;">xml/uguide.xml</tt>)</li>
+ <li>User's Guide (<tt style="white-space:
nowrap;">xml/uguide.en.xml</tt>)</li>
- <li>FAQ (<tt style="white-space: nowrap;">xml/faq.xml</tt>)</li>
+ <li>FAQ (<tt style="white-space: nowrap;">xml/faq.en.xml</tt>)</li>
- <li>Running X11 (<tt style="white-space: nowrap;">xml/x11/x11.xml</tt>)</li>
+ <li>Running X11 (<tt style="white-space:
nowrap;">xml/x11/x11.en.xml</tt>)</li>
- <li>Document Index (<tt style="white-space: nowrap;">xml/doc/doc.xml</tt>,
but the PHP
- files for this cannot be generated by running <tt style="white-space:
nowrap;">make</tt> due to
- remaining xslt problems)</li>
+ <li>Document Index (<tt style="white-space:
nowrap;">xml/doc/doc.en.xml</tt></li>
- <li>Packaging (<tt style="white-space:
nowrap;">xml/packaging/packaging.xml</tt>)</li>
+ <li>Packaging (<tt style="white-space:
nowrap;">xml/packaging/packaging.en.xml</tt>)</li>
- <li>Porting (<tt style="white-space:
nowrap;">xml/porting/porting.xml</tt>)</li>
+ <li>Porting (<tt style="white-space:
nowrap;">xml/porting/porting.en.xml</tt>)</li>
<li>News (<tt style="white-space: nowrap;">xml/news/news.xml</tt>)</li>
</ol>
@@ -278,45 +281,55 @@
<p>The <tt style="white-space: nowrap;">constants.*.inc</tt> files are intended
to deal
with hard coded items in the PHP include files. They are mostly menu
items and such, located on top and left of the pages. You should
- separate them from the scripts and create a file like the sample file
- (English) below:</p>
+ separate them from the scripts and create a constants.xx.inc file for your
language. To do this, just issue the following command in a terminal window:</p>
+ <pre>cp constants.de.inc constants.xx.inc</pre>
+ <p>where xx is your language code (e.g.: fr for French language).
+ Next, you'll want to translate the single quoted part of the define lines into
your language. In case you don't understand German, here is the translation into
English:</p>
- <pre>/* The Sections. Used in Menu Navigation Bar */ define
- (FINK_SECTION_HOME, 'Home'); define (FINK_SECTION_DOWNLOAD, 'Download');
- define (FINK_SECTION_PACKAGE, 'Packages'); define (FINK_SECTION_HELP,
- 'Help'); define (FINK_SECTION_FAQ, 'F.A.Q.'); define
- (FINK_SECTION_DOCUMENTATION, 'Documentation'); define
- (FINK_SECTION_MAILING_LISTS, 'Mailing Lists'); /* The Home Subsections.
- Used in Menu Navigation Bar */ define (FINK_SECTION_HOME_INDEX,
- 'Index'); define (FINK_SECTION_HOME_NEWS, 'News'); define
- (FINK_SECTION_HOME_ABOUT, 'About'); define
- (FINK_SECTION_HOME_CONTRIBUTORS, 'Contributors'); define
- (FINK_SECTION_HOME_LINKS, 'Links'); /* The word 'Sections'. Used in Menu
- Navigation Bar */ define (FINK_SECTIONS, 'Sections'); /* Contents as
- Table of Contents. Used in FAQ/Documentation Sections */ define
- (FINK_CONTENTS, 'Contents');</pre>
+ <pre>
+/* The Sections. Used in Menu Navigation Bar */
+define (FINK_SECTION_HOME, 'Home');
+define (FINK_SECTION_DOWNLOAD, 'Download');
+define (FINK_SECTION_PACKAGE, 'Packages');
+define (FINK_SECTION_HELP, 'Help');
+define (FINK_SECTION_FAQ, 'F.A.Q.');
+define (FINK_SECTION_DOCUMENTATION, 'Documentation');
+define (FINK_SECTION_MAILING_LISTS, 'Mailing Lists');
+
+/* The Home Subsections. Used in Menu Navigation Bar */
+define (FINK_SECTION_HOME_INDEX, 'Index');
+define (FINK_SECTION_HOME_NEWS, 'News');
+define (FINK_SECTION_HOME_ABOUT, 'About');
+define (FINK_SECTION_HOME_CONTRIBUTORS, 'Contributors');
+define (FINK_SECTION_HOME_LINKS, 'Links');
+
+/* The word 'Sections'. Used in Menu Navigation Bar */
+define (FINK_SECTIONS, 'Sections');
+
+/* Contents as Table of Contents. Used in FAQ/Documentation Sections */
+define (FINK_CONTENTS, 'Contents');</pre>
<p>When you translate, you normally follow the steps as below (suppose
you are translating the Running X11 document into
French):</p>
<ol>
- <li>Copy the xml file <pre>cp x11.en.xml
- x11.fr.xml</pre></li>
+ <li>Copy the xml file
+ <pre>cp x11.en.xml x11.fr.xml</pre></li>
<li>Edit the line to declare it is French and its encoding is UTF-8
- <pre><?xml version='1.0' encoding='utf-8' ?> ...
- <document filename="index" lang="fr" > ...</pre></li>
+<pre><?xml version='1.0' encoding='utf-8' ?> ...
+<document filename="index" lang="fr" > ...</pre></li>
<li>Save as UTF-8 Be aware that the encoding must be utf-8 and take
care not to change anything but true text.</li>
<li>Once you are done, or just to test it, edit the
<tt style="white-space: nowrap;">Makefile</tt> to include your language as:
- <pre>LANGUAGES = en ja fr include
- $(basedir)/Makefile.i18n.common</pre> <p>then type
+ <pre>LANGUAGES = en ja fr include $(basedir)/Makefile.i18n.common</pre>
+ <p>then type
<tt style="white-space: nowrap;">make</tt> in the directory. This should
generate your PHP (and
- possibly some other) files as well as English and Japanese.</p></li>
+ possibly some other) files as well as other files matching the languages in
the Makefile.</p></li>
</ol>
<p>Note: If you see some misspelling or errors in the English file,
@@ -339,18 +352,22 @@
your documents as they will appear as it will on Fink's website.
Assuming that you are using the built-in server:<ol>
<li>Edit <tt style="white-space: nowrap;">/etc/httpd/httpd.conf</tt>, e.g.
- via:<pre>sudo pico /etc/httpd/httpd.conf</pre></li>
+ via:
+ <pre>sudo pico /etc/httpd/httpd.conf</pre></li>
- <li>Look for a line that says:<pre>#LoadModule php4_module
- libexec/httpd/libphp4.so</pre>and remove the #</li>
+ <li>Look for a line that says:
+ <pre>#LoadModule php libexec/httpd/libphp4.so</pre>
+ and remove the #</li>
- <li>Look for a line that says:<pre>#AddModule
- mod_php4.c</pre>and remove the #</li>
+ <li>Look for a line that says:
+ <pre>#AddModule mod_php4.c</pre>
+ and remove the #</li>
<li>If you are running a version of Apache older than the built-in
one for Panther then you may also have to look for a line that
- looks like<pre>AddType application/x-httpd-php
- .php</pre>and put a # in front of it.</li>
+ looks like
+ <pre>AddType application/x-httpd-php .php</pre>
+ and put a # in front of it.</li>
<li>Save the file and exit your editor.</li>
@@ -361,7 +378,9 @@
checkout of the <tt style="white-space: nowrap;">xml </tt>Tree into the
<tt style="white-space: nowrap;">Sites </tt>folder in your Home folder.
You can
then open the homepage in your web browser at the following
- URL:<pre>http://127.0.0.1/~<b>USERNAME</b>/xml/web/index.php</pre>where
+ URL:
+ <pre>http://127.0.0.1/~<b>USERNAME</b>/xml/web/index.php</pre>
+ where
<tt style="white-space: nowrap;">USERNAME </tt> should be replaced by
your username.</li>
</ol></li>
</ul>
@@ -377,8 +396,9 @@
<li>Set the key up on your machine following the <a
href="http://sourceforge.net/docman/display_doc.php?docid=761&group_id=1#keygenopenssh";>instructions</a>
from SourceForge.</li>
- <li>Type in the terminal: <pre>cat ~/.ssh/id_dsa.pub |
- pbcopy</pre>This will copy the contents of the file directly
+ <li>Type in the terminal:
+ <pre>cat ~/.ssh/id_dsa.pub | pbcopy</pre>
+ This will copy the contents of the file directly
to your pasteboard, to avoid spurious linebreaks. Make sure not to
copy anything else to the pasteboard until you're done.</li>
@@ -399,17 +419,17 @@
initially, then you should rename your local copy. You can use the
Finder for this.</li>
- <li>Move to that directory in a terminal window: <pre>cd
- ~/Documents/Fink-i18n</pre></li>
+ <li>Move to that directory in a terminal window:
+ <pre>cd ~/Documents/Fink-i18n</pre></li>
- <li>Do the checkout of the xml tree:<pre>cvs
- -d:ext:[EMAIL PROTECTED]:/cvsroot/fink co
- xml</pre>where <b>yourusername</b> is of course your
- SourceForge username. Enter your password where prompted.</li>
+ <li>Do the checkout of the xml tree:
+ <pre>cvs -d:ext:[EMAIL PROTECTED]:/cvsroot/fink co xml</pre>
+ where <b>yourusername</b> is of course your
+ SourceForge username. Enter your passphrase where prompted.</li>
<li>Copy the files that you were working on from your old tree to
the new one. Feel free to use the Finder, making sure that they go
- in the same subfolder as they were they were initially.</li>
+ in the same subfolder as they were initially.</li>
</ol></li>
</ul>
@@ -419,10 +439,10 @@
<p>Now you need to send your changes to the main server. To do this you
need to make sure that you have commit access. You also should make sure
- that you are using the same version of XSLT as everyone else, which
- currently is <tt style="white-space: nowrap;">xslt-1.1.2-2</tt> from Fink.</p>
+ that you are always using the latest version of XSLT in unstable tree, which is
+ <tt style="white-space: nowrap;">libxslt-1.1.2-2</tt> from Fink as the time of
writing this document.</p>
- <p>it different between the static and dynamic documents:</p>
+ <p>The procedure is different accourding to the nature - static or dynamic - of
the documents:</p>
<ul>
<li><b>Static: </b>(PHP files only) To commit these documents do the
@@ -430,82 +450,93 @@
<li>Open a terminal.</li>
<li>Move to the directory that contains the file you want to check
- in, e.g: <pre>cd ~/Documents/Fink-i18n/xml/web</pre>
- <p>if you created your <tt style="white-space: nowrap;">web</tt> tree
under
+ in, e.g:
+ <pre>cd ~/Documents/Fink-i18n/xml/web</pre>
+ <p>if you created your <tt style="white-space: nowrap;">xml</tt> tree
under
<tt style="white-space: nowrap;">Documents/Fink-i18n/</tt> in your home
folder, and
you want to commit a PHP file from the xml/web directory.</p></li>
<li>If the file is a new one that you've created, then you need to
- add it to the list of files, e,g.:<pre>cvs add
- download.ru.php</pre>Give your SourceForge password at the
- prompt. You may get a message about the DSA key of the server
- being unknown. Go ahead and answer yes. <p>If the file already
+ add it to the list of files, e,g.:
+ <pre>cvs add download.ru.php</pre>
+ Give your SourceForge passphrase at the
+ prompt.<p>If the file already
exists, you can skip to the next step.</p></li>
- <li>Commit the file, e.g. in the prior example:<pre>cvs ci
- -m "message" download.ru.php</pre>where once again
+ <li>Commit the file, e.g. in the prior example:
+ <pre>cvs ci -m "message" download.ru.php</pre>
+ where once again
<b>message </b>should indicate what you've done. Give your
- SourceForge password at the prompt. You may get a message about
- the DSA key of the server being unknown. Go ahead and answer yes.
+ SourceForge passphrase at the prompt. Don't forget to also commit the
Makefile if you've changed it (i.e. you've added your langague in it)
<p>Note: you can commit multiple files at once.</p></li>
- </ol></li>
+ </ol></li>
<li><b>Dynamic: </b>(XML and PHP) After you've modified the XML
file, do the following:<ol>
<li>Open a terminal</li>
<li>Move to the directory that contains the file you've added or
- modified, e.g.<pre>cd
- ~/Documents/Fink-i18n/xml/faq</pre>if you've been working on
+ modified, e.g.
+ <pre>cd ~/Documents/Fink-i18n/xml/faq</pre>
+ if you've been working on
the FAQ.</li>
- <li>Now run<pre>make check</pre>To ensure that the
+ <li>Now run
+ <pre>make check</pre>
+ To ensure that the
file is valid.</li>
<li>If the XML file is a new one that you've created, then you
- need to add it to the list of files, e,g.:<pre>cvs add
- faq.ru.xml</pre> You'll need to give your SourceForge
- password. You may get a message about the DSA key of the server.
- Go ahead and answer yes. <p>If the file already exists, you can
+ need to add it to the list of files, e,g.:
+ <pre>cvs add faq.ru.xml</pre>
+ You'll need to give your SourceForge
+ passphrase.<p>If the file already exists, you can
skip to the next step.</p></li>
- <li>Commit the file, e.g.:<pre>cvs ci -m "message"
- faq.ru.xml</pre><p> where <b>message</b> is a descriptive
- message about what you've done. Enter your SourceForge Password at
- the prompt. You may get a message about the DSA key of the server.
- Go ahead and answer yes. </p></li>
+ <li>Commit the file, e.g.:
+ <pre>cvs ci -m "message" faq.ru.xml</pre>
+ <p> where <b>message</b> is a descriptive
+ message about what you've done. Enter your SourceForge passphrase at
+ the prompt.</p></li>
- <li>Now run<pre>make && make
- install</pre></li>
+ <li>Now run
+ <pre>make && make install</pre></li>
- <li>Move into your copy of the Fink web tree, e.g: <pre>cd
- ~/Documents/Fink-i18n/xml</pre> <p>if you created your
+ <li>Move into your copy of the Fink xml tree, e.g:
+ <pre>cd ~/Documents/Fink-i18n/xml</pre>
+ <p>if you created your
<tt style="white-space: nowrap;">xml</tt> tree under
<tt style="white-space: nowrap;">Documents/Fink-i18n/</tt> in your home
folder.</p></li>
<li>If the XML file was new, you'll need to do some more CVS
adding. For example, if you have been working on the FAQ, then,
- you'll want to run (e.g.):<pre>cvs add web/faq/index.en.php
- web/faq/general.ru.php \ web/faq/relations.ru.php
- web/faq/usage-fink.ru.php \ web/comp-general.ru.php
- web/faq/comp-packages.ru.php \ web/faq/usage-general.ru.php
- web/faq/usage-packages.ru.php \ web/faq/upgrade-fink.ru.php
- web/faq/mirrors.ru.php \ web/faq/faq.ru.html web/faq/header.ru.inc
- \ scripts/installer/dmg/faq.ru.html</pre>For other
+ you'll want to run (e.g.):
+<pre>cvs add web/faq/index.en.php web/faq/general.ru.php \
+web/faq/relations.ru.php web/faq/usage-fink.ru.php \
+web/comp-general.ru.php web/faq/comp-packages.ru.php \
+web/faq/usage-general.ru.php web/faq/usage-packages.ru.php \
+web/faq/upgrade-fink.ru.php web/faq/mirrors.ru.php \
+web/faq/faq.ru.html web/faq/header.ru.inc \
+scripts/installer/dmg/faq.ru.html</pre>
+For other
documents, the files will of course be different--use whatever
gets created for your language when you run <tt style="white-space:
nowrap;">make
install</tt>.</li>
- <li>Commit the whole tree:<pre>cvs ci -m
- "message"</pre> <p>Where once again <b>message</b> is a
+ <li>Don't forget to add and commit any file you've created (be it
constants.xx.inc, header.xx.inc, nav.xx.inc, etc.)
+ <p>If the file already exists, you can
+ skip to the next step.</p></li>
+
+ <li>Commit the whole tree:
+ <pre>cvs ci -m "message"</pre>
+ <p>Where once again <b>message</b> is a
descriptive log message (you may want to use the same one as when
- you committed the XML file). Enter your SourceForge Password at
- the prompt. You may get a message about the DSA key of the server.
- Go ahead and answer yes.</p><p>The reason that you have to do two
+ you committed the XML file). Enter your SourceForge passphrase at
+ the prompt.</p><p>The reason that you have to do two
commits in this case is that it's required to ensure that the
files show the correct creation time and person who last modified
- them</p></li>
+ them.</p></li>
</ol></li>
</ul>
@@ -519,21 +550,22 @@
<ol>
<li>Open a terminal</li>
- <li>log in web server via ssh: <pre>ssh
- [EMAIL PROTECTED]</pre> You'll need to give your
- SourceForge password. You may get a message about the DSA key of the
- server. Go ahead and answer yes.</li>
+ <li>log in web server via ssh:
+ <pre>ssh [EMAIL PROTECTED]</pre>
+ You'll need to give your
+ SourceForge passphrase.</li>
- <li>Move to the dictory contains our web pages: <pre>cd
- /home/groups/f/fi/fink/htdocs</pre></li>
+ <li>Move to the directory which contains our web pages:
+ <pre>cd /home/groups/f/fi/fink/htdocs</pre></li>
<li>update the website from CVS:
<pre>./update.sh</pre></li>
- <li>log out from web server: <pre>exit</pre></li>
+ <li>log out from web server:
+ <pre>exit</pre></li>
- <li>See your efforts: <pre>open
- http://fink.sourceforge.net/</pre></li>
+ <li>See your efforts:
+ <pre>open http://fink.sourceforge.net/</pre></li>
</ol>
<h2><a name="procedure">3 Procedure for Updating Documents</a></h2>
@@ -592,8 +624,9 @@
<li>In addition, the filename of the base file should be included
somewhere in the message.</li>
- <li>A full diff (e.g. <tt style="white-space: nowrap;">diff -Nru3
-r<b>last_revision</b>
- r<b>head</b> </tt>) to show the modifications in context.</li>
+ <li>A full diff, e.g.:
+ <pre>diff -Nru3 -r<b>last_revision</b> r<b>head</b> </pre>
+ to show the modifications in context.</li>
</ul>
<p>Note: since committing the XML file automatically produces a message
@@ -621,7 +654,7 @@
language versions of the document are finished.</li>
</ol>
- <h2><a name="resources">4 Additional Resources.</a></h2>
+ <h2><a name="resources">4 Additional Resources</a></h2>
@@ -695,7 +728,7 @@
- <h3><a name="appendix.cvs-codes">5.1 CVS codes.</a></h3>
+ <h3><a name="appendix.cvs-codes">5.1 CVS codes</a></h3>
<p>When you are updating your CVS checkout, you may see some letters
@@ -711,8 +744,9 @@
<li><b>C:</b> Your version conflicts with that in the remote
repository. You should resolve this by editing the the file and
- merging your modifications. <p>You can use </p><pre>rm file;cvs
- update file</pre><p>where <tt style="white-space: nowrap;">file </tt>is the
offending
+ merging your modifications. <p>You can use </p>
+ <pre>rm file; cvs update file</pre>
+ <p>where <tt style="white-space: nowrap;">file </tt>is the offending
file, to resolve the conflict, and then apply the changes from the
backup of your file that exists
under<tt style="white-space: nowrap;">.#file-version</tt></p>, where
<b>version
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
