You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/04/28 20:42:08 UTC
[1/2] qpid-site git commit: update readme/makefile to reflect new git
commands, have status check inspect the input directory too
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 <ro...@apache.org>
Authored: Thu Apr 28 19:39:58 2016 +0100
Committer: Robert Gemmell <ro...@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-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-site git commit: remove unsubscribe link for proton list,
leaving just the archives
Posted by ro...@apache.org.
remove unsubscribe link for proton list, leaving just the archives
Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/8ffddba6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/8ffddba6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/8ffddba6
Branch: refs/heads/asf-site
Commit: 8ffddba6ce2bf20e4029042dfdb87a71b0156ec2
Parents: 053d176
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Apr 28 19:41:30 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Apr 28 19:41:30 2016 +0100
----------------------------------------------------------------------
content/discussion.html | 4 ++--
input/discussion.md | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/8ffddba6/content/discussion.html
----------------------------------------------------------------------
diff --git a/content/discussion.html b/content/discussion.html
index 3f23113..bdf5a13 100644
--- a/content/discussion.html
+++ b/content/discussion.html
@@ -154,9 +154,9 @@ unsubscribe address.</p>
</tr>
<tr>
<td><a href="http://mail-archives.apache.org/mod_mbox/qpid-proton/">proton@qpid.apache.org</a></td>
- <td>Proton. Going forward, use above.</td>
+ <td>Proton. Going forward, use above lists.</td>
+ <td></td>
<td></td>
- <td><a href="mailto:proton-unsubscribe@qpid.apache.org">proton-unsubscribe</a></td>
<td><a href="http://qpid.2158936.n2.nabble.com/Apache-Qpid-Proton-f7580687.html">Nabble</a></td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/8ffddba6/input/discussion.md
----------------------------------------------------------------------
diff --git a/input/discussion.md b/input/discussion.md
index 42d9ed2..9e2ffbb 100644
--- a/input/discussion.md
+++ b/input/discussion.md
@@ -34,7 +34,7 @@ unsubscribe address.
|------|---------|-----------|-------------|---------|
| [users@qpid.apache.org](http://mail-archives.apache.org/mod_mbox/qpid-users/) | General discussion | [users-subscribe](mailto:users-subscribe@qpid.apache.org) | [users-unsubscribe](mailto:users-unsubscribe@qpid.apache.org) | [Nabble](http://qpid.2158936.n2.nabble.com/Apache-Qpid-users-f2158936.html) |
| [dev@qpid.apache.org](http://mail-archives.apache.org/mod_mbox/qpid-dev/) | Development | [dev-subscribe](mailto:dev-subscribe@qpid.apache.org) | [dev-unsubscribe](mailto:dev-unsubscribe@qpid.apache.org) | [Nabble](http://qpid.2158936.n2.nabble.com/Apache-Qpid-developers-f7254403.html) |
-| [proton@qpid.apache.org](http://mail-archives.apache.org/mod_mbox/qpid-proton/) | Proton. Going forward, use above. | | [proton-unsubscribe](mailto:proton-unsubscribe@qpid.apache.org) | [Nabble](http://qpid.2158936.n2.nabble.com/Apache-Qpid-Proton-f7580687.html) |
+| [proton@qpid.apache.org](http://mail-archives.apache.org/mod_mbox/qpid-proton/) | Proton. Going forward, use above lists. | | | [Nabble](http://qpid.2158936.n2.nabble.com/Apache-Qpid-Proton-f7580687.html) |
Qpid also offers lists for
[commits]({{site_url}}/source-code.html#commits-list) and
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org