incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmar...@apache.org
Subject svn commit: r793024 - in /websites/production/openofficeorg: ./ content/openofficeorg/people.html content/openofficeorg/svn-basics.html
Date Tue, 19 Jul 2011 01:39:34 GMT
Author: cmarcum
Date: Tue Jul 19 01:39:34 2011
New Revision: 793024

Log:
updated svn-basics

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/people.html
    websites/production/openofficeorg/content/openofficeorg/svn-basics.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 19 01:39:34 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-792964
+/websites/staging/openofficeorg/trunk:791146-793023

Modified: websites/production/openofficeorg/content/openofficeorg/people.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/people.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/people.html Tue Jul 19 01:39:34
2011
@@ -170,6 +170,12 @@ to look at all contributors to our issue
 <td>Technical writing/editing/publishing of end-user documentation</td>
 </tr>
 <tr>
+<td>jsc</td>
+<td>Juergen Schmidt</td>
+<td>Hamburg, Germany</td>
+<td>C/C++, Java, UNO, API, Extensions, SDK, Quality, ...</td>
+</tr>
+<tr>
 <td>jza</td>
 <td><a href="http://es.openoffice.org">Alexandro Colorado</a></td>
 <td>Cancun, Mexico</td>

Modified: websites/production/openofficeorg/content/openofficeorg/svn-basics.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/svn-basics.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/svn-basics.html Tue Jul 19 01:39:34
2011
@@ -73,12 +73,12 @@
   <div id="content">
     <h1 class="title">Subversion Basics</h1>
     <p>We use <a href="http://subversion.apache.org">Apache Subversion</a>
for version control. For a complete reference on Subversion see the <a href="http://svnbook.red-bean.com">Subversion
Book</a>. You can <a href="http://svn.apache.org/viewvc/incubator/ooo/trunk">browse
our repository</a> in your web browser.</p>
-<p>This page gives instructions on performing basic development tasks using Subversion.
This instruction assumes you have Apache Subversion installed.</p>
+<p>This page gives instructions on performing basic development tasks using the Subversion
Command-Line Client. This instruction assumes you have Apache Subversion installed.</p>
 <h2 id="overview">Overview</h2>
 <p>You begin using Subversion by copying a directory from a remote repository to a
local directory on your file system. This is known as a checkout of a working copy.</p>
 <p>Subversion uses a copy-modify-merge model meaning that you can add and edit files
and directories in your working copy like any other files on your system, but you should use
subversion commands for everything else such as <code>svn copy</code> and <code>svn
move</code> instead of the operating system commands.</p>
 <h2 id="sub-commands_and_abbreviations">Sub-commands and Abbreviations</h2>
-<p>Subversion's commands can be ran from a command shell such as Bash on Linux. The
subversion command is <code>svn</code> followed by optional sub-commands, options,
and arguments.</p>
+<p>Subversion commands can be ran from a command shell such as Bash on Linux. The subversion
client command is <code>svn</code> followed by optional sub-commands, options,
and arguments.</p>
 <p>to see the program version and modules</p>
 <div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span>
<span class="o">--</span><span class="n">version</span>
 </pre></div>
@@ -255,7 +255,9 @@ Select: (p) postpone, (df) diff-full, (e
 
 <p>"G" indicates "merGed"</p>
 <h3 id="committing_the_changes">Committing the Changes</h3>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span>
<span class="n">commit</span> <span class="n">test</span><span
class="o">-</span><span class="n">file</span><span class="o">.</span><span
class="n">txt</span> <span class="o">-</span><span class="n">m</span>
<span class="s">&quot;added new line&quot;</span>
+<p>Only Committers can commit directly to the repository. The following example shows
using your Apache ID and password.</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span>
<span class="n">commit</span> <span class="n">test</span><span
class="o">-</span><span class="n">file</span><span class="o">.</span><span
class="n">txt</span> <span class="o">--</span><span class="n">username</span>
<span class="n">your</span><span class="o">-</span><span class="n">name</span>
<span class="o">--</span><span class="n">password</span> <span
class="n">your</span><span class="o">-</span><span class="n">password</span>
<span class="o">\</span>
+  <span class="o">-</span><span class="n">m</span> <span class="s">&quot;added
new line&quot;</span>
 <span class="n">Sending</span>        <span class="n">test</span><span
class="o">-</span><span class="n">file</span><span class="o">.</span><span
class="n">txt</span>
 <span class="n">Transmitting</span> <span class="n">file</span> <span
class="n">data</span> <span class="o">.</span>
 <span class="n">Committed</span> <span class="n">revision</span>
<span class="mi">5</span><span class="o">.</span>
@@ -265,7 +267,7 @@ Select: (p) postpone, (df) diff-full, (e
 <p>For further information see the <a href="http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html">Basic
Work Cycle</a> page from <a href="http://svnbook.red-bean.com">Subversion Book</a>.</p>
 <h2 id="submitting_changes_by_others">Submitting Changes By Others</h2>
 <p>Coming Soon</p>
-<h2 id="creating_patches">Creating Patches</h2>
+<h2 id="creating_and_submitting_patches">Creating and Submitting Patches</h2>
 <p>Coming Soon</p>
   </div>
 



Mime
View raw message