Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserAddHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserAddHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserAddHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,86 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<!-- Help Text Box --> +<table border="0" cellspacing="0" cellpadding="3" border="0" width="100%"> + <tr> + <td class="HelpText" bgcolor="#ffcc66"><img src="/branding/images/pixel.gif" height="1" width="135"><br> +<b>How do I...?</b></td> + </tr> + <tr> + <td bgcolor="#ffffcc"> + + <table border="0" cellspacing="0" cellpadding="0" border="0" width="100%"> + +<tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminAddUsers.html#editusers">Edit user accounts...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminRoles.html#userroles">Assign roles to added users...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#createusergroup">Create user groups...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + </table> + + </td> + </tr> +</table> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html>
Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserDeleteHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserDeleteHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserDeleteHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,43 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<div id="helptext"> + <table border="0" cellspacing="0" cellpadding="3" width="100%"> + <tr> + <th>How do I...?</th> + </tr> + <tr> + <td> + <div> <a href="/project/www/docs/print.html">Print this page</a>...</div> + <div></div> + </td> + </tr> + </table> +</div> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEdit.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEdit.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEdit.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,46 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + + <title>User Profile</title> + + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + + +<span class="Header">About your user profile</span> + +<span class="PlainText"> + +<p>If you are registered with this site, clicking the <i>Edit Profile</i> link in the upper right corner of your Start Page displays a screen where you can edit your user account information, including your username and password for this site, and your email address. + +<p>Should you ever forget your password, you can use the "New Password" button on the login screen to obtain a new one. Entering your user name and clicking this button generates an email message to you with a URL to the <b>Password Edit</b> page. Once you have submitted your new password, you are logged in automatically to your <b>Start Page</b>. + +<p>Registered users automatically receive an email address for this domain: <b>username@domain</b>. Your use of this address is optional; you can specify this address in your account information on the <b>User Edit</b> page or continue to use your own existing email account. If you do opt to use the address associated with this site, you must still send and receive email through your own email client. + +<p>Once you become a member of any development projects on this site, the <b>User Edit</b> screen also lists your roles with those projects. These are linked to enable you to navigate directly to the project's home page. Clicking on any hyperlinked project takes to that project, where you can change your role by clicking on <i>Request New Project Role</i>. Read more about <a href="ProjectRoles.html">project roles</a>.</p> +<p> +<HR noShade SIZE=1> +<a href="/servlets/HelpTOC">Back to main Help index</a></p> + +</span> + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEdit.html.en ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEdit.html.en (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEdit.html.en Sat Apr 8 23:00:09 2017 @@ -0,0 +1,50 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd";> + +<html xmlns="http://www.w3.org/1999/xhtml";> + <head> +<style type="text/css"> +/* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */ +</style> + <script src="/branding/scripts/sc.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" /> + + <title>About your user profile</title> + </head> + + <body class="docs" onload="self.focus()"> + <div class="docs" id="useredit"> + <h2>About your user profile</h2> + + <div id="toc"> + <ul> + <li><strong><a href="/nonav/servlets/HelpTOC">Help index</a></strong></li> + </ul> + + <ul> + <li><a href="/nonav/docs/Introduction.html">Introduction</a></li> + + <li><a href="/nonav/docs/NavigatingWebspace.html">Site navigation</a></li> + + <li>About your user profile and password</li> + + <li><a href="/nonav/docs/StartPage.html">Using My StartPage</a></li> + </ul> + </div> + + <p>If you are registered with this site, clicking the <i>Edit Profile</i> on your Start Page displays a screen where you can edit your user account information, including your username and password for this site, and your email address.</p> + + <p>Should you ever forget your password, you can use the "New Password" button on the login screen to obtain a new one. Entering your user name and clicking this button generates an email message to you with a URL to the <b>Password Edit</b> page. Once you have submitted your new password, you are logged in automatically to your <b>Start Page</b>.</p> + + <p>Registered users automatically receive an email address for this domain: <b>username@domain</b>. This email account serves as an alias for the email address entered in your user preferences. Used to identify you as a member of the community as well as to all of the modules within the application, this address can be used at your own discretion. If you do opt to use the address associated with this site, you must still send and receive email through your own email client.</p> + + <p>Once you become a member of any development projects on this site, the <b>User Edit</b> screen also lists your roles with those projects. These are linked to enable you to navigate directly to the project's home page. Clicking on any hyperlinked project takes to that project, where you can change your role by clicking on <i>Request New Project Role</i>. Read more about <a href="/nonav/docs/ProjectRoles.html">project roles</a>.</p> + + <div class="courtesylinks"> + <p><a href="#toc">Top</a> | <a href="/nonav/servlets/HelpTOC">Help index</a></p> + </div> + </div> + </body> +</html> + + Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEditHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEditHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEditHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,43 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<div id="helptext"> + <table border="0" cellspacing="0" cellpadding="3" width="100%"> + <tr> + <th>How do I...?</th> + </tr> + <tr> + <td> + <div> <a href="/project/www/docs/print.html">Print this page</a>...</div> + <div></div> + </td> + </tr> + </table> +</div> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEditPassword.html.en ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEditPassword.html.en (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserEditPassword.html.en Sat Apr 8 23:00:09 2017 @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd";> + +<html xmlns="http://www.w3.org/1999/xhtml";> + <head> +<style type="text/css"> +/* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */ +</style> + <script src="/branding/scripts/sc.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" /> + + <title>How to change your password</title> + </head> + + <body class="docs" onload="self.focus()"> + <div class="docs" id="usereditpasswords"> + <h2>How to change your password</h2> + + <p>If you are registered with this site, clicking the <em>Edit Profile</em> link on your <strong>Start Page</strong> displays a screen where you can edit your user account information, including your password.</p> + + <p>To change your password, enter your new password into the <em>Password</em> field, then reenter it in the <em>Retype password</em> field. Click on the <strong>Submit Changes</strong> button. Your password will be updated as soon as you click on this button. The next time you login, you will need to use your new password.</p> + + <p>Should you ever forget your password, you can use the <strong>New Password</strong> button on the login screen to obtain a new one. Entering your user name and clicking this button generates an email message to you with a URL to the <strong>Password Edit</strong> page. Once you have submitted your new password, you are logged in automatically to your <strong>Start Page</strong>.</p> + + <div class="courtesylinks"> + <p><a href="#toc">Top</a> | <a href="/nonav/servlets/HelpTOC">Help index</a></p> + </div> + </div> + </body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupAddHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupAddHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupAddHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,86 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<!-- Help Text Box --> +<table border="0" cellspacing="0" cellpadding="3" border="0" width="100%"> + <tr> + <td class="HelpText" bgcolor="#ffcc66"><img src="/branding/images/pixel.gif" height="1" width="135"><br> +<b>How do I...?</b></td> + </tr> + <tr> + <td bgcolor="#ffffcc"> + + <table border="0" cellspacing="0" cellpadding="0" border="0" width="100%"> + +<tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#editusergroup">Add users to a user group...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#assign">Grant or change user group roles...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminProjectGroups.html#manageroles">Assign user groups to projects or project groups...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + </table> + + </td> + </tr> +</table> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupEditHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupEditHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupEditHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,86 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<!-- Help Text Box --> +<table border="0" cellspacing="0" cellpadding="3" border="0" width="100%"> + <tr> + <td class="HelpText" bgcolor="#ffcc66"><img src="/branding/images/pixel.gif" height="1" width="135"><br> +<b>How do I...?</b></td> + </tr> + <tr> + <td bgcolor="#ffffcc"> + + <table border="0" cellspacing="0" cellpadding="0" border="0" width="100%"> + +<tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#editusergroup">Add users to a user group...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#assign">Grant or change user group roles...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminProjectGroups.html#manageroles">Assign user groups to projects or project groups...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + </table> + + </td> + </tr> +</table> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupElementAddHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupElementAddHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupElementAddHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,86 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<!-- Help Text Box --> +<table border="0" cellspacing="0" cellpadding="3" border="0" width="100%"> + <tr> + <td class="HelpText" bgcolor="#ffcc66"><img src="/branding/images/pixel.gif" height="1" width="135"><br> +<b>How do I...?</b></td> + </tr> + <tr> + <td bgcolor="#ffffcc"> + + <table border="0" cellspacing="0" cellpadding="0" border="0" width="100%"> + +<tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#editusergroup">Add users to a user group...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#assign">Grant or change user group roles...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminProjectGroups.html#manageroles">Assign user groups to projects or project groups...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + </table> + + </td> + </tr> +</table> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupListHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupListHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserGroupListHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,120 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<!-- Help Text Box --> +<table border="0" cellspacing="0" cellpadding="3" border="0" width="100%"> + <tr> + <td class="HelpText" bgcolor="#ffcc66"><img src="/branding/images/pixel.gif" height="1" width="135"><br> +<b>How do I...?</b></td> + </tr> + <tr> + <td bgcolor="#ffffcc"> + + <table border="0" cellspacing="0" cellpadding="0" border="0" width="100%"> + + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#whatis">Learn more about the purpose of user groups...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#createusergroup">Create user groups...</a></td> + </tr> + + + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminUserGroups.html#editusergroup">Edit user groups...</a></td> + </tr> + + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminProjectGroups.html#manageroles">Grant roles to users in this group...</a></td> + </tr> + + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffcc66" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffcc66" height="1"><spacer type="block" height="1"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" class="HelpText"><a href="/project/www/docs/DomAdminProjectGroups.html#manageroles">Assign user groups to projects or project groups...</a></td> + </tr> + <tr> + <td bgcolor="#ffffcc" width="2"><spacer type="block" width="2"></td> + <td bgcolor="#ffffcc" height="2"><spacer type="block" height="2"></td> + </tr> + </table> + + </td> + </tr> +</table> + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserRoleAddHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserRoleAddHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserRoleAddHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,43 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<div id="helptext"> + <table border="0" cellspacing="0" cellpadding="3" width="100%"> + <tr> + <th>How do I...?</th> + </tr> + <tr> + <td> + <div> <a href="/project/www/docs/print.html">Print this page</a>...</div> + <div></div> + </td> + </tr> + </table> +</div> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserRoleRequestHelp.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserRoleRequestHelp.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/UserRoleRequestHelp.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,43 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<div id="helptext"> + <table border="0" cellspacing="0" cellpadding="3" width="100%"> + <tr> + <th>How do I...?</th> + </tr> + <tr> + <td> + <div> <a href="/project/www/docs/print.html">Print this page</a>...</div> + <div></div> + </td> + </tr> + </table> +</div> + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/bestpractices.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/bestpractices.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/bestpractices.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,73 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<title></title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + <div class="docs" id="bestpractices"> +<h2>Key Open Source "Best Practices" supported on this site</h2> + + <p>Software engineering practices are key to any large development project. This site provides a home to conduct open source or collaborative software projects integrated with a set of hosted development tools to facilitate project teams adopting the "best practices" that have proven themselves in the open source community.</p> + <h3>Technical Communication</h3> + + <p>Software developers spend a large part of their time communicating with each other. Clear and effective technical communications are needed to keep the team in synch and to allow individuals with key knowledge to apply that knowledge where it is needed.i</p> + + <p>One tenet of the open source community is that technical communications should take place in public forums. Mailing lists are the backbone of open source communications. Beyond that, open source projects need support for precisely communicating technical details and for group decision-making.</p> + <h3>Version Control, Document Management, and Distribution</h3> + + <p>Every software development project needs version control. Open source projects need strong and flexible support for many concurrent developers working on overlapping sets of files. Open source projects also need standard templates for design documents, technical documentation, and end user documentation.</p> + + <p>A well-organized project should facilitate distributing these documents. But, the nature of open source projects demands that these files are globally accessible, and that administrative overhead be minimized and responsibility be spread out over the members of the development community.</p> + <h3>Quality Assurance</h3> + + <p>Open source software products have achieved a remarkable degree of quality. This is something that the closed source development world has found to be one of the most difficult and costly aspects of software development.</p> + + <p>Open source software is high quality for three main reasons:</p> + + <ol> + <li>Developers are self-selected by their interest and knowledge of the application domain.</li> + + <li>Requirements are tacitly understood by developers who are themselves users of the software.</li> + + <li>Technical communications (including bug reports) are conducted in public. The public nature of open source helps developers take pride in their successes and think twice before releasing faulty code.</li> + </ol> + + <p>Furthermore, debugging is much more effective when split among many people who have diverse knowledge.</p> + <h3>Build and Test Management</h3> + + <p>Development activity on open source projects is constant and concurrent among many developers. Sometimes the changes made by one developer interfere with those made by another developer.</p> + + <p>Often the version control practices used in the open source community resolve these conflicts, but sometimes they do not. Frequent automated builds and tests of the software being developed are powerful tools that help catch logical conflicts early.</p> + <h3>Project Management</h3> + + <p>Every project needs explicit goals, resources, and a schedule. The open source community has addressed these issues in a uniquely flexible way. Shared "to do" lists keep track of tasks that need to be done. Personal "to do" lists keep developers on track. Milestone lists set flexible deadlines for individual features based on feedback from users and developers.</p> + <h3>Knowledge Management</h3> + + <p>Knowledge is the valuable resource that sets experienced developers apart from novice ones. Sharing knowledge effectively has been key to the success of the open source community. Explicitly managing knowledge can help reduce the learning curve for novices which reduces the barriers to entry for potential contributors while automatically keeping the load on the experts down to a minimum in terms of training others.</p> + </div> + + + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/bestpractices.html.en ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/bestpractices.html.en (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/bestpractices.html.en Sat Apr 8 23:00:09 2017 @@ -0,0 +1,66 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd";> + +<html xmlns="http://www.w3.org/1999/xhtml";> + <head> +<style type="text/css"> +/* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */ +</style> + <script src="/branding/scripts/sc.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" /> + + <title>Key Open Source "Best Practices" supported on this site</title> + </head> + + <body class="docs" onload="self.focus()"> + <div class="docs" id="bestpractices"> + <h2>Key Open Source "Best Practices" supported on this site</h2> + + <p>Software engineering practices are key to any large development project. This site provides a home to conduct open source or collaborative software projects integrated with a set of hosted development tools to facilitate project teams adopting the "best practices" that have proven themselves in the open source community.</p> + + <h3>Technical Communication</h3> + + <p>Software developers spend a large part of their time communicating with each other. Clear and effective technical communications are needed to keep the team in synch and to allow individuals with key knowledge to apply that knowledge where it is needed.</p> + + <p>One tenet of the open source community is that technical communications should take place in public forums. Mailing lists are the backbone of open source communications. Beyond that, open source projects need support for precisely communicating technical details and for group decision-making.</p> + + <h3>Version Control, Document Management, and Distribution</h3> + + <p>Every software development project needs version control. Open source projects need strong and flexible support for many concurrent developers working on overlapping sets of files. Open source projects also need standard templates for design documents, technical documentation, and end user documentation.</p> + + <p>A well-organized project should facilitate distributing these documents. But, the nature of open source projects demands that these files are globally accessible, and that administrative overhead be minimized and responsibility be spread out over the members of the development community.</p> + + <h3>Quality Assurance</h3> + + <p>Open source software products have achieved a remarkable degree of quality. This is something that the closed source development world has found to be one of the most difficult and costly aspects of software development.</p> + + <p>Open source software is high quality for three main reasons:</p> + + <ol> + <li>Developers are self-selected by their interest and knowledge of the application domain.</li> + + <li>Requirements are tacitly understood by developers who are themselves users of the software.</li> + + <li>Technical communications (including bug reports) are conducted in public. The public nature of open source helps developers take pride in their successes and think twice before releasing faulty code.</li> + </ol> + + <p>Furthermore, debugging is much more effective when split among many people who have diverse knowledge.</p> + + <h3>Build and Test Management</h3> + + <p>Development activity on open source projects is constant and concurrent among many developers. Sometimes the changes made by one developer interfere with those made by another developer.</p> + + <p>Often the version control practices used in the open source community resolve these conflicts, but sometimes they do not. Frequent automated builds and tests of the software being developed are powerful tools that help catch logical conflicts early.</p> + + <h3>Project Management</h3> + + <p>Every project needs explicit goals, resources, and a schedule. The open source community has addressed these issues in a uniquely flexible way. Shared "to do" lists keep track of tasks that need to be done. Personal "to do" lists keep developers on track. Milestone lists set flexible deadlines for individual features based on feedback from users and developers.</p> + + <h3>Knowledge Management</h3> + + <p>Knowledge is the valuable resource that sets experienced developers apart from novice ones. Sharing knowledge effectively has been key to the success of the open source community. Explicitly managing knowledge can help reduce the learning curve for novices which reduces the barriers to entry for potential contributors while automatically keeping the load on the experts down to a minimum in terms of training others.</p> + </div> + </body> +</html> + + Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/booleanchart.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/booleanchart.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/booleanchart.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,77 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<title>Issuezila Boolean Charts</title> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<p><span class="Header" nowrap>Using the Boolean chart</span></p> +<span class="PlainText"> +<p>The Issuezilla query page allows you to define your search parameters by all fields in the Issue database. To limit your search to a specific set of values in those fields, you can use the "Boolean chart" at the bottom of the page.</p> +<p>Each Boolean chart can contain one or more <i>terms</i> - the fields/values to search by and how each should be treated - and Boolean operators - either <i>AND</i> or <i>OR</i>.</p> +<p>To define a term, select an item from each pulldown box, specifying the field and the type of match, and enter a value in the data field. For example, if you select <b>Issue #</b> from the first pulldown, <b>equal to</b> from the second pulldown, and enter 001 in the data field, you will see only issue #001 in your search results.</p> +<p>The Boolean operators, i.e. the <b> And</b> button and the <b>Or</b> button, allow you to search by multiple terms.</p> +<p>Clicking the <b>And</b> button allows you to define a new term and have the result of the query include anything that matches <i>both</i> of the terms.</p> +<p>Clicking the <b>Or</b> button allows you to define a new term and the result of the query will be anything that matches <i>either</i> of the terms. </p> +<p>You can add as many terms as you like by clicking the <b>And</b> or <b>Or</b> button after each term. You can also use both <b>And</b> and <b>Or</b> in a single query. Terms separated by <b>Or</b> are treated as a single statement. Terms separated by <b>And</b> are treated as separate statements. For example, you could search for all <i>P1</i> and <i>P2</i> issues with a status <i>New</i> or <i>Pending</i>. Your Boolean chart would look like this:</p> +<table width="710" border="1" cellpadding="0" cellspacing="0"> +<tr> +<td width="95"><span class="PlainText">Status</span></td> +<td width="150"><span class="PlainText">Equal to</span></td> +<td width="100"><span class="PlainText">New</span></td> +<td width="45"><span class="PlainText"><i>OR</i></span></td> +<td width="110"><span class="PlainText">Status</span></td> +<td width="100"><span class="PlainText">Equal to</span></td> +<td width="75"><span class="PlainText">Pending</span></td></tr></table> +<i>AND</i> +<table width="710" border="1" cellpadding="0" cellspacing="0"> +<tr> +<td width="95"><span class="PlainText">Priority</span></td> +<td width="150"><span class="PlainText">Equal to</span></td> +<td width="100"><span class="PlainText">P2</span></td> +<td width="45"><span class="PlainText"><i>OR</i></span></td> +<td width="110"><span class="PlainText">Priority</span></td> +<td width="100"><span class="PlainText">Equal to</span></td> +<td width="75"><span class="PlainText">P1</span></td> +</tr> +</table> +<p>You can use the <b>Add another Boolean chart</b> button to search for multiple instances of a field that can have several entries associated with a single issue. For example all of the <i>changed</i>... match types and fields like <b>IssuesThisDependsOn</b>, <b>Comments</b>, and <b>CC, </b>etc. can have several entries in a single issue. If you have multiple terms in your search that refer to one field, they will always return the same instance unless the terms appear on different charts. </p> +<p> For example, if you search for "Priority <i>changed to</i> P5 <b>And</b> Priority <i>changed by</i> person@addr," your results would include only issues where the person@addr changed the Priority to P5. However, if you want to find all issues for which person@addr changed the priority, and for which the priority was changed to P5 by anyone, you would put the two terms in two different charts that would look like this:</p> +<table width="450" border="1" cellpadding="0" cellspacing="0"> +<tr> +<td width="120"><span class="PlainText">Priority</span></td> +<td width="145"><span class="PlainText">Changed by</span></td> +<td width="175"><span class="PlainText">person@addr</span></td> +</tr></table><hr><table width="450" border="1" cellpadding="0" cellspacing="0"><tr> +<td width="120"><span class="PlainText">Priority</span></td> +<td width="145"><span class="PlainText">Changed to</span></td> +<td width="175"><span class="PlainText">P5</span></td> +</tr> +</table> + +<hr noshade size=1> +<a href="ProjectIssues.html">Back to Project Issues help</a><br> +<a href="/servlets/HelpTOC">Back to main Help index</a> + +</span> + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/booleanchart.html.en ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/booleanchart.html.en (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/booleanchart.html.en Sat Apr 8 23:00:09 2017 @@ -0,0 +1,54 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd";> + +<html xmlns="http://www.w3.org/1999/xhtml";> + <head> +<style type="text/css"> +/* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */ +</style> + <script src="/branding/scripts/sc.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" /> + + <title>Using the boolean chart</title> + </head> + + <body class="docs" onload="self.focus()"> + <div class="docs" id="booleanchart"> + <h2>Using the Boolean chart</h2> + + <p>The Issuezilla query page allows you to define your search parameters by all fields in the Issue database. To limit your search to a specific set of values in those fields, you can use the "Boolean chart" at the bottom of the page.</p> + + <p>Each Boolean chart can contain one or more <i>terms</i> - the fields/values to search by and how each should be treated - and Boolean operators - either <i>AND</i> or <i>OR</i>.</p> + + <p>To define a term, select an item from each pulldown box, specifying the field and the type of match, and enter a value in the data field. For example, if you select <b>Issue #</b> from the first pulldown, <b>equal to</b> from the second pulldown, and enter 001 in the data field, you will see only issue #001 in your search results.</p> + + <p>The Boolean operators, i.e. the <b>And</b> button and the <b>Or</b> button, allow you to search by multiple terms.</p> + + <p>Clicking the <b>And</b> button allows you to define a new term and have the result of the query include anything that matches <i>both</i> of the terms.</p> + + <p>Clicking the <b>Or</b> button allows you to define a new term and the result of the query will be anything that matches <i>either</i> of the terms.</p> + + <p>You can add as many terms as you like by clicking the <b>And</b> or <b>Or</b> button after each term. You can also use both <b>And</b> and <b>Or</b> in a single query. Terms separated by <b>Or</b> are treated as a single statement. Terms separated by <b>And</b> are treated as separate statements. For example, you could search for all <i>P1</i> and <i>P2</i> issues with a status <i>New</i> or <i>Pending</i>. Your Boolean chart would look like this:</p> + + <p>Status Equal to New <em>OR</em> Status Equal to Pending</p> + + <p><em>AND</em></p> + + <p>Priority Equal to P2 <em>OR</em> Priority Equal to P1</p> + + <p>You can use the <b>Add another Boolean chart</b> button to search for multiple instances of a field that can have several entries associated with a single issue. For example all of the <i>changed</i>... match types and fields like <b>IssuesThisDependsOn</b>, <b>Comments</b>, and <b>CC,</b> etc. can have several entries in a single issue. If you have multiple terms in your search that refer to one field, they will always return the same instance unless the terms appear on different charts.</p> + + <p>For example, if you search for "Priority <i>changed to</i> P5 <b>And</b> Priority <i>changed by</i> person@addr," your results would include only issues where the person@addr changed the Priority to P5. However, if you want to find all issues for which person@addr changed the priority, and for which the priority was changed to P5 by anyone, you would put the two terms in two different charts that would look like this:</p> + + <p>Priority Changed by person@addr</p> + + <p>Priority Changed to P5</p> + + <div class="courtesylinks"> + <p><a href="#toc">Top</a> | <a href="/nonav/servlets/HelpTOC">Help index</a></p> + </div> + </div> + </body> +</html> + + Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/contributing_patches.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/contributing_patches.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/contributing_patches.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,90 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + + +<title>Contributing Patches</title> + + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + + + <span class="Header" nowrap>Contributing Patches</span> +<p> + <span class="PlainText"><strong>Additional resources about issues: Index</strong> +<ul> + <dl> + <dt><a href="ProjectIssues.html">Project Issues help</a> + <dd><a href="issue_lifecycle.html">The issue life cycle</a> + <dd><a href="issuewritinghelp.html">Issue writing guidelines</a> + <dd><a href="issuezilla_tipsandtricks.html"> IssueZilla tips and tricks</a> + <dd><strong>You are here: Contributing patches</strong> + <dt><a href="/servlets/HelpTOC">Back to main Help index</a> + </dl> +</ul> + +<hr noshade size=1> + <p> + +Well-described, easy-to-apply patches are a pleasure for other developers to encounter and go a long way towards making the module or component more stable and powerful. + + <p><span class=plaintextbold>If you are not yet a member of an open source project</span> on this site but you have mailing list access, you can post a message about your proposed patch to the project's developer mailing list. (Read more about <a href="Subscribing.html">subscribing to project mailing lists</a>.)</p> + + <p><span class=plaintextbold>If you are a project member</span>, first conduct a query of the project's issue database to determine whether this patch is associated with an already reported defect. + + <p>If your patch pertains to an existing issue, you should use the <span class=plaintextbold>File Attach</span> field in the issue edit screen to submit your patch and the <span class=plaintextbold>Add Comment</span> section to post an explanatory message. (Remember that changes to issues generate automatic email messages to the issue's owner and anyone on the cc list. All of those people will receive your message and a link to your patch.) + <p>If an issue <i>does not exist</i>, submit your patch as a new issue, using the <i>Patch</i> link in the "Enter An Issue" section of the <b>Project Issues</b> page. Attach your patch file to the new issue. Here's how to do it:</p> + <ol> + <li>First, make sure you are making changes in the most recent version of the source files -- for this, it is best to use CVS to check out the source (on the CVS trunk), make your modifications (but do not check them in), and then run the command: </p> +<p> +<span class=plaintextbold>cvs diff -c > mypatch</span> +<p> +... to get a context-format patch for the sources. This gives you a patch file which includes information about the version you are patching, the filenames, and the contents of the change. This is the preferred way to keep track of patches and makes it easier for others to find and test your patch. + <p> +<li>To apply a patch, go to the proper directory and run: +<p> +<span class=plaintextbold>patch < issuepatch.diff</span> +<p> + +<li>Always include a message with your patch with the following information: +<p> + <ul> + + <li>A description of what problem or defect you are attempting to fix, and the steps to reproduce it, if possible. +<p> + <li>A description of what the behavior should be with the patch in place. +<p> + <li>A description of how the patch works, if reasonable. If a significant amount of code is involved, include within the message that you agree to let the patch be used under the applicable project license as part of the IDE's code. + </ul> +</ol> +<span class=plaintext> + <p>The developer responsible for the section of code affected should either apply the patch and mark the defect (if there is one registered) as fixed, or reply with an objection if it does not seem safe, does not appear to fix the problem, or there is not really a problem to begin with. Notifications of any changes to the issues database, as well as CVS check-ins, are automatically sent to the appropriate issue assignee/cc'd and CVS mailing lists, so you can monitor whether the patch has been applied. Be sure to subscribe to at least the CVS and issue mailing lists for the module you are working on.</p> + + <p>If you do not know exactly how to fix a problem, but have an idea about what is causing it, you can post a message about this on the developer discussion list for other project members' suggestions or to find someone who knows how to fix it.</p> + + +<hr noshade size=1> +<a href="ProjectIssues.html">Back to Project Issues help</a><br> +<a href="/servlets/HelpTOC">Back to main Help index</a> + </span> + + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/contributing_patches.html.en ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/contributing_patches.html.en (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/contributing_patches.html.en Sat Apr 8 23:00:09 2017 @@ -0,0 +1,90 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd";> + +<html xmlns="http://www.w3.org/1999/xhtml";> + <head> +<style type="text/css"> +/* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */ +</style> + <script src="/branding/scripts/sc.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" /> + + <title>Contributing Patches</title> + </head> + + <body class="docs" onload="self.focus()"> + <div class="docs" id="contributingpatches"> + <h2>Contributing Patches</h2> + + <div id="toc"> + <ul> + <li><strong><a href="/nonav/servlets/HelpTOC">Help index</a></strong></li> + </ul> + + <ul> + <li> + <a href="/nonav/docs/ProjectIssues.html">Project Issues help</a> + + <ul> + <li><a href="/nonav/docs/issue_lifecycle.html">The issue life cycle</a></li> + + <li><a href="/nonav/docs/issuewritinghelp.html">Issue writing guidelines</a></li> + + <li><a href="/nonav/docs/issuezilla_tipsandtricks.html">IssueZilla tips and tricks</a></li> + + <li>Contributing patches</li> + </ul> + </li> + </ul> + </div> + + <p>Well-described, easy-to-apply patches are a pleasure for other developers to encounter and go a long way towards making the module or component more stable and powerful.</p> + + <p><strong>If you are not yet a member of an open source project</strong> on this site but you have mailing list access, you can post a message about your proposed patch to the project's developer mailing list. (Read more about <a href="/nonav/docs/ProjectMail.html#mailsubscribe">subscribing to project mailing lists</a>.)</p> + + <p><strong>If you are a project member</strong>, first conduct a query of the project's issue database to determine whether this patch is associated with an already reported defect.</p> + + <p>If your patch pertains to an existing issue, you should use the <strong>File Attach</strong> field in the issue edit screen to submit your patch and the <strong>Add Comment</strong> section to post an explanatory message. (Remember that changes to issues generate automatic email messages to the issue's owner and anyone on the cc list. All of those people will receive your message and a link to your patch.)</p> + + <p>If an issue <i>does not exist</i>, submit your patch as a new issue, using the <i>Patch</i> link in the "Enter An Issue" section of the <b>Issue Tracking</b> page. Attach your patch file to the new issue. Here's how to do it:</p> + + <ol> + <li> + <p>First, make sure you are making changes in the most recent version of the source files -- for this, it is best to use CVS to check out the source (on the CVS trunk), make your modifications (but do not check them in), and then run the command:</p> + + <p><code>cvs diff -c > mypatch</code></p> + + <p>... to get a context-format patch for the sources. This gives you a patch file which includes information about the version you are patching, the filenames, and the contents of the change. This is the preferred way to keep track of patches and makes it easier for others to find and test your patch.</p> + </li> + + <li> + <p>To apply a patch, go to the proper directory and run:</p> + + <p><code>patch < issuepatch.diff</code></p> + </li> + + <li> + <p>Always include a message with your patch with the following information:</p> + + <ul> + <li>A description of what problem or defect you are attempting to fix, and the steps to reproduce it, if possible.</li> + + <li>A description of what the behavior should be with the patch in place.</li> + + <li>A description of how the patch works, if reasonable. If a significant amount of code is involved, include within the message that you agree to let the patch be used under the applicable project license as part of the IDE's code.</li> + </ul> + </li> + </ol> + + <p>The developer responsible for the section of code affected should either apply the patch and mark the defect (if there is one registered) as fixed, or reply with an objection if it does not seem safe, does not appear to fix the problem, or there is not really a problem to begin with. Notifications of any changes to the issues database, as well as CVS check-ins, are automatically sent to the appropriate issue assignee/cc'd and CVS mailing lists, so you can monitor whether the patch has been applied. Be sure to subscribe to at least the CVS and issue mailing lists for the module you are working on.</p> + + <p>If you do not know exactly how to fix a problem, but have an idea about what is causing it, you can post a message about this on the developer discussion list for other project members' suggestions or to find someone who knows how to fix it.</p> + + <div class="courtesylinks"> + <p><a href="#toc">Top</a> | <a href="/nonav/servlets/HelpTOC">Help index</a></p> + </div> + </div> + </body> +</html> + + Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/custom_404.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/custom_404.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/custom_404.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,52 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<div class="app" id="alerterrormessage"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td><img src="/branding/images/icon_alert.gif" width="80" height="56" alt="" border="0" /></td> + <td> + <p> + <div><strong>Error!</strong></div> + No matches to your request were found. + <p></p> + <p> + <div> + <p><strong>Possible causes</strong></p> + </div> + <ul> + <li>Incorrect URL. Check spelling and try again.</li> + <li> + <div> Link does not exist. Use the browser's "back" button to return + to the referring page.</div> + </li> + </ul> + </td> + </tr> + </table> +</div> + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html> Added: websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/cvscontributing.html ============================================================================== --- websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/cvscontributing.html (added) +++ websites/staging/ooo-site/trunk/content/pl/Archive/trans/docs/orig/cvscontributing.html Sat Apr 8 23:00:09 2017 @@ -0,0 +1,319 @@ +<!--#include virtual="/doctype.html" --> +<html> +<head> +<link href="/css/ooo.css" rel="stylesheet" type="text/css"> + + +<TITLE>Contributing Changes with Command-Line CVS</TITLE> + + +<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8"> + +<!--#include virtual="/google-analytics.js" --> +<!--#include virtual="/scripts/entourage.js" --> +</head> +<body> +<!--#include virtual="/pl/brand.html" --> + <div id="topbara"> + <!--#include virtual="/pl/topnav.html" --> + <div id="breadcrumbsa"><a href="/">home</a> » <a href="/pl/">pl</a> » <a href="/pl/Archive/">Archive</a> » <a href="/pl/Archive/trans/">trans</a> » <a href="/pl/Archive/trans/docs/">docs</a> » <a href="/pl/Archive/trans/docs/orig/">orig</a></div> + </div> + <div id="clear"></div> + + + <div id="content"> + + + +<TABLE BORDER="0" CELLSPACING="1" CELLPADDING="3" BORDER="0" WIDTH="100%"> + <TR> + <TD CLASS="Header" NOWRAP>Contributing changes with command-line CVS</TD> + </TR> +</TABLE> + +<TABLE BORDER="0" CELLSPACING="2" CELLPADDING="2" BORDER="0" WIDTH="100%"> + <TR> +<SPAN CLASS="PlainText"> + +<P> +<UL> +<DL> +<DT><A HREF="#work">Working with files</A> +<DT><A HREF="#filetypes">About file types</A> +<DT><A HREF="#contributing">Contributing your changes</A> + <DD><A HREF="#cvscommit">Committing files and directories</A> + <DD><A HREF="#cvsadd">Adding new files and directories</A> +<DT><A HREF="#cvsimport">Importing existing source files</A> +<DT><A HREF="#cvsandrcs">CVS and RCS</A> +<DT><A HREF="#keywords">Using keywords</A> +<DT><A HREF="#cvsupdate">Keeping your working copy up to date (cvs update)</A> +<DT><A HREF="#cvstatus">Comparing your working files to the CVS repository</A> +<DT><A HREF="#otherdiff">Comparing files before you commit</A> +<DT><A HREF="#cvsmerging">Merging your changes</A> +<DT><A HREF="#cvsresolving">Resolving merge conflicts</A> +<DT><A HREF="#reverting">Revision history and reverting</A> +</DL> +</UL> + +<P> +<SPAN CLASS="InputHeader"><A NAME="work"></A>Working with files</SPAN> +<P> +Between checking files out of the project repository and checking them back in, CVS has virtually nothing to do with how files are used in the project environment or build process. That is governed by the project owner and other external factors unique to the project. +<P> +When you make changes to existing files, you must edit your working copies of these files in a file editor on your local machine using your file editor of choice. None of the changes you make to your working files has any effect on the project's source repository or on other developers' work until you check in (that is, do a <I>cvs commit</I>) your modified versions of files. +<P> +More about "<A HREF="http://www.cvshome.org/docs/manual/cvs_1.html#SEC1"; TARGET=_NEW>What CVS is not</A>." +More about <A HREF="http://cvshome.org/docs/manual/cvs_14.html#SEC111"; target="_new">How your project builds interact with CVS</A> +<P> +<BR> +<BR> + +<SPAN CLASS="InputHeader"><A NAME="filetypes"></A>About file types</SPAN> +<P> +<P> +The information provided in this document about CVS commands and actions assumes that the project files you are working with are text files. It is possible to include binary files in version control with CVS, although there are some special issues. +<P> +More about <A HREF="http://cvshome.org/docs/manual/cvs_9.html#SEC80"; TARGET="_new">Handling binary files</A> in CVS. +<P> +<BR> +<BR> + +<SPAN CLASS="InputHeader"><A NAME="contributing"></A>Contributing your changes into CVS</SPAN> +<UL> +<P><A NAME="cvscommit"></A><LI>To <I>commit</I> your changes to a file into the shared repository, type: +<BLOCKQUOTE> + <B>cvs commit -m "Type your changes message here" FILENAME</B> +</BLOCKQUOTE> +<P> +If you do not include a description of your change to the file, you will be prompted to add it by invoking your file editor before CVS can complete the commit action. +<P><LI>To commit your changes to all files in a directory and any subdirectories: +<BLOCKQUOTE> + <B>cd top_directory_to_commit</B><BR> + <B>cvs commit -m "Type your change message here"</B> +</BLOCKQUOTE> +</UL> +<P> +All commits are logged automatically and posted to the project's cvs mailing list. +<P> + +<A NAME="cvsadd"></A><SPAN CLASS="InputHeader">Adding files/directories</SPAN> + + <P>To <I>add</I> a new file to the CVS repository after you have first created and edited it in your working directory, type: +<BLOCKQUOTE> + <B>cvs add filename</B><BR> +</BLOCKQUOTE> + Then follow up with the "cvs commit filename" command. If you do not first add the file, CVS does not recognize it.</LI> + +<P> +If you have cvs write permissions, you can add subdirectories to your project's source tree using the "<B>cvs add</B>" command. You can then move existing files into new subdirectories with the "<B>cvs move</B>" command. +<P> +<A HREF="http://cvsbook.red-bean.com/cvsbook.html#Committing"; TARGET="_new">More about committing changes</A><BR> +<A HREF="http://cvshome.org/docs/manual/cvs_7.html#SEC66"; TARGET="_new">More about adding files and directories</A> +<P> +<BR> +<BR> + +<A NAME="cvsimport"></A> <B>Importing existing code?</B> +<P> +If you have existing files to add to the project, you can import these into CVS using the following command: +<BLOCKQUOTE> + <B>cvs import filename</B> +</BLOCKQUOTE> + +<P> +Importing allows you to add a lot of files at once, something like a super "cvs add." To import <I>all</I> existing directories and files, in your top level directory type: +<P> +<B>cvs import -m "log message" projectname</B> +<P> +This creates the files and directories in the CVS repository for your project on this site. If you want to preserve these files and directories in their original state, you may want to tag or archive this set of original files before you or any other developers begin checking out working copies of project files. +<P> +If your existing files are already under versioning control -- either in another CVS repository or in a versioning different system such as RCS -- there is no automated method for importing existing files that retains file histories. Using the cvs import command, copying files over, or creating them as new files does not retain these histories. +<P> +<BR> +<BR> + +<A NAME="copyfromrcs"></A>Neither cvs import nor cvs copy preserves the RCS revision histories of existing files brought in to CVS, but there is a way to do this by using: +<BLOCKQUOTE> +<B>cvs cp filename,v</B> +</BLOCKQUOTE> +If you do not copy files using the "filename,v", all versioning information for each file is lost. +<P> +<A HREF="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC112"; TARGET="_new">More about "<B>cvs import"</B></A> +<P> +<BR> +<BR> + +<SPAN CLASS="InputHeader"><A NAME="cvsandrcs"></A>CVS and RCS</SPAN> +<P> +If you're already familiar with RCS, both RCS and CVS use a similar format for storing the version control histories of individual files. But you should be aware of at least two critical differences in adapting CVS: +<P> +<UL> +<LI>One of the central principals in RCS is file locking, which prevents other developers from checking out or modifying a file when you have checked it out. The benefit to file locking is that developers never have to deal with conflicting modifications within files. RCS protects files by only allowing them to be modified by one person at a time. Therefore, the drawback to RCS is: you can't commit your changes to a file while another developer has it checked out. +<LI>The central tenant of CVS is to allow developers to check out, modify, and commit files concurrently, truly a benefit to projects with remote, geographically dispersed developers. The tradeoff is that on a CVS version controlled project, you can count on dealing with merge conflicts in files. The only method for resolving such conflicts is by hand-editing the file. Thus, project workflow with CVS ends up being a little different. +</UL> +<P> + +<A HREF="http://www.cvshome.org/cyclic/cyclic-pages/rcs.html"; TARGET="_new">More about RCS and CVS</A> +<P> +<BR> +<BR> + +<A NAME="keywords"></A><SPAN CLASS="InputHeader">Keyword substitution</SPAN> +<P> +Keyword substitution (a.k.a keyword expansion) is an RCS holdover that may be useful to you as a developer. Keywords essentially let you embed version information permanently in source files. A string containing the full version information associated with a particular keyword is substituted whenever the file is subsequently revised. +<P> +As an example, including: +<BLOCKQUOTE> +<B>$Author: mellonedain $</B> +</BLOCKQUOTE> +within the files permanently retains the login name of the user who checked in that revision. +<P>Keyword substitution is a method for tracking file versions once the files are no longer part of a CVS repository. Keyword substitution can also be configured and suppressed. +<P> +<A HREF="http://cvshome.org/docs/manual/cvs_12.html#SEC98"; TARGET="_new">More about keywords (including a list of common keywords)</A> +<P> +<BR> +<BR> + +<A NAME="cvsupdate"></A><SPAN CLASS="InputHeader">Keeping your working files up to date with the repository</SPAN> +<P> +If you want to look before you leap, you can get a list of all files in your local directory not up to date with the project repository by using the following command:<BR> +<BLOCKQUOTE> + <B>cvs -qn update</B> </LI> +</BLOCKQUOTE> +Files in the affected directory or directories are listed with their current status indicated as follows: +<UL> +<LI>? = File is unrecognized by CVS (needs to be added and committed). +<LI>A = File is added; file is recognized by CVS but still needs to be committed to the repository. +<LI>M = File has been modified by another developer since you checked out your working copy. This means that you need to update. +<LI>U = File is updated. +<LI>C = File has merge conflicts that must be resolved by hand. +</UL> +<P> +To go ahead and actually perform an update to make your working directory up to sync with the repository, the command is: +<BLOCKQUOTE> + <B>cvs update</B> +</BLOCKQUOTE> +You can also update individual files by adding the filename to the command. +<P>Or, to include any new directories when updating, do: +<BLOCKQUOTE> + <B>cvs update -d</B> +</BLOCKQUOTE> +<P> +<A HREF="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC132"; TARGET="_new">More about the cvs update command</A><BR> +<A HREF="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC134"; TARGET="_new">More about CVS update output</A> +<P> +<BR> +<BR> + +<A NAME="cvstatus"></A><SPAN CLASS="InputHeader">Comparing your working files to the repository</SPAN> +<P> +Another way to determine whether all of your working files are in sync with the latest versions in the repository is with the command: +<BLOCKQUOTE> +<B>cvstatus</B><BR> +</BLOCKQUOTE> +or for status on individual files:<BR> +<BLOCKQUOTE> +<B>cvs status filename</B> +</BLOCKQUOTE> +<P> +This comparison may return one of the following messages: +<P> +<DL> +<DT><B><I>Locally modified</I></B> <DD>Your version has not yet been committed. +<DT><B><I>Needs patch</I></B> <DD>Your version needs to be updated because someone else has made changes. +<DT><B><I>File had conflicts on merge</I></B> <DD>CVS could not resolve changes made to this file and committed. (<A HREF="cvsresolving">Resolving merge conflicts</A>.) +</DL> + +<P> +In general, a good rule of thumb is to make sure your working files are up to date with the repository <I>just before you commit your changes to a file</I>. The reason for this is that sometimes your commit may be unsuccessful, for example, you may be trying to commit from the wrong directory or perhaps another developer has committed changes to that same file after you checked it out of the repository or last updated it. Trying to commit your changes to an older version of the same file often causes conflicts when CVS tries to merge these. The result of your commit attempt under such circumstances is a somewhat daunting failure message about "dying gasps" from CVS. (Unfortunately, you don't find this out until <I>after</I> you've gone through the process of mentally composing and entering a pithy change log message.) +<P> +<P><LI>To see the differences between your copy of a file and the latest version in the repository:<BR> +<BLOCKQUOTE> + <B>cvs diff filename</B> </LI> +</BLOCKQUOTE> +<P> +<A HREF="http://cvsbook.red-bean.com/cvsbook.html#Finding_Out_What_You__And_Others__Did_--_update_And_diff"; TARGET=_NEW>More about comparing your work with the project repository</A> +<P> +<BR> +<BR> + +<A NAME="diffs"></A><SPAN CLASS="InputHeader">Comparing versions of files <I>before</I> you commit (diff)</SPAN> +<P> +Perhaps you want to see the changes another developer has made to the same file <I>before</I> you commit your own changes. For example, suppose you are committing some very complex changes which you anticipate may conflict with another developer's work. +<P> +In this case, a workable solution is to save off your working file under a different name (something like: "filename-new"). Then you can run the "<B>cvs update</B>" command and compare the latest version from the repository with your file before committing your changes. You can even compare the two files side-by-side using the following diff command: +<BLOCKQUOTE> +<B>diff -y filename filename-new</B> +</BLOCKQUOTE> +<P> +<BR> +<BR> + +<A NAME="cvsmerging"></A><SPAN CLASS="InputHeader">Merging your changes with other developers' changes</SPAN> +<P> +By giving the "<B>cvs update</B>" command, you are essentially telling CVS to merge the latest versions of files from the repository into your working copies. +<P> +Sometimes, however, other modifications made to a file since you last updated do not mesh well with your version. Or, you've made changes that conflict with the repository version. CVS makes every attempt to resolve such conflicts automatically when you update and commit, but sometimes it cannot resolve everything. Conflicts within the file must be resolved by hand. +<P> +<BR> +<BR> + +<A NAME="cvsresolving"></A><LI>Resolving merge conflicts +<P> +To resolve merge conflicts, open the file in your file editor. Look for lines or sections marked by ">>>>>>" and "<<<<<<<". When CVS cannot resolve a conflict, it includes both versions of the affect line or sections in the file, usually the latest version first. Your task is to delete the unwanted lines, along with the lines containing the conflict symbols and revision numbers. Then save the file and commit. +<P> +<A HREF="http://www.gnu.org/manual/cvs/html_chapter/cvs_7.html#SEC40"; TARGET="_new">An example of a conflict</A><BR> +<A HREF="http://cvsbook.red-bean.com/cvsbook.html#Detecting_And_Resolving_Conflicts"; TARGET="_new">More about resolving conflicts</A> +<P> +<BR> +<BR> + +<A NAME="reverting"></A><SPAN CLASS="InputHeader">Revision history and reverting</SPAN> +<P> +Beyond the usefulness of being able to review a file's modification history using the "<B>cvs log</B>" command to review, earlier versions can actually be restored as the most current revision (that is, to the "repository head") by the process of <I>reverting</I>. This can become a particularly useful option if you want or need to return to an earlier point in a file's evolution for whatever reason, somewhat like being able to turn back the clock. +<P> +The command to revert to an earlier version of a file is: +<BLOCKQUOTE> +<B>cvs up -r filename version_#</B> +</BLOCKQUOTE> +<P> +Reverting may results in "sticky tag" errors. You can resolve these using the following update command with a special switch: +<BLOCKQUOTE> +<B>cvs update -dAP</B> +</BLOCKQUOTE> +(<A H REF="http://cvsbook.red-bean.com/cvsbook.html#Getting_Snapshots__Dates_And_Tagging_"; TARGET="_new">What are sticky tag errors?</A>) + + +<!-- +revisions are specific updates to files, i.e. 1.1, 1.2, 1.3 +versions are SETS of file revisions tagged and named at a certain point in time (the confusion comes because versions are sometimes named 1.0, 1.1, 1.2 etc. but don't have to be named that way, can be any set of characters project owner designates) + +--> +<P> +<BR> +<BR> + +<A HREF="http://www.gnu.org/manual/cvs/html_chapter/cvs_16.html#SEC72"; TARGET="_new">More about revision history</A><BR> +<A HREF="http://cvsbook.red-bean.com/cvsbook.html#Examining_And_Reverting_Changes"; TARGET="_new">More about reverting</A> + + + +<!-- +<P> +<A NAME="cvstips"><span class="InputHeader">Feedback on this document</span></A> +<P> +The author of this help document has made every attempt to compile accurate, helpful information about using CVS for projects hosted on this site. If you think any content in the above document is wrong, inadequate, or something is just plain missing ... that's good. This is open source, so step up to the plate and contribute your suggestions for additions and improvements. +<P> +--> + +<HR NOSHADE SIZE=1> +<A HREF="Help.html">Back to main Help index</A></P></SPAN> + +</SPAN> +</TR> +</TABLE> + + </div> +<!--#include virtual="/footer.html" --> +</body> +</html>
