Index: project_git_instructions.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_git_instructions/project_git_instructions.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 project_git_instructions.admin.inc
--- project_git_instructions.admin.inc	15 Feb 2011 05:35:53 -0000	1.14
+++ project_git_instructions.admin.inc	24 Feb 2011 06:26:31 -0000
@@ -25,10 +25,10 @@ function project_git_instructions_settin
     [@email] => => user411@example.org<br />
     [!git_access_link] => <a href="/user/300411/edit/git">Git access page</a><br />
     [@project_username] => merlinofchaos<br />
-    [@auth_project_url] => ssh://user411@git-testing.drupal.org:2222/project/ctools.git<br />
-    [@anon_project_url] => http://git-testing.drupalcode.org/project/ctools.git<br />
-    [@auth_sandbox_url] => ssh://user411@git-testing.drupal.org:2222/sandbox/merlinofchaos/ctools.git<br />
-    [@anon_sandbox_url] => http://git-testing.drupalcode.org/sandbox/merlinofchaos/ctools.git<br />
+    [@auth_project_url] => ssh://user411@git.drupal.org:project/ctools.git<br />
+    [@anon_project_url] => http://git.drupal.org/project/ctools.git<br />
+    [@auth_sandbox_url] => ssh://user411@git.drupal.org:sandbox/merlinofchaos/ctools.git<br />
+    [@anon_sandbox_url] => http://git.drupal.org/sandbox/merlinofchaos/ctools.git<br />
     </div>'
   );
   $form['project_git_instructions_maintainer'] = array(
@@ -123,25 +123,25 @@ function project_git_instructions_settin
     '#title' => t('Repository URL for Authenticated Users'),
     '#description' => t('The preferred URL style. You can use variables here.'),
     '#type' => 'textfield',
-    '#default_value' => variable_get('project_git_instructions_git_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/project/@project_name'),
+    '#default_value' => variable_get('project_git_instructions_git_repository_url_authenticated', '@git_username@git.drupal.org:project/@project_name'),
   );
   $form['project_git_instructions_git_repository_url_anonymous'] = array(
     '#title' => t('Repository URL for Anonymous Users'),
     '#description' => t('The preferred URL style. You can use variables here.'),
     '#type' => 'textfield',
-    '#default_value' => variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git-testing.drupalcode.org/project/@project_name'),
+    '#default_value' => variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git.drupal.org/project/@project_name'),
   );
   $form['project_git_instructions_git_sandbox_repository_url_authenticated'] = array(
-    '#title' => t('Repository URL for Authenticated Users'),
+    '#title' => t('Repository URL for Authenticated Users (Sandbox)'),
     '#description' => t('The preferred URL style. You can use variables here.'),
     '#type' => 'textfield',
-    '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/sandbox/@project_username/@project_name'),
+    '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', '@git_username@git.drupal.org:sandbox/@project_username/@project_name'),
   );
   $form['project_git_instructions_git_sandbox_repository_url_anonymous'] = array(
-    '#title' => t('Repository URL for Anonymous Users'),
+    '#title' => t('Repository URL for Anonymous Users (Sandbox)'),
     '#description' => t('The preferred URL style. You can use variables here.'),
     '#type' => 'textfield',
-    '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git-testing.drupalcode.org/sandbox/@project_username/@project_name'),
+    '#default_value' => variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git.drupal.org/sandbox/@project_username/@project_name'),
   );
 
   return system_settings_form($form);
Index: project_git_instructions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_git_instructions/project_git_instructions.module,v
retrieving revision 1.64
diff -u -p -r1.64 project_git_instructions.module
--- project_git_instructions.module	15 Feb 2011 05:35:53 -0000	1.64
+++ project_git_instructions.module	24 Feb 2011 06:26:32 -0000
@@ -130,10 +130,10 @@ function project_git_instructions_get_de
 
   // These are special variables and need to be run through t() in advance.
   // We generate an auth url even for non-maintainers. Of course it won't work if they see it and use it.
