Rename @since back to @newin

* docs/reference/Doxyfile.in (ALIASES): Rename the @since alias
back to its old name @newin, but otherwise keep the parameters.
Apparently there is a @since command predefined in Doxygen which
I hadn't noticed.  It does seem to get overridden silently, but
it is better not to rely on this.
* tools/pm/DocsParser.pm (convert_tags_to_doxygen): Output @newin
instead of @since.
* {glib,gio}/src/*.hg, {glib,gio}/{glib,gio}mm/*.h: Replace all
uses of @since with @newin.

69 files changed, 139 insertions, 125 deletions

diff --git a/ChangeLog b/ChangeLog
index bd0df1a2..dd088505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2009-08-20  Daniel Elstner  <danielk@openismus.com>
 
+	Rename @since back to @newin
+
+	* docs/reference/Doxyfile.in (ALIASES): Rename the @since alias
+	back to its old name @newin, but otherwise keep the parameters.
+	Apparently there is a @since command predefined in Doxygen which
+	I hadn't noticed.  It does seem to get overridden silently, but
+	it is better not to rely on this.
+	* tools/pm/DocsParser.pm (convert_tags_to_doxygen): Output @newin
+	instead of @since.
+	* {glib,gio}/src/*.hg, {glib,gio}/{glib,gio}mm/*.h: Replace all
+	uses of @since with @newin.
+
+2009-08-20  Daniel Elstner  <danielk@openismus.com>
+
 	Predefine GIOMM_API for Doxygen
 
 	* docs/reference/Doxyfile.in (PREDEFINED): Define GIOMM_API to the
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index e6651fd7..8e3707a6 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -35,7 +35,7 @@ MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
-ALIASES                = "since{2}=\xrefitem since_\1_\2 \"Since @PACKAGE_NAME@ \1.\2\" \"New API in @PACKAGE_NAME@ \1.\2\""
+ALIASES                = "newin{2}=\xrefitem since_\1_\2 \"Since @PACKAGE_NAME@ \1.\2\" \"New API in @PACKAGE_NAME@ \1.\2\""
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
diff --git a/gio/giomm/contenttype.h b/gio/giomm/contenttype.h
index 4f8637e0..0ccb05ee 100644
--- a/gio/giomm/contenttype.h
+++ b/gio/giomm/contenttype.h
@@ -104,7 +104,7 @@ bool content_type_can_be_executable(const Glib::ustring& type);
  * @param mime_type a mime type string.
  * @returns string with content type or empty when it does not know.
  *
- * @since{2,20}
+ * @newin{2,20}
  */
 Glib::ustring content_type_from_mime_type(const Glib::ustring& mime_type);
 
@@ -149,7 +149,7 @@ Glib::ustring content_type_guess(const std::string& filename,
  * @param root The root of the tree to guess a type for.
  * @return List of zero or more content types.
  *
- * @since{2,18}
+ * @newin{2,18}
  */
 Glib::StringArrayHandle content_type_guess_for_tree(const Glib::RefPtr<const File>& root);
 
diff --git a/gio/src/appinfo.hg b/gio/src/appinfo.hg
index 1181f19e..03f91d20 100644
--- a/gio/src/appinfo.hg
+++ b/gio/src/appinfo.hg
@@ -47,7 +47,7 @@ class File;
 /** This is used to handle, for instance, startup notification and launching of the new application on the same screen as the launching window.
  * See also AppInfo.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class AppLaunchContext : public Glib::Object
 {
@@ -73,7 +73,7 @@ public:
  * and launch them.
  * See also AppLaunchContext.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class AppInfo : public Glib::Interface
 {
diff --git a/gio/src/asyncresult.hg b/gio/src/asyncresult.hg
index fc76396f..efc882e0 100644
--- a/gio/src/asyncresult.hg
+++ b/gio/src/asyncresult.hg
@@ -40,7 +40,7 @@ class AsyncResult;
  * void on_async_ready(Glib::RefPtr<AsyncResult>& result);
  * @endcode
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 typedef sigc::slot<void, Glib::RefPtr<AsyncResult>& > SlotAsyncReady;
 
@@ -98,7 +98,7 @@ typedef sigc::slot<void, Glib::RefPtr<AsyncResult>& > SlotAsyncReady;
  * Some ascynchronous operations are implemented using synchronous calls. These are run in a separate GThread, but otherwise they are sent 
  * to the Main Event Loop and processed in an idle function. So, if you truly need asynchronous operations, make sure to initialize GThread.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class AsyncResult : public Glib::Interface
 {
diff --git a/gio/src/bufferedinputstream.hg b/gio/src/bufferedinputstream.hg
index 7d38b8d0..b7ae1c91 100644
--- a/gio/src/bufferedinputstream.hg
+++ b/gio/src/bufferedinputstream.hg
@@ -40,7 +40,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class BufferedInputStream : public Gio::FilterInputStream
 {
diff --git a/gio/src/bufferedoutputstream.hg b/gio/src/bufferedoutputstream.hg
index e8245e8f..e9ec64f9 100644
--- a/gio/src/bufferedoutputstream.hg
+++ b/gio/src/bufferedoutputstream.hg
@@ -36,7 +36,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class BufferedOutputStream : public Gio::FilterOutputStream
 {
diff --git a/gio/src/cancellable.hg b/gio/src/cancellable.hg
index 874f9160..a3ef6adf 100644
--- a/gio/src/cancellable.hg
+++ b/gio/src/cancellable.hg
@@ -29,7 +29,7 @@ namespace Gio
 /** Allows actions to be cancelled.
  * Cancellable is a thread-safe operation cancellation stack used throughout GIO to allow for cancellation of synchronous and asynchronous operations.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Cancellable : public Glib::Object
 {
diff --git a/gio/src/datainputstream.hg b/gio/src/datainputstream.hg
index c9914b53..c3e2ea64 100644
--- a/gio/src/datainputstream.hg
+++ b/gio/src/datainputstream.hg
@@ -32,7 +32,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class DataInputStream : public Gio::BufferedInputStream
 {
diff --git a/gio/src/dataoutputstream.hg b/gio/src/dataoutputstream.hg
index 14aed5d9..5b7660f9 100644
--- a/gio/src/dataoutputstream.hg
+++ b/gio/src/dataoutputstream.hg
@@ -32,7 +32,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class DataOutputStream : public Gio::BufferedOutputStream
 {
diff --git a/gio/src/desktopappinfo.hg b/gio/src/desktopappinfo.hg
index 370ad412..29bab3ad 100644
--- a/gio/src/desktopappinfo.hg
+++ b/gio/src/desktopappinfo.hg
@@ -29,7 +29,7 @@ namespace Gio
 /**
  * DesktopAppInfo is an implementation of AppInfo based on desktop files.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class DesktopAppInfo
 : public Glib::Object,
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 507b7105..e82496f0 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -45,7 +45,7 @@ _WRAP_ENUM(DriveStartStopType, GDriveStartStopType)
  * If the Gio::Drive reports that media isn't automatically detected, one can poll for media; typically one should not do this periodically as a 
  * poll for media operation is potententially expensive and may spin up the drive, creating noise.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Drive : public Glib::Interface
 {
@@ -124,41 +124,41 @@ public:
   _WRAP_METHOD(std::string get_identifier(const std::string& kind) const, g_drive_get_identifier)
   _WRAP_METHOD(Glib::StringArrayHandle enumerate_identifiers() const, g_drive_enumerate_identifiers)
 
-  /** @since{2,22} */
+  /** @newin{2,22} */
   void start(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
-  /** @since{2,22} */
+  /** @newin{2,22} */
   void start(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
   _IGNORE(g_drive_start)
   _WRAP_METHOD(bool start_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_start_finish, errthrow)
-  /** @since{2,22} */
+  /** @newin{2,22} */
   _WRAP_METHOD(bool can_start() const, g_drive_can_start)
-  /** @since{2,22} */
+  /** @newin{2,22} */
   _WRAP_METHOD(bool can_start_degraded() const, g_drive_can_start_degraded)
 
-  /** @since{2,22} */
+  /** @newin{2,22} */
   void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
-  /** @since{2,22} */
+  /** @newin{2,22} */
   void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
   _IGNORE(g_drive_stop)
   _WRAP_METHOD(bool stop_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_stop_finish, errthrow)
-  /** @since{2,22} */
+  /** @newin{2,22} */
   _WRAP_METHOD(bool can_stop() const, g_drive_can_stop)
 
   _WRAP_METHOD(DriveStartStopType get_start_stop_type() const, g_drive_get_start_stop_type)
 
-  /** @since{2,20}
+  /** @newin{2,20}
    */
   _WRAP_SIGNAL(void changed(), changed, no_default_handler)
 
-  /** @since{2,20}
+  /** @newin{2,20}
    */
   _WRAP_SIGNAL(void disconnected(), disconnected, no_default_handler)
 
-  /** @since{2,20}
+  /** @newin{2,20}
    */
   _WRAP_SIGNAL(void eject_button(), eject_button, no_default_handler)
 
-  /** @since{2,22} */
+  /** @newin{2,22} */
   _WRAP_SIGNAL(void stop_button(), stop_button, no_default_handler)
 
   //_WRAP_VFUNC(Glib::ustring get_name() const, get_name)
diff --git a/gio/src/emblem.hg b/gio/src/emblem.hg
index 2ddbcb77..3b093b62 100644
--- a/gio/src/emblem.hg
+++ b/gio/src/emblem.hg
@@ -37,7 +37,7 @@ _WRAP_ENUM(EmblemOrigin, GEmblemOrigin, NO_GTYPE)
  * Currently, only metainformation about the emblem's origin is supported. More
  * may be added in the future.
  *
- * @since{2,20}
+ * @newin{2,20}
  */
 class Emblem
 : public Glib::Object,
diff --git a/gio/src/emblemedicon.hg b/gio/src/emblemedicon.hg
index 360e3d54..86a732c7 100644
--- a/gio/src/emblemedicon.hg
+++ b/gio/src/emblemedicon.hg
@@ -35,7 +35,7 @@ namespace Gio
  * Note that EmblemedIcon allows no control over the position of the emblems.
  * See also Emblem for more information.
  *
- * @since{2,20}
+ * @newin{2,20}
  */
 class EmblemedIcon
 : public Glib::Object,
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 0d50d3ce..0a680278 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -73,7 +73,7 @@ _WRAP_ENUM(MountMountFlags, GMountMountFlags, NO_GTYPE)
  * traditional mtime, and can be used to quickly determine if the file has been modified from the version on the file system. 
  * See the HTTP 1.1 specification for HTTP Etag headers, which are a very similar concept.
  *
- * @since{2,16}
+ * @newin{2,16}
  */ 
 class File : public Glib::Interface
 {
@@ -606,7 +606,7 @@ public:
    * @param flags: a set of FileQueryInfoFlags passed to query_info().
    * @results The FileType of the file, or FILE_TYPE_UNKNOWN if the file does not exist.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
    FileType query_file_type(FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE) const;
 
@@ -1150,7 +1150,7 @@ public:
    * 
    * @return <tt>true</tt> on successful creation, <tt>false</tt> otherwise.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool make_directory_with_parents();
@@ -1671,7 +1671,7 @@ public:
    * @param A Cancellable object.
    * @return A FileMonitor for the file.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   Glib::RefPtr<FileMonitor> monitor(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags flags = FILE_MONITOR_NONE);
@@ -1689,7 +1689,7 @@ public:
    * @param A Cancellable object.
    * @return A FileMonitor for the file.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   Glib::RefPtr<FileMonitor> monitor(FileMonitorFlags flags = FILE_MONITOR_NONE);
@@ -1740,7 +1740,7 @@ public:
    * @param cancellable A cancellable object.
    * @param contents A location to place the contents of the file. 
    * @param length A location to place the length of the contents of the file.
-   * @since{2,22}
+   * @newin{2,22}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool load_contents(const Glib::RefPtr<Cancellable>& cancellable, char*& contents, gsize& length);
@@ -1766,7 +1766,7 @@ public:
    *
    * @param contents A location to place the contents of the file. 
    * @param length A location to place the length of the contents of the file.
-   * @since{2,22}
+   * @newin{2,22}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool load_contents(char*& contents, gsize& length);
@@ -1826,7 +1826,7 @@ public:
    * @param length A location to place the length of the contents of the file.
    * @return <tt>true</tt> if the load was successful. If <tt>false</tt> and @a error is 
    * present, it will be set appropriately.
-   * @since{2,22}
+   * @newin{2,22}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool load_contents_finish(const Glib::RefPtr<AsyncResult>& result, char*& contents, gsize& length);
@@ -1895,7 +1895,7 @@ public:
    * @param length A location to place the length of the contents of the file.
    * @return <tt>true</tt> if the load was successful. If <tt>false</tt> and @a error is 
    * present, it will be set appropriately.
-   * @since{2,22}
+   * @newin{2,22}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool load_partial_contents_finish(const Glib::RefPtr<AsyncResult>& result, char*& contents, gsize& length);
diff --git a/gio/src/fileattributeinfo.hg b/gio/src/fileattributeinfo.hg
index b3c27d14..710e1534 100644
--- a/gio/src/fileattributeinfo.hg
+++ b/gio/src/fileattributeinfo.hg
@@ -35,7 +35,7 @@ _WRAP_ENUM(FileAttributeStatus, GFileAttributeStatus, NO_GTYPE)
 
 /** Information about a specific attribute - see FileAttributeInfoList.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileAttributeInfo
 {
diff --git a/gio/src/fileattributeinfolist.hg b/gio/src/fileattributeinfolist.hg
index 1ccb38e1..5bbd25aa 100644
--- a/gio/src/fileattributeinfolist.hg
+++ b/gio/src/fileattributeinfolist.hg
@@ -43,7 +43,7 @@ namespace Gio
  *
  * See http://library.gnome.org/devel/gio/unstable/gio-GFileAttribute.html for the list of default namespaces and the list of default keys.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileAttributeInfoList
 {
diff --git a/gio/src/fileenumerator.hg b/gio/src/fileenumerator.hg
index 7dc7d31f..f92a1d26 100644
--- a/gio/src/fileenumerator.hg
+++ b/gio/src/fileenumerator.hg
@@ -46,7 +46,7 @@ class File;
  * To close a Gio::FileEnumerator, use FileEnumerator::close(), or its asynchronous version, close_async(). Once a FileEnumerator is closed, 
  * no further actions may be performed on it.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileEnumerator : public Glib::Object
 {
diff --git a/gio/src/fileicon.hg b/gio/src/fileicon.hg
index 8af2dd3b..f87dd373 100644
--- a/gio/src/fileicon.hg
+++ b/gio/src/fileicon.hg
@@ -30,7 +30,7 @@ namespace Gio
 
 /** FileIcon specifies an icon by pointing to an image file to be used as icon.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileIcon
 : public Glib::Object,
diff --git a/gio/src/fileinfo.hg b/gio/src/fileinfo.hg
index 9e54a536..c472ce26 100644
--- a/gio/src/fileinfo.hg
+++ b/gio/src/fileinfo.hg
@@ -44,7 +44,7 @@ const FileType FILE_TYPE_UNKNOWN = FILE_TYPE_NOT_KNOWN;
 
 /** FileAttributeMatcher allows for searching through a FileInfo for attributes.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileAttributeMatcher
 {
diff --git a/gio/src/fileinputstream.hg b/gio/src/fileinputstream.hg
index 844b517b..2fe2cdf6 100644
--- a/gio/src/fileinputstream.hg
+++ b/gio/src/fileinputstream.hg
@@ -37,7 +37,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileInputStream 
 : public Gio::InputStream, 
diff --git a/gio/src/fileiostream.hg b/gio/src/fileiostream.hg
index abf5dc5c..d12ebe8e 100644
--- a/gio/src/fileiostream.hg
+++ b/gio/src/fileiostream.hg
@@ -35,7 +35,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class FileIOStream
 : public Gio::IOStream,
diff --git a/gio/src/filemonitor.hg b/gio/src/filemonitor.hg
index 27409ed7..c6127451 100644
--- a/gio/src/filemonitor.hg
+++ b/gio/src/filemonitor.hg
@@ -38,7 +38,7 @@ class File;
  * To get informed about changes to the file or directory you are monitoring, 
  * connect to signal_changed.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileMonitor : public Glib::Object
 {
diff --git a/gio/src/filenamecompleter.hg b/gio/src/filenamecompleter.hg
index 63eada75..fd949b66 100644
--- a/gio/src/filenamecompleter.hg
+++ b/gio/src/filenamecompleter.hg
@@ -32,7 +32,7 @@ class File;
 /** Completes partial file and directory names given a partial string by looking in the file system for clues. 
  * Can return a list of possible completion strings for widget implementation.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FilenameCompleter : public Glib::Object
 {
diff --git a/gio/src/fileoutputstream.hg b/gio/src/fileoutputstream.hg
index 798feec3..3db4f7af 100644
--- a/gio/src/fileoutputstream.hg
+++ b/gio/src/fileoutputstream.hg
@@ -40,7 +40,7 @@ namespace Gio
  * 
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FileOutputStream
 : public OutputStream,
diff --git a/gio/src/filterinputstream.hg b/gio/src/filterinputstream.hg
index 254de1f4..c975c642 100644
--- a/gio/src/filterinputstream.hg
+++ b/gio/src/filterinputstream.hg
@@ -32,7 +32,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FilterInputStream : public Gio::InputStream
 {
diff --git a/gio/src/filteroutputstream.hg b/gio/src/filteroutputstream.hg
index ce1d5f46..d6137f9c 100644
--- a/gio/src/filteroutputstream.hg
+++ b/gio/src/filteroutputstream.hg
@@ -32,7 +32,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class FilterOutputStream : public Gio::OutputStream
 {
diff --git a/gio/src/icon.hg b/gio/src/icon.hg
index d6280615..579b86ce 100644
--- a/gio/src/icon.hg
+++ b/gio/src/icon.hg
@@ -37,7 +37,7 @@ namespace Gio
  *
  * To check if two Icon instances are equal, see equal().
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Icon : public Glib::Interface
 {
diff --git a/gio/src/inetaddress.hg b/gio/src/inetaddress.hg
index 27702b3e..d08ca463 100644
--- a/gio/src/inetaddress.hg
+++ b/gio/src/inetaddress.hg
@@ -37,7 +37,7 @@ namespace Gio
  * To actually connect to a remote host, you will need a InetSocketAddress
  * (which includes a InetAddress as well as a port number).
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class InetAddress
 : public Glib::Object
diff --git a/gio/src/inetsocketaddress.hg b/gio/src/inetsocketaddress.hg
index 94a4b029..f0b093c5 100644
--- a/gio/src/inetsocketaddress.hg
+++ b/gio/src/inetsocketaddress.hg
@@ -35,7 +35,7 @@ namespace Gio
  * An IPv4 or IPv6 socket address, corresponding to a struct sockaddr_in or
  * struct sockaddr_in6.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class InetSocketAddress
 : public SocketAddress
diff --git a/gio/src/initable.hg b/gio/src/initable.hg
index 5fe24821..0cddf6ab 100644
--- a/gio/src/initable.hg
+++ b/gio/src/initable.hg
@@ -49,7 +49,7 @@ namespace Gio
  * construction and automatically initialize them, throwing an exception on
  * failure.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class Initable : public Glib::Interface
 {
diff --git a/gio/src/inputstream.hg b/gio/src/inputstream.hg
index c2279c80..2c9a5bdb 100644
--- a/gio/src/inputstream.hg
+++ b/gio/src/inputstream.hg
@@ -34,7 +34,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class InputStream : public Glib::Object
 {
diff --git a/gio/src/iostream.hg b/gio/src/iostream.hg
index 198696be..eda4a8ff 100644
--- a/gio/src/iostream.hg
+++ b/gio/src/iostream.hg
@@ -34,7 +34,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class IOStream : public Glib::Object
 {
diff --git a/gio/src/loadableicon.hg b/gio/src/loadableicon.hg
index c1364867..647d1323 100644
--- a/gio/src/loadableicon.hg
+++ b/gio/src/loadableicon.hg
@@ -33,7 +33,7 @@ namespace Gio
 
 /** Extends the Icon interface and adds the ability to load icons from streams.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class LoadableIcon : public Icon
 {
diff --git a/gio/src/memoryinputstream.hg b/gio/src/memoryinputstream.hg
index 41873aa1..2ad92bb0 100644
--- a/gio/src/memoryinputstream.hg
+++ b/gio/src/memoryinputstream.hg
@@ -30,7 +30,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class MemoryInputStream 
 : public Gio::InputStream, 
diff --git a/gio/src/memoryoutputstream.hg b/gio/src/memoryoutputstream.hg
index 18e07264..cf6276e8 100644
--- a/gio/src/memoryoutputstream.hg
+++ b/gio/src/memoryoutputstream.hg
@@ -35,7 +35,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,20}
+ * @newin{2,20}
  */
 class MemoryOutputStream :
     public OutputStream,
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 52df9a4d..14c6d2eb 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -47,7 +47,7 @@ class Drive;
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Mount : public Glib::Interface
 {
@@ -159,7 +159,7 @@ public:
    * @param cancellable A cancellable object which can be used to cancel the operation.
    * @param force_rescan Whether to force a rescan of the content. Otherwise a cached result will be used if available.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
   void guess_content_type(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, bool force_rescan = true);
 
@@ -174,7 +174,7 @@ public:
    * @param slot A callback which will be called when the operation is completed or canceled.
    * @param force_rescan Whether to force a rescan of the content. Otherwise a cached result will be used if available.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
   void guess_content_type(const SlotAsyncReady& slot, bool force_rescan = true);
 
@@ -185,7 +185,7 @@ public:
    *
    * @param force_rescan Whether to force a rescan of the content. Otherwise a cached result will be used if available.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
   void guess_content_type(bool force_rescan = true);
   _IGNORE(g_mount_guess_content_type)
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index b74560d7..c66a21a0 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -40,7 +40,7 @@ _WRAP_ENUM(MountOperationResult, GMountOperationResult, NO_GTYPE)
  *
  * Developers should instantiate a subclass of this that implements all the various callbacks to show the required dialogs.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class MountOperation : public Glib::Object
 {
diff --git a/gio/src/networkaddress.hg b/gio/src/networkaddress.hg
index 677d5187..c178f211 100644
--- a/gio/src/networkaddress.hg
+++ b/gio/src/networkaddress.hg
@@ -32,7 +32,7 @@ namespace Gio
  * connect to that host, handling the possibility of multiple IP addresses and
  * multiple address families.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class NetworkAddress : public Glib::Object,
     public SocketConnectable
diff --git a/gio/src/networkservice.hg b/gio/src/networkservice.hg
index 735db740..6ee082e8 100644
--- a/gio/src/networkservice.hg
+++ b/gio/src/networkservice.hg
@@ -36,7 +36,7 @@ namespace Gio
  * See SrvTarget for more information about SRV records, and see
  * SocketConnectable for and example of using the connectable interface.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class NetworkService : public Glib::Object,
     public SocketConnectable
diff --git a/gio/src/outputstream.hg b/gio/src/outputstream.hg
index e85cae8d..00699fac 100644
--- a/gio/src/outputstream.hg
+++ b/gio/src/outputstream.hg
@@ -34,7 +34,7 @@ _WRAP_ENUM(OutputStreamSpliceFlags, GOutputStreamSpliceFlags, NO_GTYPE)
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class OutputStream : public Glib::Object
 {
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index cd985c28..e862439e 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -39,7 +39,7 @@ namespace Gio
  * functionality that also implement SocketConnectable, making it easy to
  * connect to a remote host/service.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class Resolver
 : public Glib::Object
diff --git a/gio/src/seekable.hg b/gio/src/seekable.hg
index 64fb0486..6e94f4ae 100644
--- a/gio/src/seekable.hg
+++ b/gio/src/seekable.hg
@@ -41,7 +41,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Seekable : public Glib::Interface
 {
diff --git a/gio/src/socket.hg b/gio/src/socket.hg
index 09343960..0e3b2199 100644
--- a/gio/src/socket.hg
+++ b/gio/src/socket.hg
@@ -81,7 +81,7 @@ _WRAP_ENUM(SocketMsgFlags, GSocketMsgFlags)
  * automatically be killed if it tries to write to stdout after it has been
  * closed.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class Socket : public Glib::Object,
     public Initable
diff --git a/gio/src/socketaddress.hg b/gio/src/socketaddress.hg
index 89098a6b..2c95875e 100644
--- a/gio/src/socketaddress.hg
+++ b/gio/src/socketaddress.hg
@@ -32,7 +32,7 @@ namespace Gio
 
 /** Abstract base class representing endpoints for socket communication
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class SocketAddress : public Glib::Object,
     public SocketConnectable
diff --git a/gio/src/socketaddressenumerator.hg b/gio/src/socketaddressenumerator.hg
index 168feb4c..8438065e 100644
--- a/gio/src/socketaddressenumerator.hg
+++ b/gio/src/socketaddressenumerator.hg
@@ -31,7 +31,7 @@ class SocketAddress;
 
 /** Enumerator type for objects that contain or generate SocketAddresses
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class SocketAddressEnumerator : public Glib::Object
 {
diff --git a/gio/src/socketconnectable.hg b/gio/src/socketconnectable.hg
index 47230edc..2b527328 100644
--- a/gio/src/socketconnectable.hg
+++ b/gio/src/socketconnectable.hg
@@ -32,7 +32,7 @@ namespace Gio
 
 /** Interface for potential socket endpoints
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class SocketConnectable : public Glib::Interface
 {
diff --git a/gio/src/srvtarget.hg b/gio/src/srvtarget.hg
index 353b3003..048f1254 100644
--- a/gio/src/srvtarget.hg
+++ b/gio/src/srvtarget.hg
@@ -41,7 +41,7 @@ namespace Gio
  * planning to connect to the remote service, you can use NetworkService's
  * SocketConnectable interface and not need to worry about SrvTarget at all.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class SrvTarget
 {
diff --git a/gio/src/themedicon.hg b/gio/src/themedicon.hg
index fd47e1cf..4271fd14 100644
--- a/gio/src/themedicon.hg
+++ b/gio/src/themedicon.hg
@@ -37,7 +37,7 @@ namespace Gio
  * resolve the list of names so that fallback icons work nicely with
  * themes that inherit other themes.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class ThemedIcon
 : public Glib::Object,
diff --git a/gio/src/unixinputstream.hg b/gio/src/unixinputstream.hg
index 750bc7e0..58a32c90 100644
--- a/gio/src/unixinputstream.hg
+++ b/gio/src/unixinputstream.hg
@@ -32,7 +32,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class UnixInputStream : public Gio::InputStream
 {
diff --git a/gio/src/unixmount.hg b/gio/src/unixmount.hg
index 334386d9..97c27d50 100644
--- a/gio/src/unixmount.hg
+++ b/gio/src/unixmount.hg
@@ -29,7 +29,7 @@ namespace Gio
 /**
  * Routines for managing mounted UNIX mount points and paths.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 
 // TODO: GUnixMount seems to be hidden (the gunixmount.h header is not installed.)
diff --git a/gio/src/unixoutputstream.hg b/gio/src/unixoutputstream.hg
index 1cf37310..0c172bd5 100644
--- a/gio/src/unixoutputstream.hg
+++ b/gio/src/unixoutputstream.hg
@@ -31,7 +31,7 @@ namespace Gio
  *
  * @ingroup Streams
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class UnixOutputStream : public Gio::OutputStream
 {
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index 95faf1ef..973649de 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -50,7 +50,7 @@ class Drive;
  * That callback should then call g_volume_mount_finish() with the GVolume instance and the GAsyncReady data to see if the operation was completed 
  * successfully. If an error is present when finish() is called, then it will be filled with any error information.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Volume : public Glib::Interface
 {
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index 614c8b94..981eaf3d 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -32,7 +32,7 @@ namespace Gio
  * computer. In other words, what a file selector or file manager would show in 
  * a sidebar.
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class VolumeMonitor : public Glib::Object
 {
diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h
index 99fca308..85ba7c45 100644
--- a/glib/glibmm/main.h
+++ b/glib/glibmm/main.h
@@ -191,7 +191,7 @@ public:
    * @param priority The priority of the new event source.
    * @return A connection handle, which can be used to disconnect the handler.
    *
-   * @since{2,14}
+   * @newin{2,14}
    */
   sigc::connection connect_seconds(const sigc::slot<bool>& slot, unsigned int interval,
                            int priority = PRIORITY_DEFAULT);
diff --git a/glib/glibmm/miscutils.h b/glib/glibmm/miscutils.h
index dfa765b8..a8cf0f11 100644
--- a/glib/glibmm/miscutils.h
+++ b/glib/glibmm/miscutils.h
@@ -168,7 +168,7 @@ std::string get_current_dir();
  * Return value: the path to the specified special directory.
  * @param directory Te logical id of special directory
  * 
- * @since{2,14}
+ * @newin{2,14}
  */
 std::string get_user_special_dir(GUserDirectory directory);
 
@@ -178,7 +178,7 @@ std::string get_user_special_dir(GUserDirectory directory);
  * On UNIX platforms this is determined using the mechanisms described in the
  * XDG Base Directory Specification
  *
- * @since{2,14}
+ * @newin{2,14}
  */
 std::string get_user_data_dir();
 
@@ -188,7 +188,7 @@ std::string get_user_data_dir();
  * On UNIX platforms this is determined using the mechanisms described in the
  * XDG Base Directory Specification
  *
- * @since{2,14}
+ * @newin{2,14}
  */
 std::string get_user_config_dir();
 
@@ -198,7 +198,7 @@ std::string get_user_config_dir();
  * On UNIX platforms this is determined using the mechanisms described in the
  * XDG Base Directory Specification
  *
- * @since{2,14}
+ * @newin{2,14}
  */
 std::string get_user_cache_dir();
 
diff --git a/glib/glibmm/refptr.h b/glib/glibmm/refptr.h
index a72d7f9f..b262edde 100644
--- a/glib/glibmm/refptr.h
+++ b/glib/glibmm/refptr.h
@@ -121,7 +121,7 @@ public:
 #endif //GLIBMM_DISABLE_DEPRECATED
 
   /** Set underlying instance to 0, decrementing reference count of existing instance appropriately.
-   * @since{2,16}
+   * @newin{2,16}
    */
   inline void reset();
 
diff --git a/glib/glibmm/timeval.h b/glib/glibmm/timeval.h
index 387be842..685f7832 100644
--- a/glib/glibmm/timeval.h
+++ b/glib/glibmm/timeval.h
@@ -53,7 +53,7 @@ struct TimeVal : public GTimeVal
    * @param iso_date ISO 8601 encoded string.
    * @return <tt>true</tt> if conversion was successful.
    *
-   * @since{2,22}
+   * @newin{2,22}
    */
   bool assign_from_iso8601(const Glib::ustring& iso_date);
 
@@ -81,7 +81,7 @@ struct TimeVal : public GTimeVal
   /** Returns an ISO 8601 encoded string, relative to the Coordinated
    * Universal Time (UTC).
    *
-   * @since{2,22}
+   * @newin{2,22}
    */
   Glib::ustring as_iso8601() const;
 
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index 7b03caf4..948b927a 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -598,7 +598,7 @@ public:
 //! @{
 
   /* Returns fmt as is, but checks for invalid references in the format string.
-   * @since{2,18}
+   * @newin{2,18}
    */
   template <class T1>
   static inline
@@ -620,21 +620,21 @@ public:
    * @return The substituted message string.
    * @throw Glib::ConvertError
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1>
   static inline
   ustring compose(const ustring& fmt, const T1& a1);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2>
   static inline
   ustring compose(const ustring& fmt, const T1& a1, const T2& a2);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3>
   static inline
@@ -642,7 +642,7 @@ public:
                   const T1& a1, const T2& a2, const T3& a3);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4>
   static inline
@@ -651,7 +651,7 @@ public:
                   const T4& a4);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4, class T5>
   static inline
@@ -660,7 +660,7 @@ public:
                   const T4& a4, const T5& a5);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4, class T5, class T6>
   static inline
@@ -669,7 +669,7 @@ public:
                   const T4& a4, const T5& a5, const T6& a6);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
   static inline
@@ -679,7 +679,7 @@ public:
                   const T7& a7);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4,
             class T5, class T6, class T7, class T8>
@@ -690,7 +690,7 @@ public:
                   const T7& a7, const T8& a8);
 
   /* See the documentation for compose(const ustring& fmt, const T1& a1).
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4, class T5,
             class T6, class T7, class T8, class T9>
@@ -728,7 +728,7 @@ public:
    * @return The string representation of the argument stream.
    * @throw Glib::ConvertError
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1>
   static inline
@@ -736,7 +736,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2>
   static inline
@@ -744,7 +744,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3>
   static inline
@@ -752,7 +752,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4>
   static inline
@@ -760,7 +760,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4, class T5>
   static inline
@@ -769,7 +769,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4, class T5, class T6>
   static inline
@@ -778,7 +778,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4,
             class T5, class T6, class T7>
@@ -788,7 +788,7 @@ public:
 
   /* See the documentation for format(const T1& a1).
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   template <class T1, class T2, class T3, class T4,
             class T5, class T6, class T7, class T8>
diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg
index 8c429450..659222c1 100644
--- a/glib/src/checksum.hg
+++ b/glib/src/checksum.hg
@@ -37,7 +37,7 @@ namespace Glib
  * or get_digest() to compute the checksum and return it either as a string in hexadecimal form, or as a raw sequence of bytes. 
  * To compute the checksum for binary blobs and NULL-terminated strings in one go, use the static compute_checksum() convenience functions().
  *
- * @since{2,16}
+ * @newin{2,16}
  */
 class Checksum
 {
@@ -57,7 +57,7 @@ public:
    * Note that the ChecksumType enumeration may be extended at a later 
    * date to include new hashing algorithm types. 
    *
-   * @since{2,16}
+   * @newin{2,16}
    */
   _WRAP_ENUM(ChecksumType, GChecksumType, NO_GTYPE)
 
diff --git a/glib/src/date.hg b/glib/src/date.hg
index 0a553473..5f0182cc 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -69,14 +69,14 @@ public:
   /** Construct a Glib::Date by copying the contents of a GDate.
    * @param castitem The GDate.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
   explicit Date(const GDate& castitem);
 
   /** Construct a Glib::Date from another.
    * @param other the other Glib::Date.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
   Date(const Date& other);
 
@@ -89,7 +89,7 @@ public:
    *
    * @param other The other Glib::Date.
    *
-   * @since{2,18}
+   * @newin{2,18}
    */
   Date& operator=(const Date& other);
 
@@ -318,7 +318,7 @@ public:
    * The date must be valid.
    * @return ISO 8601 week number of the year.
    *
-   * @since{2,22}
+   * @newin{2,22}
    */
   unsigned int get_iso8601_week_of_year() const;
 
diff --git a/glib/src/fileutils.hg b/glib/src/fileutils.hg
index bfe37f3f..9a541aa7 100644
--- a/glib/src/fileutils.hg
+++ b/glib/src/fileutils.hg
@@ -423,12 +423,12 @@ std::string file_get_contents(const std::string& filename);
  * If the call was not successful, an exception is thrown.
  * Possible error codes are those in the FileError enumeration.
  *
- * @since{2,22}
+ * @newin{2,22}
  **/
 void file_set_contents (const std::string& filename, const gchar *contents, gssize length);
 /** A variant of file_set_contents which accepts a standard C++ string
  *
- * @since{2,22}
+ * @newin{2,22}
  * */
 void file_set_contents (const std::string& filename, const std::string& contents);
 
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index 17ff3abd..07a66c52 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -90,7 +90,7 @@ _WRAP_GERROR(KeyFileError, GKeyFileError, G_KEY_FILE_ERROR, NO_GTYPE)
  * times; the last entry wins. Key files may also contain multiple groups with the same name; they are merged 
  * together. Another difference is that keys and group names in key files are not restricted to ASCII characters. 
  *
- * @since{2,14}
+ * @newin{2,14}
  */
 class KeyFile
 {
@@ -231,7 +231,7 @@ public:
    * @return The value of @a key as an double
    * @throw Glib::KeyFileError
    *
-   * @since{2,14}
+   * @newin{2,14}
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   double get_double(const Glib::ustring& key) const;
@@ -245,7 +245,7 @@ public:
   /** Associates a new double value with @a key under the start group.
    * If @a key  cannot be found then it is created.
    * 
-   * @since{2,12}
+   * @newin{2,12}
    * @param key A key.
    * @param value An double value.
    */
@@ -409,7 +409,7 @@ public:
    * @param key The name of a key
    * @param list A list holding object of type int
    *
-   * @since{2,14}
+   * @newin{2,14}
    */
   void set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ArrayHandle<double>& list);
   _IGNORE(g_key_file_set_double_list)
diff --git a/glib/src/nodetree.hg b/glib/src/nodetree.hg
index 4348f8bc..4d49fbb9 100644
--- a/glib/src/nodetree.hg
+++ b/glib/src/nodetree.hg
@@ -62,7 +62,7 @@ enum TraverseType
  * 
  * To remove a node or subtree from a tree use unlink().
  *
- * @since{2,18}
+ * @newin{2,18}
  */
 template <typename T> 
 class NodeTree
diff --git a/glib/src/optioncontext.hg b/glib/src/optioncontext.hg
index ba8c155c..9ec718cb 100644
--- a/glib/src/optioncontext.hg
+++ b/glib/src/optioncontext.hg
@@ -117,7 +117,7 @@ public:
    * If you are using gettext(), you only need to set the translation domain,
    * see set_translation_domain().
    *
-   * @since{2,14}
+   * @newin{2,14}
    */
   void set_translate_func (const SlotTranslate& slot);
   _IGNORE(g_option_context_set_translate_func)
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 73784cab..50e90e4a 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -89,7 +89,7 @@ _WRAP_GERROR(RegexError, GRegexError, G_REGEX_ERROR, NO_GTYPE)
  * The regular expressions low level functionalities are obtained through the 
  * excellent PCRE library written by Philip Hazel. 
  *
- * @since{2,14}
+ * @newin{2,14}
  */
 class Regex
 {
diff --git a/glib/src/uriutils.hg b/glib/src/uriutils.hg
index 387e24f3..2714979b 100644
--- a/glib/src/uriutils.hg
+++ b/glib/src/uriutils.hg
@@ -43,7 +43,7 @@ namespace Glib
  * @result An unescaped version of @a escaped_string.
  * 
  * @ingroup UriUtils
- * @since{2,16}
+ * @newin{2,16}
  */
 std::string uri_unescape_string(const std::string& escaped_string, const std::string& illegal_characters = std::string());
 
@@ -62,7 +62,7 @@ std::string uri_unescape_string(const std::string& escaped_string, const std::st
  * @result The "Scheme" component of the URI, or an empty string on error. 
  * 
  * @ingroup UriUtils
- * @since{2,16}
+ * @newin{2,16}
  */
 std::string uri_parse_scheme(const std::string& uri);
 
@@ -81,7 +81,7 @@ std::string uri_parse_scheme(const std::string& uri);
  * @result An escaped version of @a unescaped.
  *
  * @ingroup UriUtils
- * @since{2,16}
+ * @newin{2,16}
  */
 std::string uri_escape_string(const std::string& unescaped, const std::string& reserved_chars_allowed = std::string(), bool allow_utf8 = true);
 
diff --git a/glib/src/valuearray.hg b/glib/src/valuearray.hg
index 35e41634..cbe9cc0b 100644
--- a/glib/src/valuearray.hg
+++ b/glib/src/valuearray.hg
@@ -31,7 +31,7 @@ namespace Glib
  * that holds an array of values. A ValueArray wraps an array of ValueBase
  * elements.
  *
- * @since{2,22}
+ * @newin{2,22}
  */
 class ValueArray
 {
diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index 70bcf0da..8072b4e3 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -371,8 +371,8 @@ sub convert_tags_to_doxygen($)
     # Remove all para tags (from tmpl sgml files).
     s"&lt;/?para&gt;""g;
 
-    # Use our Doxygen @since alias:
-    s/\bSince:\s*(\d+)\.(\d+)\b/\@since{$1,$2}/g;
+    # Use our Doxygen @newin alias:
+    s/\bSince:\s*(\d+)\.(\d+)\b/\@newin{$1,$2}/g;
 
     s"\b-&gt;\b"->"g;