{"thread":{"id":"7041","subject":"[PATCH 1/4] Documentation/build-docdep.perl: Fix dependencies for included asciidoc files","startedAt":"2007-03-01T19:41:14Z","lastAt":"2007-03-02T18:23:17Z","messageCount":6,"participants":["Sergey Vlasov","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"35999","messageId":"1172778077659-git-send-email-vsu@altlinux.ru","threadId":"7041","inReplyTo":null,"subject":"[PATCH 1/4] Documentation/build-docdep.perl: Fix dependencies for included asciidoc files","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2007-03-01T19:41:14Z","receivedAt":"2007-03-01T19:41:14Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"Adding dependencies on included files to the generated man pages is\nwrong - includes are processed by asciidoc, therefore the intermediate\nDocbook XML files really depend on included files. Because of these\nwrong dependencies the man pages were not rebuilt properly if the\nintermediate XML files were left in the tree.\n\nSigned-off-by: Sergey Vlasov \n---\n Documentation/build-docdep.perl | 6 +-----\n 1 files changed, 1 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/build-docdep.perl b/Documentation/build-docdep.perl\nindex 489389c..ba4205e 100755\n--- a/Documentation/build-docdep.perl\n+++ b/Documentation/build-docdep.perl\n@@ -41,10 +41,6 @@ while ($changed) {\n while (my ($text, $included) = each %include) {\n if (! exists $included{$text} &&\n \t(my $base = $text) =~ s/\\.txt$//) {\n-\tmy ($suffix) = '1';\n-\tif ($base eq 'git') {\n-\t $suffix = '7'; # yuck...\n-\t}\n-\tprint \"$base.html $base.$suffix : \", join(\" \", keys %$included), \"\\n\";\n+\tprint \"$base.html $base.xml : \", join(\" \", keys %$included), \"\\n\";\n }\n }\n-- \n1.5.0.2.285.g5347\n"},{"id":"36000","messageId":"11727780872894-git-send-email-vsu@altlinux.ru","threadId":"7041","inReplyTo":"1172778077659-git-send-email-vsu@altlinux.ru","subject":"[PATCH 2/4] Documentation/git-quiltimport.txt: Fix labeled list formatting","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2007-03-01T19:41:15Z","receivedAt":"2007-03-01T19:41:15Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"Mark the continuation paragraph of a list entry as such to avoid\ngetting a literal paragraph instead.\n\nSigned-off-by: Sergey Vlasov \n---\n Documentation/git-quiltimport.txt | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt\nindex 6e9a8c3..296937a 100644\n--- a/Documentation/git-quiltimport.txt\n+++ b/Documentation/git-quiltimport.txt\n@@ -42,10 +42,10 @@ OPTIONS\n --patches ::\n \tThe directory to find the quilt patches and the\n \tquilt series file.\n-\n- The default for the patch directory is patches\n-\tor the value of the $QUILT_PATCHES environment\n-\tvariable.\n++\n+The default for the patch directory is patches\n+or the value of the $QUILT_PATCHES environment\n+variable.\n \n Author\n ------\n-- \n1.5.0.2.285.g5347\n"},{"id":"36001","messageId":"11727780982140-git-send-email-vsu@altlinux.ru","threadId":"7041","inReplyTo":"11727780872894-git-send-email-vsu@altlinux.ru","subject":"[PATCH 3/4] Documentation/git-send-email.txt: Fix labeled list formatting","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2007-03-01T19:41:16Z","receivedAt":"2007-03-01T19:41:16Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"Mark continuation paragraphs of list entries as such to avoid\ngetting literal paragraphs instead.\n\nSigned-off-by: Sergey Vlasov \n---\n Documentation/git-send-email.txt | 12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\nindex 4c8d907..35b0104 100644\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -26,13 +26,13 @@ The options available are:\n \n --bcc::\n \tSpecify a \"Bcc:\" value for each email.\n-\n-\tThe --bcc option must be repeated for each user you want on the bcc list.\n++\n+The --bcc option must be repeated for each user you want on the bcc list.\n \n --cc::\n \tSpecify a starting \"Cc:\" value for each email.\n-\n-\tThe --cc option must be repeated for each user you want on the cc list.\n++\n+The --cc option must be repeated for each user you want on the cc list.\n \n --chain-reply-to, --no-chain-reply-to::\n \tIf this is set, each email will be sent as a reply to the previous\n@@ -87,8 +87,8 @@ The options available are:\n \tSpecify the primary recipient of the emails generated.\n \tGenerally, this will be the upstream maintainer of the\n \tproject involved.\n-\n-\tThe --to option must be repeated for each user you want on the to list.\n++\n+The --to option must be repeated for each user you want on the to list.\n \n \n Author\n-- \n1.5.0.2.285.g5347\n"},{"id":"36002","messageId":"11727781092949-git-send-email-vsu@altlinux.ru","threadId":"7041","inReplyTo":"11727780982140-git-send-email-vsu@altlinux.ru","subject":"[PATCH 4/4] Documentation/git-svn.txt: Fix formatting errors","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2007-03-01T19:41:17Z","receivedAt":"2007-03-01T19:41:17Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"Fix some formatting problems:\n\n - Some list labels were missing their \"::\" characters.\n - Some of continuation paragraphs in labeled lists were incorrectly\n formatted as literal paragraphs.\n - In one case \"[verse]\" was missing before the config key list.\n - The \"Basic Examples\" section was incorrectly nested inside the\n \"Config File-Only Options\" section.\n\nSigned-off-by: Sergey Vlasov \nCc: Eric Wong \n---\n Documentation/git-svn.txt | 119 +++++++++++++++++++++++++--------------------\n 1 files changed, 67 insertions(+), 52 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex cf094ca..06b49b0 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -63,7 +63,7 @@ COMMANDS\n \ttransports (eg svn+ssh://), you must include the username in\n \tthe URL, eg svn+ssh://foo@svn.bar.com/project\n \n---prefix=\n+--prefix=::\n \tThis allows one to specify a prefix which is prepended\n \tto the names of remotes if trunk/branches/tags are\n \tspecified. The prefix does not automatically include a\n@@ -94,16 +94,16 @@ COMMANDS\n \tThis fetches revisions from the SVN parent of the current HEAD\n \tand rebases the current (uncommitted to SVN) work against it.\n \n-\tThis works similarly to 'svn update' or 'git-pull' except that\n-\tit preserves linear history with 'git-rebase' instead of\n-\t'git-merge' for ease of dcommit-ing with git-svn.\n+This works similarly to 'svn update' or 'git-pull' except that\n+it preserves linear history with 'git-rebase' instead of\n+'git-merge' for ease of dcommit-ing with git-svn.\n \n-\tThis accepts all options that 'git-svn fetch' and 'git-rebase'\n-\taccepts. However '--fetch-all' only fetches from the current\n-\t[svn-remote], and not all [svn-remote] definitions.\n+This accepts all options that 'git-svn fetch' and 'git-rebase'\n+accepts. However '--fetch-all' only fetches from the current\n+[svn-remote], and not all [svn-remote] definitions.\n \n-\tLike 'git-rebase'; this requires that the working tree be clean\n-\tand have no uncommitted changes.\n+Like 'git-rebase'; this requires that the working tree be clean\n+and have no uncommitted changes.\n \n 'dcommit'::\n \tCommit each diff from a specified head directly to the SVN\n@@ -117,29 +117,40 @@ COMMANDS\n \talternative to HEAD.\n \tThis is advantageous over 'set-tree' (below) because it produces\n \tcleaner, more linear history.\n+--\n \n 'log'::\n \tThis should make it easy to look up svn log messages when svn\n \tusers refer to -r/--revision numbers.\n++\n+The following features from `svn log' are supported:\n++\n+--\n+--revision=[:];;\n+\tis supported, non-numeric args are not:\n+\tHEAD, NEXT, BASE, PREV, etc ...\n+-v/--verbose;;\n+\tit's not completely compatible with the --verbose\n+\toutput in svn log, but reasonably close.\n+--limit=;;\n+\tis NOT the same as --max-count, doesn't count\n+\tmerged/excluded commits\n+--incremental;;\n+\tsupported\n+--\n++\n+New features:\n++\n+--\n+--show-commit;;\n+\tshows the git commit sha1, as well\n+--oneline;;\n+\tour version of --pretty=oneline\n+--\n++\n+Any other arguments are passed directly to `git log'\n \n-\tThe following features from `svn log' are supported:\n-\n-\t--revision=[:] - is supported, non-numeric args are not:\n-\t HEAD, NEXT, BASE, PREV, etc ...\n-\t-v/--verbose - it's not completely compatible with\n-\t the --verbose output in svn log, but\n-\t\t\t reasonably close.\n-\t--limit= - is NOT the same as --max-count,\n-\t doesn't count merged/excluded commits\n-\t--incremental - supported\n-\n-\tNew features:\n-\n-\t--show-commit - shows the git commit sha1, as well\n-\t--oneline - our version of --pretty=oneline\n-\n-\tAny other arguments are passed directly to `git log'\n-\n+--\n 'set-tree'::\n \tYou should consider using 'dcommit' instead of this command.\n \tCommit specified commit or tree objects to SVN. This relies on\n@@ -256,16 +267,18 @@ config key: svn.authorsfile\n \tMake git-svn less verbose.\n \n --repack[=]::\n---repack-flags=\n-\tThese should help keep disk usage sane for large fetches\n-\twith many revisions.\n+--repack-flags=::\n+\n+These should help keep disk usage sane for large fetches\n+with many revisions.\n \n-\t--repack takes an optional argument for the number of revisions\n-\tto fetch before repacking. This defaults to repacking every\n-\t1000 commits fetched if no argument is specified.\n+--repack takes an optional argument for the number of revisions\n+to fetch before repacking. This defaults to repacking every\n+1000 commits fetched if no argument is specified.\n \n-\t--repack-flags are passed directly to gitlink:git-repack[1].\n+--repack-flags are passed directly to gitlink:git-repack[1].\n \n+[verse]\n config key: svn.repack\n config key: svn.repackflags\n \n@@ -323,28 +336,30 @@ CONFIG FILE-ONLY OPTIONS\n \n svn.noMetadata::\n svn-remote..noMetadata::\n-\tThis gets rid of the git-svn-id: lines at the end of every commit.\n \n-\tIf you lose your .git/svn/git-svn/.rev_db file, git-svn will not\n-\tbe able to rebuild it and you won't be able to fetch again,\n-\teither. This is fine for one-shot imports.\n+This gets rid of the git-svn-id: lines at the end of every commit.\n+\n+If you lose your .git/svn/git-svn/.rev_db file, git-svn will not\n+be able to rebuild it and you won't be able to fetch again,\n+either. This is fine for one-shot imports.\n \n-\tThe 'git-svn log' command will not work on repositories using\n-\tthis, either. Using this conflicts with the 'useSvmProps'\n-\toption for (hopefully) obvious reasons.\n+The 'git-svn log' command will not work on repositories using\n+this, either. Using this conflicts with the 'useSvmProps'\n+option for (hopefully) obvious reasons.\n \n svn.useSvmProps::\n svn-remote..useSvmProps::\n-\tThis allows git-svn to re-map repository URLs and UUIDs from\n-\tmirrors created using SVN::Mirror (or svk) for metadata.\n \n-\tIf an SVN revision has a property, \"svm:headrev\", it is likely\n-\tthat the revision was created by SVN::Mirror (also used by SVK).\n-\tThe property contains a repository UUID and a revision. We want\n-\tto make it look like we are mirroring the original URL, so\n-\tintroduce a helper function that returns the original identity\n-\tURL and UUID, and use it when generating metadata in commit\n-\tmessages.\n+This allows git-svn to re-map repository URLs and UUIDs from\n+mirrors created using SVN::Mirror (or svk) for metadata.\n+\n+If an SVN revision has a property, \"svm:headrev\", it is likely\n+that the revision was created by SVN::Mirror (also used by SVK).\n+The property contains a repository UUID and a revision. We want\n+to make it look like we are mirroring the original URL, so\n+introduce a helper function that returns the original identity\n+URL and UUID, and use it when generating metadata in commit\n+messages.\n \n svn.useSvnsyncProps::\n svn-remote..useSvnsyncprops::\n@@ -369,8 +384,8 @@ section because they affect the 'git-svn-id:' metadata line.\n \n --\n \n-Basic Examples\n-~~~~~~~~~~~~~~\n+BASIC EXAMPLES\n+--------------\n \n Tracking and contributing to a the trunk of a Subversion-managed project:\n \n-- \n1.5.0.2.285.g5347\n"},{"id":"36004","messageId":"20070301203833.GB25782@localdomain","threadId":"7041","inReplyTo":"11727781092949-git-send-email-vsu@altlinux.ru","subject":"Re: [PATCH 4/4] Documentation/git-svn.txt: Fix formatting errors","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-03-01T20:38:33Z","receivedAt":"2007-03-01T20:38:33Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Sergey Vlasov wrote:\n> Fix some formatting problems:\n> \n> - Some list labels were missing their \"::\" characters.\n> - Some of continuation paragraphs in labeled lists were incorrectly\n> formatted as literal paragraphs.\n> - In one case \"[verse]\" was missing before the config key list.\n> - The \"Basic Examples\" section was incorrectly nested inside the\n> \"Config File-Only Options\" section.\n\nThanks. However, are the indentation changes in the source absolutely\nnecessary for asciidoc to correctly format these things? I try to\navoid building the docs because my computers are too slow.\n\nIf so:\n\nAcked-by: Eric Wong \n\n> Signed-off-by: Sergey Vlasov \n> Cc: Eric Wong \n\n-- \nEric Wong\n"},{"id":"36112","messageId":"20070302182317.GB6811@procyon.home","threadId":"7041","inReplyTo":"20070301203833.GB25782@localdomain","subject":"Re: [PATCH 4/4] Documentation/git-svn.txt: Fix formatting errors","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2007-03-02T18:23:17Z","receivedAt":"2007-03-02T18:23:17Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"On Thu, Mar 01, 2007 at 12:38:33PM -0800, Eric Wong wrote:\n> Sergey Vlasov wrote:\n> > Fix some formatting problems:\n> > \n> > - Some list labels were missing their \"::\" characters.\n> > - Some of continuation paragraphs in labeled lists were incorrectly\n> > formatted as literal paragraphs.\n> > - In one case \"[verse]\" was missing before the config key list.\n> > - The \"Basic Examples\" section was incorrectly nested inside the\n> > \"Config File-Only Options\" section.\n> \n> Thanks. However, are the indentation changes in the source absolutely\n> necessary for asciidoc to correctly format these things?\n\nYes - normally asciidoc formats indented text as literal paragraphs;\nonly the first paragraph after \"tag::\" is processed specially.\nAnd using a \"+\" line inside a \"--\" block also does not work.\n\n> I try to avoid building the docs because my computers are too slow.\n\nYes, asciidoc is slow, and xmlto (xsltproc) is even slower :(\n\n> If so:\n> \n> Acked-by: Eric Wong \n> \n> > Signed-off-by: Sergey Vlasov \n> > Cc: Eric Wong \n"}]}