svn commit: r44712 - head/en_US.ISO8859-1/articles/p4-primer

Warren Block wblock at
Tue Apr 29 21:49:09 UTC 2014

Author: wblock
Date: Tue Apr 29 21:49:08 2014
New Revision: 44712

  Restore lost <replaceable> tags.


Modified: head/en_US.ISO8859-1/articles/p4-primer/article.xml
--- head/en_US.ISO8859-1/articles/p4-primer/article.xml	Tue Apr 29 21:44:04 2014	(r44711)
+++ head/en_US.ISO8859-1/articles/p4-primer/article.xml	Tue Apr 29 21:49:08 2014	(r44712)
@@ -104,8 +104,8 @@
     and <envar>P4PASSWD</envar> variables be set.  Use the username
     and password from above, like so:</para>
-  <screen>&prompt.user; <userinput>export P4USER=username</userinput>
-&prompt.user; <userinput>export P4PASSWD=password</userinput></screen>
+  <screen>&prompt.user; <userinput>export P4USER=<replaceable>username</replaceable></userinput>
+&prompt.user; <userinput>export P4PASSWD=<replaceable>password</replaceable></userinput></screen>
   <para>Test that this works by running the following command:</para>
@@ -145,7 +145,7 @@
 	  you want, but it must be unique within the
 	  <application>Perforce</application> server.  A naming
 	  convention that is commonly used is
-	  <literal>username_machinename</literal>,
+	  <literal><replaceable>username</replaceable>_<replaceable>machinename</replaceable></literal>,
 	  which makes it easy to identify clients when browsing them.
 	  A default name will be filled in that is just the machine
@@ -252,14 +252,14 @@
   <para>Existing clients can be listed via the <command>p4
     clients</command> command.  They can be viewed without being
     modified via the <command>p4 client -o
-    clientname</command> command.</para>
+    <replaceable>clientname</replaceable></command> command.</para>
   <para>Whenever you are interacting with files in
     <application>Perforce</application>, the <envar>P4CLIENT</envar>
     environment variable must be set to the name of the client that
     you are using, like so:</para>
-  <screen>&prompt.user; <userinput>export P4CLIENT=myclientname</userinput></screen>
+  <screen>&prompt.user; <userinput>export P4CLIENT=<replaceable>myclientname</replaceable></userinput></screen>
   <para>Note that client mappings in the repository are not exclusive;
     multiple clients can map in the same part of the repository.  This
@@ -296,7 +296,7 @@
     <literal>smpng</literal> project, you might do the
-  <screen>&prompt.user; <userinput>cd projectroot/smpng</userinput>
+  <screen>&prompt.user; <userinput>cd <replaceable>projectroot</replaceable>/smpng</userinput>
 &prompt.user; <userinput>p4 sync src/sys/ufs/...</userinput></screen>
   <para>Specifying a local relative path works for many other
@@ -334,7 +334,7 @@
   <para>The first step to creating a branch is to create a branch
     specification.  This is similar to a client specification, but is
     created via the command <command>p4 branch
-    branchname</command>.</para>
+    <replaceable>branchname</replaceable></command>.</para>
   <para>The following important fields are explained:</para>
@@ -418,7 +418,7 @@
   <para>The common way to do an integration is with the following
-  <screen>&prompt.user; <userinput>p4 integrate -b branchname</userinput></screen>
+  <screen>&prompt.user; <userinput>p4 integrate -b <replaceable>branchname</replaceable></userinput></screen>
   <para><replaceable>branchname</replaceable> is the name given to a
     branch spec, as discussed in the previous section.  This command
@@ -521,7 +521,7 @@
   <para>To open a file for editing, use the <command>p4 edit</command>
     command like so:</para>
-  <screen>&prompt.user; <userinput>p4 edit filename</userinput></screen>
+  <screen>&prompt.user; <userinput>p4 edit <replaceable>filename</replaceable></userinput></screen>
   <para>This marks the file on the server as being in the <emphasis>edit</emphasis> state,
     which then allows it to be submitted after changes are made, or
@@ -545,7 +545,7 @@
     your changes and revert it to its original state, run the
     <command>p4 revert</command> command like so:</para>
-  <screen>&prompt.user; <userinput>p4 revert filename</userinput></screen>
+  <screen>&prompt.user; <userinput>p4 revert <replaceable>filename</replaceable></userinput></screen>
   <para>This resyncs the file to the contents of the server, and
     removes the edit attribute from the server.  Any local changes
