Hi, I remove merge conflicts in source files and i made so tests. All is OK.
Regards. Vincent DAB. Le dim. 3 mai 2020 à 12:21, Philippe Mouawad <philippe.moua...@gmail.com> a écrit : > Hello > Thank you. > But can you have a look again, there are merge conflicts. > > https://github.com/apache/jmeter/pull/571/commits/be81754a3cb541702c498e54b396233902471de0 > > Search for <<<<<<< > Thanks > Regards > > On Sat, May 2, 2020 at 3:42 PM Vincent Daburon <vdabu...@gmail.com> wrote: > > > The code and the documentation update for the "HTTP(S) Test Script > > Recorder" is done, > > > > https://github.com/apache/jmeter/pull/571 > > > > Regards. > > > > Le ven. 1 mai 2020 à 21:44, Felix Schumacher < > > felix.schumac...@internetallee.de> a écrit : > > > > > > > > Am 01.05.20 um 18:20 schrieb Vincent Daburon: > > > > Hi, > > > > Add prefix or suffix sampler numbering for HTTP Test Script Recorder > > > > https://github.com/apache/jmeter/pull/571 > > > > > > > > I want to update the documentation about the "HTTP(S) Test Script > > > Recorder". > > > > I see the last image > > > > > > > > > > https://github.com/apache/jmeter/blob/master/xdocs/images/screenshots/proxy_control.png > > > > had the *Metal *Look & Feel. > > > I think it is up to you, which LAF you use, I would use some LAF that > > > looks good to me :). You could take a look at > > > https://github.com/apache/jmeter/pull/574 which tries to generate them > > > automatically. > > > > > > > > If i put a new image what i recommended Look & Feel ? > > > > Metal, Windows ? > > > I always made the screenshots using Linux and I know some of the other > > > developers used MacOS. I don't think it is bad to use different LAFs, > as > > > everyone will probably have their own preferences. > > > > > > > > Do you have a manual to update the documentation ? > > > > > > I have started (locally) on a show-case document for the available > > > features of our XML-dialect, but didn't find the time to polish it up. > > > > > > One way to update the documentation is to look through the XML > documents > > > and the web site and copy the features/structure to get what you want. > > > The XML files produce two different targets. One is the website and the > > > other one is the "printable" documentation, that is used by JMeters old > > > help system. > > > > > > > How do you show the final result for you modifications (xdoc manual) > ? > > > > > > You can verify the generated files locally, as they should contain > > > relative links inside, only. > > > > > > To generate the documentation you can use gradle > > > > > > $ ./gradlew previewSite > > > > > > $ ./gradlew previewPrintableDocs > > > > > > The documentation should then be reachable using > > > src/dist/build/site/index.html and > > > src/dist/build/docs/printable_preview/printable_docs/index.html > > > > > > Regards > > > > > > Felix > > > > > > > > > > > Regards > > > > Vincent DAB. > > > > > > > > > > > > -- > Cordialement. > Philippe Mouawad. >
