diff options
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/gawkworkflow.info | 124 | ||||
| -rw-r--r-- | doc/gawkworkflow.texi | 2 |
3 files changed, 67 insertions, 63 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 96f308b5..9ff53055 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2017-06-18 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * gawkworkflow.texi: Fix typo. + 2017-06-15 Arnold D. Robbins <arnold@skeeve.com> * gawktexi.in: Expand tab characters. diff --git a/doc/gawkworkflow.info b/doc/gawkworkflow.info index 64e13a13..88240ba6 100644 --- a/doc/gawkworkflow.info +++ b/doc/gawkworkflow.info @@ -58,7 +58,7 @@ in (a) below. A copy of the license is included in the section entitled development. * Using Git:: Getting started with Git. * Configuring git:: Configuring Git. -* Development without commit access:: How to wwork without commit access. +* Development without commit access:: How to work without commit access. * Development with commit access:: How to work with commit access. * General practices:: How things should usually be done. * Repo Maintenance:: Tips for keeping your repo clean. @@ -866,7 +866,7 @@ File: gawkworkflow.info, Node: Updating, Next: Submitting Changes, Prev: Undo ======================== As you work on your branch, you will occasionally want to bring it up to -date with respect to 'master'. This minor node dicusses updating locale +date with respect to 'master'. This minor node discusses updating local branches and handling merge conflicts. * Menu: @@ -1916,65 +1916,65 @@ Index Tag Table: Node: Top1102 -Node: Preface5174 -Node: This Manual6070 -Node: Conventions7559 -Node: Acknowledgments9028 -Node: Reviewers9465 -Node: Contributing9786 -Ref: Contributing-Footnote-113141 -Node: Using Git13173 -Node: Push Pull13929 -Node: Repo Copies15344 -Ref: savannah-repo16327 -Ref: your-repo17360 -Ref: Repo Copies-Footnote-119054 -Node: Local Branches19111 -Ref: your-repo-220889 -Ref: Local Branches-Footnote-121970 -Node: Branches are state22028 -Node: Repo State22751 -Node: Local State24871 -Node: Remotes25535 -Node: Configuring git26850 -Ref: Configuring git-Footnote-129203 -Node: Development without commit access29372 -Node: Cloning30374 -Node: Switching Branches32233 -Node: Starting A New Branch32886 -Ref: Starting A New Branch-Footnote-134774 -Ref: Starting A New Branch-Footnote-234832 -Node: Undoing a change34908 -Node: Updating35509 -Node: Rebasing36011 -Node: Merge Conflicts36623 -Node: Submitting Changes38123 -Ref: Submitting Changes-Footnote-140267 -Ref: Submitting Changes-Footnote-240304 -Ref: Submitting Changes-Footnote-340340 -Node: Removing Branches40386 -Node: Points to remember40922 -Node: Development with commit access42599 -Node: Initial setup43244 -Node: ssh clone44032 -Node: Developing patches44629 -Node: Developing new features45965 -Node: Developing fixes47869 -Node: General practices48956 -Node: Repo Maintenance53686 -Ref: Repo Maintenance-Footnote-156455 -Node: Development Stuff56588 -Node: Coding style57151 -Ref: Coding style-Footnote-157809 -Node: Doing paperwork57899 -Node: Tools58694 -Node: GNU Tools59276 -Node: Compilers61437 -Ref: Compilers-Footnote-163931 -Node: Debugging63969 -Node: Cheat Sheet64675 -Node: Resources68356 -Node: TODO68799 -Node: Index69019 +Node: Preface5173 +Node: This Manual6069 +Node: Conventions7558 +Node: Acknowledgments9027 +Node: Reviewers9464 +Node: Contributing9785 +Ref: Contributing-Footnote-113140 +Node: Using Git13172 +Node: Push Pull13928 +Node: Repo Copies15343 +Ref: savannah-repo16326 +Ref: your-repo17359 +Ref: Repo Copies-Footnote-119053 +Node: Local Branches19110 +Ref: your-repo-220888 +Ref: Local Branches-Footnote-121969 +Node: Branches are state22027 +Node: Repo State22750 +Node: Local State24870 +Node: Remotes25534 +Node: Configuring git26849 +Ref: Configuring git-Footnote-129202 +Node: Development without commit access29371 +Node: Cloning30373 +Node: Switching Branches32232 +Node: Starting A New Branch32885 +Ref: Starting A New Branch-Footnote-134773 +Ref: Starting A New Branch-Footnote-234831 +Node: Undoing a change34907 +Node: Updating35508 +Node: Rebasing36010 +Node: Merge Conflicts36622 +Node: Submitting Changes38122 +Ref: Submitting Changes-Footnote-140266 +Ref: Submitting Changes-Footnote-240303 +Ref: Submitting Changes-Footnote-340339 +Node: Removing Branches40385 +Node: Points to remember40921 +Node: Development with commit access42598 +Node: Initial setup43243 +Node: ssh clone44031 +Node: Developing patches44628 +Node: Developing new features45964 +Node: Developing fixes47868 +Node: General practices48955 +Node: Repo Maintenance53685 +Ref: Repo Maintenance-Footnote-156454 +Node: Development Stuff56587 +Node: Coding style57150 +Ref: Coding style-Footnote-157808 +Node: Doing paperwork57898 +Node: Tools58693 +Node: GNU Tools59275 +Node: Compilers61436 +Ref: Compilers-Footnote-163930 +Node: Debugging63968 +Node: Cheat Sheet64674 +Node: Resources68355 +Node: TODO68798 +Node: Index69018 End Tag Table diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi index 1bee193a..f9ec2088 100644 --- a/doc/gawkworkflow.texi +++ b/doc/gawkworkflow.texi @@ -1160,7 +1160,7 @@ chance for recovery, so be sure you really want to do it. As you work on your branch, you will occasionally want to bring it up to date with respect to @code{master}. -This @value{SECTION} discusses updating locale branches +This @value{SECTION} discusses updating local branches and handling merge conflicts. @menu |