diff options
| -rw-r--r-- | HACKING | 6 | ||||
| -rw-r--r-- | docs/chapters/cfgfile.xml | 2 | ||||
| -rw-r--r-- | docs/chapters/patches.xml | 2 | ||||
| -rw-r--r-- | docs/chapters/special.xml | 2 | ||||
| -rw-r--r-- | docs/manpages/gbp-dch.xml | 10 | ||||
| -rw-r--r-- | docs/manpages/gbp-import-ref.xml | 2 | ||||
| -rw-r--r-- | docs/manpages/gbp-push.xml | 2 | ||||
| -rw-r--r-- | docs/manpages/gbp-rpm-ch.xml | 6 | ||||
| -rw-r--r-- | docs/po/de.po | 30 | ||||
| -rw-r--r-- | docs/po/gbp.pot | 30 |
10 files changed, 46 insertions, 46 deletions
@@ -63,9 +63,9 @@ Layout Interfaces ---------- -A gbp command in gbp/scripts/<commmand>.py must provide these interfaces: +A gbp command in gbp/scripts/<command>.py must provide these interfaces: -When one invokes `gbp <command>` gbp/scripts/<commmand>.py is imported by +When one invokes `gbp <command>` gbp/scripts/<command>.py is imported by gbp/scripts/supercommand.py @@ -73,7 +73,7 @@ which then invokes it's *main* function with all given command line arguments. It is expected to return with the exit status that should be passed back to the shell. -When one invokes `gbp config <command>` gbp/scripts/<commmand>.py is imported by +When one invokes `gbp config <command>` gbp/scripts/<command>.py is imported by gbp/scripts/config.py diff --git a/docs/chapters/cfgfile.xml b/docs/chapters/cfgfile.xml index 16272a7b..cd7c118e 100644 --- a/docs/chapters/cfgfile.xml +++ b/docs/chapters/cfgfile.xml @@ -109,7 +109,7 @@ can be used to override configuration entries shipped by the package. This can be useful if packages set e.g. <option>export-dir</option> or - <option>tarball-dir</option> and you perfer different locations: + <option>tarball-dir</option> and you prefer different locations: <programlisting> $ cat <<EOF >~/.gbp.late.conf [DEFAULT] diff --git a/docs/chapters/patches.xml b/docs/chapters/patches.xml index aaf60299..29e9d6c0 100644 --- a/docs/chapters/patches.xml +++ b/docs/chapters/patches.xml @@ -47,7 +47,7 @@ <para> The main drawback of this workflow is the lack of history on the - patch-queue branch since it is frequently droppend and + patch-queue branch since it is frequently dropped and recreated. But there is full history on the your &debian-branch;, of course. </para> diff --git a/docs/chapters/special.xml b/docs/chapters/special.xml index 8e4ec3f4..6c13eae4 100644 --- a/docs/chapters/special.xml +++ b/docs/chapters/special.xml @@ -244,7 +244,7 @@ mkdir -p ~/.config/pk4/hooks-enabled/unpack/ ln -s /usr/share/pk4/hooks-available/unpack/gbp ~/.config/pk4/hooks-enabled/unpack/ </programlisting> <para> - This will make sure packages are imported into a git respository after download. + This will make sure packages are imported into a git repository after download. </para> </sect1> </chapter> diff --git a/docs/manpages/gbp-dch.xml b/docs/manpages/gbp-dch.xml index bb9574cb..f5f068ee 100644 --- a/docs/manpages/gbp-dch.xml +++ b/docs/manpages/gbp-dch.xml @@ -26,8 +26,8 @@ <arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg> <arg><option>--ignore-branch</option></arg> <group> - <arg><option>-s</option> <replaceable>commitish</replaceable></arg> - <arg><option>--since=</option><replaceable>commitish</replaceable></arg> + <arg><option>-s</option> <replaceable>commit-ish</replaceable></arg> + <arg><option>--since=</option><replaceable>commit-ish</replaceable></arg> </group> <group> <group> @@ -96,7 +96,7 @@ <listitem><para>The start commit is read from the snapshot banner (see below for details)</para></listitem> <listitem><para>If the topmost version of the - <filename>debian/changelog</filename> is alread tagged. Use the commit + <filename>debian/changelog</filename> is already tagged. Use the commit the tag points to as start commit.</para></listitem> <listitem><para>The last commit that modified <filename>debian/changelog</filename> is used as start commit.</para></listitem> @@ -200,12 +200,12 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--since=</option><replaceable>committish</replaceable> + <term><option>--since=</option><replaceable>commit-ish</replaceable> </term> <listitem> <para> Start reading commit messages at - <replaceable>committish</replaceable>. + <replaceable>commit-ish</replaceable>. This option can't be set via &gbp.conf;. </para> </listitem> diff --git a/docs/manpages/gbp-import-ref.xml b/docs/manpages/gbp-import-ref.xml index 72193890..c68a7c6f 100644 --- a/docs/manpages/gbp-import-ref.xml +++ b/docs/manpages/gbp-import-ref.xml @@ -216,7 +216,7 @@ <screen> &gbp-import-ref; --upstream-tree=BRANCH -u0.0~git20180524</screen> <para> - Merge commits from the the tag corresponding to version <replaceable>1.0</replaceable>: + Merge commits from the tag corresponding to version <replaceable>1.0</replaceable>: </para> <screen> &gbp-import-ref; --upstream-tree=VERSION -u1.0</screen> diff --git a/docs/manpages/gbp-push.xml b/docs/manpages/gbp-push.xml index 5c8abc18..1ce5c026 100644 --- a/docs/manpages/gbp-push.xml +++ b/docs/manpages/gbp-push.xml @@ -82,7 +82,7 @@ <para> If a <replaceable>remote</replaceable> is given on the command line the changes are pushed to the given remote repository. By - default it will push to the current branchs remote and fall + default it will push to the current branches remote and fall back to <emphasis>origin</emphasis>. </para> </refsect1> diff --git a/docs/manpages/gbp-rpm-ch.xml b/docs/manpages/gbp-rpm-ch.xml index e0f0d9d7..941180e4 100644 --- a/docs/manpages/gbp-rpm-ch.xml +++ b/docs/manpages/gbp-rpm-ch.xml @@ -28,7 +28,7 @@ <arg><option>--packaging-dir=</option><replaceable>DIRECTORY</replaceable></arg> <arg><option>--changelog-file=</option><replaceable>FILEPATH</replaceable></arg> <arg><option>--spec-file=</option><replaceable>FILEPATH</replaceable></arg> - <arg><option>--since=</option><replaceable>COMMITISH</replaceable></arg> + <arg><option>--since=</option><replaceable>COMMIT-ISH</replaceable></arg> <arg><option>--no-release</option></arg> <arg><option>--[no-]git-author</option></arg> <arg><option>--[no-]full</option></arg> @@ -152,12 +152,12 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--since=</option><replaceable>COMMITTISH</replaceable> + <term><option>--since=</option><replaceable>COMMIT-ISH</replaceable> </term> <listitem> <para> Start reading commit messages at - <replaceable>COMMITTISH</replaceable>. + <replaceable>COMMIT-ISH</replaceable>. </para> </listitem> </varlistentry> diff --git a/docs/po/de.po b/docs/po/de.po index ee0bb86b..162a9815 100644 --- a/docs/po/de.po +++ b/docs/po/de.po @@ -690,7 +690,7 @@ msgid "" "filename> is at the very end of the list it can be used to override " "configuration entries shipped by the package. This can be useful if packages " "set e.g. <option>export-dir</option> or <option>tarball-dir</option> and you " -"perfer different locations: <placeholder type=\"programlisting\" id=\"0\"/>" +"prefer different locations: <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <chapter><sect1><para><programlisting> @@ -1680,7 +1680,7 @@ msgstr "" msgid "" "The basic idea is that patches are imported from your &debian-branch; to a " "patch-queue branch with one patch file in <filename>debian/patches/</" -"filename> becoming one commit on the the patch-queue branch. The created " +"filename> becoming one commit on the patch-queue branch. The created " "branch will be named after the branch you imported from with <filename>patch-" "queue/</filename> prepended. So if you do your &debian; packaging on " "<filename>debian/sid</filename> and do a" @@ -1725,7 +1725,7 @@ msgstr "" #: chapters/patches.xml:49 msgid "" "The main drawback of this workflow is the lack of history on the patch-queue " -"branch since it is frequently droppend and recreated. But there is full " +"branch since it is frequently dropped and recreated. But there is full " "history on the your &debian-branch;, of course." msgstr "" @@ -2866,7 +2866,7 @@ msgstr "" #. type: Content of: <chapter><sect1><para> #: chapters/special.xml:247 msgid "" -"This will make sure packages are imported into a git respository after " +"This will make sure packages are imported into a git repository after " "download." msgstr "" @@ -5432,8 +5432,8 @@ msgid "" "upstream-branch=</option><replaceable>branch_name</replaceable></arg> " "<arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></" "arg> <arg><option>--ignore-branch</option></arg> <group> <arg><option>-s</" -"option> <replaceable>commitish</replaceable></arg> <arg><option>--since=</" -"option><replaceable>commitish</replaceable></arg> </group> <group> <group> " +"option> <replaceable>commit-ish</replaceable></arg> <arg><option>--since=</" +"option><replaceable>commit-ish</replaceable></arg> </group> <group> <group> " "<arg><option>-S</option></arg> <arg><option>--snapshot</option></arg> </" "group> <group> <arg><option>-R</option></arg> <arg><option>--release</" "option></arg> </group> </group> <group> <arg><option>-N</option> " @@ -5487,7 +5487,7 @@ msgstr "" #: manpages/gbp-dch.xml:98 msgid "" "If the topmost version of the <filename>debian/changelog</filename> is " -"alread tagged. Use the commit the tag points to as start commit." +"already tagged. Use the commit the tag points to as start commit." msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> @@ -5523,7 +5523,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: manpages/gbp-dch.xml:123 msgid "" -"To restrict the selected changes even further you can use use the <option>--" +"To restrict the selected changes even further you can use the <option>--" "git-log</option> option which is passed on verbatim to <command>git log</" "command>. E.g. by using <option>--git-log=</option><replaceable>\"--" "author=Foo Bar\"</replaceable>." @@ -5584,13 +5584,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: manpages/gbp-dch.xml:203 -msgid "<option>--since=</option><replaceable>committish</replaceable>" +msgid "<option>--since=</option><replaceable>commit-ish</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: manpages/gbp-dch.xml:207 msgid "" -"Start reading commit messages at <replaceable>committish</replaceable>. " +"Start reading commit messages at <replaceable>commit-ish</replaceable>. " "This option can't be set via &gbp.conf;." msgstr "" @@ -7263,7 +7263,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: manpages/gbp-import-ref.xml:219 msgid "" -"Merge commits from the the tag corresponding to version <replaceable>1.0</" +"Merge commits from the tag corresponding to version <replaceable>1.0</" "replaceable>:" msgstr "" @@ -8334,7 +8334,7 @@ msgstr "" msgid "" "If a <replaceable>remote</replaceable> is given on the command line the " "changes are pushed to the given remote repository. By default it will push " -"to the current branchs remote and fall back to <emphasis>origin</emphasis>." +"to the current branches remote and fall back to <emphasis>origin</emphasis>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -8425,7 +8425,7 @@ msgid "" "option><replaceable>DIRECTORY</replaceable></arg> <arg><option>--changelog-" "file=</option><replaceable>FILEPATH</replaceable></arg> <arg><option>--spec-" "file=</option><replaceable>FILEPATH</replaceable></arg> <arg><option>--" -"since=</option><replaceable>COMMITISH</replaceable></arg> <arg><option>--no-" +"since=</option><replaceable>COMMIT-ISH</replaceable></arg> <arg><option>--no-" "release</option></arg> <arg><option>--[no-]git-author</option></arg> " "<arg><option>--[no-]full</option></arg> <arg><option>--id-length=</" "option><replaceable>NUMBER</replaceable></arg> <arg><option>--ignore-regex=</" @@ -8497,12 +8497,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: manpages/gbp-rpm-ch.xml:155 -msgid "<option>--since=</option><replaceable>COMMITTISH</replaceable>" +msgid "<option>--since=</option><replaceable>COMMIT-ISH</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: manpages/gbp-rpm-ch.xml:159 -msgid "Start reading commit messages at <replaceable>COMMITTISH</replaceable>." +msgid "Start reading commit messages at <replaceable>COMMIT-ISH</replaceable>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> diff --git a/docs/po/gbp.pot b/docs/po/gbp.pot index dcba81a2..d74310e9 100644 --- a/docs/po/gbp.pot +++ b/docs/po/gbp.pot @@ -731,7 +731,7 @@ msgid "" "~/.gbp.late.conf</filename> is at the very end of the list it can be used to " "override configuration entries shipped by the package. This can be useful if " "packages set e.g. <option>export-dir</option> or " -"<option>tarball-dir</option> and you perfer different locations: " +"<option>tarball-dir</option> and you prefer different locations: " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" @@ -1748,7 +1748,7 @@ msgstr "" msgid "" "The basic idea is that patches are imported from your &debian-branch; to a " "patch-queue branch with one patch file in " -"<filename>debian/patches/</filename> becoming one commit on the the " +"<filename>debian/patches/</filename> becoming one commit on the " "patch-queue branch. The created branch will be named after the branch you " "imported from with <filename>patch-queue/</filename> prepended. So if you do " "your &debian; packaging on <filename>debian/sid</filename> and do a" @@ -1793,7 +1793,7 @@ msgstr "" #: chapters/patches.xml:49 msgid "" "The main drawback of this workflow is the lack of history on the patch-queue " -"branch since it is frequently droppend and recreated. But there is full " +"branch since it is frequently dropped and recreated. But there is full " "history on the your &debian-branch;, of course." msgstr "" @@ -2967,7 +2967,7 @@ msgstr "" #. type: Content of: <chapter><sect1><para> #: chapters/special.xml:247 msgid "" -"This will make sure packages are imported into a git respository after " +"This will make sure packages are imported into a git repository after " "download." msgstr "" @@ -5530,8 +5530,8 @@ msgid "" "<arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> " "<arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg> " "<arg><option>--ignore-branch</option></arg> <group> <arg><option>-s</option> " -"<replaceable>commitish</replaceable></arg> " -"<arg><option>--since=</option><replaceable>commitish</replaceable></arg> " +"<replaceable>commit-ish</replaceable></arg> " +"<arg><option>--since=</option><replaceable>commit-ish</replaceable></arg> " "</group> <group> <group> <arg><option>-S</option></arg> " "<arg><option>--snapshot</option></arg> </group> <group> " "<arg><option>-R</option></arg> <arg><option>--release</option></arg> " @@ -5590,7 +5590,7 @@ msgstr "" #: manpages/gbp-dch.xml:98 msgid "" "If the topmost version of the <filename>debian/changelog</filename> is " -"alread tagged. Use the commit the tag points to as start commit." +"already tagged. Use the commit the tag points to as start commit." msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> @@ -5627,7 +5627,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: manpages/gbp-dch.xml:123 msgid "" -"To restrict the selected changes even further you can use use the " +"To restrict the selected changes even further you can use the " "<option>--git-log</option> option which is passed on verbatim to " "<command>git log</command>. E.g. by using " "<option>--git-log=</option><replaceable>\"--author=Foo Bar\"</replaceable>." @@ -5688,13 +5688,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: manpages/gbp-dch.xml:203 -msgid "<option>--since=</option><replaceable>committish</replaceable>" +msgid "<option>--since=</option><replaceable>commit-ish</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: manpages/gbp-dch.xml:207 msgid "" -"Start reading commit messages at <replaceable>committish</replaceable>. " +"Start reading commit messages at <replaceable>commit-ish</replaceable>. " "This option can't be set via &gbp.conf;." msgstr "" @@ -7368,7 +7368,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: manpages/gbp-import-ref.xml:219 msgid "" -"Merge commits from the the tag corresponding to version " +"Merge commits from the tag corresponding to version " "<replaceable>1.0</replaceable>:" msgstr "" @@ -8448,7 +8448,7 @@ msgstr "" msgid "" "If a <replaceable>remote</replaceable> is given on the command line the " "changes are pushed to the given remote repository. By default it will push " -"to the current branchs remote and fall back to <emphasis>origin</emphasis>." +"to the current branches remote and fall back to <emphasis>origin</emphasis>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -8539,7 +8539,7 @@ msgid "" "<arg><option>--packaging-dir=</option><replaceable>DIRECTORY</replaceable></arg> " "<arg><option>--changelog-file=</option><replaceable>FILEPATH</replaceable></arg> " "<arg><option>--spec-file=</option><replaceable>FILEPATH</replaceable></arg> " -"<arg><option>--since=</option><replaceable>COMMITISH</replaceable></arg> " +"<arg><option>--since=</option><replaceable>COMMIT-ISH</replaceable></arg> " "<arg><option>--no-release</option></arg> " "<arg><option>--[no-]git-author</option></arg> " "<arg><option>--[no-]full</option></arg> " @@ -8612,12 +8612,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: manpages/gbp-rpm-ch.xml:155 -msgid "<option>--since=</option><replaceable>COMMITTISH</replaceable>" +msgid "<option>--since=</option><replaceable>COMMIT-ISH</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: manpages/gbp-rpm-ch.xml:159 -msgid "Start reading commit messages at <replaceable>COMMITTISH</replaceable>." +msgid "Start reading commit messages at <replaceable>COMMIT-ISH</replaceable>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |