{"thread":{"id":"59693","subject":"[PATCH 0/2] doc: manpage: get rid of an ancient asciidoc workaround","startedAt":"2023-05-04T03:55:44Z","lastAt":"2023-05-04T03:55:53Z","messageCount":3,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"476586","messageId":"20230504035517.329765-1-felipe.contreras@gmail.com","threadId":"59693","inReplyTo":null,"subject":"[PATCH 0/2] doc: manpage: get rid of an ancient asciidoc workaround","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-05-04T03:55:15Z","receivedAt":"2023-05-04T03:55:44Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"There a small issue removing the workaround in git-svn.txt, so that's\nfixed first, which also improves the output with asciidoctor, and then\nremoving the workaround is a no-op.\n\nFelipe Contreras (2):\n  doc: git-svn: use listing instead of verse\n  doc: manpage: remove ancient workaround\n\n Documentation/asciidoc.conf | 21 ------------------\n Documentation/git-svn.txt   | 43 +++++++++++++------------------------\n 2 files changed, 15 insertions(+), 49 deletions(-)\n\n-- \n2.40.0+fc1\n\n"},{"id":"476587","messageId":"20230504035517.329765-3-felipe.contreras@gmail.com","threadId":"59693","inReplyTo":"20230504035517.329765-1-felipe.contreras@gmail.com","subject":"[PATCH 2/2] doc: manpage: remove ancient workaround","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-05-04T03:55:17Z","receivedAt":"2023-05-04T03:55:51Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"This was added in 9b6f84d2c2 (asciidoc: add minor workaround to add an\nempty line after code blocks, 2008-10-30) in order to deal with a bug in\ndocbook-xsl 1.72, but it was fixed in 1.74 in 2008.\n\nNo functional changes.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/asciidoc.conf | 21 ---------------------\n 1 file changed, 21 deletions(-)\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 60f76f43ed..7e3de98cd7 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -30,27 +30,6 @@ ifdef::backend-docbook[]\n {0#</citerefentry>}\n endif::backend-docbook[]\n \n-ifdef::backend-docbook[]\n-ifdef::doctype-manpage[]\n-# The following two small workarounds insert a simple paragraph after screen\n-[listingblock]\n-<example><title>{title}</title>\n-<literallayout class=\"monospaced\">\n-|\n-</literallayout><simpara></simpara>\n-{title#}</example>\n-\n-[verseblock]\n-<formalpara{id? id=\"{id}\"}><title>{title}</title><para>\n-{title%}<literallayout{id? id=\"{id}\"}>\n-{title#}<literallayout>\n-|\n-</literallayout>\n-{title#}</para></formalpara>\n-{title%}<simpara></simpara>\n-endif::doctype-manpage[]\n-endif::backend-docbook[]\n-\n ifdef::backend-xhtml11[]\n [attributes]\n git-relative-html-prefix=\n-- \n2.40.0+fc1\n\n"},{"id":"476588","messageId":"20230504035517.329765-2-felipe.contreras@gmail.com","threadId":"59693","inReplyTo":"20230504035517.329765-1-felipe.contreras@gmail.com","subject":"[PATCH 1/2] doc: git-svn: use listing instead of verse","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-05-04T03:55:16Z","receivedAt":"2023-05-04T03:55:53Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Code snippets are supposed to be listing blocks, not verse blocks, and\nit's easy to add them by a simple indentation.\n\nThis fixes the output for asciidoctor in a few places and gets rid of\nthe need of  a hack for asciidoc introduced in 9b6f84d2c2 (asciidoc: add\nminor workaround to add an empty line after code blocks, 2008-10-30),\nplus shows the snippets in monospace font in the html backend.\n\n  --- a/git-svn.1\n  +++ b/git-svn.1\n  @@ -148,6 +148,7 @@ COMMANDS\n                  be used to allow only certain refs.\n\n                      config key: svn-remote.<name>.ignore-refs\n  +\n                  If the ignore-refs configuration key is set, and the\n                  command-line option is also given, both regular expressions\n                  will be used.\n  @@ -160,6 +161,7 @@ COMMANDS\n                  etc) on a given repository.\n\n                      config key: svn-remote.<name>.ignore-paths\n  +\n                  If the ignore-paths configuration key is set, and the\n                  command-line option is also given, both regular expressions\n                  will be used.\n  @@ -260,6 +262,7 @@ COMMANDS\n\n                      config key: svn-remote.<name>.commiturl\n                      config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n  +\n                  Note that the SVN URL of the commiturl config key includes the\n                  SVN branch. If you rather want to set the commit URL for an\n                  entire SVN repository use svn-remote.<name>.pushurl instead.\n  @@ -277,6 +280,7 @@ COMMANDS\n                  /branches/bar:3,5-6,8\")\n\n                      config key: svn.pushmergeinfo\n  +\n                  This option will cause git-svn to attempt to automatically\n                  populate the svn:mergeinfo property in the SVN repository when\n                  possible. Currently, this can only be done when dcommitting\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/git-svn.txt | 43 ++++++++++++++-------------------------\n 1 file changed, 15 insertions(+), 28 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex 4e92308e85..79f767478f 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -148,8 +148,7 @@ the same local time zone.\n \t`^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$`\n \tcan be used to allow only certain refs.\n +\n-[verse]\n-config key: svn-remote.<name>.ignore-refs\n+ config key: svn-remote.<name>.ignore-refs\n +\n If the ignore-refs configuration key is set, and the command-line\n option is also given, both regular expressions will be used.\n@@ -161,8 +160,7 @@ option is also given, both regular expressions will be used.\n \t(including automatic fetches due to 'clone', 'dcommit',\n \t'rebase', etc) on a given repository.\n +\n-[verse]\n-config key: svn-remote.<name>.ignore-paths\n+ config key: svn-remote.<name>.ignore-paths\n +\n If the ignore-paths configuration key is set, and the command-line\n option is also given, both regular expressions will be used.\n@@ -191,8 +189,7 @@ Skip \"branches\" and \"tags\" of first level directories;;\n \t'rebase', etc) on a given repository. `--ignore-paths` takes\n \tprecedence over `--include-paths`.\n +\n-[verse]\n-config key: svn-remote.<name>.include-paths\n+ config key: svn-remote.<name>.include-paths\n \n --log-window-size=<n>;;\n \tFetch <n> log entries per request when scanning Subversion history.\n@@ -267,9 +264,8 @@ Use of 'dcommit' is preferred to 'set-tree' (below).\n \treused if a user is later given access to an alternate transport\n \tmethod (e.g. `svn+ssh://` or `https://`) for commit.\n +\n-[verse]\n-config key: svn-remote.<name>.commiturl\n-config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n+ config key: svn-remote.<name>.commiturl\n+ config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n +\n Note that the SVN URL of the commiturl config key includes the SVN branch.\n If you rather want to set the commit URL for an entire SVN repository use\n@@ -286,8 +282,7 @@ discouraged.\n \tbranches, use a single space character between the branches\n \t(`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)\n +\n-[verse]\n-config key: svn.pushmergeinfo\n+ config key: svn.pushmergeinfo\n +\n This option will cause git-svn to attempt to automatically populate the\n svn:mergeinfo property in the SVN repository when possible. Currently, this can\n@@ -608,8 +603,7 @@ removed by default if there are no files left in them.  Git\n cannot version empty directories.  Enabling this flag will make\n the commit to SVN act like Git.\n +\n-[verse]\n-config key: svn.rmdir\n+ config key: svn.rmdir\n \n -e::\n --edit::\n@@ -619,8 +613,7 @@ Edit the commit message before committing to SVN.  This is off by\n default for objects that are commits, and forced on when committing\n tree objects.\n +\n-[verse]\n-config key: svn.edit\n+ config key: svn.edit\n \n -l<num>::\n --find-copies-harder::\n@@ -629,9 +622,8 @@ config key: svn.edit\n They are both passed directly to 'git diff-tree'; see\n linkgit:git-diff-tree[1] for more information.\n +\n-[verse]\n-config key: svn.l\n-config key: svn.findcopiesharder\n+ config key: svn.l\n+ config key: svn.findcopiesharder\n \n -A<filename>::\n --authors-file=<filename>::\n@@ -648,8 +640,7 @@ will abort operation. The user will then have to add the\n appropriate entry.  Re-running the previous 'git svn' command\n after the authors-file is modified should continue operation.\n +\n-[verse]\n-config key: svn.authorsfile\n+ config key: svn.authorsfile\n \n --authors-prog=<filename>::\n \tIf this option is specified, for each SVN committer name that\n@@ -664,8 +655,7 @@ relative to the current directory for 'init' and 'clone' and relative\n to the root of the working tree for 'fetch'. If 'filename' is\n not found, it is searched like any other command in '$PATH'.\n +\n-[verse]\n-config key: svn.authorsProg\n+ config key: svn.authorsProg\n \n -q::\n --quiet::\n@@ -703,8 +693,7 @@ creating the branch or tag.\n \t'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer\n \tin the log message and use that as the author string.\n +\n-[verse]\n-config key: svn.useLogAuthor\n+ config key: svn.useLogAuthor\n \n --add-author-from::\n \tWhen committing to svn from Git (as part of 'set-tree' or 'dcommit'\n@@ -713,8 +702,7 @@ config key: svn.useLogAuthor\n \tGit commit's author string.  If you use this, then `--use-log-author`\n \twill retrieve a valid author string for all commits.\n +\n-[verse]\n-config key: svn.addAuthorFrom\n+ config key: svn.addAuthorFrom\n \n ADVANCED OPTIONS\n ----------------\n@@ -748,8 +736,7 @@ ADVANCED OPTIONS\n \tprocess. This feature is enabled by default, use\n \t--no-follow-parent to disable it.\n +\n-[verse]\n-config key: svn.followparent\n+ config key: svn.followparent\n \n CONFIG FILE-ONLY OPTIONS\n ------------------------\n-- \n2.40.0+fc1\n\n"}]}