@@ -571,7 +571,7 @@
     will provide a brief description of each change, who made the
     change, and what its change number was.  A change can be examined
     in detail via the <command>p4 describe
-    changenumber</command> command.  This
+    <replaceable>changenumber</replaceable></command> command.  This
     will provide the submit log and the diffs of the actual change.</para>
   <para>Commonly, the <command>p4 describe</command> command is used in one
@@ -579,7 +579,7 @@
-      <term><command>p4 describe -s CHANGE</command></term>
+      <term><command>p4 describe -s <replaceable>CHANGE</replaceable></command></term>
 	<para>List a short description of
@@ -589,7 +589,7 @@
-      <term><command>p4 describe -du CHANGE</command></term>
+      <term><command>p4 describe -du <replaceable>CHANGE</replaceable></command></term>
 	<para>List a description of changeset <emphasis>CHANGE</emphasis>,
@@ -601,7 +601,7 @@
-      <term><command>p4 describe -dc CHANGE</command></term>
+      <term><command>p4 describe -dc <replaceable>CHANGE</replaceable></command></term>
 	<para>List a description of changeset <emphasis>CHANGE</emphasis>,
@@ -614,7 +614,7 @@
   <para>The <command>p4 filelog
-    filename</command> command will show
+    <replaceable>filename</replaceable></command> command will show
     the history of a file, including all submits, integrations, and
     branches of it.</para>
@@ -654,11 +654,11 @@
 	  <option>-dc</option> flags do work.  The two forms of this
 	  command are:</para>
-	<screen>&prompt.user; <userinput>p4 diff2 -b branchname</userinput></screen>
+	<screen>&prompt.user; <userinput>p4 diff2 -b <replaceable>branchname</replaceable></userinput></screen>
-	<screen>&prompt.user; <userinput>p4 diff2 //depot/path1 //depot/path2</userinput></screen>
+	<screen>&prompt.user; <userinput>p4 diff2 //depot/<replaceable>path1</replaceable> //depot/<replaceable>path2</replaceable></userinput></screen>
@@ -684,7 +684,7 @@
     Adding files is easily done be creating the file and then running
     the <command>p4 add</command> command like so:</para>
-  <screen>&prompt.user; <userinput>p4 add filename</userinput></screen>
+  <screen>&prompt.user; <userinput>p4 add <replaceable>filename</replaceable></userinput></screen>
   <para>If you want to add a whole tree of files, run a command
@@ -709,7 +709,7 @@
   <para>Removing a file is just as easy with the <command>p4</command>
     delete command like so:</para>
-  <screen>&prompt.user; <userinput>p4 delete filename</userinput></screen>
+  <screen>&prompt.user; <userinput>p4 delete <replaceable>filename</replaceable></userinput></screen>
   <para>This will mark the file for deletion from the depot the next
     time that a submit is run.  It will also remove the local copy of
@@ -774,9 +774,9 @@
     dealing with this is to do a one-time, in-tree integration, like
-  <screen>&prompt.user; <userinput>p4 integrate -i oldfile newfile</userinput>
+  <screen>&prompt.user; <userinput>p4 integrate -i <replaceable>oldfile</replaceable> <replaceable>newfile</replaceable></userinput>
 &prompt.user; <userinput>p4 resolve</userinput>
-&prompt.user; <userinput>p4 delete oldfile</userinput>
+&prompt.user; <userinput>p4 delete <replaceable>oldfile</replaceable></userinput>
 &prompt.user; <userinput>p4 submit</userinput></screen>
   <para>The integration will force <application>Perforce</application>
@@ -847,16 +847,16 @@
-      <para><filename>//depot/projects/soc2005/project-name/...</filename></para>
+      <para><filename>//depot/projects/soc2005/<replaceable>project-name</replaceable>/...</filename></para>
-      <para><filename>//depot/projects/soc2006/project-name/...</filename></para>
+      <para><filename>//depot/projects/soc2006/<replaceable>project-name</replaceable>/...</filename></para>
-      <para><filename>//depot/projects/soc2007/project-name/...</filename></para>
+      <para><filename>//depot/projects/soc2007/<replaceable>project-name</replaceable>/...</filename></para>
-      <para><filename>//depot/projects/soc2008/project-name/...</filename></para>
+      <para><filename>//depot/projects/soc2008/<replaceable>project-name</replaceable>/...</filename></para>

More information about the svn-doc-all mailing list