doc: networking: integrate scaling document into doc tree
Subsystems (3)
v2 cover doc: networking: integrate scaling document into doc tree
Changes in v2:
* Changed formatting of sections according to kernel documentation conventions [0].
* All commits from this series were squashed into one.
[0] https://www.kernel.org/doc/html/latest/doc-guide/sphinx.html
Otto Sabart (1):
doc: networking: integrate scaling document into doc tree
Documentation/networking/index.rst | 1 +
.../networking/{scaling.txt => scaling.rst} | 131 ++++++++++++------
2 files changed, 86 insertions(+), 46 deletions(-)
rename Documentation/networking/{scaling.txt => scaling.rst} (92%)Signature · 1 line
2.17.2
PATCH v2 1/1 doc: networking: integrate scaling document into doc tree
Convert scaling document into reStructuredText and add reference to scaling document into main table of contents in network documentation.
There are no semantic changes.
There are no references to "scaling.txt" file. Whole kernel tree was checked using:
$ grep -r "scaling\.txt"
---
Documentation/networking/index.rst | 1 +
.../networking/{scaling.txt => scaling.rst} | 131 ++++++++++++------
2 files changed, 86 insertions(+), 46 deletions(-)
rename Documentation/networking/{scaling.txt => scaling.rst} (92%)Documentation/networking/index.rst +1 -0
@@ -32,6 +32,7 @@ Contents: alias bridge snmp_counter + scaling .. only:: subproject
Documentation/networking/scaling.rst renamed from Documentation/networking/scaling.txt +85 -46
276 lines not on this page · raw message
Signature · 1 line
2.17.2
Quoted 12 lines · Jonathan Corbet
Quoted 9 lines · On Fri, 18 Jan 2019 21:38:32 +0100 Otto Sabart <[email protected]> wrote:
Convert scaling document into reStructuredText and add reference to scaling document into main table of contents in network documentation.
There are no semantic changes.
There are no references to "scaling.txt" file. Whole kernel tree was checked using:
$ grep -r "scaling\.txt"
Quoted 5 lines
Quoted 1 line
Signed-off-by Otto Sabart <[email protected]>So this didn't apply cleanly to docs-next due to a conflict with commit
d96bedb2b248("doc: networking: add offload documents into main index file") by one Otto Sabart.
Yeah, .. I always just checked if it merges cleanly against the Linus's tree.
Quoted 3 lines
I've fixed that up, but in the future it will be helpful if you can be sure that your patches are against the docs tree if you want me to merge them.
Will do. Thank you Jon and sorry for the merge conflict.
Ota
Jonathan Corbet
maintainerQuoted 10 lines · On Fri, 18 Jan 2019 21:38:32 +0100 Otto Sabart <[email protected]> wrote:
Convert scaling document into reStructuredText and add reference to scaling document into main table of contents in network documentation.
There are no semantic changes.
There are no references to "scaling.txt" file. Whole kernel tree was checked using:
$ grep -r "scaling\.txt"Signed-off-by Otto Sabart <[email protected]>
So this didn't apply cleanly to docs-next due to a conflict with commit d96bedb2b248 ("doc: networking: add offload documents into main index file") by one Otto Sabart. I've fixed that up, but in the future it will be helpful if you can be sure that your patches are against the docs tree if you want me to merge them.
Thanks,
jon