You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/08/08 23:43:34 UTC
git commit: docs: update sphinx documentation version
Updated Branches:
refs/heads/master c78a4f886 -> 3fad79d75
docs: update sphinx documentation version
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fad79d7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fad79d7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fad79d7
Branch: refs/heads/master
Commit: 3fad79d75186ff4de86bdd560a4543ea14eb3dc4
Parents: c78a4f8
Author: James Peach <jp...@apache.org>
Authored: Thu Aug 8 14:39:31 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Aug 8 14:39:31 2013 -0700
----------------------------------------------------------------------
doc/conf.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fad79d7/doc/conf.py
----------------------------------------------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index 026583f..9e46148 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -64,10 +64,14 @@ copyright = u'2013, dev@trafficserver.apache.org'
# |version| and |release|, also used in various other places throughout the
# built documents.
#
+# NOTE: The build system automatically sets the version correctly, but external
+# sphinx builders (like readthedocs.org) do not, so we still have to manually
+# update a reasonable version number here.
+#
# The short X.Y version.
-version = '3.3'
+version = '3.4'
# The full version, including alpha/beta/rc tags.
-release = '3.3.1'
+release = '3.4.x'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Re: git commit: docs: update sphinx documentation version
Posted by Igor Galić <i....@brainsware.org>.
> > how about generating this from autoconf?
>
> We do, but readthedocs.org doesn't run the autoconf
huh? And there's no way to fix that?
> J
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
Re: git commit: docs: update sphinx documentation version
Posted by James Peach <jp...@apache.org>.
On Aug 8, 2013, at 2:47 PM, Igor Galić <i....@brainsware.org> wrote:
>
>
> ----- Original Message -----
>> Updated Branches:
>> refs/heads/master c78a4f886 -> 3fad79d75
>>
>>
>> docs: update sphinx documentation version
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fad79d7
>> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fad79d7
>> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fad79d7
>>
>> Branch: refs/heads/master
>> Commit: 3fad79d75186ff4de86bdd560a4543ea14eb3dc4
>> Parents: c78a4f8
>> Author: James Peach <jp...@apache.org>
>> Authored: Thu Aug 8 14:39:31 2013 -0700
>> Committer: James Peach <jp...@apache.org>
>> Committed: Thu Aug 8 14:39:31 2013 -0700
>>
>> ----------------------------------------------------------------------
>> doc/conf.py | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fad79d7/doc/conf.py
>> ----------------------------------------------------------------------
>> diff --git a/doc/conf.py b/doc/conf.py
>> index 026583f..9e46148 100644
>> --- a/doc/conf.py
>> +++ b/doc/conf.py
>> @@ -64,10 +64,14 @@ copyright = u'2013, dev@trafficserver.apache.org'
>> # |version| and |release|, also used in various other places throughout the
>> # built documents.
>> #
>> +# NOTE: The build system automatically sets the version correctly, but
>> external
>> +# sphinx builders (like readthedocs.org) do not, so we still have to
>> manually
>> +# update a reasonable version number here.
>> +#
>> # The short X.Y version.
>> -version = '3.3'
>> +version = '3.4'
>> # The full version, including alpha/beta/rc tags.
>> -release = '3.3.1'
>> +release = '3.4.x'
>
>
> how about generating this from autoconf?
We do, but readthedocs.org doesn't run the autoconf
J
Re: git commit: docs: update sphinx documentation version
Posted by James Peach <jp...@apache.org>.
On Aug 8, 2013, at 2:47 PM, Igor Galić <i....@brainsware.org> wrote:
>
>
> ----- Original Message -----
>> Updated Branches:
>> refs/heads/master c78a4f886 -> 3fad79d75
>>
>>
>> docs: update sphinx documentation version
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fad79d7
>> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fad79d7
>> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fad79d7
>>
>> Branch: refs/heads/master
>> Commit: 3fad79d75186ff4de86bdd560a4543ea14eb3dc4
>> Parents: c78a4f8
>> Author: James Peach <jp...@apache.org>
>> Authored: Thu Aug 8 14:39:31 2013 -0700
>> Committer: James Peach <jp...@apache.org>
>> Committed: Thu Aug 8 14:39:31 2013 -0700
>>
>> ----------------------------------------------------------------------
>> doc/conf.py | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fad79d7/doc/conf.py
>> ----------------------------------------------------------------------
>> diff --git a/doc/conf.py b/doc/conf.py
>> index 026583f..9e46148 100644
>> --- a/doc/conf.py
>> +++ b/doc/conf.py
>> @@ -64,10 +64,14 @@ copyright = u'2013, dev@trafficserver.apache.org'
>> # |version| and |release|, also used in various other places throughout the
>> # built documents.
>> #
>> +# NOTE: The build system automatically sets the version correctly, but
>> external
>> +# sphinx builders (like readthedocs.org) do not, so we still have to
>> manually
>> +# update a reasonable version number here.
>> +#
>> # The short X.Y version.
>> -version = '3.3'
>> +version = '3.4'
>> # The full version, including alpha/beta/rc tags.
>> -release = '3.3.1'
>> +release = '3.4.x'
>
>
> how about generating this from autoconf?
We do, but readthedocs.org doesn't run the autoconf
J
Re: git commit: docs: update sphinx documentation version
Posted by Igor Galić <i....@brainsware.org>.
----- Original Message -----
> Updated Branches:
> refs/heads/master c78a4f886 -> 3fad79d75
>
>
> docs: update sphinx documentation version
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fad79d7
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fad79d7
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fad79d7
>
> Branch: refs/heads/master
> Commit: 3fad79d75186ff4de86bdd560a4543ea14eb3dc4
> Parents: c78a4f8
> Author: James Peach <jp...@apache.org>
> Authored: Thu Aug 8 14:39:31 2013 -0700
> Committer: James Peach <jp...@apache.org>
> Committed: Thu Aug 8 14:39:31 2013 -0700
>
> ----------------------------------------------------------------------
> doc/conf.py | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fad79d7/doc/conf.py
> ----------------------------------------------------------------------
> diff --git a/doc/conf.py b/doc/conf.py
> index 026583f..9e46148 100644
> --- a/doc/conf.py
> +++ b/doc/conf.py
> @@ -64,10 +64,14 @@ copyright = u'2013, dev@trafficserver.apache.org'
> # |version| and |release|, also used in various other places throughout the
> # built documents.
> #
> +# NOTE: The build system automatically sets the version correctly, but
> external
> +# sphinx builders (like readthedocs.org) do not, so we still have to
> manually
> +# update a reasonable version number here.
> +#
> # The short X.Y version.
> -version = '3.3'
> +version = '3.4'
> # The full version, including alpha/beta/rc tags.
> -release = '3.3.1'
> +release = '3.4.x'
how about generating this from autoconf?
> # The language for content autogenerated by Sphinx. Refer to documentation
> # for a list of supported languages.
>
>
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE