Modified: websites/staging/openoffice/trunk/content/svn-basics.html ============================================================================== --- websites/staging/openoffice/trunk/content/svn-basics.html (original) +++ websites/staging/openoffice/trunk/content/svn-basics.html Mon Jul 22 21:53:03 2013 @@ -85,8 +85,7 @@ <h1 id="project-management-pmc">Project Management PMC</h1> <ul> <li><a href="http://blogs.apache.org/OOo/";>Project Blog</a></li> -<li><a href="/pmc-faqs.html">PMC FAQs</a><br /> -</li> +<li><a href="/pmc-faqs.html">PMC FAQs</a> </li> </ul> <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1> <ul> @@ -121,12 +120,12 @@ <h2 id="wzxhzdk28wzxhzdk29sub-commands-and-abbreviations"><a id="sub-commands_and_abbreviations"></a>Sub-commands and Abbreviations</h2> <p>Subversion commands can be run 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>Show 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> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="o">--</span><span class="n">version</span> </pre></div> <p>Run a sub-command</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="sr"><subcommand></span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="p">[</span><span class="n">args</span><span class="p">]</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="o"><</span><span class="n">subcommand</span><span class="o">></span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="p">[</span><span class="n">args</span><span class="p">]</span> </pre></div> @@ -149,7 +148,7 @@ <h2 id="wzxhzdk30wzxhzdk31client-configuration"><a id="client_configuration"></a>Client Configuration</h2> <p>Committers need to <a href="http://www.apache.org/dev/version-control.html#https-svn-config";>configure their Subversion client</a> to handle the differences in line endings of text files on different operating systems.</p> <p>There are instances where Subversion may need to open an editor. You need to have the environment variable EDITOR set to the editor you would like to use. To set it for the current terminal session in Bash (your path may differ):</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">export</span> <span class="n">EDITOR</span><span class="o">=</span><span class="sr">/usr/</span><span class="n">bin</span><span class="o">/</span><span class="n">vim</span> +<div class="codehilite"><pre>$ <span class="n">export</span> <span class="n">EDITOR</span><span class="p">=</span><span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">vim</span> </pre></div> @@ -164,15 +163,15 @@ For more information see the <a href="ht </ul> <h2 id="getting-the-source-code">Getting the source code</h2> <p>From the parent directory of where you want the working copy. In this example the <code>aoo-trunk</code> directory will be created if it does not exist.</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/openoffice/</span><span class="n">trunk</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">co</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">openoffice</span><span class="o">/</span><span class="n">trunk</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span> <span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span> -<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span> -<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">fetch</span><span class="o">-</span><span class="n">all</span><span class="o">-</span><span class="n">cws</span><span class="o">.</span><span class="n">sh</span> -<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">cws</span><span class="o">-</span><span class="n">list</span><span class="o">.</span><span class="n">txt</span> -<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">fetch</span><span class="o">-</span><span class="n">all</span><span class="o">-</span><span class="n">web</span><span class="o">.</span><span class="n">sh</span> -<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">web</span><span class="o">-</span><span class="n">list</span><span class="o">.</span><span class="n">txt</span> -<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">single</span><span class="o">-</span><span class="n">hg</span><span class="o">.</span><span class="n">sh</span> -<span class="n">Checked</span> <span class="n">out</span> <span class="n">revision</span> <span class="mi">1145818</span><span class="o">.</span> +<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span><span class="o">/</span><span class="n">dev</span> +<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">fetch</span><span class="o">-</span><span class="n">all</span><span class="o">-</span><span class="n">cws</span><span class="p">.</span><span class="n">sh</span> +<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">cws</span><span class="o">-</span><span class="n">list</span><span class="p">.</span><span class="n">txt</span> +<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">fetch</span><span class="o">-</span><span class="n">all</span><span class="o">-</span><span class="n">web</span><span class="p">.</span><span class="n">sh</span> +<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">web</span><span class="o">-</span><span class="n">list</span><span class="p">.</span><span class="n">txt</span> +<span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">single</span><span class="o">-</span><span class="n">hg</span><span class="p">.</span><span class="n">sh</span> +<span class="n">Checked</span> <span class="n">out</span> <span class="n">revision</span> 1145818<span class="p">.</span> </pre></div> @@ -188,85 +187,85 @@ For more information see the <a href="ht </ul> <h3 id="adding-a-file">Adding a File</h3> <p>After creating the file "test-file.txt" in the working copy.</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">status</span> -<span class="p">?</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">status</span> +? <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> </pre></div> <p>? indicates test-file.txt is not under version control</p> <h3 id="scheduling-a-file-for-addition-to-repository">Scheduling a file for addition to repository</h3> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">add</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">A</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">add</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="n">A</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> -<span class="nv">$</span> <span class="nv">svn</span> <span class="n">status</span> -<span class="n">A</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">svn</span> <span class="n">status</span> +<span class="n">A</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> </pre></div> <p>"A" indicates file is scheduled for addition</p> <h3 id="running-a-diff">Running a diff</h3> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">diff</span> -<span class="n">Index:</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="o">---</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="p">(</span><span class="n">revision</span> <span class="mi">0</span><span class="p">)</span> -<span class="o">+++</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="p">(</span><span class="n">revision</span> <span class="mi">0</span><span class="p">)</span> -<span class="nv">@@</span> <span class="err">-</span><span class="nv">0</span><span class="p">,</span><span class="mi">0</span> <span class="o">+</span><span class="mi">1</span> <span class="nv">@@</span> -<span class="err">+</span><span class="nv">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">test</span> <span class="n">file</span> <span class="k">for</span> <span class="n">svn</span><span class="o">-</span><span class="n">basics</span><span class="o">.</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">diff</span> +<span class="n">Index</span><span class="p">:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="o">==================================================================</span><span class="p">=</span> +<span class="o">---</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="p">(</span><span class="n">revision</span> 0<span class="p">)</span> +<span class="o">+++</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="p">(</span><span class="n">revision</span> 0<span class="p">)</span> +<span class="p">@@</span> <span class="o">-</span>0<span class="p">,</span>0 <span class="o">+</span>1 <span class="p">@@</span> +<span class="o">+</span><span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">test</span> <span class="n">file</span> <span class="k">for</span> <span class="n">svn</span><span class="o">-</span><span class="n">basics</span><span class="p">.</span> -<span class="n">Property</span> <span class="n">changes</span> <span class="n">on:</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">Property</span> <span class="n">changes</span> <span class="n">on</span><span class="p">:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="n">___________________________________________________________________</span> -<span class="n">Added:</span> <span class="n">svn:eol</span><span class="o">-</span><span class="n">style</span> +<span class="n">Added</span><span class="p">:</span> <span class="n">svn</span><span class="p">:</span><span class="n">eol</span><span class="o">-</span><span class="n">style</span> <span class="o">+</span> <span class="n">native</span> </pre></div> <h3 id="committing-a-file">Committing a file</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">"added test-file.txt"</span> -<span class="n">Adding</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">2</span><span class="o">.</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="o">-</span><span class="n">m</span> "<span class="n">added</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span>" +<span class="n">Adding</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="p">.</span> +<span class="n">Committed</span> <span class="n">revision</span> 2<span class="p">.</span> </pre></div> <h3 id="update-the-working-copy">Update the working copy</h3> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">update</span> -<span class="n">U</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">Updated</span> <span class="n">to</span> <span class="n">revision</span> <span class="mi">3</span><span class="o">.</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">update</span> +<span class="n">U</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="n">Updated</span> <span class="n">to</span> <span class="n">revision</span> 3<span class="p">.</span> </pre></div> <p>"U" indicates an "Update" to a file or directory</p> <p>Modify the file (this example uses the vim editor)</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">vim</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> +<div class="codehilite"><pre>$ <span class="n">vim</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> </pre></div> <h3 id="check-the-status">Check the Status</h3> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">status</span> -<span class="n">M</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">status</span> +<span class="n">M</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> </pre></div> <p>"M" indicates the file has been "Modified"</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">diff</span> -<span class="n">Index:</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="o">---</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="p">(</span><span class="n">revision</span> <span class="mi">3</span><span class="p">)</span> -<span class="o">+++</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="p">(</span><span class="n">working</span> <span class="n">copy</span><span class="p">)</span> -<span class="nv">@@</span> <span class="err">-</span><span class="nv">1</span><span class="p">,</span><span class="mi">2</span> <span class="o">+</span><span class="mi">1</span><span class="p">,</span><span class="mi">3</span> <span class="nv">@@</span> - <span class="nv">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">test</span> <span class="n">file</span> <span class="k">for</span> <span class="n">svn</span><span class="o">-</span><span class="n">basics</span><span class="o">.</span> - <span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="k">new</span> <span class="n">line</span> <span class="n">added</span> <span class="n">by</span> <span class="n">someone</span> <span class="k">else</span><span class="o">.</span> -<span class="o">+</span><span class="n">This</span> <span class="n">line</span> <span class="n">added</span> <span class="n">by</span> <span class="n">me</span><span class="o">.</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">diff</span> +<span class="n">Index</span><span class="p">:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="o">==================================================================</span><span class="p">=</span> +<span class="o">---</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="p">(</span><span class="n">revision</span> 3<span class="p">)</span> +<span class="o">+++</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="p">(</span><span class="n">working</span> <span class="n">copy</span><span class="p">)</span> +<span class="p">@@</span> <span class="o">-</span>1<span class="p">,</span>2 <span class="o">+</span>1<span class="p">,</span>3 <span class="p">@@</span> + <span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">test</span> <span class="n">file</span> <span class="k">for</span> <span class="n">svn</span><span class="o">-</span><span class="n">basics</span><span class="p">.</span> + <span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">new</span> <span class="n">line</span> <span class="n">added</span> <span class="n">by</span> <span class="n">someone</span> <span class="k">else</span><span class="p">.</span> +<span class="o">+</span><span class="n">This</span> <span class="n">line</span> <span class="n">added</span> <span class="n">by</span> <span class="n">me</span><span class="p">.</span> </pre></div> <h3 id="resolving-conflicts">Resolving Conflicts</h3> <p>Suppose someone edits the same line as you before you commit</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">update</span> -<span class="n">Conflict</span> <span class="n">discovered</span> <span class="n">in</span> <span class="s">'test-file.txt'</span><span class="o">.</span> -<span class="n">Select:</span> <span class="p">(</span><span class="n">p</span><span class="p">)</span> <span class="n">postpone</span><span class="p">,</span> <span class="p">(</span><span class="n">df</span><span class="p">)</span> <span class="n">diff</span><span class="o">-</span><span class="n">full</span><span class="p">,</span> <span class="p">(</span><span class="n">e</span><span class="p">)</span> <span class="n">edit</span><span class="p">,</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">update</span> +<span class="n">Conflict</span> <span class="n">discovered</span> <span class="n">in</span> <span class="s">'test-file.txt'</span><span class="p">.</span> +<span class="n">Select</span><span class="p">:</span> <span class="p">(</span><span class="n">p</span><span class="p">)</span> <span class="n">postpone</span><span class="p">,</span> <span class="p">(</span><span class="n">df</span><span class="p">)</span> <span class="n">diff</span><span class="o">-</span><span class="n">full</span><span class="p">,</span> <span class="p">(</span><span class="n">e</span><span class="p">)</span> <span class="n">edit</span><span class="p">,</span> <span class="p">(</span><span class="n">mc</span><span class="p">)</span> <span class="n">mine</span><span class="o">-</span><span class="n">conflict</span><span class="p">,</span> <span class="p">(</span><span class="n">tc</span><span class="p">)</span> <span class="n">theirs</span><span class="o">-</span><span class="n">conflict</span><span class="p">,</span> - <span class="p">(</span><span class="n">s</span><span class="p">)</span> <span class="n">show</span> <span class="n">all</span> <span class="n">options:</span> + <span class="p">(</span><span class="n">s</span><span class="p">)</span> <span class="n">show</span> <span class="n">all</span> <span class="n">options</span><span class="p">:</span> </pre></div> @@ -289,19 +288,19 @@ Select: (p) postpone, (df) diff-full, (e <p>If you choose <code>e</code>, Subversion will launch an editor with both sets of changes included for you to edit. You can save your changes in the editor and then select <code>r</code> (for resolved).</p> -<div class="codehilite"><pre><span class="n">G</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">Updated</span> <span class="n">to</span> <span class="n">revision</span> <span class="mi">4</span><span class="o">.</span> +<div class="codehilite"><pre><span class="n">G</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="n">Updated</span> <span class="n">to</span> <span class="n">revision</span> 4<span class="p">.</span> </pre></div> <p>"G" indicates "merGed"</p> <h2 id="wzxhzdk36wzxhzdk37committing-changes"><a id="committing_changes"></a>Committing Changes</h2> <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">c</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">"added new C file"</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> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">c</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="n">added</span> <span class="n">new</span> <span class="n">C</span> <span class="n">file</span>" +<span class="n">Sending</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> +<span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="p">.</span> +<span class="n">Committed</span> <span class="n">revision</span> 5<span class="p">.</span> </pre></div> @@ -320,10 +319,10 @@ Information like author, where the chang in the code as SVN can keep it much more effectively without altering the coding style. Always try to use a log file for your commits. The previous commit when done by an experienced committer should actually look like this:</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">ci</span> <span class="o">-</span><span class="n">F</span> <span class="n">test</span><span class="o">-</span><span class="nb">log</span><span class="o">.</span><span class="n">txt</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">c</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">c</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> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">ci</span> <span class="o">-</span><span class="n">F</span> <span class="n">test</span><span class="o">-</span><span class="nb">log</span><span class="p">.</span><span class="n">txt</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">c</span> +<span class="n">Sending</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">c</span> +<span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="p">.</span> +<span class="n">Committed</span> <span class="n">revision</span> 5<span class="p">.</span> </pre></div> @@ -334,26 +333,26 @@ contributors.</p> <p>See the <a href="http://www.apache.org/dev/committers.html#applying-patches";>Applying Patches</a> section of the Committer FAQ page. Please use the special fields described in the previous Commit Message section to commit changes supplied by others. </p> <p>Example similar to one on Committer FAQ:</p> -<div class="codehilite"><pre><span class="n">Issue</span> <span class="c1">#43835:</span> -<span class="n">Added</span> <span class="n">some</span> <span class="n">cool</span> <span class="k">new</span> <span class="n">feature</span><span class="o">.</span> -<span class="n">Patch</span> <span class="n">by:</span> <span class="n">John</span> <span class="n">Doe</span> <span class="sr"><john.doe.at.null.org></span> -<span class="n">Suggested</span> <span class="n">by:</span> <span class="n">Jane</span> <span class="n">Brown</span> <span class="sr"><janeb.at.notnull.org></span> +<div class="codehilite"><pre><span class="n">Issue</span> #43835<span class="p">:</span> +<span class="n">Added</span> <span class="n">some</span> <span class="n">cool</span> <span class="n">new</span> <span class="n">feature</span><span class="p">.</span> +<span class="n">Patch</span> <span class="n">by</span><span class="p">:</span> <span class="n">John</span> <span class="n">Doe</span> <span class="o"><</span><span class="n">john</span><span class="p">.</span><span class="n">doe</span><span class="p">.</span><span class="n">at</span><span class="p">.</span><span class="n">null</span><span class="p">.</span><span class="n">org</span><span class="o">></span> +<span class="n">Suggested</span> <span class="n">by</span><span class="p">:</span> <span class="n">Jane</span> <span class="n">Brown</span> <span class="o"><</span><span class="n">janeb</span><span class="p">.</span><span class="n">at</span><span class="p">.</span><span class="n">notnull</span><span class="p">.</span><span class="n">org</span><span class="o">></span> </pre></div> <!-- Using the `-m (--message)` option only allows a single line log message. To commit a multi-line message use the `-F (--file)` option (with a previously created file) or use neither -m or -F and an editor will be started. --> <p>An alternative way is the following command. It adds a new line with "\n":</p> -<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="nv">$</span><span class="err">'</span><span class="nv">Issue</span> <span class="c1">#43835:\nAdded some cool new feature.\nPatch by: /</span> - <span class="n">John</span> <span class="n">Doe</span> <span class="sr"><john.doe.at.null.org></span><span class="o">\</span><span class="n">nSubmitted</span> <span class="n">by:</span> <span class="n">John</span> <span class="n">Doe</span> <span class="o">/</span> - <span class="sr"><john.doe.at.null.org></span><span class="err">'</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> +<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> $<span class="s">'Issue #43835:\nAdded some cool new feature.\nPatch by: /</span> +<span class="s"> John Doe <john.doe.at.null.org>\nSubmitted by: John Doe /</span> +<span class="s"> <john.doe.at.null.org>'</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> </pre></div> <h2 id="wzxhzdk42wzxhzdk43creating-and-submitting-patches"><a id="creating_and_submitting_patches"></a>Creating and Submitting Patches</h2> <p>See the <a href="http://www.apache.org/dev/contributors.html#patches";>Sending in Patches</a> section on the Contributors Tech Guide page.</p> <p>Create the patch file from <code>svn diff</code> where <code>your-patch-name.patch</code> is the full path to the patch file to create.</p> -<div class="codehilite"><pre><span class="n">svn</span> <span class="n">diff</span> <span class="o">></span> <span class="n">your</span><span class="o">-</span><span class="n">patch</span><span class="o">-</span><span class="n">name</span><span class="o">.</span><span class="n">patch</span> +<div class="codehilite"><pre><span class="n">svn</span> <span class="n">diff</span> <span class="o">></span> <span class="n">your</span><span class="o">-</span><span class="n">patch</span><span class="o">-</span><span class="n">name</span><span class="p">.</span><span class="n">patch</span> </pre></div> @@ -388,29 +387,29 @@ checkout or you can save some space by u <p>To do a complete checkout from there:</p> -<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">up</span> <span class="o">--</span><span class="n">set</span><span class="o">-</span><span class="n">depth</span><span class="o">=</span><span class="n">infinity</span> +<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">up</span> <span class="o">--</span><span class="n">set</span><span class="o">-</span><span class="n">depth</span><span class="p">=</span><span class="n">infinity</span> <span class="n">Updating</span> <span class="s">'.'</span><span class="p">:</span> <span class="n">A</span> <span class="n">source</span> - <span class="n">A</span> <span class="n">source</span><span class="o">/</span><span class="n">elements</span><span class="o">.</span><span class="n">hxx</span> - <span class="n">A</span> <span class="n">source</span><span class="o">/</span><span class="n">fwkbase</span><span class="o">.</span><span class="n">cxx</span> - <span class="o">...</span> <span class="p">(</span><span class="ow">and</span> <span class="n">so</span> <span class="n">on</span><span class="p">)</span> + <span class="n">A</span> <span class="n">source</span><span class="o">/</span><span class="n">elements</span><span class="p">.</span><span class="n">hxx</span> + <span class="n">A</span> <span class="n">source</span><span class="o">/</span><span class="n">fwkbase</span><span class="p">.</span><span class="n">cxx</span> + <span class="p">...</span> <span class="p">(</span><span class="n">and</span> <span class="n">so</span> <span class="n">on</span><span class="p">)</span> </pre></div> <p>Now merge the specific revision(s) you want (in this case r1333165):</p> -<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">merge</span> <span class="o">-</span><span class="n">c1333165</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/openoffice/</span><span class="n">trunk</span><span class="sr">/main/</span><span class="n">jvmfwk</span> <span class="o">.</span> +<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">merge</span> <span class="o">-</span><span class="n">c1333165</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">openoffice</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">main</span><span class="o">/</span><span class="n">jvmfwk</span> <span class="p">.</span> <span class="o">---</span> <span class="n">Merging</span> <span class="n">r1333165</span> <span class="n">into</span> <span class="s">'.'</span><span class="p">:</span> - <span class="n">U</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_unx</span><span class="o">.</span><span class="n">xml</span> + <span class="n">U</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_unx</span><span class="p">.</span><span class="n">xml</span> </pre></div> <p>After you finish merging, check your changes with "svn status" and "svn diff" and commit:</p> -<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s">"Merge r1329539, r1329547, 1333165 - Add Oracle as a Java vendor on unix."</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_unx</span><span class="o">.</span><span class="n">xml</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_freebsd</span><span class="o">.</span><span class="n">xml</span> - <span class="n">Sending</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_freebsd</span><span class="o">.</span><span class="n">xml</span> - <span class="n">Sending</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_unx</span><span class="o">.</span><span class="n">xml</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">1347377</span><span class="o">.</span> +<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> "<span class="n">Merge</span> <span class="n">r1329539</span><span class="p">,</span> <span class="n">r1329547</span><span class="p">,</span> 1333165 <span class="o">-</span> <span class="n">Add</span> <span class="n">Oracle</span> <span class="n">as</span> <span class="n">a</span> <span class="n">Java</span> <span class="n">vendor</span> <span class="n">on</span> <span class="n">unix</span><span class="p">.</span>" <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_unx</span><span class="p">.</span><span class="n">xml</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_freebsd</span><span class="p">.</span><span class="n">xml</span> + <span class="n">Sending</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_freebsd</span><span class="p">.</span><span class="n">xml</span> + <span class="n">Sending</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_unx</span><span class="p">.</span><span class="n">xml</span> + <span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="p">..</span> + <span class="n">Committed</span> <span class="n">revision</span> 1347377<span class="p">.</span> </pre></div>
Modified: websites/staging/openoffice/trunk/content/terms.html ============================================================================== --- websites/staging/openoffice/trunk/content/terms.html (original) +++ websites/staging/openoffice/trunk/content/terms.html Mon Jul 22 21:53:03 2013 @@ -85,8 +85,7 @@ <h1 id="project-management-pmc">Project Management PMC</h1> <ul> <li><a href="http://blogs.apache.org/OOo/";>Project Blog</a></li> -<li><a href="/pmc-faqs.html">PMC FAQs</a><br /> -</li> +<li><a href="/pmc-faqs.html">PMC FAQs</a> </li> </ul> <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1> <ul> @@ -105,28 +104,19 @@ <p>INTRODUCTION. This Site and its contents are made available by Apache Software Foundation, OpenOffice Project Management Committee (AOO-PMC). These Terms of Use apply to everyone who Uses this Site (as defined below), or who participates in any projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY PROJECTS HOSTED ON THIS SITE.</p> </li> <li> -<p>DEFINITIONS. As used here:<br /> -</p> -<p>a. "Host" means AOO-PMC.<br /> -</p> -<p>b. "Materials" means source code, code samples, object code, technical materials, documentation , discussion thread postings, weblogs, wikis, data, and any other content, information or technology available on the Site.<br /> -</p> -<p>c. "Project" means a project hosted on the Site.<br /> -</p> -<p>d. "Site" means the collection of web pages that can be accessed via this website, as well as any successor web pages or other technology as may be designated by the Host.<br /> -</p> -<p>e. "Submissions" means any Materials submitted to the Site, including all Projects.<br /> -</p> -<p>f. "Terms" means these Terms of Use.<br /> -</p> -<p>g. "Use" and its variants are meant in their broadest sense, including, but not limited to, the acts of using, accessing, receiving, browsing, downloading from, and uploading to. A "User" is a person or entity who Uses the Site.<br /> -</p> +<p>DEFINITIONS. As used here: </p> +<p>a. "Host" means AOO-PMC. </p> +<p>b. "Materials" means source code, code samples, object code, technical materials, documentation , discussion thread postings, weblogs, wikis, data, and any other content, information or technology available on the Site. </p> +<p>c. "Project" means a project hosted on the Site. </p> +<p>d. "Site" means the collection of web pages that can be accessed via this website, as well as any successor web pages or other technology as may be designated by the Host. </p> +<p>e. "Submissions" means any Materials submitted to the Site, including all Projects. </p> +<p>f. "Terms" means these Terms of Use. </p> +<p>g. "Use" and its variants are meant in their broadest sense, including, but not limited to, the acts of using, accessing, receiving, browsing, downloading from, and uploading to. A "User" is a person or entity who Uses the Site. </p> <p>h. "You" means you personally, as well as the person or entity on whose behalf you are Using the Site.</p> </li> <li> <p>ACCESS TO THE SITE AND THINGS YOU FIND HERE. - This section refers to the Materials found on the Site, as defined above. <br /> -</p> + This section refers to the Materials found on the Site, as defined above. </p> <p>a. Other Licenses/Terms. Some of the Materials may be accompanied by their own licenses or terms of use. With respect to Your rights in and obligations regarding such Materials, and to the extent there is a conflict, those licenses or terms of use take precedence over these Terms, and you agree to be bound accordingly. With respect to any other matters, including but not limited to Your Use of this Site, submission of Materials hereto, and obligations to the Host, these Terms take precedence over any conflicting terms.</p> <p>b. Use at Your Own Risk. You understand that the Host does not pre-screen Materials, and You agree to assume all risks in Using them. These risks include, but are not limited to, errors, viruses, worms, time-limited software that expires without notice, and the possibility that the Materials infringe or misappropriate the intellectual property rights of others. You agree to assume all such risks.</p> <p>c. Don't Blame the Messenger. You understand that Materials may contain the opinions of others and You do not hold the Host responsible for such opinions.</p> Modified: websites/staging/openoffice/trunk/content/trademarks.html ============================================================================== --- websites/staging/openoffice/trunk/content/trademarks.html (original) +++ websites/staging/openoffice/trunk/content/trademarks.html Mon Jul 22 21:53:03 2013 @@ -85,8 +85,7 @@ <h1 id="project-management-pmc">Project Management PMC</h1> <ul> <li><a href="http://blogs.apache.org/OOo/";>Project Blog</a></li> -<li><a href="/pmc-faqs.html">PMC FAQs</a><br /> -</li> +<li><a href="/pmc-faqs.html">PMC FAQs</a> </li> </ul> <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1> <ul> Modified: websites/staging/openoffice/trunk/content/website-local.html ============================================================================== --- websites/staging/openoffice/trunk/content/website-local.html (original) +++ websites/staging/openoffice/trunk/content/website-local.html Mon Jul 22 21:53:03 2013 @@ -85,8 +85,7 @@ <h1 id="project-management-pmc">Project Management PMC</h1> <ul> <li><a href="http://blogs.apache.org/OOo/";>Project Blog</a></li> -<li><a href="/pmc-faqs.html">PMC FAQs</a><br /> -</li> +<li><a href="/pmc-faqs.html">PMC FAQs</a> </li> </ul> <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1> <ul> @@ -190,8 +189,7 @@ See detailed how-to steps in the <a href <h3 id="for-committers">For Committers</h3> <p>As previously noted, changes you make, either through an svn commit or using the CMS GUI tool, are enacted on the staging sites. Once you review your changes on the staging site, -you can "publish" the site -- enacting our changes on the production site. Only Apache "committers" can actually publish sites.<br /> -</p> +you can "publish" the site -- enacting our changes on the production site. Only Apache "committers" can actually publish sites. </p> <ul> <li>You can use the CMS GUI tool to also commit, review, and publish your changes from the staging site. </li> @@ -221,23 +219,23 @@ and how to publish to the production Apa <h3 id="setup">Setup</h3> <h4 id="create-a-directory-on-your-computer-for-the-apache-cms-work-with-both-the-projects">Create a directory on your computer for the Apache CMS work with both the project's</h4> <p>site and the migrating openoffice.org website.</p> -<div class="codehilite"><pre><span class="nb">mkdir</span> <span class="n">aoo</span><span class="o">-</span><span class="n">web</span> +<div class="codehilite"><pre><span class="n">mkdir</span> <span class="n">aoo</span><span class="o">-</span><span class="n">web</span> <span class="n">cd</span> <span class="n">aoo</span><span class="o">-</span><span class="n">web</span> </pre></div> <h4 id="download-the-svn-repos-for-the-aoo-site">Download the svn repos for the AOO site.</h4> -<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/openoffice/si</span><span class="n">te</span><span class="o">/</span><span class="n">trunk</span> <span class="n">site</span> +<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">openoffice</span><span class="o">/</span><span class="n">site</span><span class="o">/</span><span class="n">trunk</span> <span class="n">site</span> </pre></div> <h4 id="download-the-svn-repos-for-the-migrated-openofficeorg-website">Download the svn repos for the migrated OpenOffice.org website.</h4> -<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/openoffice/ooo</span><span class="o">-</span><span class="n">site</span><span class="o">/</span><span class="n">trunk</span> <span class="n">ooo</span><span class="o">-</span><span class="n">site</span> +<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">openoffice</span><span class="o">/</span><span class="n">ooo</span><span class="o">-</span><span class="n">site</span><span class="o">/</span><span class="n">trunk</span> <span class="n">ooo</span><span class="o">-</span><span class="n">site</span> </pre></div> <h4 id="download-the-svn-repos-for-the-apache-cms">Download the svn repos for the Apache CMS.</h4> -<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/i</span><span class="n">nfra</span><span class="sr">/websites/cms</span><span class="o">/</span> <span class="n">cms</span> +<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">infra</span><span class="o">/</span><span class="n">websites</span><span class="o">/</span><span class="n">cms</span><span class="o">/</span> <span class="n">cms</span> </pre></div> @@ -288,20 +286,20 @@ and how to publish to the production Apa <p>Using your favorite editors edit the site content, templates, and lib scripts.</p> <h4 id="python-markdown-daemon">Python Markdown Daemon</h4> <p>Start the Python Markdown daemon.</p> -<div class="codehilite"><pre><span class="n">export</span> <span class="n">MARKDOWN_SOCKET</span><span class="o">=</span><span class="sb">`pwd`</span><span class="o">/</span><span class="n">markdown</span><span class="o">.</span><span class="nb">socket</span> <span class="n">PYTHONPATH</span><span class="o">=</span><span class="sb">`pwd`</span> -<span class="n">python</span> <span class="n">cms</span><span class="sr">/build/m</span><span class="n">arkdownd</span><span class="o">.</span><span class="n">py</span> +<div class="codehilite"><pre><span class="n">export</span> <span class="n">MARKDOWN_SOCKET</span><span class="p">=</span>`<span class="n">pwd</span>`<span class="o">/</span><span class="n">markdown</span><span class="p">.</span><span class="n">socket</span> <span class="n">PYTHONPATH</span><span class="p">=</span>`<span class="n">pwd</span>` +<span class="n">python</span> <span class="n">cms</span><span class="o">/</span><span class="n">build</span><span class="o">/</span><span class="n">markdownd</span><span class="p">.</span><span class="n">py</span> </pre></div> <h4 id="build-the-sites">Build the sites.</h4> -<div class="codehilite"><pre><span class="n">cms</span><span class="sr">/build/</span><span class="n">build_site</span><span class="o">.</span><span class="n">pl</span> <span class="o">--</span><span class="n">source</span><span class="o">-</span><span class="n">base</span> <span class="n">site</span> <span class="o">--</span><span class="n">target</span><span class="o">-</span><span class="n">base</span> <span class="n">www</span> -<span class="n">cms</span><span class="sr">/build/</span><span class="n">build_site</span><span class="o">.</span><span class="n">pl</span> <span class="o">--</span><span class="n">source</span><span class="o">-</span><span class="n">base</span> <span class="n">ooo</span><span class="o">-</span><span class="n">site</span> <span class="o">--</span><span class="n">target</span><span class="o">-</span><span class="n">base</span> <span class="n">www</span> +<div class="codehilite"><pre><span class="n">cms</span><span class="o">/</span><span class="n">build</span><span class="o">/</span><span class="n">build_site</span><span class="p">.</span><span class="n">pl</span> <span class="o">--</span><span class="n">source</span><span class="o">-</span><span class="n">base</span> <span class="n">site</span> <span class="o">--</span><span class="n">target</span><span class="o">-</span><span class="n">base</span> <span class="n">www</span> +<span class="n">cms</span><span class="o">/</span><span class="n">build</span><span class="o">/</span><span class="n">build_site</span><span class="p">.</span><span class="n">pl</span> <span class="o">--</span><span class="n">source</span><span class="o">-</span><span class="n">base</span> <span class="n">ooo</span><span class="o">-</span><span class="n">site</span> <span class="o">--</span><span class="n">target</span><span class="o">-</span><span class="n">base</span> <span class="n">www</span> </pre></div> <h4 id="copy-the-site-to-your-computers-web-server">Copy the site to your computer's web server.</h4> <p>On my Mac:</p> -<div class="codehilite"><pre><span class="n">sudo</span> <span class="n">scp</span> <span class="o">-</span><span class="n">rp</span> <span class="n">www</span><span class="sr">/content /</span><span class="n">Library</span><span class="sr">/WebServer/</span><span class="n">Documents</span><span class="o">/.</span> +<div class="codehilite"><pre><span class="n">sudo</span> <span class="n">scp</span> <span class="o">-</span><span class="n">rp</span> <span class="n">www</span><span class="o">/</span><span class="n">content</span> <span class="o">/</span><span class="n">Library</span><span class="o">/</span><span class="n">WebServer</span><span class="o">/</span><span class="n">Documents</span><span class="o">/</span><span class="p">.</span> </pre></div> @@ -340,8 +338,7 @@ of JavaScript immediately before the clo </pre></div> -<p>Note: This is not needed for the project website, only for the openoffice.org pages. <br /> -</p> +<p>Note: This is not needed for the project website, only for the openoffice.org pages. </p> <p>It is not necessary to add this to every single web page. The greatest benefit for the effort comes from adding it to the key destination pages.</p> </div>