-  $defaults['@auth_project_url'] = t(variable_get('project_git_instructions_git_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/project/@project_name'), $defaults);
-  $defaults['@anon_project_url'] = t(variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git-testing.drupalcode.org/project/@project_name'), $defaults);
-  $defaults['@auth_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', 'ssh://@git_username@git-testing.drupal.org:2222/sandbox/@project_username/@project_name'), $defaults);
-  $defaults['@anon_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git-testing.drupalcode.org/sandbox/@project_username/@project_name'), $defaults);
+  $defaults['@auth_project_url'] = t(variable_get('project_git_instructions_git_repository_url_authenticated', '@git_username@git.drupal.org:project/@project_name'), $defaults);
+  $defaults['@anon_project_url'] = t(variable_get('project_git_instructions_git_repository_url_anonymous', 'http://git.drupal.org/project/@project_name'), $defaults);
+  $defaults['@auth_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_authenticated', '@git_username@git.drupal.org:sandbox/@project_username/@project_name'), $defaults);
+  $defaults['@anon_sandbox_url'] = t(variable_get('project_git_instructions_git_sandbox_repository_url_anonymous', 'http://git.drupal.org/sandbox/@project_username/@project_name'), $defaults);
 
   return $defaults;
 }
@@ -345,58 +345,59 @@ function project_git_instructions_projec
 function project_git_instructions_maintainer() {
   $default = <<<EOT
 <h2>One-Time Only</h2>
-<h3>To set up this repository in your local environment for the first time:</h3>
+<h3>Setting up this repository in your local environment for the first time:</h3>
+If you have just created a project or you already have a local repository, skip this step.
 <div class="codeblock">
 <code>git clone --branch @branch @auth_project_url</code><br /><br />
 <code>cd @uri</code><br />
 </div>
-<h3>Associate your copy of the repository with your Drupal.org account</h3>
+<h3>Associating your copy of the repository with your Drupal.org account</h3>
 If you have NOT already <a href="/node/1022156#identify-global">identified yourself to Git globally</a>, do so now. Although it is standard practice to use a functional address, you can also use the pre-configured address <code>@git_username@@uid-no-reply.drupal.org</code>. See <a href="/node/1053134">Manage your Git identity</a> for details.
 <div class="codeblock">
 <code>git config user.email "@email"</code><br />
 </div>
 <h2>Routinely</h2>
-<h3>Create a branch</h3>
-The following command both creates and checks out a new branch:
+The headings below are not sequential. What you choose to do depends on where you are in your process.
+<h3>Checking your repository status</h3>
+To see what you will commit by running <code>git commit</code> and what you could commit by running <code>git add</code> before running <code>git commit</code>.
 <div class="codeblock">
-<code>git checkout -b [branchname]</code><br />
+<code>git status</code><br />
 </div>
-<h3>Check your repository status</h3>
-To see what you will commit by running git commit and what you could commit by running git add before running git commit.
+<h3>Switching to a different branch</h3>
+When you clone the repository you have access to all the branches and tags. The first command shows your choices. The second command makes the switch.  See <a href="/node/1066342">branching and tagging</a> for details.
 <div class="codeblock">
-<code>git status</code><br />
+<code>git branch -a</code><br />
+<code>git checkout [branchname]</code><br />
 </div>
-<h3>Commit all changes locally</h3>
+
+<h3>Commiting all changes locally</h3>
 <p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
 href="/node/1061754">Commit messages</a> page for details.</p>
 <div class="codeblock">
-<code>git add -u</code><br />
-<code>git commit -m &quot;[issue category] #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code>
+<code>git add .</code><br />
+<code>git commit -m &quot;Issue #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code>
 </div>
-<h3>Push your code back to the repository on Drupal.org</h3>
+<h3>Pushing your code back to the repository on Drupal.org</h3>
 <div class="codeblock">
 <code>git push origin @branch</code><br />
 </div>
-<h3>Create a patch</h3>
+<h3>Creating a patch</h3>
+For a discussion of this recommend patch sequence, see the <a href="/node/1054616">Patch contributor guide.</a>
 <div class="codeblock">
+<code>git checkout -b [description]-[issue-number]</code>
+</div>
+<p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
+href="/node/1061754">Commit messages</a> page for details.</p>
+<div class="codeblock">
+<code>git add -A</code><br />
+<code>git commit -m &quot;Issue #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
+</div>
+Roll the patch.
+<div class="codeblock">
+<code>git status</code><br />
 <code>git fetch origin</code><br />
 <code>git rebase origin/@branch</code><br />
-<code>git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
-</div>
-<h2>Create Releases</h2>
-See the <a href="/node/1015226">naming conventions</a> for a complete description of how to name branches and tags so you can create releases.
-<h3>Branch for a dev release</h3>
-This creates and checks out a new branch in one command:
-<div class="codeblock">
-<code>git checkout -b 7.x-1.x</code><br />
-<code>git commit -am "Commit message"</code><br />
-<code>git push origin 7.x-1.x</code><br />
-</div>
-<h3>Tag for a stable release</h3>
-<div class="codeblock">
-<code>git checkout  7.x-1.x</code><br />
-<code>git tag 7.x-1.0</code><br />
-<code>git push origin 7.x-1.0</code><br />
+<code>git format-patch origin/@branch --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
 </div>
 EOT;
   return $default;
@@ -408,37 +409,42 @@ EOT;
 function project_git_instructions_nonmaintainer() {
   $default = <<<EOT
 <h2>One-Time Only</h2>
-<h3>Set up repository for the first time:</h3>
+<h3>Setting up repository for the first time:</h3>
 <div class="codeblock">
 <code>git clone --branch @branch @anon_project_url</code><br />
+<code>cd @uri</code><br />
 </div>
+Not working for you? See <a href="/node/1065850">Troubleshooting Git clone</a>.
 <h2>Routinely</h2>
-The following command both creates and checks out a new branch:
+The headings below are not sequential. What you choose to do depends on where you are in your process.
+<h3>Checking your repository status</h3>
+To see what you will commit by running <code>git commit</code> and what you could commit by running <code>git add</code> before running <code>git commit</code>.
 <div class="codeblock">
-<code>git checkout -b [branchname]</code><br />
+<code>git status</code><br />
 </div>
-<h3>Check your repository status</h3>
-To see what you will commit by running git commit and what you could commit by running git add before running git commit.
+<h3>Switching to a different branch</h3>
+When you clone the repository you have access to all the branches and tags.  The first command shows your choices. The second command makes the switch. See <a href="/node/1066342">branching and tagging</a> for details.
 <div class="codeblock">
-<code>git status</code><br />
+<code>git branch -a</code><br />
+<code>git checkout [branchname]</code><br />
 </div>
-<h3>Commit all changes locally</h3>
-<p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
-href="/node/1061754">Commit messages</a> page for details.</p>
+<h3>Creating a patch</h3>
+For a discussion of this recommend patch sequence, see the <a href="/node/1054616">Patch contributor guide.</a>
 <div class="codeblock">
-<code>git add -u</code><br />
-<code>git commit -m &quot;[issue category] #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
+<code>git checkout -b [description]-[issue-number]</code>
 </div>
-<h3>Update your copy</h3>
+<p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
+href="/node/1061754">Commit messages</a> page for details.</p>
 <div class="codeblock">
-<code>git pull</code><br />
-<code>git rebase</code>
+<code>git add -A</code><br />
+<code>git commit -m &quot;Issue #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
 </div>
-<h3>Create a patch</h3>
+Roll the patch.
 <div class="codeblock">
+<code>git status</code><br />
 <code>git fetch origin</code><br />
 <code>git rebase origin/@branch</code><br />
-<code>git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
+<code>git format-patch origin/@branch --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
 </div>
 EOT;
   return $default;
@@ -450,7 +456,7 @@ EOT;
 function project_git_instructions_new_maintainer() {
   $default = <<<EOT
 <h2>Empty Repository</h2>
-<h3>Set up this repository for the first time:</h3>
+<h3>Setting up this repository for the first time:</h3>
 <p>You will be prompted to enter your Drupal.org password after the
 first and last step if you have not uploaded an SSH Key or if your SSH
 key fails. See <a href="/node/1027094">Authenticating with Git on
@@ -465,6 +471,9 @@ Drupal.org</a> for details.</p>
 <code>git remote add origin @auth_project_url</code><br /><br />
 <code>git push origin master</code><br />
 </div>
+<p>When you've completed these steps, <a href="">refresh this page</a> for further direction. </p>
+
+<p><strong>Note: </strong> You have created a local repository. You will not need to complete the One-Time clone on the next page unless you delete your local repository or set up on a different machine. Then, you'll need to perform the One-time setup, as will co-maintainers.</p>
 EOT;
   return $default;
 }
@@ -485,53 +494,67 @@ EOT;
 function project_git_instructions_sandbox_maintainer() {
   $default = <<<EOT
 <h2>One-Time Only</h2>
-<h3>Set up this repository in your local environment for the first time:</h3>
+<h3>Setting up this repository in your local environment for the first time:</h3>
 <p>You will be prompted to enter your Drupal.org password after the
 first step (and any time you make requests from Drupal.org) if you
 have not uploaded an SSH key or if your SSH key fails. See <a
 href="/node/1027094">Authenticate with Git on Drupal.org</a> for
 details.</p>
 <div class="codeblock">
-<code>git clone --branch @branch @auth_sandbox_url</code><br />
+<code>git clone --branch @branch @auth_sandbox_url @project_fullname</code><br />
 <br />
 <code>cd @project_fullname</code><br />
 </div>
 <h2>Routinely</h2>
-The following command both creates and checks out a new branch:
+The headings below are not sequential. What you choose to do depends on where you are in your process.
+<h3>Checking your repository status</h3>
+To see what you will commit by running <code>git commit</code> and what you could commit by running <code>git add</code> before running <code>git commit</code>.
 <div class="codeblock">
-<code>git checkout -b [branchname] </code><br />
+<code>git status</code><br />
 </div>
-<h3>Check your repository status</h3>
-To see what you will commit by running git commit and what you could commit by running git add before running git commit.
+
+<h3>Switching to a different branch</h3>
+When you clone the repository you have access to all the branches and tags. The first command shows your choices. The second command makes the switch.  See <a href="/node/1066342">branching and tagging</a> for details.
 <div class="codeblock">
-<code>git status</code><br />
+<code>git branch -a</code><br />
+<code>git checkout [branchname]</code><br />
 </div>
-<h3>Commit all changes locally</h3>
+
+<h3>Committing all changes locally</h3>
 <p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
 href="/node/1061754">Commit messages</a> page for details.</p>
 <div class="codeblock">
-<code>git add -u</code><br />
+<code>git add .</code><br />
 <code>git commit -m "Message about your changes"</code><br />
 </div>
 <br />
-<p><strong>Note:</strong> When patching in response to an issue from
-your issue queue, the format for the commit message takes the form
+<p><strong>Note:</strong> When patching in response to an issue from your issue queue, the format for the commit message takes the form
 of:</p>
 <div class="codeblock">
-<code>git commit -m &quot;[issue category] #[issue number] by
-[comma-separated usernames]: [Short summary of the
-change].&quot;</code><br />
+<code>git commit -m &quot;Issue #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
 </div>
-<h3>Push your code back to the repository on Drupal.org</h3>
+<h3>Pushing your code back to the repository on Drupal.org</h3>
 <div class="codeblock">
 <code>git diff origin/@branch</code><br />
 <code>git push origin @branch</code><br />
 </div>
-<h3>Create a patch</h3>
+<h3>Creating a patch</h3>
+For a discussion of this recommend patch sequence, see the <a href="/node/1054616">Patch contributor guide.</a>
+<div class="codeblock">
+<code>git checkout -b [branchname] </code>
+</div>
+<p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
+href="/node/1061754">Commit messages</a> page for details.</p>
+<div class="codeblock">
+<code>git add .</code><br />
+<code>git commit -m &quot;Issue #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
+</div>
+
+Roll the patch.
 <div class="codeblock">
 <code>git fetch origin</code><br />
 <code>git rebase origin/@branch</code><br />
-<code>git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
+<code>git format-patch origin/@branch --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
 </div>
 EOT;
   return $default;
@@ -540,38 +563,43 @@ EOT;
 function project_git_instructions_sandbox_nonmaintainer() {
   $default = <<<EOT
 <h2>One-Time Only</h2>
-<h3>Set up this repository locally for the first time:</h3>
+<h3>Setting up this repository locally for the first time:</h3>
 <div class="codeblock">
-<code>git clone --branch @branch @anon_sandbox_url</code><br />
-<code>cd @uri</code>
+<code>git clone --branch @branch @anon_sandbox_url @project_fullname</code><br />
+<code>cd @project_fullname</code>
 </div>
+Not working for you? See <a href="/node/1065850">Troubleshooting Git clone</a>.
 <h2>Routinely</h2>
-The following command both creates and checks out a new branch:
+The headings below are not sequential. What you choose to do depends on where you are in your process.
+<h3>Checking your repository status</h3>
+To see what you will commit by running <code>git commit</code> and what you could commit by running <code>git add</code> before running <code>git commit</code>.
 <div class="codeblock">
-<code>git checkout -b [branchname]</code><br />
+<code>git status</code><br />
 </div>
-<h3>Check your repository status</h3>
-To see what you will commit by running git commit and what you could commit by running git add before running git commit.
+
+<h3>Switching to a different branch</h3>
+When you clone the repository you have access to all the branches and tags. The first command shows your choices. The second command makes the switch.  See <a href="/node/1066342">branching and tagging</a> for details.
 <div class="codeblock">
-<code>git status</code><br />
+<code>git branch -a</code><br />
+<code>git checkout [branchname]</code><br />
 </div>
-<h3>Commit all changes locally</h3>
-<p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
-href="/node/1061754">Commit messages</a> page for details.</p>
+<h3>Creating a patch</h3>
+For a discussion of this recommend patch sequence, see the <a href="/node/1054616">Patch contributor guide.</a>
 <div class="codeblock">
-<code>git add -u</code><br />
-<code>git commit -m "Message about your changes"</code><br />
+<code>git checkout -b [branchname] </code>
 </div>
-<br />
-<p><strong>Note:</strong> When patching in response to an issue from the issue queue, the format for the commit message takes the form of:</p>
+<p>Make your changes. Note the change in syntax for issue-related commit messages. See the <a
+href="/node/1061754">Commit messages</a> page for details.</p>
 <div class="codeblock">
-<code>git commit -m &quot;[issue category] #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
+<code>git add .</code><br />
+<code>git commit -m &quot;Issue #[issue number] by [comma-separated usernames]: [Short summary of the change].&quot;</code><br />
 </div>
-<h3>Create a patch</h3>
+
+Roll the patch.
 <div class="codeblock">
 <code>git fetch origin</code><br />
 <code>git rebase origin/@branch</code><br />
-<code>git format-patch origin/[version] --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
+<code>git format-patch origin/@branch --stdout > [description]-[issue-number]-[comment-number].patch</code><br />
 </div>
 EOT;
   return $default;
@@ -580,7 +608,7 @@ EOT;
 function project_git_instructions_sandbox_new_maintainer() {
   $default = <<<EOT
 <h2>Empty Sandbox Repository</h2>
-<h3>Set up this repository for the first time:</h3>
+<h3>Setting up this repository for the first time:</h3>
 <p>You will be prompted to enter your Drupal.org password after the last step (and any time you make requests from Drupal.org) if you have not uploaded an SSH key or if your SSH key fails. See <a href="/node/1027094">Authenticate with Git on Drupal.org</a> for details.</p>
 <div class="codeblock">
 <code>mkdir @project_fullname</code><br /><br />
@@ -595,6 +623,10 @@ function project_git_instructions_sandbo
 <br />
 <h3>A note about your sandbox and function names:</h3>
 <p>Contributed modules on Drupal.org typically use their project's shortname as the prefix to the module's functions. Sandbox shortnames are numbers, which are not valid function names. If you intend to release your code for Drupal.org someday, choose a prefix that isn't being used on Drupal.org already. There is, unfortunately, no guarantee it will still be available when you're ready to release, but you'll save a step if it is. To check, type http://drupal.org/project/[the_name_you_want].</p>
+
+<p>When you've completed these steps, <a href="">refresh this page</a> for further direction. </p>
+
+<p><strong>Note: </strong> You have created a local repository. You will not need to complete the One-Time clone on the next page unless you delete your local repository or set up on a different machine. Then, you'll need to perform the One-time setup, as will co-maintainers.</p>
 EOT;
   return $default;
 }
@@ -604,7 +636,7 @@ function project_git_instructions_reposi
 <h2>No Repository is Available Yet</h2>
 <p>Go make a cup of tea. The repository should be ready before you get back.</p>
 <p>Reload the page to try again.</p>
-<p>If this message persists longer than 5 minutes, file an issue in the Git component of the <a href="/project/infrastructure">Drupal.org Infrastructure</a> queue. <strong>Important:</strong> Include a link to the project. <strong>During testing, do NOT file an issue in the actual Drupal.org queue.</strong><p>
+<p>If this message persists longer than 5 minutes, file an issue in the Git component of the <a href="/project/infrastructure">Drupal.org Infrastructure</a> queue. <strong>Important:</strong> Include a link to the project.<p>
 EOT;
   return $default;
 }
@@ -620,7 +652,7 @@ EOT;
 
 function project_git_instructions_clone_url_direction() {
   $default = <<<EOT
-<form><input style="font-family: courier; width: 500px;" value="git clone @anon_sandbox_url" /></form>
+<form><input style="font-family: courier; width: 500px;" value="git clone @anon_sandbox_url @project_fullname" /></form>
 EOT;
   return $default;
 }
