From 319a3e231a27d1e1742b1378604abb6c7e501472 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 24 Nov 2016 15:11:50 +0100 Subject: [PATCH] Doc: Editing info on Perforce Converting a table to text to be able to describe the related options next to the functions. Change-Id: If50084e4e83a3c8a50cad84c458f58caa979ac86 Reviewed-by: Friedemann Kleint --- doc/src/vcs/creator-vcs-perforce.qdoc | 45 +++++++++++++++------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/doc/src/vcs/creator-vcs-perforce.qdoc b/doc/src/vcs/creator-vcs-perforce.qdoc index 1347f87083b..e86a1423baa 100644 --- a/doc/src/vcs/creator-vcs-perforce.qdoc +++ b/doc/src/vcs/creator-vcs-perforce.qdoc @@ -40,6 +40,8 @@ Perforce is a fast software configuration management system developed by Perforce Software. + \section1 Configuring Perforce + When you start \QC, it looks for the executable specified in the \uicontrol{P4 command} field in \uicontrol{Tools > Options > Version Control > Perforce}. If the file is not found, the following error @@ -54,31 +56,34 @@ deselect the \uicontrol Load check box for the \uicontrol Perforce plugin in the \uicontrol {Version Control} group. - \section1 Using Additional Perforce Functions - In the Perforce options, you can specify workspace details: \uicontrol {P4 user}, \uicontrol {P4 client}, and \uicontrol {P4 port}. To specify the details individually for several projects, use configuration files instead. Create a \c {p4config.txt} configuration file for each project in the top level project directory. - The \uicontrol Perforce submenu contains the following additional items: + \section1 Editing Files - \table - \header - \li Menu Item - \li Description - \row - \li \uicontrol{Describe} - \li View information about changelists and the files in them. - \row - \li \uicontrol{Edit File} - \li Open a file for editing. - \row - \li \uicontrol{Opened} - \li List files that are open for editing. - \row - \li \uicontrol{Pending Changes} - \li Group files for commit. - \endtable + In addition to the standard version control system functions described in + \l {Using Common Functions}, you can select \uicontrol Tools > + \uicontrol Perforce > \uicontrol {Edit File} to open a file for editing + within the client workspace. By default, files are automatically opened for + editing. To disable this feature, select \uicontrol Tools > + \uicontrol Options > \uicontrol {Version Control} > \uicontrol Perforce, + and then deselect the \uicontrol {Automatically open files when editing} + check box. + + To list files that are open for editing, select \uicontrol Tools > + \uicontrol Perforce > \uicontrol Opened. + + To group files for commit, select \uicontrol Tools > \uicontrol Perforce > + \uicontrol {Pending Changes}. + + To view information about changelists and the files in them, select + \uicontrol Tools > \uicontrol Perforce > \uicontrol Describe. + + By default, you are prompted to confirm that you want to submit changes. + To suppress the prompt, select \uicontrol Tools > \uicontrol Options > + \uicontrol {Version Control} > \uicontrol Perforce, and then deselect the + \uicontrol {Prompt on submit} check box. */