add and use wiki and forum macros

diff --git a/attributes.txt b/attributes.txt
index f0fe7ca690256ee0f338cbc3166d1872bb05d6d1..7ab1fa3a41d159b377937ee594030296e5ef29b1 100644 (file)
--- a/attributes.txt
+++ b/attributes.txt
@@ -2,6 +2,10 @@
 :copyright:   {proxmoxGmbh}
 :pve:         Proxmox VE
 :website:     http://www.proxmox.com/
 :copyright:   {proxmoxGmbh}
 :pve:         Proxmox VE
 :website:     http://www.proxmox.com/

+:forum-url:   https://forum.proxmox.com/
+:forum:       https://forum.proxmox.com/[{pve} Community Forum]
+:webwiki-url:    https://pve.proxmox.com/wiki/
+:webwiki:        https://pve.proxmox.com/wiki/[{pve} Wiki]

 :manmanual:   {pve} Documentation
 :max-width:   55em
 ifndef::docinfo1[]
 :manmanual:   {pve} Documentation
 :max-width:   55em
 ifndef::docinfo1[]

diff --git a/getting-help.adoc b/getting-help.adoc
index 180a2121bd2aa3829419e3ed1cad04c2fe63353e..6da017921ce6403c22b63ee2b92d9f88ab2ad0c2 100644 (file)
--- a/getting-help.adoc
+++ b/getting-help.adoc
@@ -6,17 +6,15 @@ include::attributes.txt[]
 Proxmox VE Wiki
 ~~~~~~~~~~~~~~~
 
 Proxmox VE Wiki
 ~~~~~~~~~~~~~~~
 

-The primary source of information is the {pve}
-http://pve.proxmox.com[wiki]. It combines the reference documentaion
-with user contributed content.
+The primary source of information is the {webwiki}. It combines the reference
+documentation with user contributed content.

 
 
 Community Support Forum
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 {pve} itself is fully open source, so we always encourage our users to
 
 
 Community Support Forum
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 {pve} itself is fully open source, so we always encourage our users to

-discuss and share their knowledge using the
-http://forum.proxmox.com/[Community Support Forum]. The forum is fully
+discuss and share their knowledge using the {forum}. The forum is fully

 moderated by the Proxmox support team, and has a quite large user base
 around the whole world. Needless to say that such a large forum is a
 great place to get information.
 moderated by the Proxmox support team, and has a quite large user base
 around the whole world. Needless to say that such a large forum is a
 great place to get information.

diff --git a/pve-installation.adoc b/pve-installation.adoc
index cf32851f55cfecb2e1c33ae8fcdab97b33daec80..b49b866900d5e6c072883db4984eff1c26841baa 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -168,8 +168,8 @@ apt-get update
 apt-get install proxmox-ve
 ----
 
 apt-get install proxmox-ve
 ----
 

-You can find a detailed step by step howto on the {pve}
-http://pve.proxmox.com/wiki/Install_Proxmox_VE_on_Debian_Jessie[wiki].
+You can find a detailed step by step howto on the
+{webwiki-url}Install_Proxmox_VE_on_Debian_Jessie[wiki].

 
 endif::wiki[]
 
 
 endif::wiki[]
 

diff --git a/pve-intro.adoc b/pve-intro.adoc
index 703f43cc2224dc165793a1a253ced0ab4aedd6c8..f0793b742c7f754ea106e2558ab08810926bc5d2 100644 (file)
--- a/pve-intro.adoc
+++ b/pve-intro.adoc
@@ -271,5 +271,5 @@ article and is an interesting foray in the development of a large
 opensource project.
 
 NOTE: If you are interested in working on the {pve} codebase, the
 opensource project.
 
 NOTE: If you are interested in working on the {pve} codebase, the

-https://pve.proxmox.com/wiki/Developer_Documentation[Developer
-Documentation] wiki article will show you where to start.
+{webwiki-url}Developer_Documentation[Developer Documentation] wiki
+article will show you where to start.

diff --git a/system-software-updates.adoc b/system-software-updates.adoc
index 78cd3fdfa9f4240976330e1d85ad6d96f818de5d..82281b4ee35c154093373cb0b92eadd7698a0b34 100644 (file)
--- a/system-software-updates.adoc
+++ b/system-software-updates.adoc
@@ -15,8 +15,8 @@ additional information.
 
 You should do such updates at regular intervals, or when we release
 versions with security related fixes. Major system upgrades are
 
 You should do such updates at regular intervals, or when we release
 versions with security related fixes. Major system upgrades are

-announced at the https://forum.proxmox.com/[Forum]. Those announcement
-also contain detailed upgrade instructions.
+announced at the {forum}. Those announcement also contain detailed
+upgrade instructions.

 
 TIP: We recommend to run regular upgrades, because it is important to
 get the latest security updates.
 
 TIP: We recommend to run regular upgrades, because it is important to
 get the latest security updates.