Repository: qpid-site Updated Branches: refs/heads/asf-site 0465a7125 -> 8ffddba6c
update readme/makefile to reflect new git commands, have status check inspect the input directory too Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/053d176b Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/053d176b Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/053d176b Branch: refs/heads/asf-site Commit: 053d176b887fb6b12a5f1c3c4ded8a17db33214b Parents: 0465a71 Author: Robert Gemmell <rob...@apache.org> Authored: Thu Apr 28 19:39:58 2016 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Thu Apr 28 19:39:58 2016 +0100 ---------------------------------------------------------------------- Makefile | 4 ++-- README | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/053d176b/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 1e45f95..7d1cd8f 100644 --- a/Makefile +++ b/Makefile @@ -62,11 +62,11 @@ render: .PHONY: publish publish: scripts/render "" input content - git status content + git status input content @echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" @echo "NOTICE! One more step remains!" @echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - @echo "Use git to commit the changes under content." + @echo "Use git to commit and push the changes." @echo "Keep in mind that you may need to git add new files." .PHONY: devel-publish http://git-wip-us.apache.org/repos/asf/qpid-site/blob/053d176b/README ---------------------------------------------------------------------- diff --git a/README b/README index 8ab7395..47e98ca 100644 --- a/README +++ b/README @@ -173,21 +173,32 @@ automatically propagated to the live site. `make publish` renders to this same `content/` directory. To publish, run `make publish` and use git to commit and push the -changes. Any additions or other structural changes under the `content/` -directory may require git adds or removes. +changes. Any additions or other structural changes under the `input/` and +`content/` directories may require git adds or removes. - site$ make publish + [qpid-site]$ make publish scripts/render "" input content - git status content - M content/index.html - ? content/a-new-file.html + git status input content + # On branch asf-site + # Changes not staged for commit: + # (use "git add <file>..." to update what will be committed) + # (use "git checkout -- <file>..." to discard changes in working directory) + # + # modified: content/discussion.html + # modified: input/discussion.md + # + # Untracked files: + # (use "git add <file>..." to include in what will be committed) + # + # content/new_file.html + # input/new_file.md + no changes added to commit (use "git add" and/or "git commit -a") ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ NOTICE! One more step remains! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Use git to commit the changes under content. + Use git to commit and push the changes. Keep in mind that you may need to git add new files. - site$ git add content/a-new-file.html - site$ git commit content -m "A commit message" + ## More information --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
